diff options
author | Tejun Heo <tj@kernel.org> | 2011-05-24 11:59:36 +0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-05-24 11:59:36 +0400 |
commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /lib/show_mem.c | |
parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
download | linux-6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0.tar.xz |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'lib/show_mem.c')
-rw-r--r-- | lib/show_mem.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/show_mem.c b/lib/show_mem.c index d8d602b58c31..90cbe4bb5960 100644 --- a/lib/show_mem.c +++ b/lib/show_mem.c @@ -9,7 +9,7 @@ #include <linux/nmi.h> #include <linux/quicklist.h> -void __show_mem(unsigned int filter) +void show_mem(unsigned int filter) { pg_data_t *pgdat; unsigned long total = 0, reserved = 0, shared = 0, @@ -61,8 +61,3 @@ void __show_mem(unsigned int filter) quicklist_total_size()); #endif } - -void show_mem(void) -{ - __show_mem(0); -} |