diff --git a/[refs] b/[refs]
index 072cf54ccc81..a77f527e7d89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0ec406c80a65590dbdb60ed0d0c8e73e6c3884f
+refs/heads/master: b490ff42709546d5cf6b631c1a84a5f4fcb020e4
diff --git a/trunk/arch/mips/kernel/head.S b/trunk/arch/mips/kernel/head.S
index 9f6927169358..d7d7de7cdb40 100644
--- a/trunk/arch/mips/kernel/head.S
+++ b/trunk/arch/mips/kernel/head.S
@@ -131,6 +131,14 @@
 EXPORT(stext)					# used for profiling
 EXPORT(_stext)
 
+#ifdef CONFIG_QEMU
+	/*
+	 * 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
 
 NESTED(kernel_entry, 16, sp)			# kernel entry point
@@ -166,6 +174,10 @@ NESTED(kernel_entry, 16, sp)			# kernel entry point
 	j		start_kernel
 	END(kernel_entry)
 
+#ifdef CONFIG_QEMU
+	__INIT
+#endif
+
 #ifdef CONFIG_SMP
 /*
  * SMP slave cpus entry point.  Board specific code for bootstrap calls this