[SPARC32]: Use model-specific cpuid calls in model-specific code

There are no longer any callers of GET_PROCESSOR_MID and
GET_PROCESSOR_ID, so both are removed.

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 4763e795cd1567ff964154c3dc23c0c99ccdb5fd..ae5e8d2aba8d574a74708838df7321e767972bdc 100644 (file)
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -350,7 +350,7 @@ smp4m_ticker:
         * for cross calls.  That has a separate entry point below.
         */
 maybe_smp4m_msg:
-       GET_PROCESSOR_MID(o3)
+       GET_PROCESSOR4M_ID(o3)
        set     sun4m_interrupts, %l5
        ld      [%l5], %o5
        sethi   %hi(0x60000000), %o4
@@ -390,7 +390,7 @@ maybe_smp4m_msg:
 linux_trap_ipi15_sun4m:
        SAVE_ALL
        sethi   %hi(0x80000000), %o2
-       GET_PROCESSOR_MID(o0)
+       GET_PROCESSOR4M_ID(o0)
        set     sun4m_interrupts, %l5
        ld      [%l5], %o5
        sll     %o0, 12, %o0

diff --git a/include/asm-sparc/asmmacro.h b/include/asm-sparc/asmmacro.h
index c2970f3e43e927c0a354b03e45936f1c00803d5b..0d4b65bd252bb4ee2745889fc05e35f1640eabb5 100644 (file)
--- a/include/asm-sparc/asmmacro.h
+++ b/include/asm-sparc/asmmacro.h
@@ -18,17 +18,6 @@
 #define GET_PROCESSOR4D_ID(reg) \
        lda     [%g0] ASI_M_VIKING_TMP1, %reg;
 
-/* Blackbox */
-#define GET_PROCESSOR_ID(reg) \
-       sethi   %hi(___b_smp_processor_id), %reg; \
-       sethi   %hi(boot_cpu_id), %reg; \
-       ldub    [%reg + %lo(boot_cpu_id)], %reg;
-
-#define GET_PROCESSOR_MID(reg) \
-       rd      %tbr, %reg; \
-       srl     %reg, 12, %reg; \
-       and     %reg, 3, %reg;
-
 /* All trap entry points _must_ begin with this macro or else you
  * lose.  It makes sure the kernel has a proper window so that
  * c-code can be called.