diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-13 23:09:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-14 13:31:38 -0700 |
| commit | c68e5d39a502d01421cbc70d25c377e9215facef (patch) | |
| tree | 9135a68681381d94a929b57a28a1878df0134ff7 /arch/sparc/kernel/trampoline_32.S | |
| parent | 5d83d66635bb1642f3c6a3690c28ff4afdf1ae5f (diff) | |
| download | op-kernel-dev-c68e5d39a502d01421cbc70d25c377e9215facef.zip op-kernel-dev-c68e5d39a502d01421cbc70d25c377e9215facef.tar.gz | |
sparc32: Implement hard_smp_processor_id() via instruction patching.
This is the last non-trivial user of btfixup.
Like sparc64, use a special patch section to resolve the various
implementations of how to read the current CPU's ID when we don't
have current_thread_info()->cpu necessarily available.
Signed-off-by: David S. Miller <davem@davemloft.net>
Tested-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch/sparc/kernel/trampoline_32.S')
| -rw-r--r-- | arch/sparc/kernel/trampoline_32.S | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/arch/sparc/kernel/trampoline_32.S b/arch/sparc/kernel/trampoline_32.S index 691f484..7364ddc 100644 --- a/arch/sparc/kernel/trampoline_32.S +++ b/arch/sparc/kernel/trampoline_32.S @@ -15,8 +15,8 @@ #include <asm/contregs.h> #include <asm/thread_info.h> - .globl sun4m_cpu_startup, __smp4m_processor_id, __leon_processor_id - .globl sun4d_cpu_startup, __smp4d_processor_id + .globl sun4m_cpu_startup + .globl sun4d_cpu_startup __CPUINIT .align 4 @@ -94,24 +94,6 @@ smp_do_cpu_idle: call cpu_panic nop -__smp4m_processor_id: - rd %tbr, %g2 - srl %g2, 12, %g2 - and %g2, 3, %g2 - retl - mov %g1, %o7 - -__smp4d_processor_id: - lda [%g0] ASI_M_VIKING_TMP1, %g2 - retl - mov %g1, %o7 - -__leon_processor_id: - rd %asr17,%g2 - srl %g2,28,%g2 - retl - mov %g1, %o7 - /* CPUID in bootbus can be found at PA 0xff0140000 */ #define SUN4D_BOOTBUS_CPUID 0xf0140000 |
