@ -66,8 +66,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
struct sysinfo i ;
si_meminfo_node ( & i , nid ) ;
n = sprintf ( buf , " \n "
n = sprintf ( buf ,
" Node %d MemTotal: %8lu kB \n "
" Node %d MemFree: %8lu kB \n "
" Node %d MemUsed: %8lu kB \n "
@ -78,13 +77,33 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
" Node %d Active(file): %8lu kB \n "
" Node %d Inactive(file): %8lu kB \n "
" Node %d Unevictable: %8lu kB \n "
" Node %d Mlocked: %8lu kB \n "
" Node %d Mlocked: %8lu kB \n " ,
nid , K ( i . totalram ) ,
nid , K ( i . freeram ) ,
nid , K ( i . totalram - i . freeram ) ,
nid , K ( node_page_state ( nid , NR_ACTIVE_ANON ) +
node_page_state ( nid , NR_ACTIVE_FILE ) ) ,
nid , K ( node_page_state ( nid , NR_INACTIVE_ANON ) +
node_page_state ( nid , NR_INACTIVE_FILE ) ) ,
nid , K ( node_page_state ( nid , NR_ACTIVE_ANON ) ) ,
nid , K ( node_page_state ( nid , NR_INACTIVE_ANON ) ) ,
nid , K ( node_page_state ( nid , NR_ACTIVE_FILE ) ) ,
nid , K ( node_page_state ( nid , NR_INACTIVE_FILE ) ) ,
nid , K ( node_page_state ( nid , NR_UNEVICTABLE ) ) ,
nid , K ( node_page_state ( nid , NR_MLOCK ) ) ) ;
# ifdef CONFIG_HIGHMEM
n + = sprintf ( buf + n ,
" Node %d HighTotal: %8lu kB \n "
" Node %d HighFree: %8lu kB \n "
" Node %d LowTotal: %8lu kB \n "
" Node %d LowFree: %8lu kB \n "
" Node %d LowFree: %8lu kB \n " ,
nid , K ( i . totalhigh ) ,
nid , K ( i . freehigh ) ,
nid , K ( i . totalram - i . totalhigh ) ,
nid , K ( i . freeram - i . freehigh ) ) ;
# endif
n + = sprintf ( buf + n ,
" Node %d Dirty: %8lu kB \n "
" Node %d Writeback: %8lu kB \n "
" Node %d FilePages: %8lu kB \n "
@ -99,25 +118,6 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
" Node %d Slab: %8lu kB \n "
" Node %d SReclaimable: %8lu kB \n "
" Node %d SUnreclaim: %8lu kB \n " ,
nid , K ( i . totalram ) ,
nid , K ( i . freeram ) ,
nid , K ( i . totalram - i . freeram ) ,
nid , K ( node_page_state ( nid , NR_ACTIVE_ANON ) +
node_page_state ( nid , NR_ACTIVE_FILE ) ) ,
nid , K ( node_page_state ( nid , NR_INACTIVE_ANON ) +
node_page_state ( nid , NR_INACTIVE_FILE ) ) ,
nid , K ( node_page_state ( nid , NR_ACTIVE_ANON ) ) ,
nid , K ( node_page_state ( nid , NR_INACTIVE_ANON ) ) ,
nid , K ( node_page_state ( nid , NR_ACTIVE_FILE ) ) ,
nid , K ( node_page_state ( nid , NR_INACTIVE_FILE ) ) ,
nid , K ( node_page_state ( nid , NR_UNEVICTABLE ) ) ,
nid , K ( node_page_state ( nid , NR_MLOCK ) ) ,
# ifdef CONFIG_HIGHMEM
nid , K ( i . totalhigh ) ,
nid , K ( i . freehigh ) ,
nid , K ( i . totalram - i . totalhigh ) ,
nid , K ( i . freeram - i . freehigh ) ,
# endif
nid , K ( node_page_state ( nid , NR_FILE_DIRTY ) ) ,
nid , K ( node_page_state ( nid , NR_WRITEBACK ) ) ,
nid , K ( node_page_state ( nid , NR_FILE_PAGES ) ) ,