diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 02:53:38 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 02:53:38 -0400 |
| commit | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (patch) | |
| tree | b9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42 /arch/m68knommu/kernel/setup.c | |
| parent | 37f9ef553bed630957e025504cdcbc76f5de49d5 (diff) | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/kernel/asm-offsets.c
Diffstat (limited to 'arch/m68knommu/kernel/setup.c')
| -rw-r--r-- | arch/m68knommu/kernel/setup.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c index 5985f1989021..5c2bb3eeaaa2 100644 --- a/arch/m68knommu/kernel/setup.c +++ b/arch/m68knommu/kernel/setup.c | |||
| @@ -166,15 +166,13 @@ void __init setup_arch(char **cmdline_p) | |||
| 166 | printk(KERN_INFO "Motorola M5235EVB support (C)2005 Syn-tech Systems, Inc. (Jate Sujjavanich)\n"); | 166 | printk(KERN_INFO "Motorola M5235EVB support (C)2005 Syn-tech Systems, Inc. (Jate Sujjavanich)\n"); |
| 167 | #endif | 167 | #endif |
| 168 | 168 | ||
| 169 | #ifdef DEBUG | 169 | pr_debug("KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x " |
| 170 | printk(KERN_DEBUG "KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x " | 170 | "BSS=0x%06x-0x%06x\n", (int) &_stext, (int) &_etext, |
| 171 | "BSS=0x%06x-0x%06x\n", (int) &_stext, (int) &_etext, | 171 | (int) &_sdata, (int) &_edata, |
| 172 | (int) &_sdata, (int) &_edata, | 172 | (int) &_sbss, (int) &_ebss); |
| 173 | (int) &_sbss, (int) &_ebss); | 173 | pr_debug("MEMORY -> ROMFS=0x%06x-0x%06x MEM=0x%06x-0x%06x\n ", |
| 174 | printk(KERN_DEBUG "MEMORY -> ROMFS=0x%06x-0x%06x MEM=0x%06x-0x%06x\n ", | 174 | (int) &_ebss, (int) memory_start, |
| 175 | (int) &_ebss, (int) memory_start, | 175 | (int) memory_start, (int) memory_end); |
| 176 | (int) memory_start, (int) memory_end); | ||
| 177 | #endif | ||
| 178 | 176 | ||
| 179 | /* Keep a copy of command line */ | 177 | /* Keep a copy of command line */ |
| 180 | *cmdline_p = &command_line[0]; | 178 | *cmdline_p = &command_line[0]; |