From: Alex Williamson <alex.williamson@hp.com>
To: Keir Fraser <Keir.Fraser@cl.cam.ac.uk>,
xen-devel <xen-devel@lists.xensource.com>
Cc: xen-ia64-devel <xen-ia64-devel@lists.xensource.com>
Subject: [PATCH] ia64 build fix
Date: Mon, 14 Aug 2006 10:49:15 -0600 [thread overview]
Message-ID: <1155574155.5608.33.camel@lappy> (raw)
Hi Keir,
This patch gets ia64 building again on xen-unstable.hg due to the
addition of the uint64_t type in public/arch-ia64.h. I also cleaned up
directly including this file versus public/xen.h as ia64 seems to be the
only arch using it directly. Please apply. Thanks,
Alex
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---
diff -r f328519053f5 xen/arch/ia64/vmx/mmio.c
--- a/xen/arch/ia64/vmx/mmio.c Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/vmx/mmio.c Mon Aug 14 10:44:54 2006 -0600
@@ -33,7 +33,7 @@
#include <asm/mm.h>
#include <asm/vmx.h>
#include <public/event_channel.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
#include <linux/event.h>
#include <xen/domain.h>
/*
diff -r f328519053f5 xen/arch/ia64/vmx/vlsapic.c
--- a/xen/arch/ia64/vmx/vlsapic.c Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/vmx/vlsapic.c Mon Aug 14 10:44:54 2006 -0600
@@ -21,7 +21,7 @@
*/
#include <linux/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
#include <asm/ia64_int.h>
#include <asm/vcpu.h>
#include <asm/regionreg.h>
diff -r f328519053f5 xen/arch/ia64/vmx/vmx_init.c
--- a/xen/arch/ia64/vmx/vmx_init.c Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/vmx/vmx_init.c Mon Aug 14 10:44:54 2006 -0600
@@ -41,15 +41,14 @@
#include <asm/vmx_vcpu.h>
#include <xen/lib.h>
#include <asm/vmmu.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
#include <public/hvm/ioreq.h>
+#include <public/event_channel.h>
#include <asm/vmx_phy_mode.h>
#include <asm/processor.h>
#include <asm/vmx.h>
#include <xen/mm.h>
-#include <public/arch-ia64.h>
#include <asm/hvm/vioapic.h>
-#include <public/event_channel.h>
#include <xen/event.h>
#include <asm/vlsapic.h>
diff -r f328519053f5 xen/arch/ia64/vmx/vmx_vcpu.c
--- a/xen/arch/ia64/vmx/vmx_vcpu.c Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/vmx/vmx_vcpu.c Mon Aug 14 10:44:54 2006 -0600
@@ -24,7 +24,7 @@
*/
#include <xen/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
#include <asm/ia64_int.h>
#include <asm/vmx_vcpu.h>
#include <asm/regionreg.h>
diff -r f328519053f5 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/xen/domain.c Mon Aug 14 10:44:54 2006 -0600
@@ -35,14 +35,13 @@
#include <asm/pgalloc.h>
#include <asm/offsets.h> /* for IA64_THREAD_INFO_SIZE */
#include <asm/vcpu.h> /* for function declarations */
-#include <public/arch-ia64.h>
+#include <public/xen.h>
#include <xen/domain.h>
#include <asm/vmx.h>
#include <asm/vmx_vcpu.h>
#include <asm/vmx_vpd.h>
#include <asm/vmx_phy_mode.h>
#include <asm/vhpt.h>
-#include <public/arch-ia64.h>
#include <asm/tlbflush.h>
#include <asm/regionreg.h>
#include <asm/dom_fw.h>
diff -r f328519053f5 xen/arch/ia64/xen/hyperprivop.S
--- a/xen/arch/ia64/xen/hyperprivop.S Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/xen/hyperprivop.S Mon Aug 14 10:44:54 2006 -0600
@@ -14,7 +14,7 @@
#include <asm/system.h>
#include <asm/debugger.h>
#include <asm/asm-xsi-offsets.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
#define _PAGE_PPN_MASK 0x0003fffffffff000 //asm/pgtable.h doesn't do assembly
diff -r f328519053f5 xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/xen/vcpu.c Mon Aug 14 10:44:54 2006 -0600
@@ -7,7 +7,7 @@
*/
#include <linux/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
#include <asm/ia64_int.h>
#include <asm/vcpu.h>
#include <asm/regionreg.h>
diff -r f328519053f5 xen/arch/ia64/xen/xenasm.S
--- a/xen/arch/ia64/xen/xenasm.S Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/arch/ia64/xen/xenasm.S Mon Aug 14 10:44:54 2006 -0600
@@ -11,7 +11,7 @@
#include <asm/pgtable.h>
#include <asm/vhpt.h>
#include <asm/asm-xsi-offsets.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
// Change rr7 to the passed value while ensuring
// Xen is mapped into the new region.
diff -r f328519053f5 xen/include/asm-ia64/domain.h
--- a/xen/include/asm-ia64/domain.h Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/domain.h Mon Aug 14 10:44:54 2006 -0600
@@ -6,7 +6,7 @@
#include <asm/vmx_vpd.h>
#include <asm/vmmu.h>
#include <asm/regionreg.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
#include <asm/vmx_platform.h>
#include <xen/list.h>
#include <xen/cpumask.h>
diff -r f328519053f5 xen/include/asm-ia64/event.h
--- a/xen/include/asm-ia64/event.h Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/event.h Mon Aug 14 10:44:54 2006 -0600
@@ -9,7 +9,7 @@
#ifndef __ASM_EVENT_H__
#define __ASM_EVENT_H__
-#include <public/arch-ia64.h>
+#include <public/xen.h>
#include <asm/vcpu.h>
static inline void vcpu_kick(struct vcpu *v)
diff -r f328519053f5 xen/include/asm-ia64/linux-xen/asm/ptrace.h
--- a/xen/include/asm-ia64/linux-xen/asm/ptrace.h Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/linux-xen/asm/ptrace.h Mon Aug 14 10:44:54 2006 -0600
@@ -96,7 +96,8 @@
*
*/
#ifdef XEN
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
#define pt_regs cpu_user_regs
/* User regs at placed at the end of the vcpu area.
diff -r f328519053f5 xen/include/asm-ia64/privop_stat.h
--- a/xen/include/asm-ia64/privop_stat.h Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/privop_stat.h Mon Aug 14 10:44:54 2006 -0600
@@ -1,6 +1,7 @@
#ifndef _XEN_UA64_PRIVOP_STAT_H
#define _XEN_UA64_PRIVOP_STAT_H
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
extern int dump_privop_counts_to_user(char *, int);
extern int zero_privop_counts_to_user(char *, int);
diff -r f328519053f5 xen/include/asm-ia64/vcpu.h
--- a/xen/include/asm-ia64/vcpu.h Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/vcpu.h Mon Aug 14 10:44:54 2006 -0600
@@ -7,7 +7,8 @@
#include <asm/fpu.h>
#include <asm/tlb.h>
#include <asm/ia64_int.h>
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
typedef unsigned long UINT64;
typedef unsigned int UINT;
typedef int BOOLEAN;
diff -r f328519053f5 xen/include/asm-ia64/vmx_platform.h
--- a/xen/include/asm-ia64/vmx_platform.h Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/vmx_platform.h Mon Aug 14 10:44:54 2006 -0600
@@ -21,7 +21,6 @@
#include <public/xen.h>
#include <public/hvm/params.h>
-#include <public/arch-ia64.h>
#include <asm/hvm/vioapic.h>
struct mmio_list;
typedef struct virtual_platform_def {
diff -r f328519053f5 xen/include/asm-ia64/vmx_vpd.h
--- a/xen/include/asm-ia64/vmx_vpd.h Mon Aug 14 10:58:02 2006 +0100
+++ b/xen/include/asm-ia64/vmx_vpd.h Mon Aug 14 10:44:54 2006 -0600
@@ -26,7 +26,7 @@
#include <asm/vtm.h>
#include <asm/vmx_platform.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
#define VPD_SHIFT 17 /* 128K requirement */
#define VPD_SIZE (1 << VPD_SHIFT)
next reply other threads:[~2006-08-14 16:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-14 16:49 Alex Williamson [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-10-08 15:41 [PATCH] ia64 build fix Alex Williamson
2006-07-12 17:51 Alex Williamson
2006-03-05 17:41 Alex Williamson
2006-02-18 0:06 Alex Williamson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1155574155.5608.33.camel@lappy \
--to=alex.williamson@hp.com \
--cc=Keir.Fraser@cl.cam.ac.uk \
--cc=xen-devel@lists.xensource.com \
--cc=xen-ia64-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.