git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-mips
/
sn
/
sn0
/
arch.h
diff --git
a/include/asm-mips/sn/sn0/arch.h
b/include/asm-mips/sn/sn0/arch.h
index
0e00dd4
..
f734f20
100644
(file)
--- a/
include/asm-mips/sn/sn0/arch.h
+++ b/
include/asm-mips/sn/sn0/arch.h
@@
-11,9
+11,6
@@
#ifndef _ASM_SN_SN0_ARCH_H
#define _ASM_SN_SN0_ARCH_H
#ifndef _ASM_SN_SN0_ARCH_H
#define _ASM_SN_SN0_ARCH_H
-#include <linux/config.h>
-
-#ifndef SABLE
#ifndef SN0XXL /* 128 cpu SMP max */
/*
#ifndef SN0XXL /* 128 cpu SMP max */
/*
@@
-54,33
+51,19
@@
*/
#define MAX_PARTITIONS MAX_REGIONS
*/
#define MAX_PARTITIONS MAX_REGIONS
-
-#else
-
-#define MAX_COMPACT_NODES 4
-#define MAX_NASIDS 4
-#define MAXCPUS 8
-
-#endif
-
#define NASID_MASK_BYTES ((MAX_NASIDS + 7) / 8)
/*
* Slot constants for SN0
*/
#define NASID_MASK_BYTES ((MAX_NASIDS + 7) / 8)
/*
* Slot constants for SN0
*/
-#ifdef CONFIG_SGI_SN
0
_N_MODE
+#ifdef CONFIG_SGI_SN_N_MODE
#define MAX_MEM_SLOTS 16 /* max slots per node */
#define MAX_MEM_SLOTS 16 /* max slots per node */
-#else /* !CONFIG_SGI_SN
0_N_MODE, assume
M_MODE */
+#else /* !CONFIG_SGI_SN
_N_MODE, assume CONFIG_SGI_SN_
M_MODE */
#define MAX_MEM_SLOTS 32 /* max slots per node */
#define MAX_MEM_SLOTS 32 /* max slots per node */
-#endif /*
defined(N_MODE)
*/
+#endif /*
CONFIG_SGI_SN_M_MODE
*/
-#if SABLE_RTL
-#define SLOT_SHIFT (28)
-#define SLOT_MIN_MEM_SIZE (16*1024*1024)
-#else
#define SLOT_SHIFT (27)
#define SLOT_MIN_MEM_SIZE (32*1024*1024)
#define SLOT_SHIFT (27)
#define SLOT_MIN_MEM_SIZE (32*1024*1024)
-#endif
#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_NODE 2 /* CPUs on a single hub */
#define CPUS_PER_NODE_SHFT 1 /* Bits to shift in the node number */