diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 12:09:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 12:09:43 -0400 |
| commit | 713c0515a555952d53956196d47dec3a3ece860a (patch) | |
| tree | 52ef61f6dbb338ad64e24662da859265d0c87a4d /arch/parisc/mm | |
| parent | 8f40f672e6bb071812f61bfbd30efc3fc1263ad1 (diff) | |
| parent | c913f94d86d75492af6222d268c53df236194afb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
arch/parisc/kernel/perf_asm.S: build fix
parisc: remove -traditional from assembler flags
parisc: use conditional macro for 64-bit wide ops
parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
arch/parisc/kernel/unaligned.c: use time_* macros
parisc: remove redundant display of free swap space in show_mem()
drivers/parisc: replace remaining __FUNCTION__ occurrences
parisc: replace remaining __FUNCTION__ occurrences
parisc: new termios definitions
parisc: fix trivial section name warnings
Diffstat (limited to 'arch/parisc/mm')
| -rw-r--r-- | arch/parisc/mm/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index b0ed709d5743..78fe252b92c3 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
| @@ -555,8 +555,6 @@ void show_mem(void) | |||
| 555 | 555 | ||
| 556 | printk(KERN_INFO "Mem-info:\n"); | 556 | printk(KERN_INFO "Mem-info:\n"); |
| 557 | show_free_areas(); | 557 | show_free_areas(); |
| 558 | printk(KERN_INFO "Free swap: %6ldkB\n", | ||
| 559 | nr_swap_pages<<(PAGE_SHIFT-10)); | ||
| 560 | #ifndef CONFIG_DISCONTIGMEM | 558 | #ifndef CONFIG_DISCONTIGMEM |
| 561 | i = max_mapnr; | 559 | i = max_mapnr; |
| 562 | while (i-- > 0) { | 560 | while (i-- > 0) { |