[PATCH] fix ia64 build

[PATCH] fix ia64 build

[Alex Williamson]

   The ia64 build doesn't yet include drivers/xen/Kconfig directly so we
need to replicate the new XEN_INTERFACE_VERSION option in the arch
Kconfig.  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 8a8361994904 linux-2.6-xen-sparse/arch/ia64/Kconfig
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Fri Mar 31 00:26:07 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Thu Mar 30 23:56:15 2006 -0700
@@ -90,6 +90,11 @@ config XEN_SYSFS
 	default y
 	help
 		Xen hypervisor attributes will show up under /sys/hypervisor/.
+
+config XEN_INTERFACE_VERSION
+	hex
+	depends on XEN
+	default 0x00030101
 
 config SCHED_NO_NO_OMIT_FRAME_POINTER
 	bool

[PATCH] fix ia64 build

[Alex Williamson]

[IA64] Fix ia64 build

xen-unstable.hg cset 10035 moved typedefs to their own line in the xen
public headers and started using the structure definition in places
rather than the typedef.  This replicates the change in the ia64 specific
header.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff -r 3c2e7925bb93 -r 3628f696b37d xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h	Fri May 19 17:50:32 2006 +0100
+++ b/xen/include/public/arch-ia64.h	Fri May 19 14:11:10 2006 -0600
@@ -38,15 +38,19 @@ DEFINE_XEN_GUEST_HANDLE(void);
 #ifndef __ASSEMBLY__
 
 #define MAX_NR_SECTION  32  /* at most 32 memory holes */
-typedef struct {
+struct mm_section {
     unsigned long start;  /* start of memory hole */
     unsigned long end;    /* end of memory hole */
-} mm_section_t;
-
-typedef struct {
+};
+
+typedef struct mm_section mm_section_t;
+
+struct pmt_entry {
     unsigned long mfn : 56;
     unsigned long type: 8;
-} pmt_entry_t;
+};
+
+typedef struct pmt_entry pmt_entry_t;
 
 #define GPFN_MEM          (0UL << 56) /* Guest pfn is normal mem */
 #define GPFN_FRAME_BUFFER (1UL << 56) /* VGA framebuffer */
@@ -93,10 +97,12 @@ typedef struct {
  * NB. This may become a 64-bit count with no shift. If this happens then the 
  * structure size will still be 8 bytes, so no other alignments will change.
  */
-typedef struct {
+struct tsc_timestamp {
     unsigned int  tsc_bits;      /* 0: 32 bits read from the CPU's TSC. */
     unsigned int  tsc_bitshift;  /* 4: 'tsc_bits' uses N:N+31 of TSC.   */
-} tsc_timestamp_t; /* 8 bytes */
+}; /* 8 bytes */
+
+typedef struct tsc_timestamp tsc_timestamp_t;
 
 struct pt_fpreg {
     union {
@@ -105,7 +111,7 @@ struct pt_fpreg {
     } u;
 };
 
-typedef struct cpu_user_regs{
+struct cpu_user_regs {
     /* The following registers are saved by SAVE_MIN: */
     unsigned long b6;  /* scratch */
     unsigned long b7;  /* scratch */
@@ -179,7 +185,9 @@ typedef struct cpu_user_regs{
     unsigned long eml_unat;    /* used for emulating instruction */
     unsigned long rfi_pfs;     /* used for elulating rfi */
 
-}cpu_user_regs_t;
+};
+
+typedef struct cpu_user_regs cpu_user_regs_t;
 
 typedef union {
     unsigned long value;
@@ -208,7 +216,7 @@ typedef union {
     };
 } vdc_t;
 
-typedef struct {
+struct mapped_regs {
     vac_t   vac;
     vdc_t   vdc;
     unsigned long  virt_env_vaddr;
@@ -290,27 +298,35 @@ typedef struct {
     unsigned long  reserved6[3456];
     unsigned long  vmm_avail[128];
     unsigned long  reserved7[4096];
-} mapped_regs_t;
-
-typedef struct {
-    mapped_regs_t *privregs;
+};
+
+typedef struct mapped_regs mapped_regs_t;
+
+struct arch_vcpu_info {
+    struct mapped_regs *privregs;
     int evtchn_vector;
-} arch_vcpu_info_t;
+};
+
+typedef struct arch_shared_info arch_shared_info_t;
 
 typedef mapped_regs_t vpd_t;
 
-typedef struct {
+struct arch_shared_info {
     unsigned int flags;
     unsigned long start_info_pfn;
-} arch_shared_info_t;
-
-typedef struct {
+};
+
+typedef struct arch_vcpu_info arch_vcpu_info_t;
+
+struct arch_initrd_info {
     unsigned long start;
     unsigned long size;
-} arch_initrd_info_t;
+};
+
+typedef struct arch_initrd_info arch_initrd_info_t;
 
 #define IA64_COMMAND_LINE_SIZE 512
-typedef struct vcpu_guest_context {
+struct vcpu_guest_context {
 #define VGCF_FPU_VALID (1<<0)
 #define VGCF_VMX_GUEST (1<<1)
 #define VGCF_IN_KERNEL (1<<2)
@@ -325,7 +341,9 @@ typedef struct vcpu_guest_context {
     arch_shared_info_t shared;
     arch_initrd_info_t initrd;
     char cmdline[IA64_COMMAND_LINE_SIZE];
-} vcpu_guest_context_t;
+};
+
+typedef struct vcpu_guest_context vcpu_guest_context_t;
 DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
 
 // dom0 vp op

[PATCH] fix ia64 build

[Alex Williamson]

   This patch is necessary to build on ia64 with xen-unstable.hg cset
13214.  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 60f91c9f1a24 xen/include/xen/kernel.h
--- a/xen/include/xen/kernel.h	Wed Jan 03 23:53:27 2007 +0000
+++ b/xen/include/xen/kernel.h	Wed Jan 03 19:55:42 2007 -0700
@@ -56,6 +56,7 @@
 	1;                                      \
 })
 
+#ifndef __ASSEMBLY__
 extern char _start[], _end[];
 #define is_kernel(p) ({                         \
     char *__p = (char *)(unsigned long)(p);     \
@@ -73,6 +74,6 @@ extern char _sinittext[], _einittext[];
     char *__p = (char *)(unsigned long)(p);     \
     (__p >= _sinittext) && (__p <= _einittext); \
 })
-
+#endif /* !__ASSEMBLY__ */
 #endif /* _LINUX_KERNEL_H */

Re: [PATCH] fix ia64 build

[Keir Fraser]

There's nothing in kernel.h of use to asm files. If erroneous inclusion is
happening due to some include spaghetti, let's clean that up rather than
work around it.

 -- Keir

On 4/1/07 03:03, "Alex Williamson" <alex.williamson@hp.com> wrote:

> 
>    This patch is necessary to build on ia64 with xen-unstable.hg cset
> 13214.  Thanks,
> 
> Alex
> 
> Signed-off-by: Alex Williamson <alex.williamson@hp.com>
> ---
> 
> diff -r 60f91c9f1a24 xen/include/xen/kernel.h
> --- a/xen/include/xen/kernel.h Wed Jan 03 23:53:27 2007 +0000
> +++ b/xen/include/xen/kernel.h Wed Jan 03 19:55:42 2007 -0700
> @@ -56,6 +56,7 @@
> 1;                                      \
>  })
>  
> +#ifndef __ASSEMBLY__
>  extern char _start[], _end[];
>  #define is_kernel(p) ({                         \
>      char *__p = (char *)(unsigned long)(p);     \
> @@ -73,6 +74,6 @@ extern char _sinittext[], _einittext[];
>      char *__p = (char *)(unsigned long)(p);     \
>      (__p >= _sinittext) && (__p <= _einittext); \
>  })
> -
> +#endif /* !__ASSEMBLY__ */
>  #endif /* _LINUX_KERNEL_H */
>  
> 
>