52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
--- proc/sysinfo.c
|
|
+++ proc/sysinfo.c 2012-06-01 15:12:32.676010123 +0000
|
|
@@ -3,6 +3,7 @@
|
|
* Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com
|
|
* Copyright 1998-2003 Albert Cahalan
|
|
* June 2003, Fabian Frederick, disk and slab info
|
|
+ * Copyright (c) 2008 Bart Van Assche.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
@@ -592,12 +593,12 @@ static unsigned long kb_vmalloc_chunk;
|
|
static unsigned long kb_vmalloc_total;
|
|
static unsigned long kb_vmalloc_used;
|
|
// seen on 2.6.24-rc6-git12
|
|
-static unsigned long kb_anon_pages;
|
|
-static unsigned long kb_bounce;
|
|
-static unsigned long kb_commit_limit;
|
|
-static unsigned long kb_nfs_unstable;
|
|
-static unsigned long kb_swap_reclaimable;
|
|
-static unsigned long kb_swap_unreclaimable;
|
|
+unsigned long kb_anon_pages;
|
|
+unsigned long kb_bounce;
|
|
+unsigned long kb_commit_limit;
|
|
+unsigned long kb_nfs_unstable;
|
|
+unsigned long kb_swap_reclaimable;
|
|
+unsigned long kb_swap_unreclaimable;
|
|
|
|
void meminfo(void){
|
|
char namebuf[16]; /* big enough to hold any row name */
|
|
@@ -677,6 +678,7 @@ nextline:
|
|
}
|
|
kb_swap_used = kb_swap_total - kb_swap_free;
|
|
kb_main_used = kb_main_total - kb_main_free;
|
|
+ kb_main_cached += kb_swap_reclaimable + kb_swap_cached + kb_nfs_unstable;
|
|
}
|
|
|
|
/*****************************************************************/
|
|
--- proc/sysinfo.h
|
|
+++ proc/sysinfo.h 2012-06-01 15:10:56.976306140 +0000
|
|
@@ -31,6 +31,11 @@ extern unsigned long kb_main_total;
|
|
extern unsigned long kb_swap_free;
|
|
extern unsigned long kb_swap_total;
|
|
/* recently introduced */
|
|
+extern unsigned long kb_anon_pages;
|
|
+extern unsigned long kb_bounce;
|
|
+extern unsigned long kb_nfs_unstable;
|
|
+extern unsigned long kb_slab_reclaimable;
|
|
+extern unsigned long kb_slab_unreclaimable;
|
|
extern unsigned long kb_high_free;
|
|
extern unsigned long kb_high_total;
|
|
extern unsigned long kb_low_free;
|