Commit cf07cb1f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tony Luck
Browse files

ia64: remove support for the SGI SN2 platform 



The SGI SN2 (early Altix) is a very non-standard IA64 platform that was
at the very high end of even IA64 hardware, and has been discontinued
a long time ago.  Remove it because there no upstream users left, and it
has magic hooks all over the kernel.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-16-hch@lst.de


Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent f7bc6e42

arch/ia64/Kconfig

+1 −18
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ config 64BIT 


config ZONE_DMA32

	def_bool y

	depends on !IA64_SGI_SN2



config QUICKLIST

	bool
@@ -140,7 +139,6 @@ config IA64_GENERIC 
	  DIG+Intel+IOMMU	For DIG systems with Intel IOMMU

	  HP-zx1/sx1000		For HP systems

	  HP-zx1/sx1000+swiotlb	For HP systems with (broken) DMA-constrained devices.

	  SGI-SN2		For SGI Altix systems

	  SGI-UV		For SGI UV systems

	  Ski-simulator		For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>
@@ -171,17 +169,6 @@ config IA64_HP_ZX1_SWIOTLB 
	  I/O TLB, which allows supporting the broken devices at the expense of

	  wasting some kernel memory (about 2MB by default).



config IA64_SGI_SN2

	bool "SGI-SN2"

	select NUMA

	select ACPI_NUMA

	help

	  Selecting this option will optimize the kernel for use on sn2 based

	  systems, but the resulting kernel binary will not run on other

	  types of ia64 systems.  If you have an SGI Altix system, it's safe

	  to select this option.  If in doubt, select ia64 generic support

	  instead.



config IA64_SGI_UV

	bool "SGI-UV"

	select NUMA
@@ -381,13 +368,12 @@ config ARCH_SPARSEMEM_ENABLE 
	select SPARSEMEM_VMEMMAP_ENABLE



config ARCH_DISCONTIGMEM_DEFAULT

	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)

	def_bool y if (IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)

	depends on ARCH_DISCONTIGMEM_ENABLE



config NUMA

	bool "NUMA support"

	depends on !IA64_HP_SIM && !FLATMEM

	default y if IA64_SGI_SN2

	select ACPI_NUMA if ACPI

	help

	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory
@@ -472,9 +458,6 @@ config IA64_MC_ERR_INJECT 


	  If you're unsure, do not select this option.



config SGI_SN

	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)



config IA64_ESI

	bool "ESI (Extensible SAL Interface) support"

	help

arch/ia64/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ config IA64_GRANULE_16MB 


config IA64_GRANULE_64MB

	bool "64MB"

	depends on !(IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_SGI_SN2)

	depends on !(IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)



endchoice

arch/ia64/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -49,14 +49,13 @@ core-$(CONFIG_IA64_DIG_VTD) += arch/ia64/dig/ 
core-$(CONFIG_IA64_GENERIC) 	+= arch/ia64/dig/

core-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/dig/

core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/

core-$(CONFIG_IA64_SGI_SN2)	+= arch/ia64/sn/

core-$(CONFIG_IA64_SGI_UV)	+= arch/ia64/uv/



drivers-$(CONFIG_PCI)		+= arch/ia64/pci/

drivers-$(CONFIG_IA64_HP_SIM)	+= arch/ia64/hp/sim/

drivers-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/

drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/

drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/sn/ arch/ia64/uv/

drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/uv/

drivers-$(CONFIG_OPROFILE)	+= arch/ia64/oprofile/



boot := arch/ia64/hp/sim/boot

arch/ia64/include/asm/acpi.h

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ static inline const char *acpi_get_sysname (void) 
	return "hpzx1";

# elif defined (CONFIG_IA64_HP_ZX1_SWIOTLB)

	return "hpzx1_swiotlb";

# elif defined (CONFIG_IA64_SGI_SN2)

	return "sn2";

# elif defined (CONFIG_IA64_SGI_UV)

	return "uv";

# elif defined (CONFIG_IA64_DIG)

arch/ia64/include/asm/irq.h

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ irq_canonicalize (int irq) 
}



extern void set_irq_affinity_info (unsigned int irq, int dest, int redir);

bool is_affinity_mask_valid(const struct cpumask *cpumask);



#define is_affinity_mask_valid is_affinity_mask_valid



int create_irq(void);

void destroy_irq(unsigned int irq);