1 files changed, 5 insertions, 5 deletions

diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index 6f57ca44291..f78538eceef 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/threads.h>
 
+#include <asm/addrspace.h>
 #include <asm/asm.h>
 #include <asm/asmmacro.h>
 #include <asm/irqflags.h>
@@ -129,24 +130,25 @@
 #endif
         .endm
 
+#ifndef CONFIG_NO_EXCEPT_FILL
         /*
          * Reserved space for exception handlers.
          * Necessary for machines which link their kernels at KSEG0.
          */
         .fill   0x400
+#endif
 
 EXPORT(stext)                                   # used for profiling
 EXPORT(_stext)
 
-#ifdef CONFIG_MIPS_SIM
+#ifdef CONFIG_BOOT_RAW
         /*
          * Give us a fighting chance of running if execution beings at the
          * kernel load address.  This is needed because this platform does
          * not have a ELF loader yet.
          */
-        j       kernel_entry
-#endif
         __INIT
+#endif
 
 NESTED(kernel_entry, 16, sp)                    # kernel entry point
 
@@ -197,9 +199,7 @@ NESTED(kernel_entry, 16, sp)			# kernel entry point
         j               start_kernel
         END(kernel_entry)
 
-#ifdef CONFIG_QEMU
         __INIT
-#endif
 
 #ifdef CONFIG_SMP
 /*