]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
powerpc: Clean up some panic messages in prom_init
authorAnton Blanchard <anton@samba.org>
Mon, 25 Jul 2011 20:47:51 +0000 (20:47 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 5 Aug 2011 04:47:55 +0000 (14:47 +1000)
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>
arch/powerpc/kernel/prom_init.c

index 3b22142c40df11bc3d16c74daa941237ca1321cf..a909f4e9343bd05d0dd044bf940ffce5f488abb6 100644 (file)
@@ -1830,10 +1830,12 @@ static void __init *make_room(unsigned long *mem_start, unsigned long *mem_end,
                if (room > DEVTREE_CHUNK_SIZE)
                        room = DEVTREE_CHUNK_SIZE;
                if (room < PAGE_SIZE)
-                       prom_panic("No memory for flatten_device_tree (no room)");
+                       prom_panic("No memory for flatten_device_tree "
+                                  "(no room)\n");
                chunk = alloc_up(room, 0);
                if (chunk == 0)
-                       prom_panic("No memory for flatten_device_tree (claim failed)");
+                       prom_panic("No memory for flatten_device_tree "
+                                  "(claim failed)\n");
                *mem_end = chunk + room;
        }
 
@@ -2042,7 +2044,7 @@ static void __init flatten_device_tree(void)
 
        /*
         * Check how much room we have between alloc top & bottom (+/- a
-        * few pages), crop to 4Mb, as this is our "chuck" size
+        * few pages), crop to 1MB, as this is our "chunk" size
         */
        room = RELOC(alloc_top) - RELOC(alloc_bottom) - 0x4000;
        if (room > DEVTREE_CHUNK_SIZE)