diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-04-03 12:35:35 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-04-03 12:35:35 +0200 |
| commit | 570c311ca2c7a1131570cdfc77e977bc7a9bf4c0 (patch) | |
| tree | 727a5b57670ed6eef54aa89de3f9699be441df83 /xen/common | |
| parent | 62872b0f0311eacd40100663d31faf7cafa24586 (diff) | |
| download | xen-570c311ca2c7a1131570cdfc77e977bc7a9bf4c0.tar.gz xen-570c311ca2c7a1131570cdfc77e977bc7a9bf4c0.tar.bz2 xen-570c311ca2c7a1131570cdfc77e977bc7a9bf4c0.zip | |
remove ia64
It retains IA64-specific bits in code imported from elsewhere (e.g.
ACPI, EFI) as well as in the public headers.
It also doesn't touch the tools, mini-os, and unmodified_drivers
sub-trees.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/common')
| -rw-r--r-- | xen/common/Makefile | 1 | ||||
| -rw-r--r-- | xen/common/grant_table.c | 2 | ||||
| -rw-r--r-- | xen/common/kexec.c | 4 | ||||
| -rw-r--r-- | xen/common/memory.c | 2 | ||||
| -rw-r--r-- | xen/common/page_alloc.c | 2 | ||||
| -rw-r--r-- | xen/common/tmem_xen.c | 2 |
6 files changed, 2 insertions, 11 deletions
diff --git a/xen/common/Makefile b/xen/common/Makefile index 4c7fdd41db..9eba8bc2e0 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -58,7 +58,6 @@ subdir-$(CONFIG_COMPAT) += compat subdir-$(x86_32) += hvm subdir-$(x86_64) += hvm -subdir-$(ia64) += hvm subdir-y += libelf subdir-$(HAS_DEVICE_TREE) += libfdt diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e6706df53b..04c70388ca 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1514,9 +1514,7 @@ gnttab_transfer( goto copyback; } -#ifndef __ia64__ /* IA64 implicitly replaces the old page in steal_page(). */ guest_physmap_remove_page(d, gop.mfn, mfn, 0); -#endif flush_tlb_mask(d->domain_dirty_cpumask); /* Find the target domain. */ diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 71a3995b82..444cae1b03 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -721,11 +721,7 @@ static void crash_save_vmcoreinfo(void) VMCOREINFO_STRUCT_SIZE(domain); VMCOREINFO_OFFSET(page_info, count_info); -#ifdef __ia64__ - VMCOREINFO_OFFSET_SUB(page_info, u.inuse, _domain); -#else VMCOREINFO_OFFSET_SUB(page_info, v.inuse, _domain); -#endif VMCOREINFO_OFFSET(domain, domain_id); VMCOREINFO_OFFSET(domain, next_in_list); diff --git a/xen/common/memory.c b/xen/common/memory.c index 3f02380fdf..f0d396109b 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -23,9 +23,7 @@ #include <xen/tmem_xen.h> #include <asm/current.h> #include <asm/hardirq.h> -#ifndef __ia64__ #include <asm/p2m.h> -#endif #include <xen/numa.h> #include <public/memory.h> #include <xsm/xsm.h> diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 75d1eeae98..1d7359db29 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1141,7 +1141,7 @@ void __init scrub_heap_pages(void) * XEN-HEAP SUB-ALLOCATOR */ -#if !defined(__x86_64__) && !defined(__ia64__) +#if !defined(__x86_64__) void init_xenheap_pages(paddr_t ps, paddr_t pe) { diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 37e82896f5..84b5bb27d6 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -88,7 +88,7 @@ void tmh_copy_page(char *to, char*from) #endif } -#if defined(__ia64__) || defined (CONFIG_ARM) +#if defined(CONFIG_ARM) static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn, pfp_t **pcli_pfp, bool_t cli_write) { |