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 67e69139520bd91cb834dbfc68d591039712d3b7..0817f9db836e3cf582edd26de186e901f7e1d79e 100644 (file)
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
@@ -53,7 +53,7 @@ _start:       _j      2f
 2:     l32r    a0, 1b
        jx      a0
 
-       .text
+       .section .init.text, "ax"
        .align 4
 _startup:
 
@@ -235,8 +235,9 @@ should_never_return:
  */
        
 .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
-