upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / ppc64 / boot / main.c

diff --git a/arch/ppc64/boot/main.c b/arch/ppc64/boot/main.c
index 454f31c..3f67390 100644 (file)
--- a/arch/ppc64/boot/main.c
+++ b/arch/ppc64/boot/main.c
@@ -15,7 +15,6 @@
 #include <linux/string.h>
 #include <asm/processor.h>
 #include <asm/page.h>
-#include <asm/bootinfo.h>
 
 extern void *finddevice(const char *);
 extern int getprop(void *, const char *, void *, int);
@@ -74,7 +73,7 @@ void *stdin;
 void *stdout;
 void *stderr;
 
-#define DEBUG
+#undef DEBUG
 
 static unsigned long claim_base = PROG_START;
 
@@ -113,7 +112,7 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
        if (getprop(chosen_handle, "stdin", &stdin, sizeof(stdin)) != 4)
                exit();
 
-       printf("zImage starting: loaded at 0x%x\n\r", (unsigned)_start);
+       printf("\n\rzImage starting: loaded at 0x%x\n\r", (unsigned)_start);
 
        /*
         * Now we try to claim some memory for the kernel itself
@@ -152,7 +151,7 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
                printf("initial ramdisk moving 0x%lx <- 0x%lx (%lx bytes)\n\r",
                       initrd.addr, (unsigned long)_initrd_start, initrd.size);
                memmove((void *)initrd.addr, (void *)_initrd_start, initrd.size);
-               printf("initrd head: 0x%lx\n", *((u32 *)initrd.addr));
+               printf("initrd head: 0x%lx\n\r", *((u32 *)initrd.addr));
        }
 
        /* Eventually gunzip the kernel */
@@ -201,7 +200,7 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
        vmlinux.addr += (unsigned long)elf64ph->p_offset;
        vmlinux.size -= (unsigned long)elf64ph->p_offset;
 
-       flush_cache((void *)vmlinux.addr, vmlinux.memsize);
+       flush_cache((void *)vmlinux.addr, vmlinux.size);
 
        if (a1)
                printf("initrd head: 0x%lx\n\r", *((u32 *)initrd.addr));