diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /arch/s390 | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/traps.c | 6 | ||||
| -rw-r--r-- | arch/s390/mm/init.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c index 71fbe4665..4af4f6565 100644 --- a/arch/s390/kernel/traps.c +++ b/arch/s390/kernel/traps.c @@ -47,12 +47,6 @@ extern pgm_check_handler_t do_page_fault; asmlinkage int system_call(void); -static inline void console_verbose(void) -{ - extern int console_loglevel; - console_loglevel = 15; -} - #define DO_ERROR(trapnr, signr, str, name, tsk) \ asmlinkage void name(struct pt_regs * regs, long error_code) \ { \ diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index 1a22e429b..177e5e8f2 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -192,7 +192,7 @@ int do_check_pgt_cache(int low, int high) void show_mem(void) { - int i,free = 0,total = 0,reserved = 0; + int i, total = 0, reserved = 0; int shared = 0, cached = 0; printk("Mem-info:\n"); @@ -205,9 +205,7 @@ void show_mem(void) reserved++; else if (PageSwapCache(mem_map+i)) cached++; - else if (!atomic_read(&mem_map[i].count)) - free++; - else + else if (page_count(mem_map+i)) shared += atomic_read(&mem_map[i].count) - 1; } printk("%d pages of RAM\n",total); |