summaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/setup.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-01-27 23:45:22 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-01-27 23:45:22 +0000
commit5b35aa5cd29bb111d847b2a2ed18110acbfb1f44 (patch)
treec7bbaa1137528330d3c74d14056ef7016a52be72 /arch/ppc/kernel/setup.c
parent511bcd7c5924ce9e98ad1cb851988f7448dfef0f (diff)
Merge with Linux 2.3.24.
Diffstat (limited to 'arch/ppc/kernel/setup.c')
-rw-r--r--arch/ppc/kernel/setup.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 518446bf9..8863a9940 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -311,18 +311,16 @@ int get_cpuinfo(char *buffer)
/*
* Ooh's and aah's info about zero'd pages in idle task
*/
- {
- len += sprintf(buffer+len,"zero pages\t: total %lu (%luKb) "
- "current: %lu (%luKb) hits: %lu/%lu (%lu%%)\n",
- zero_cache_total,
- (zero_cache_total*PAGE_SIZE)>>10,
- zero_cache_sz,
- (zero_cache_sz*PAGE_SIZE)>>10,
- zero_cache_hits,zero_cache_calls,
- /* : 1 below is so we don't div by zero */
- (zero_cache_hits*100) /
- ((zero_cache_calls)?zero_cache_calls:1));
- }
+ len += sprintf(buffer+len,"zero pages\t: total: %u (%luKb) "
+ "current: %u (%luKb) hits: %u/%u (%u%%)\n",
+ atomic_read(&zero_cache_total),
+ (atomic_read(&zero_cache_total)*PAGE_SIZE)>>10,
+ atomic_read(&zero_cache_sz),
+ (atomic_read(&zero_cache_sz)*PAGE_SIZE)>>10,
+ atomic_read(&zero_cache_hits),atomic_read(&zero_cache_calls),
+ /* : 1 below is so we don't div by zero */
+ (atomic_read(&zero_cache_hits)*100) /
+ ((atomic_read(&zero_cache_calls))?atomic_read(&zero_cache_calls):1));
if (ppc_md.get_cpuinfo != NULL)
{