diff options
| author | Kanoj Sarcar <kanoj@engr.sgi.com> | 2000-06-05 17:20:59 +0000 |
|---|---|---|
| committer | Kanoj Sarcar <kanoj@engr.sgi.com> | 2000-06-05 17:20:59 +0000 |
| commit | 280de41b910deb8fadff937891b2e6c93daf556f (patch) | |
| tree | 9806fbbd263e232e2fac0d28c009a5bf13e70601 | |
| parent | b5e2f2a226e5729f740f5310397874c5b060bb41 (diff) | |
Fix the address twiddling. For some reason, the code that I was expecting
was not getting generated (coding problem or cpp/as problem, no point
tracking this down).
| -rw-r--r-- | arch/mips64/kernel/head.S | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/mips64/kernel/head.S b/arch/mips64/kernel/head.S index cc19d318c..0615209f9 100644 --- a/arch/mips64/kernel/head.S +++ b/arch/mips64/kernel/head.S @@ -20,15 +20,6 @@ #include <asm/mipsregs.h> #include <asm/stackframe.h> -#define ARC64_TWIDDLE_PC \ -#ifdef CONFIG_ARC64 \ - /* We get launched at a XKPHYS address but the kernel is linked to \ - run at a KSEG0 address, so jump there. */ \ - la t0, 1f \ - jr t0 \ -1: \ -#endif - .text EXPORT(stext) # used for profiling @@ -38,7 +29,11 @@ EXPORT(_stext) NESTED(kernel_entry, 16, sp) # kernel entry point - ARC64_TWIDDLE_PC +#ifdef CONFIG_ARC64 + la t0, 1f + jr t0 +1: +#endif ori sp, 0xf # align stack on 16 byte. xori sp, 0xf @@ -75,7 +70,11 @@ NESTED(kernel_entry, 16, sp) # kernel entry point END(kernel_entry) NESTED(bootstrap, 16, sp) - ARC64_TWIDDLE_PC +#ifdef CONFIG_ARC64 + la t0, 1f + jr t0 +1: +#endif CLI mfc0 t0, CP0_STATUS li t1, ~(ST0_CU1|ST0_CU2|ST0_CU3) |