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

Commit db4fcb45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-rm_xen' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux 

Pull ia64 Xen removal from Tony Luck:
 "Nobody has been maintaining xen in ia64 for a long time.  Rip it all
  out so people do not waste time making updates to broken/dead code"

* tag 'please-pull-rm_xen' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64/xen: Remove Xen support for ia64
parents 09854dde d52eefb4

arch/ia64/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -147,9 +147,6 @@ config PARAVIRT 
	  over full virtualization.  However, when run without a hypervisor

	  the kernel is theoretically slower and slightly larger.





source "arch/ia64/xen/Kconfig"



endif



choice
@@ -175,7 +172,6 @@ config IA64_GENERIC 
	  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/>

	  Xen-domU		For xen domU system



	  If you don't know what to do, choose "generic".
@@ -231,14 +227,6 @@ config IA64_HP_SIM 
	bool "Ski-simulator"

	select SWIOTLB



config IA64_XEN_GUEST

	bool "Xen guest"

	select SWIOTLB

	depends on XEN

	help

	  Build a kernel that runs on Xen guest domain. At this moment only

	  16KB page size in supported.



endchoice



choice

arch/ia64/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -51,11 +51,9 @@ 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_XEN_GUEST)	+= arch/ia64/dig/

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

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

core-$(CONFIG_KVM) 		+= arch/ia64/kvm/

core-$(CONFIG_XEN)		+= arch/ia64/xen/



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

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

arch/ia64/configs/xen_domu_defconfig

deleted100644 → 0
+0 −199
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=20

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_ALL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARAVIRT_GUEST=y

CONFIG_IA64_XEN_GUEST=y

CONFIG_MCKINLEY=y

CONFIG_IA64_CYCLONE=y

CONFIG_SMP=y

CONFIG_NR_CPUS=16

CONFIG_HOTPLUG_CPU=y

CONFIG_PERMIT_BSP_REMOVE=y

CONFIG_FORCE_CPEI_RETARGET=y

CONFIG_IA64_MCA_RECOVERY=y

CONFIG_PERFMON=y

CONFIG_IA64_PALINFO=y

CONFIG_KEXEC=y

CONFIG_EFI_VARS=y

CONFIG_BINFMT_MISC=m

CONFIG_ACPI_PROCFS=y

CONFIG_ACPI_BUTTON=m

CONFIG_ACPI_FAN=m

CONFIG_ACPI_PROCESSOR=m

CONFIG_ACPI_CONTAINER=m

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_ACPI=m

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_ARPD=y

CONFIG_SYN_COOKIES=y

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_CMD64X=y

CONFIG_BLK_DEV_PIIX=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_BLK_DEV_SR=m

CONFIG_CHR_DEV_SG=m

CONFIG_SCSI_SYM53C8XX_2=y

CONFIG_SCSI_QLOGIC_1280=y

CONFIG_MD=y

CONFIG_BLK_DEV_MD=m

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_MD_RAID1=m

CONFIG_MD_MULTIPATH=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_MIRROR=m

CONFIG_DM_ZERO=m

CONFIG_FUSION=y

CONFIG_FUSION_SPI=y

CONFIG_FUSION_FC=y

CONFIG_FUSION_CTL=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_NET_ETHERNET=y

CONFIG_NET_TULIP=y

CONFIG_TULIP=m

CONFIG_NET_PCI=y

CONFIG_NET_VENDOR_INTEL=y

CONFIG_E100=m

CONFIG_E1000=y

CONFIG_TIGON3=y

CONFIG_NETCONSOLE=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_GAMEPORT=m

CONFIG_SERIAL_NONSTANDARD=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

# CONFIG_HW_RANDOM is not set

CONFIG_EFI_RTC=y

CONFIG_RAW_DRIVER=m

CONFIG_HPET=y

CONFIG_AGP=m

CONFIG_DRM=m

CONFIG_DRM_TDFX=m

CONFIG_DRM_R128=m

CONFIG_DRM_RADEON=m

CONFIG_DRM_MGA=m

CONFIG_DRM_SIS=m

CONFIG_HID_GYRATION=y

CONFIG_HID_NTRIG=y

CONFIG_HID_PANTHERLORD=y

CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_TOPSEED=y

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_EHCI_HCD=m

CONFIG_USB_OHCI_HCD=m

CONFIG_USB_UHCI_HCD=y

CONFIG_USB_STORAGE=m

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_REISERFS_FS=y

CONFIG_REISERFS_FS_XATTR=y

CONFIG_REISERFS_FS_POSIX_ACL=y

CONFIG_REISERFS_FS_SECURITY=y

CONFIG_XFS_FS=y

CONFIG_AUTOFS_FS=y

CONFIG_AUTOFS4_FS=y

CONFIG_ISO9660_FS=m

CONFIG_JOLIET=y

CONFIG_UDF_FS=m

CONFIG_VFAT_FS=y

CONFIG_NTFS_FS=m

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_HUGETLBFS=y

CONFIG_NFS_FS=m

CONFIG_NFS_V3=y

CONFIG_NFS_V4=y

CONFIG_NFSD=m

CONFIG_NFSD_V4=y

CONFIG_SMB_FS=m

CONFIG_SMB_NLS_DEFAULT=y

CONFIG_CIFS=m

CONFIG_PARTITION_ADVANCED=y

CONFIG_SGI_PARTITION=y

CONFIG_EFI_PARTITION=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_737=m

CONFIG_NLS_CODEPAGE_775=m

CONFIG_NLS_CODEPAGE_850=m

CONFIG_NLS_CODEPAGE_852=m

CONFIG_NLS_CODEPAGE_855=m

CONFIG_NLS_CODEPAGE_857=m

CONFIG_NLS_CODEPAGE_860=m

CONFIG_NLS_CODEPAGE_861=m

CONFIG_NLS_CODEPAGE_862=m

CONFIG_NLS_CODEPAGE_863=m

CONFIG_NLS_CODEPAGE_864=m

CONFIG_NLS_CODEPAGE_865=m

CONFIG_NLS_CODEPAGE_866=m

CONFIG_NLS_CODEPAGE_869=m

CONFIG_NLS_CODEPAGE_936=m

CONFIG_NLS_CODEPAGE_950=m

CONFIG_NLS_CODEPAGE_932=m

CONFIG_NLS_CODEPAGE_949=m

CONFIG_NLS_CODEPAGE_874=m

CONFIG_NLS_ISO8859_8=m

CONFIG_NLS_CODEPAGE_1250=m

CONFIG_NLS_CODEPAGE_1251=m

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_2=m

CONFIG_NLS_ISO8859_3=m

CONFIG_NLS_ISO8859_4=m

CONFIG_NLS_ISO8859_5=m

CONFIG_NLS_ISO8859_6=m

CONFIG_NLS_ISO8859_7=m

CONFIG_NLS_ISO8859_9=m

CONFIG_NLS_ISO8859_13=m

CONFIG_NLS_ISO8859_14=m

CONFIG_NLS_ISO8859_15=m

CONFIG_NLS_KOI8_R=m

CONFIG_NLS_KOI8_U=m

CONFIG_NLS_UTF8=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_MUTEXES=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_IA64_GRANULE_16MB=y

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_MD5=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/ia64/include/asm/acpi.h

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

# elif defined (CONFIG_IA64_DIG)

	return "dig";

# elif defined (CONFIG_IA64_XEN_GUEST)

	return "xen";

# elif defined(CONFIG_IA64_DIG_VTD)

	return "dig_vtd";

# else

arch/ia64/include/asm/machvec.h

+0 −2
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *); 
#  include <asm/machvec_sn2.h>

# elif defined (CONFIG_IA64_SGI_UV)

#  include <asm/machvec_uv.h>

# elif defined (CONFIG_IA64_XEN_GUEST)

#  include <asm/machvec_xen.h>

# elif defined (CONFIG_IA64_GENERIC)



# ifdef MACHVEC_PLATFORM_HEADER