Skip to content

Commit

Permalink
ia64/xen: Remove Xen support for ia64
Browse files Browse the repository at this point in the history
ia64 has not been supported by Xen since 4.2 so it's time to drop
Xen/ia64 from Linux as well.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Boris Ostrovsky authored and aegl committed Dec 11, 2013
1 parent 374b105 commit d52eefb
Show file tree
Hide file tree
Showing 50 changed files with 2 additions and 5,118 deletions.
12 changes: 0 additions & 12 deletions arch/ia64/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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".

Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions arch/ia64/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
199 changes: 0 additions & 199 deletions arch/ia64/configs/xen_domu_defconfig

This file was deleted.

2 changes: 0 additions & 2 deletions arch/ia64/include/asm/acpi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions arch/ia64/include/asm/machvec.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 0 additions & 22 deletions arch/ia64/include/asm/machvec_xen.h

This file was deleted.

1 change: 0 additions & 1 deletion arch/ia64/include/asm/meminit.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
* - crash dumping code reserved region
* - Kernel memory map built from EFI memory map
* - ELF core header
* - xen start info if CONFIG_XEN
*
* More could be added if necessary
*/
Expand Down
1 change: 0 additions & 1 deletion arch/ia64/include/asm/paravirt.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ void *paravirt_get_gate_section(void);
#ifdef CONFIG_PARAVIRT_GUEST

#define PARAVIRT_HYPERVISOR_TYPE_DEFAULT 0
#define PARAVIRT_HYPERVISOR_TYPE_XEN 1

#ifndef __ASSEMBLY__

Expand Down
2 changes: 1 addition & 1 deletion arch/ia64/include/asm/pvclock-abi.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/*
* These structs MUST NOT be changed.
* They are the ABI between hypervisor and guest OS.
* Both Xen and KVM are using this.
* KVM is using this.
*
* pvclock_vcpu_time_info holds the system time and the tsc timestamp
* of the last update. So the guest can use the tsc delta to get a
Expand Down
51 changes: 0 additions & 51 deletions arch/ia64/include/asm/sync_bitops.h

This file was deleted.

Loading

0 comments on commit d52eefb

Please sign in to comment.