sparc32: Move GET_PROCESSOR*_ID() out of asm/asmmacro.h

GET_PROCESSOR4D_ID is completely unused, so delete it.

Move GET_PROCESSOR4M_ID to the sun4m specific trap code
which uses it.

We now no longer need to include asm/asi.h

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/include/asm/asmmacro.h b/arch/sparc/include/asm/asmmacro.h
index 1d511615c7cdd812b02d077eb2b4f09a0436c924..02a172fb193aaded11b3080f2e5337ee951e1ad9 100644 (file)
--- a/arch/sparc/include/asm/asmmacro.h
+++ b/arch/sparc/include/asm/asmmacro.h
@@ -6,16 +6,6 @@
 #ifndef _SPARC_ASMMACRO_H
 #define _SPARC_ASMMACRO_H
 
-#include <asm/asi.h>
-
-#define GET_PROCESSOR4M_ID(reg) \
-       rd      %tbr, %reg; \
-       srl     %reg, 12, %reg; \
-       and     %reg, 3, %reg;
-
-#define GET_PROCESSOR4D_ID(reg) \
-       lda     [%g0] ASI_M_VIKING_TMP1, %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.

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 3f3976e0e98fd26ad5c5473cf1d614a8b307f854..2dbe1806e5300ab8bf49a1c22dda5850c263f75f 100644 (file)
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -254,6 +254,11 @@ smp4m_ticker:
        WRITE_PAUSE
        RESTORE_ALL
 
+#define GET_PROCESSOR4M_ID(reg)        \
+       rd      %tbr, %reg;     \
+       srl     %reg, 12, %reg; \
+       and     %reg, 3, %reg;
+
        /* Here is where we check for possible SMP IPI passed to us
         * on some level other than 15 which is the NMI and only used
         * for cross calls.  That has a separate entry point below.