Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / xtensa / kernel / head.S

diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S
index ea89910efa44f523e928ffc6a1b33938e5e97d45..0817f9db836e3cf582edd26de186e901f7e1d79e 100644 (file)
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
@@ -19,6 +19,8 @@
 #include <asm/page.h>
 #include <asm/cacheasm.h>
 
+#include <linux/linkage.h>
+
 /*
  * This module contains the entry code for kernel images. It performs the
  * minimal setup needed to call the generic C routines.
@@ -51,7 +53,7 @@ _start:       _j      2f
 2:     l32r    a0, 1b
        jx      a0
 
-       .text
+       .section .init.text, "ax"
        .align 4
 _startup:
 
@@ -227,13 +229,15 @@ _startup:
 should_never_return:
        j       should_never_return
 
-       /* Define some common data structures here.  We define them
-        * here in this assembly file due to their unusual alignment
-        * requirements.
-        */
-
-       .comm   swapper_pg_dir,PAGE_SIZE,PAGE_SIZE
-       .comm   empty_bad_page_table,PAGE_SIZE,PAGE_SIZE
-       .comm   empty_bad_page,PAGE_SIZE,PAGE_SIZE
-       .comm   empty_zero_page,PAGE_SIZE,PAGE_SIZE
 
+/*
+ * BSS section
+ */
+       
+.section ".bss.page_aligned", "w"
+#ifdef CONFIG_MMU
+ENTRY(swapper_pg_dir)
+       .fill   PAGE_SIZE, 1, 0
+#endif
+ENTRY(empty_zero_page)
+       .fill   PAGE_SIZE, 1, 0