Skip to content

Commit d52eefb

Browse files
Boris Ostrovskyaegl
authored andcommitted
ia64/xen: Remove Xen support for ia64
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 <[email protected]> Signed-off-by: Tony Luck <[email protected]>
1 parent 374b105 commit d52eefb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2
-5118
lines changed

arch/ia64/Kconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@ config PARAVIRT
147147
over full virtualization. However, when run without a hypervisor
148148
the kernel is theoretically slower and slightly larger.
149149

150-
151-
source "arch/ia64/xen/Kconfig"
152-
153150
endif
154151

155152
choice
@@ -175,7 +172,6 @@ config IA64_GENERIC
175172
SGI-SN2 For SGI Altix systems
176173
SGI-UV For SGI UV systems
177174
Ski-simulator For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>
178-
Xen-domU For xen domU system
179175

180176
If you don't know what to do, choose "generic".
181177

@@ -231,14 +227,6 @@ config IA64_HP_SIM
231227
bool "Ski-simulator"
232228
select SWIOTLB
233229

234-
config IA64_XEN_GUEST
235-
bool "Xen guest"
236-
select SWIOTLB
237-
depends on XEN
238-
help
239-
Build a kernel that runs on Xen guest domain. At this moment only
240-
16KB page size in supported.
241-
242230
endchoice
243231

244232
choice

arch/ia64/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ core-$(CONFIG_IA64_DIG_VTD) += arch/ia64/dig/
5151
core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/
5252
core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/
5353
core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/
54-
core-$(CONFIG_IA64_XEN_GUEST) += arch/ia64/dig/
5554
core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/
5655
core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/
5756
core-$(CONFIG_KVM) += arch/ia64/kvm/
58-
core-$(CONFIG_XEN) += arch/ia64/xen/
5957

6058
drivers-$(CONFIG_PCI) += arch/ia64/pci/
6159
drivers-$(CONFIG_IA64_HP_SIM) += arch/ia64/hp/sim/

arch/ia64/configs/xen_domu_defconfig

Lines changed: 0 additions & 199 deletions
This file was deleted.

arch/ia64/include/asm/acpi.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ static inline const char *acpi_get_sysname (void)
111111
return "uv";
112112
# elif defined (CONFIG_IA64_DIG)
113113
return "dig";
114-
# elif defined (CONFIG_IA64_XEN_GUEST)
115-
return "xen";
116114
# elif defined(CONFIG_IA64_DIG_VTD)
117115
return "dig_vtd";
118116
# else

arch/ia64/include/asm/machvec.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *);
113113
# include <asm/machvec_sn2.h>
114114
# elif defined (CONFIG_IA64_SGI_UV)
115115
# include <asm/machvec_uv.h>
116-
# elif defined (CONFIG_IA64_XEN_GUEST)
117-
# include <asm/machvec_xen.h>
118116
# elif defined (CONFIG_IA64_GENERIC)
119117

120118
# ifdef MACHVEC_PLATFORM_HEADER

arch/ia64/include/asm/machvec_xen.h

Lines changed: 0 additions & 22 deletions
This file was deleted.

arch/ia64/include/asm/meminit.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
* - crash dumping code reserved region
1919
* - Kernel memory map built from EFI memory map
2020
* - ELF core header
21-
* - xen start info if CONFIG_XEN
2221
*
2322
* More could be added if necessary
2423
*/

arch/ia64/include/asm/paravirt.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ void *paravirt_get_gate_section(void);
7575
#ifdef CONFIG_PARAVIRT_GUEST
7676

7777
#define PARAVIRT_HYPERVISOR_TYPE_DEFAULT 0
78-
#define PARAVIRT_HYPERVISOR_TYPE_XEN 1
7978

8079
#ifndef __ASSEMBLY__
8180

arch/ia64/include/asm/pvclock-abi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/*
1212
* These structs MUST NOT be changed.
1313
* They are the ABI between hypervisor and guest OS.
14-
* Both Xen and KVM are using this.
14+
* KVM is using this.
1515
*
1616
* pvclock_vcpu_time_info holds the system time and the tsc timestamp
1717
* of the last update. So the guest can use the tsc delta to get a

arch/ia64/include/asm/sync_bitops.h

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)