|
@@ -27,16 +27,6 @@
|
|
|
|
|
|
#include <kernel-entry-init.h>
|
|
#include <kernel-entry-init.h>
|
|
|
|
|
|
- .macro ARC64_TWIDDLE_PC
|
|
|
|
-#if defined(CONFIG_ARC64) || defined(CONFIG_MAPPED_KERNEL)
|
|
|
|
- /* We get launched at a XKPHYS address but the kernel is linked to
|
|
|
|
- run at a KSEG0 address, so jump there. */
|
|
|
|
- PTR_LA t0, \@f
|
|
|
|
- jr t0
|
|
|
|
-\@:
|
|
|
|
-#endif
|
|
|
|
- .endm
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* inputs are the text nasid in t1, data nasid in t2.
|
|
* inputs are the text nasid in t1, data nasid in t2.
|
|
*/
|
|
*/
|
|
@@ -157,7 +147,11 @@ NESTED(kernel_entry, 16, sp) # kernel entry point
|
|
|
|
|
|
setup_c0_status_pri
|
|
setup_c0_status_pri
|
|
|
|
|
|
- ARC64_TWIDDLE_PC
|
|
|
|
|
|
+ /* We might not get launched at the address the kernel is linked to,
|
|
|
|
+ so we jump there. */
|
|
|
|
+ PTR_LA t0, 0f
|
|
|
|
+ jr t0
|
|
|
|
+0:
|
|
|
|
|
|
#ifdef CONFIG_MIPS_MT_SMTC
|
|
#ifdef CONFIG_MIPS_MT_SMTC
|
|
/*
|
|
/*
|