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

MIPS: SGI-IP27: remove not used stuff inherited from IRIX 



Most of the SN/SN0 header files are inherited from IRIX header files,
but not all of that stuff is useful for Linux. Remove not used parts.

Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
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 da0c9ea1

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

+0 −8
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


#define cputonasid(cpu)		(sn_cpu_info[(cpu)].p_nasid)

#define cputoslice(cpu)		(sn_cpu_info[(cpu)].p_slice)

#define makespnum(_nasid, _slice)					\

		(((_nasid) << CPUS_PER_NODE_SHFT) | (_slice))



#define INVALID_NASID		(nasid_t)-1

#define INVALID_CNODEID		(cnodeid_t)-1
@@ -47,12 +45,6 @@ extern nasid_t compact_to_nasid_node[MAX_COMPACT_NODES]; 
 * will continue to work.  Don't use the arrays above directly.

 */



#define NASID_TO_REGION(nnode)		\

    ((nnode) >> \

     (is_fine_dirmode() ? NASID_TO_FINEREG_SHFT : NASID_TO_COARSEREG_SHFT))



extern cnodeid_t nasid_to_compact_node[MAX_NASIDS];

extern nasid_t compact_to_nasid_node[MAX_COMPACT_NODES];

extern cnodeid_t cpuid_to_compact_node[MAXCPUS];



#define NASID_TO_COMPACT_NODEID(nnode)	(nasid_to_compact_node[nnode])

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

+0 −2
Original line number Diff line number Diff line
@@ -66,7 +66,5 @@ 
#define SLOT_MIN_MEM_SIZE	(32*1024*1024)



#define CPUS_PER_NODE		2	/* CPUs on a single hub */

#define CPUS_PER_NODE_SHFT	1	/* Bits to shift in the node number */

#define CPUS_PER_SUBNODE	2	/* CPUs on a single hub PI */



#endif /* _ASM_SN_SN0_ARCH_H */

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

+0 −3
Original line number Diff line number Diff line
@@ -12,13 +12,10 @@ 
#include <linux/types.h>



typedef unsigned long	cpuid_t;

typedef unsigned long	cnodemask_t;

typedef signed short	nasid_t;	/* node id in numa-as-id space */

typedef signed short	cnodeid_t;	/* node id in compact-id space */

typedef signed char	partid_t;	/* partition ID type */

typedef signed short	moduleid_t;	/* user-visible module number type */

typedef signed short	cmoduleid_t;	/* kernel compact module id type */

typedef unsigned char	clusterid_t;	/* Clusterid of the cell */



typedef dev_t		vertex_hdl_t;	/* hardware graph vertex handle */

CRA Git | Maintained and supported by SUSTech CRA and CCSE