Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa9772e3 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] SN: Rename SGI_SN0_N_MODE -> SGI_SN_N_MODE. 



It's not SN0-specific.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent bf5a312b

arch/mips/configs/ip27_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ CONFIG_SGI_IP27=y 
# CONFIG_TOSHIBA_JMR3927 is not set

# CONFIG_TOSHIBA_RBTX4927 is not set

# CONFIG_TOSHIBA_RBTX4938 is not set

# CONFIG_SGI_SN0_N_MODE is not set

# CONFIG_SGI_SN_N_MODE is not set

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

CONFIG_NUMA=y

# CONFIG_MAPPED_KERNEL is not set

arch/mips/sgi-ip27/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#	  This options adds support for userspace processes upto 16TB size.

#	  Normally the limit is just .5TB.



config SGI_SN0_N_MODE

config SGI_SN_N_MODE

	bool "IP27 N-Mode"

	depends on SGI_IP27

	help

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

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ void __init plat_setup(void) 
	 */

	n_mode = LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_MORENODES_MASK;

	printk("Machine is in %c mode.\n", n_mode ? 'N' : 'M');

#ifdef CONFIG_SGI_SN0_N_MODE

#ifdef CONFIG_SGI_SN_N_MODE

	if (!n_mode)

		panic("Kernel compiled for M mode.");

#else

include/asm-mips/sn/sn0/addrs.h

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
 * so for now we just use defines bracketed by an ifdef.

 */



#ifdef CONFIG_SGI_SN0_N_MODE

#ifdef CONFIG_SGI_SN_N_MODE



#define NODE_SIZE_BITS		31

#define BWIN_SIZE_BITS		28
@@ -63,7 +63,7 @@ 
#define BDDIR_UPPER_MASK	(UINT64_CAST 0x7ffff << 10)

#define BDECC_UPPER_MASK	(UINT64_CAST 0x3ffffff << 3)



#else /* !defined(CONFIG_SGI_SN0_N_MODE), assume that M-mode is desired */

#else /* !defined(CONFIG_SGI_SN_N_MODE), assume that M-mode is desired */



#define NODE_SIZE_BITS		32

#define BWIN_SIZE_BITS		29
@@ -77,7 +77,7 @@ 
#define BDDIR_UPPER_MASK	(UINT64_CAST 0xfffff << 10)

#define BDECC_UPPER_MASK	(UINT64_CAST 0x7ffffff << 3)



#endif /* !defined(CONFIG_SGI_SN0_N_MODE) */

#endif /* !defined(CONFIG_SGI_SN_N_MODE) */



#define NODE_ADDRSPACE_SIZE	(UINT64_CAST 1 << NODE_SIZE_BITS)

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

+2 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ 
/*

 * Slot constants for SN0

 */

#ifdef CONFIG_SGI_SN0_N_MODE

#ifdef CONFIG_SGI_SN_N_MODE

#define MAX_MEM_SLOTS   16                      /* max slots per node */

#else /* !CONFIG_SGI_SN0_N_MODE, assume M_MODE */

#else /* !CONFIG_SGI_SN_N_MODE, assume M_MODE */

#define MAX_MEM_SLOTS   32                      /* max slots per node */

#endif /* defined(N_MODE) */