tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

Ralf Baechle aa9772e3 bf5a312b

+9 -9
+1 -1
arch/mips/configs/ip27_defconfig
··· 63 63 # CONFIG_TOSHIBA_JMR3927 is not set 64 64 # CONFIG_TOSHIBA_RBTX4927 is not set 65 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 67 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 68 68 CONFIG_NUMA=y 69 69 # CONFIG_MAPPED_KERNEL is not set
+1 -1
arch/mips/sgi-ip27/Kconfig
··· 4 4 # This options adds support for userspace processes upto 16TB size. 5 5 # Normally the limit is just .5TB. 6 6 7 - config SGI_SN0_N_MODE 7 + config SGI_SN_N_MODE 8 8 bool "IP27 N-Mode" 9 9 depends on SGI_IP27 10 10 help
+1 -1
arch/mips/sgi-ip27/ip27-init.c
··· 228 228 */ 229 229 n_mode = LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_MORENODES_MASK; 230 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 232 if (!n_mode) 233 233 panic("Kernel compiled for M mode."); 234 234 #else
+3 -3
include/asm-mips/sn/sn0/addrs.h
··· 49 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 54 #define NODE_SIZE_BITS 31 55 55 #define BWIN_SIZE_BITS 28 ··· 63 63 #define BDDIR_UPPER_MASK (UINT64_CAST 0x7ffff << 10) 64 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 68 #define NODE_SIZE_BITS 32 69 69 #define BWIN_SIZE_BITS 29 ··· 77 77 #define BDDIR_UPPER_MASK (UINT64_CAST 0xfffff << 10) 78 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 82 #define NODE_ADDRSPACE_SIZE (UINT64_CAST 1 << NODE_SIZE_BITS) 83 83
+2 -2
include/asm-mips/sn/sn0/arch.h
··· 57 57 /* 58 58 * Slot constants for SN0 59 59 */ 60 - #ifdef CONFIG_SGI_SN0_N_MODE 60 + #ifdef CONFIG_SGI_SN_N_MODE 61 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 63 #define MAX_MEM_SLOTS 32 /* max slots per node */ 64 64 #endif /* defined(N_MODE) */ 65 65
+1 -1
include/asm-mips/sn/sn0/hubmd.h
··· 92 92 #define MD_UREG1_14 0x2200f0 /* uController/UART 1 register */ 93 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 96 #define MD_MEM_BANKS 4 /* 4 banks of memory max in N mode */ 97 97 #else 98 98 #define MD_MEM_BANKS 8 /* 8 banks of memory max in M mode */