Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / arch / sh / kernel / head.S

diff --git a/arch/sh/kernel/head.S b/arch/sh/kernel/head.S
index 6aca4bc..0bccc0c 100644 (file)
--- a/arch/sh/kernel/head.S
+++ b/arch/sh/kernel/head.S
@@ -33,9 +33,11 @@ ENTRY(empty_zero_page)
        .long   0x00360000      /* INITRD_START */
        .long   0x000a0000      /* INITRD_SIZE */
        .long   0
-       .balign PAGE_SIZE,0,PAGE_SIZE
+1:
+       .skip   PAGE_SIZE - empty_zero_page - 1b
+
+       .section        .text.head, "ax"
 
-       .text   
 /*
  * Condition at the entry of _stext:
  *