Changeset 150

Show
Ignore:
Timestamp:
07/24/06 21:24:59 (2 years ago)
Author:
jtv
Message:

Fixed for format change in /proc/meminfo in recent -mm kernels

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/debian/changelog

    r149 r150  
     1swapspace (1.9) stable; urgency=medium 
     2 
     3  * Fixed for format changes in /proc/meminfo, kernel 2.6.18-mm4 or so 
     4 
     5 -- Jeroen T. Vermeulen <jtv@thaiopensource.org>  Tue, 25 Jul 2006 08:25:00 +0700 
     6 
    17swapspace (1.8) stable; urgency=medium 
    28 

  • trunk/src/memory.c

    r144 r150  
    121121      fact); 
    122122 
    123   if (unlikely(x < 3)) 
     123  if (unlikely(x == 2)) 
     124  { 
     125    // Since Linux 2.6.18-mm4 or so, /proc/meminfo may contain lines without a 
     126    // unit or "factor" attached. 
     127    fact[0] = '\0'; 
     128  } 
     129  else if (unlikely(x < 2)) 
    124130  { 
    125131    result->value = 0;