diff options
author | Anton Blanchard <anton@samba.org> | 2011-07-25 16:47:51 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-08-05 00:47:55 -0400 |
commit | fbafd728151ccc8665584bde78deb03dbb9ef055 (patch) | |
tree | 256f82b7705093e93532867e3aac4fd83ae471e5 /arch/powerpc | |
parent | 966728dd88b4026ec58fee169ccceaeaf56ef120 (diff) |
powerpc: Clean up some panic messages in prom_init
Add a newline to the panic messages in make_room. Also fix a
comment that suggested our chunk size is 4Mb. It's 1MB.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 3b22142c40df..a909f4e9343b 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -1830,10 +1830,12 @@ static void __init *make_room(unsigned long *mem_start, unsigned long *mem_end, | |||
1830 | if (room > DEVTREE_CHUNK_SIZE) | 1830 | if (room > DEVTREE_CHUNK_SIZE) |
1831 | room = DEVTREE_CHUNK_SIZE; | 1831 | room = DEVTREE_CHUNK_SIZE; |
1832 | if (room < PAGE_SIZE) | 1832 | if (room < PAGE_SIZE) |
1833 | prom_panic("No memory for flatten_device_tree (no room)"); | 1833 | prom_panic("No memory for flatten_device_tree " |
1834 | "(no room)\n"); | ||
1834 | chunk = alloc_up(room, 0); | 1835 | chunk = alloc_up(room, 0); |
1835 | if (chunk == 0) | 1836 | if (chunk == 0) |
1836 | prom_panic("No memory for flatten_device_tree (claim failed)"); | 1837 | prom_panic("No memory for flatten_device_tree " |
1838 | "(claim failed)\n"); | ||
1837 | *mem_end = chunk + room; | 1839 | *mem_end = chunk + room; |
1838 | } | 1840 | } |
1839 | 1841 | ||
@@ -2042,7 +2044,7 @@ static void __init flatten_device_tree(void) | |||
2042 | 2044 | ||
2043 | /* | 2045 | /* |
2044 | * Check how much room we have between alloc top & bottom (+/- a | 2046 | * Check how much room we have between alloc top & bottom (+/- a |
2045 | * few pages), crop to 4Mb, as this is our "chuck" size | 2047 | * few pages), crop to 1MB, as this is our "chunk" size |
2046 | */ | 2048 | */ |
2047 | room = RELOC(alloc_top) - RELOC(alloc_bottom) - 0x4000; | 2049 | room = RELOC(alloc_top) - RELOC(alloc_bottom) - 0x4000; |
2048 | if (room > DEVTREE_CHUNK_SIZE) | 2050 | if (room > DEVTREE_CHUNK_SIZE) |