[Linux-mips-commits]CVS: linux/fs/proc proc_misc.c,1.1.1.1,1.2

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/fs/proc
In directory usw-pr-cvs1:/tmp/cvs-serv13548/fs/proc

Modified Files:
	proc_misc.c 
Log Message:
Sync to 2.4.7



Index: proc_misc.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/proc/proc_misc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** proc_misc.c	2001/06/22 02:29:31	1.1.1.1
--- proc_misc.c	2001/08/25 02:19:28	1.2
***************
*** 147,195 ****
  #define K(x) ((x) << (PAGE_SHIFT - 10))
  #define B(x) ((x) << PAGE_SHIFT)
!         si_meminfo(&i);
!         si_swapinfo(&i);
!         len = sprintf(page, "        total:    used:    free:  shared: buffers:  cached:\n"
!                 "Mem:  %8lu %8lu %8lu %8lu %8lu %8u\n"
!                 "Swap: %8lu %8lu %8lu\n",
!                 B(i.totalram), B(i.totalram-i.freeram), B(i.freeram),
!                 B(i.sharedram), B(i.bufferram),
!                 B(atomic_read(&page_cache_size)), B(i.totalswap),
!                 B(i.totalswap-i.freeswap), B(i.freeswap));
!         /*
!          * Tagged format, for easy grepping and expansion.
!          * The above will go away eventually, once the tools
!          * have been updated.
!          */
!         len += sprintf(page+len,
!                 "MemTotal:     %8lu kB\n"
!                 "MemFree:      %8lu kB\n"
!                 "MemShared:    %8lu kB\n"
!                 "Buffers:      %8lu kB\n"
!                 "Cached:       %8u kB\n"
  		"Active:       %8u kB\n"
  		"Inact_dirty:  %8u kB\n"
  		"Inact_clean:  %8u kB\n"
  		"Inact_target: %8lu kB\n"
!                 "HighTotal:    %8lu kB\n"
!                 "HighFree:     %8lu kB\n"
!                 "LowTotal:     %8lu kB\n"
!                 "LowFree:      %8lu kB\n"
!                 "SwapTotal:    %8lu kB\n"
!                 "SwapFree:     %8lu kB\n",
!                 K(i.totalram),
!                 K(i.freeram),
!                 K(i.sharedram),
!                 K(i.bufferram),
!                 K(atomic_read(&page_cache_size)),
  		K(nr_active_pages),
  		K(nr_inactive_dirty_pages),
  		K(nr_inactive_clean_pages()),
  		K(inactive_target),
!                 K(i.totalhigh),
!                 K(i.freehigh),
!                 K(i.totalram-i.totalhigh),
!                 K(i.freeram-i.freehigh),
!                 K(i.totalswap),
!                 K(i.freeswap));
  
  	return proc_calc_metrics(page, start, off, count, eof, len);
--- 147,197 ----
  #define K(x) ((x) << (PAGE_SHIFT - 10))
  #define B(x) ((x) << PAGE_SHIFT)
! 	si_meminfo(&i);
! 	si_swapinfo(&i);
! 	len = sprintf(page, "        total:    used:    free:  shared: buffers:  cached:\n"
! 		"Mem:  %8lu %8lu %8lu %8lu %8lu %8u\n"
! 		"Swap: %8lu %8lu %8lu\n",
! 		B(i.totalram), B(i.totalram-i.freeram), B(i.freeram),
! 		B(i.sharedram), B(i.bufferram),
! 		B(atomic_read(&page_cache_size)), B(i.totalswap),
! 		B(i.totalswap-i.freeswap), B(i.freeswap));
! 	/*
! 	 * Tagged format, for easy grepping and expansion.
! 	 * The above will go away eventually, once the tools
! 	 * have been updated.
! 	 */
! 	len += sprintf(page+len,
! 		"MemTotal:     %8lu kB\n"
! 		"MemFree:      %8lu kB\n"
! 		"MemShared:    %8lu kB\n"
! 		"Buffers:      %8lu kB\n"
! 		"Cached:       %8lu kB\n"
! 		"SwapCached:   %8lu kB\n"
  		"Active:       %8u kB\n"
  		"Inact_dirty:  %8u kB\n"
  		"Inact_clean:  %8u kB\n"
  		"Inact_target: %8lu kB\n"
! 		"HighTotal:    %8lu kB\n"
! 		"HighFree:     %8lu kB\n"
! 		"LowTotal:     %8lu kB\n"
! 		"LowFree:      %8lu kB\n"
! 		"SwapTotal:    %8lu kB\n"
! 		"SwapFree:     %8lu kB\n",
! 		K(i.totalram),
! 		K(i.freeram),
! 		K(i.sharedram),
! 		K(i.bufferram),
! 		K(atomic_read(&page_cache_size) - swapper_space.nrpages),
! 		K(swapper_space.nrpages),
  		K(nr_active_pages),
  		K(nr_inactive_dirty_pages),
  		K(nr_inactive_clean_pages()),
  		K(inactive_target),
! 		K(i.totalhigh),
! 		K(i.freehigh),
! 		K(i.totalram-i.totalhigh),
! 		K(i.freeram-i.freehigh),
! 		K(i.totalswap),
! 		K(i.freeswap));
  
  	return proc_calc_metrics(page, start, off, count, eof, len);
***************
*** 290,298 ****
  			hz_to_std(kstat.per_cpu_system[cpu_logical_map(i)]),
  			jif - hz_to_std(  kstat.per_cpu_user[cpu_logical_map(i)] \
! 			           + kstat.per_cpu_nice[cpu_logical_map(i)] \
! 			           + kstat.per_cpu_system[cpu_logical_map(i)]));
  	len += sprintf(page + len,
  		"page %u %u\n"
!                 "swap %u %u\n"
  		"intr %u",
  			kstat.pgpgin >> 1,
--- 292,300 ----
  			hz_to_std(kstat.per_cpu_system[cpu_logical_map(i)]),
  			jif - hz_to_std(  kstat.per_cpu_user[cpu_logical_map(i)] \
! 				   + kstat.per_cpu_nice[cpu_logical_map(i)] \
! 				   + kstat.per_cpu_system[cpu_logical_map(i)]));
  	len += sprintf(page + len,
  		"page %u %u\n"
! 		"swap %u %u\n"
  		"intr %u",
  			kstat.pgpgin >> 1,