1.1 --- a/xen/arch/ia64/xen/acpi.c	Wed Jun 11 16:57:42 2008 +0900
     1.2 +++ b/xen/arch/ia64/xen/acpi.c	Wed Jun 11 15:38:00 2008 +0900
     1.3 @@ -54,6 +54,7 @@
     1.4  #ifdef XEN
     1.5  #include <xen/errno.h>
     1.6  #include <xen/nodemask.h>
     1.7 +extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
     1.8  #endif
     1.9  
    1.10  #define BAD_MADT_ENTRY(entry, end) (                                        \

     2.1 --- a/xen/include/asm-ia64/config.h	Wed Jun 11 16:57:42 2008 +0900
     2.2 +++ b/xen/include/asm-ia64/config.h	Wed Jun 11 15:38:00 2008 +0900
     2.3 @@ -33,10 +33,8 @@
     2.4  #endif
     2.5  #define CONFIG_NUMA
     2.6  #define CONFIG_ACPI_NUMA
     2.7 -#define NODES_SHIFT 8
     2.8 -#define MAX_NUMNODES (1 << NODES_SHIFT)
     2.9 -#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
    2.10 -#define MAX_PXM_DOMAINS 256
    2.11 +#define NODES_SHIFT 8				/* linux/asm/numnodes.h */
    2.12 +#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)	/* linux-xen/asm/acpi.h */
    2.13  #else
    2.14  #undef CONFIG_SMP
    2.15  #define NR_CPUS 1

     3.1 --- a/xen/include/asm-ia64/linux-xen/asm/acpi.h	Wed Jun 11 16:57:42 2008 +0900
     3.2 +++ b/xen/include/asm-ia64/linux-xen/asm/acpi.h	Wed Jun 11 15:38:00 2008 +0900
     3.3 @@ -108,10 +108,8 @@ extern void set_cpei_target_cpu(unsigned
     3.4  extern unsigned int get_cpei_target_cpu(void);
     3.5  
     3.6  #ifdef CONFIG_ACPI_NUMA
     3.7 -#ifndef XEN
     3.8  /* Proximity bitmap length; _PXM is at most 255 (8 bit)*/
     3.9  #define MAX_PXM_DOMAINS (256)
    3.10 -#endif
    3.11  extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS];
    3.12  extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
    3.13  #endif

     4.1 --- a/xen/include/asm-ia64/linux-xen/asm/numa.h	Wed Jun 11 16:57:42 2008 +0900
     4.2 +++ b/xen/include/asm-ia64/linux-xen/asm/numa.h	Wed Jun 11 15:38:00 2008 +0900
     4.3 @@ -26,7 +26,11 @@
     4.4  #include <asm/mmzone.h>
     4.5  
     4.6  extern u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
     4.7 +#ifndef XEN
     4.8  extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
     4.9 +#else
    4.10 +extern cpumask_t node_to_cpu_mask[] __cacheline_aligned;
    4.11 +#endif
    4.12  
    4.13  /* Stuff below this line could be architecture independent */
    4.14  
    4.15 @@ -49,7 +53,11 @@ struct node_cpuid_s {
    4.16  	int	nid;		/* logical node containing this CPU */
    4.17  };
    4.18  
    4.19 +#ifndef XEN
    4.20  extern struct node_memblk_s node_memblk[NR_NODE_MEMBLKS];
    4.21 +#else
    4.22 +extern struct node_memblk_s node_memblk[];
    4.23 +#endif
    4.24  extern struct node_cpuid_s node_cpuid[NR_CPUS];
    4.25  
    4.26  /*
    4.27 @@ -60,7 +68,11 @@ extern struct node_cpuid_s node_cpuid[NR
    4.28   * proportional to the memory access latency ratios.
    4.29   */
    4.30  
    4.31 +#ifndef XEN
    4.32  extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
    4.33 +#else
    4.34 +extern u8 numa_slit[];
    4.35 +#endif
    4.36  #define node_distance(from,to) (numa_slit[(from) * num_online_nodes() + (to)])
    4.37  
    4.38  extern int paddr_to_nid(unsigned long paddr);

     5.1 --- a/xen/include/asm-ia64/linux/README.origin	Wed Jun 11 16:57:42 2008 +0900
     5.2 +++ b/xen/include/asm-ia64/linux/README.origin	Wed Jun 11 15:38:00 2008 +0900
     5.3 @@ -13,7 +13,6 @@ jiffies.h		-> linux/include/linux/jiffie
     5.4  kmalloc_sizes.h		-> linux/include/linux/kmalloc_sizes.h
     5.5  linkage.h		-> linux/include/linux/linkage.h
     5.6  notifier.h		-> linux/include/linux/notifier.h
     5.7 -numa.h			-> linux/include/linux/numa.h
     5.8  percpu.h		-> linux/include/linux/percpu.h
     5.9  preempt.h		-> linux/include/linux/preempt.h
    5.10  seqlock.h		-> linux/include/linux/seqlock.h

     6.1 --- a/xen/include/asm-ia64/linux/numa.h	Wed Jun 11 16:57:42 2008 +0900
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,16 +0,0 @@
     6.4 -#ifndef _LINUX_NUMA_H
     6.5 -#define _LINUX_NUMA_H
     6.6 -
     6.7 -#include <linux/config.h>
     6.8 -
     6.9 -#ifndef CONFIG_FLATMEM
    6.10 -#include <asm/numnodes.h>
    6.11 -#endif
    6.12 -
    6.13 -#ifndef NODES_SHIFT
    6.14 -#define NODES_SHIFT     0
    6.15 -#endif
    6.16 -
    6.17 -#define MAX_NUMNODES    (1 << NODES_SHIFT)
    6.18 -
    6.19 -#endif /* _LINUX_NUMA_H */