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/sh | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/traps.c | 6 | ||||
| -rw-r--r-- | arch/sh/mm/init.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index db11c1247..4aeaf8efa 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c @@ -28,12 +28,6 @@ #include <asm/atomic.h> #include <asm/processor.h> -static inline void console_verbose(void) -{ - extern int console_loglevel; - console_loglevel = 15; -} - #define DO_ERROR(trapnr, signr, str, name, tsk) \ asmlinkage void do_##name(unsigned long r4, unsigned long r5, \ unsigned long r6, unsigned long r7, \ diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 5a0ac1f10..e03dba90a 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -150,7 +150,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"); @@ -163,9 +163,7 @@ void show_mem(void) reserved++; else if (PageSwapCache(mem_map+i)) cached++; - else if (!page_count(mem_map+i)) - free++; - else + else if (page_count(mem_map+i)) shared += page_count(mem_map+i) - 1; } printk("%d pages of RAM\n",total); |