Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

[linux-2.6] / arch / sh / kernel / head_32.S

diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S
index 3338239717f108f2d03f4779eecd7e9ed865ebe3..ae0a382a82ebbf0f18d54767413c3d31ff87685a 100644 (file)
--- a/arch/sh/kernel/head_32.S
+++ b/arch/sh/kernel/head_32.S
@@ -30,9 +30,13 @@ ENTRY(empty_zero_page)
        .long   0               /* RAMDISK_FLAGS */
        .long   0x0200          /* ORIG_ROOT_DEV */
        .long   1               /* LOADER_TYPE */
-       .long   0x00360000      /* INITRD_START */
-       .long   0x000a0000      /* INITRD_SIZE */
-       .long   0
+       .long   0x00000000      /* INITRD_START */
+       .long   0x00000000      /* INITRD_SIZE */
+#ifdef CONFIG_32BIT
+       .long   0x53453f00 + 32 /* "SE?" = 32 bit */
+#else
+       .long   0x53453f00 + 29 /* "SE?" = 29 bit */
+#endif
 1:
        .skip   PAGE_SIZE - empty_zero_page - 1b