diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-06-11 19:55:14 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-06-19 12:39:22 -0400 |
commit | aa9772e330d6c0a8a94316cb38ae8a7495885a60 (patch) | |
tree | 7371d03f0d86a74eb751d0e262fd562214bf8da5 | |
parent | bf5a312b26e9943613b765a29a8de5f4c762df11 (diff) |
[MIPS] SN: Rename SGI_SN0_N_MODE -> SGI_SN_N_MODE.
It's not SN0-specific.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/configs/ip27_defconfig | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip27/Kconfig | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip27/ip27-init.c | 2 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/addrs.h | 6 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/arch.h | 4 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/hubmd.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index f724b4b2ecf2..87d27cd3d2cf 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
@@ -63,7 +63,7 @@ CONFIG_SGI_IP27=y | |||
63 | # CONFIG_TOSHIBA_JMR3927 is not set | 63 | # CONFIG_TOSHIBA_JMR3927 is not set |
64 | # CONFIG_TOSHIBA_RBTX4927 is not set | 64 | # CONFIG_TOSHIBA_RBTX4927 is not set |
65 | # CONFIG_TOSHIBA_RBTX4938 is not set | 65 | # CONFIG_TOSHIBA_RBTX4938 is not set |
66 | # CONFIG_SGI_SN0_N_MODE is not set | 66 | # CONFIG_SGI_SN_N_MODE is not set |
67 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 67 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
68 | CONFIG_NUMA=y | 68 | CONFIG_NUMA=y |
69 | # CONFIG_MAPPED_KERNEL is not set | 69 | # CONFIG_MAPPED_KERNEL is not set |
diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig index 6da5926210a6..4b7c3c675174 100644 --- a/arch/mips/sgi-ip27/Kconfig +++ b/arch/mips/sgi-ip27/Kconfig | |||
@@ -4,7 +4,7 @@ | |||
4 | # This options adds support for userspace processes upto 16TB size. | 4 | # This options adds support for userspace processes upto 16TB size. |
5 | # Normally the limit is just .5TB. | 5 | # Normally the limit is just .5TB. |
6 | 6 | ||
7 | config SGI_SN0_N_MODE | 7 | config SGI_SN_N_MODE |
8 | bool "IP27 N-Mode" | 8 | bool "IP27 N-Mode" |
9 | depends on SGI_IP27 | 9 | depends on SGI_IP27 |
10 | help | 10 | help |
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c index 8651a0e75404..16c4b3410eaf 100644 --- a/arch/mips/sgi-ip27/ip27-init.c +++ b/arch/mips/sgi-ip27/ip27-init.c | |||
@@ -228,7 +228,7 @@ void __init plat_setup(void) | |||
228 | */ | 228 | */ |
229 | n_mode = LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_MORENODES_MASK; | 229 | n_mode = LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_MORENODES_MASK; |
230 | printk("Machine is in %c mode.\n", n_mode ? 'N' : 'M'); | 230 | printk("Machine is in %c mode.\n", n_mode ? 'N' : 'M'); |
231 | #ifdef CONFIG_SGI_SN0_N_MODE | 231 | #ifdef CONFIG_SGI_SN_N_MODE |
232 | if (!n_mode) | 232 | if (!n_mode) |
233 | panic("Kernel compiled for M mode."); | 233 | panic("Kernel compiled for M mode."); |
234 | #else | 234 | #else |
diff --git a/include/asm-mips/sn/sn0/addrs.h b/include/asm-mips/sn/sn0/addrs.h index 0ee8cbcb5b03..2c4b758f6736 100644 --- a/include/asm-mips/sn/sn0/addrs.h +++ b/include/asm-mips/sn/sn0/addrs.h | |||
@@ -49,7 +49,7 @@ | |||
49 | * so for now we just use defines bracketed by an ifdef. | 49 | * so for now we just use defines bracketed by an ifdef. |
50 | */ | 50 | */ |
51 | 51 | ||
52 | #ifdef CONFIG_SGI_SN0_N_MODE | 52 | #ifdef CONFIG_SGI_SN_N_MODE |
53 | 53 | ||
54 | #define NODE_SIZE_BITS 31 | 54 | #define NODE_SIZE_BITS 31 |
55 | #define BWIN_SIZE_BITS 28 | 55 | #define BWIN_SIZE_BITS 28 |
@@ -63,7 +63,7 @@ | |||
63 | #define BDDIR_UPPER_MASK (UINT64_CAST 0x7ffff << 10) | 63 | #define BDDIR_UPPER_MASK (UINT64_CAST 0x7ffff << 10) |
64 | #define BDECC_UPPER_MASK (UINT64_CAST 0x3ffffff << 3) | 64 | #define BDECC_UPPER_MASK (UINT64_CAST 0x3ffffff << 3) |
65 | 65 | ||
66 | #else /* !defined(CONFIG_SGI_SN0_N_MODE), assume that M-mode is desired */ | 66 | #else /* !defined(CONFIG_SGI_SN_N_MODE), assume that M-mode is desired */ |
67 | 67 | ||
68 | #define NODE_SIZE_BITS 32 | 68 | #define NODE_SIZE_BITS 32 |
69 | #define BWIN_SIZE_BITS 29 | 69 | #define BWIN_SIZE_BITS 29 |
@@ -77,7 +77,7 @@ | |||
77 | #define BDDIR_UPPER_MASK (UINT64_CAST 0xfffff << 10) | 77 | #define BDDIR_UPPER_MASK (UINT64_CAST 0xfffff << 10) |
78 | #define BDECC_UPPER_MASK (UINT64_CAST 0x7ffffff << 3) | 78 | #define BDECC_UPPER_MASK (UINT64_CAST 0x7ffffff << 3) |
79 | 79 | ||
80 | #endif /* !defined(CONFIG_SGI_SN0_N_MODE) */ | 80 | #endif /* !defined(CONFIG_SGI_SN_N_MODE) */ |
81 | 81 | ||
82 | #define NODE_ADDRSPACE_SIZE (UINT64_CAST 1 << NODE_SIZE_BITS) | 82 | #define NODE_ADDRSPACE_SIZE (UINT64_CAST 1 << NODE_SIZE_BITS) |
83 | 83 | ||
diff --git a/include/asm-mips/sn/sn0/arch.h b/include/asm-mips/sn/sn0/arch.h index 5643a6e639bd..0ecbaa0d3837 100644 --- a/include/asm-mips/sn/sn0/arch.h +++ b/include/asm-mips/sn/sn0/arch.h | |||
@@ -57,9 +57,9 @@ | |||
57 | /* | 57 | /* |
58 | * Slot constants for SN0 | 58 | * Slot constants for SN0 |
59 | */ | 59 | */ |
60 | #ifdef CONFIG_SGI_SN0_N_MODE | 60 | #ifdef CONFIG_SGI_SN_N_MODE |
61 | #define MAX_MEM_SLOTS 16 /* max slots per node */ | 61 | #define MAX_MEM_SLOTS 16 /* max slots per node */ |
62 | #else /* !CONFIG_SGI_SN0_N_MODE, assume M_MODE */ | 62 | #else /* !CONFIG_SGI_SN_N_MODE, assume M_MODE */ |
63 | #define MAX_MEM_SLOTS 32 /* max slots per node */ | 63 | #define MAX_MEM_SLOTS 32 /* max slots per node */ |
64 | #endif /* defined(N_MODE) */ | 64 | #endif /* defined(N_MODE) */ |
65 | 65 | ||
diff --git a/include/asm-mips/sn/sn0/hubmd.h b/include/asm-mips/sn/sn0/hubmd.h index a66def4e0ba0..1006aa26d771 100644 --- a/include/asm-mips/sn/sn0/hubmd.h +++ b/include/asm-mips/sn/sn0/hubmd.h | |||
@@ -92,7 +92,7 @@ | |||
92 | #define MD_UREG1_14 0x2200f0 /* uController/UART 1 register */ | 92 | #define MD_UREG1_14 0x2200f0 /* uController/UART 1 register */ |
93 | #define MD_UREG1_15 0x2200f8 /* uController/UART 1 register */ | 93 | #define MD_UREG1_15 0x2200f8 /* uController/UART 1 register */ |
94 | 94 | ||
95 | #ifdef CONFIG_SGI_SN0_N_MODE | 95 | #ifdef CONFIG_SGI_SN_N_MODE |
96 | #define MD_MEM_BANKS 4 /* 4 banks of memory max in N mode */ | 96 | #define MD_MEM_BANKS 4 /* 4 banks of memory max in N mode */ |
97 | #else | 97 | #else |
98 | #define MD_MEM_BANKS 8 /* 8 banks of memory max in M mode */ | 98 | #define MD_MEM_BANKS 8 /* 8 banks of memory max in M mode */ |