Unverified Commit e9d2eb99 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Paul Burton
Browse files

MIPS: SGI-IP27: Move get_nasid() to a IP27 specific file 



get_nasid() will be different for SGI-IP35, therefore move IP27
implementation to IP27 specific file.

Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
parent 58fd034d

arch/mips/include/asm/sn/arch.h

+0 −6
Original line number Diff line number Diff line
@@ -25,10 +25,4 @@ 
#define INVALID_MODULE		(moduleid_t)-1

#define INVALID_PARTID		(partid_t)-1



#ifndef __ASSEMBLY__



extern nasid_t get_nasid(void);



#endif



#endif /* _ASM_SN_ARCH_H */

arch/mips/include/asm/sn/sn0/hub.h

+10 −0
Original line number Diff line number Diff line
@@ -47,6 +47,16 @@ 
	and	\res, NSRI_NODEID_MASK

	dsrl	\res, NSRI_NODEID_SHFT

	.endm

#else



/*

 * get_nasid() returns the physical node id number of the caller.

 */

static inline nasid_t get_nasid(void)

{

	return (nasid_t)((LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_NODEID_MASK)

			 >> NSRI_NODEID_SHFT);

}

#endif



#endif /* _ASM_SN_SN0_HUB_H */

arch/mips/sgi-ip27/ip27-init.c

+0 −10
Original line number Diff line number Diff line
@@ -94,16 +94,6 @@ void per_cpu_init(void) 
	enable_percpu_irq(IP27_HUB_PEND1_IRQ, IRQ_TYPE_NONE);

}



/*

 * get_nasid() returns the physical node id number of the caller.

 */

nasid_t

get_nasid(void)

{

	return (nasid_t)((LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_NODEID_MASK)

			 >> NSRI_NODEID_SHFT);

}



void __init plat_mem_setup(void)

{

	u64 p, e, n_mode;

CRA Git | Maintained and supported by SUSTech CRA and CCSE