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

Commit 45d9ca49 authored by Dean Nelson's avatar Dean Nelson Committed by Tony Luck
Browse files

[IA64] move XP and XPC to drivers/misc/sgi-xp 



Move XPC and XPNET from arch/ia64/sn/kernel to drivers/misc/sgi-xp.

Signed-off-by: default avatarDean Nelson <dcn@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 9010eff0

arch/ia64/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -266,17 +266,6 @@ config IOSAPIC 
	depends on !IA64_HP_SIM

	default y



config IA64_SGI_SN_XP

	tristate "Support communication between SGI SSIs"

	depends on IA64_GENERIC || IA64_SGI_SN2

	select IA64_UNCACHED_ALLOCATOR

	help

	  An SGI machine can be divided into multiple Single System

	  Images which act independently of each other and have

	  hardware based memory protection from the others.  Enabling

	  this feature will allow for direct communication between SSIs

	  based on a network adapter and DMA messaging.



config FORCE_MAX_ZONEORDER

	int "MAX_ORDER (11 - 17)"  if !HUGETLB_PAGE

	range 11 17  if !HUGETLB_PAGE

arch/ia64/sn/kernel/Makefile

+1 −6
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

# Copyright (C) 1999,2001-2006 Silicon Graphics, Inc.  All Rights Reserved.

# Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc.  All Rights Reserved.

#



EXTRA_CFLAGS += -Iarch/ia64/sn/include
@@ -15,9 +15,4 @@ obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \ 
				   sn2/

obj-$(CONFIG_IA64_GENERIC)      += machvec.o

obj-$(CONFIG_SGI_TIOCX)		+= tiocx.o

obj-$(CONFIG_IA64_SGI_SN_XP)	+= xp.o

xp-y				:= xp_main.o xp_nofault.o

obj-$(CONFIG_IA64_SGI_SN_XP)	+= xpc.o

xpc-y				:= xpc_main.o xpc_channel.o xpc_partition.o

obj-$(CONFIG_IA64_SGI_SN_XP)	+= xpnet.o

obj-$(CONFIG_PCI_MSI)		+= msi_sn.o

drivers/misc/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -360,4 +360,16 @@ config ENCLOSURE_SERVICES 
	  driver (SCSI/ATA) which supports enclosures

	  or a SCSI enclosure device (SES) to use these services.



config SGI_XP

	tristate "Support communication between SGI SSIs"

	depends on IA64_GENERIC || IA64_SGI_SN2

	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2

	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2

	---help---

	  An SGI machine can be divided into multiple Single System

	  Images which act independently of each other and have

	  hardware based memory protection from the others.  Enabling

	  this feature will allow for direct communication between SSIs

	  based on a network adapter and DMA messaging.



endif # MISC_DEVICES

drivers/misc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -24,3 +24,4 @@ obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o 
obj-$(CONFIG_INTEL_MENLOW)	+= intel_menlow.o

obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o

obj-$(CONFIG_KGDB_TESTS)	+= kgdbts.o

obj-$(CONFIG_SGI_XP)		+= sgi-xp/

drivers/misc/sgi-xp/Makefile

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#

# Makefile for SGI's XP devices.

#



obj-$(CONFIG_SGI_XP)		+= xp.o

xp-y				:= xp_main.o xp_nofault.o



obj-$(CONFIG_SGI_XP)		+= xpc.o

xpc-y				:= xpc_main.o xpc_channel.o xpc_partition.o



obj-$(CONFIG_SGI_XP)		+= xpnet.o