Commit 0bfcee9a authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent d0be6b16

arch/sparc/include/asm/asmmacro.h

+0 −10
Original line number Diff line number Diff line
@@ -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.

arch/sparc/kernel/entry.S

+5 −0
Original line number Diff line number Diff line
@@ -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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE