1.1 --- a/xen/arch/ia64/linux-xen/Makefile	Thu Jun 19 12:48:04 2008 +0900
     1.2 +++ b/xen/arch/ia64/linux-xen/Makefile	Thu Jun 19 12:48:04 2008 +0900
     1.3 @@ -20,7 +20,6 @@ obj-y += unaligned.o
     1.4  obj-y += unwind.o
     1.5  obj-y += iosapic.o
     1.6  obj-y += numa.o
     1.7 -obj-y += mm_numa.o
     1.8  obj-y += perfmon.o
     1.9  obj-y += perfmon_default_smpl.o
    1.10  obj-y += acpi.o

     2.1 --- a/xen/arch/ia64/linux-xen/README.origin	Thu Jun 19 12:48:04 2008 +0900
     2.2 +++ b/xen/arch/ia64/linux-xen/README.origin	Thu Jun 19 12:48:04 2008 +0900
     2.3 @@ -15,7 +15,6 @@ mca.c			-> linux/arch/ia64/kernel/mca.c
     2.4  mca_asm.S		-> linux/arch/ia64/kernel/mca_asm.S
     2.5  minstate.h		-> linux/arch/ia64/kernel/minstate.h
     2.6  mm_contig.c		-> linux/arch/ia64/mm/contig.c
     2.7 -mm_numa.c		-> linux/arch/ia64/mm/numa.c
     2.8  numa.c			-> linux/arch/ia64/kernel/numa.c
     2.9  process-linux-xen.c	-> linux/arch/ia64/kernel/process.c
    2.10  sal.c			-> linux/arch/ia64/kernel/sal.c

     3.1 --- a/xen/arch/ia64/linux-xen/acpi.c	Thu Jun 19 12:48:04 2008 +0900
     3.2 +++ b/xen/arch/ia64/linux-xen/acpi.c	Thu Jun 19 12:48:04 2008 +0900
     3.3 @@ -51,10 +51,9 @@
     3.4  #include <asm/system.h>
     3.5  #include <asm/numa.h>
     3.6  #include <asm/sal.h>
     3.7 -#ifndef XEN
     3.8  #include <asm/cyclone.h>
     3.9  #include <asm/xen/hypervisor.h>
    3.10 -#else
    3.11 +#ifdef XEN
    3.12  #include <asm/hw_irq.h>
    3.13  extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
    3.14  #endif

     4.1 --- a/xen/arch/ia64/linux-xen/iosapic.c	Thu Jun 19 12:48:04 2008 +0900
     4.2 +++ b/xen/arch/ia64/linux-xen/iosapic.c	Thu Jun 19 12:48:04 2008 +0900
     4.3 @@ -75,9 +75,8 @@
     4.4  #include <linux/irq.h>
     4.5  #include <linux/kernel.h>
     4.6  #include <linux/list.h>
     4.7 -#ifndef XEN
     4.8  #include <linux/pci.h>
     4.9 -#else
    4.10 +#ifdef XEN
    4.11  #include <xen/errno.h>
    4.12  #endif
    4.13  #include <linux/smp.h>

     5.1 --- a/xen/arch/ia64/linux-xen/mm_numa.c	Thu Jun 19 12:48:04 2008 +0900
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,75 +0,0 @@
     5.4 -/*
     5.5 - * This file is subject to the terms and conditions of the GNU General Public
     5.6 - * License.  See the file "COPYING" in the main directory of this archive
     5.7 - * for more details.
     5.8 - *
     5.9 - * This file contains NUMA specific variables and functions which can
    5.10 - * be split away from DISCONTIGMEM and are used on NUMA machines with
    5.11 - * contiguous memory.
    5.12 - * 
    5.13 - *                         2002/08/07 Erich Focht <efocht@ess.nec.de>
    5.14 - */
    5.15 -
    5.16 -#include <linux/config.h>
    5.17 -#include <linux/cpu.h>
    5.18 -#include <linux/kernel.h>
    5.19 -#include <linux/mm.h>
    5.20 -#ifndef XEN
    5.21 -#include <linux/node.h>
    5.22 -#endif
    5.23 -#include <linux/init.h>
    5.24 -#include <linux/bootmem.h>
    5.25 -#include <asm/mmzone.h>
    5.26 -#include <asm/numa.h>
    5.27 -
    5.28 -
    5.29 -/*
    5.30 - * The following structures are usually initialized by ACPI or
    5.31 - * similar mechanisms and describe the NUMA characteristics of the machine.
    5.32 - */
    5.33 -int num_node_memblks;
    5.34 -struct node_memblk_s node_memblk[NR_NODE_MEMBLKS];
    5.35 -struct node_cpuid_s node_cpuid[NR_CPUS];
    5.36 -/*
    5.37 - * This is a matrix with "distances" between nodes, they should be
    5.38 - * proportional to the memory access latency ratios.
    5.39 - */
    5.40 -u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
    5.41 -
    5.42 -/* Identify which cnode a physical address resides on */
    5.43 -int
    5.44 -paddr_to_nid(unsigned long paddr)
    5.45 -{
    5.46 -	int	i;
    5.47 -
    5.48 -	for (i = 0; i < num_node_memblks; i++)
    5.49 -		if (paddr >= node_memblk[i].start_paddr &&
    5.50 -		    paddr < node_memblk[i].start_paddr + node_memblk[i].size)
    5.51 -			break;
    5.52 -
    5.53 -	return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
    5.54 -}
    5.55 -
    5.56 -#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA)
    5.57 -/*
    5.58 - * Because of holes evaluate on section limits.
    5.59 - * If the section of memory exists, then return the node where the section
    5.60 - * resides.  Otherwise return node 0 as the default.  This is used by
    5.61 - * SPARSEMEM to allocate the SPARSEMEM sectionmap on the NUMA node where
    5.62 - * the section resides.
    5.63 - */
    5.64 -int early_pfn_to_nid(unsigned long pfn)
    5.65 -{
    5.66 -	int i, section = pfn >> PFN_SECTION_SHIFT, ssec, esec;
    5.67 -
    5.68 -	for (i = 0; i < num_node_memblks; i++) {
    5.69 -		ssec = node_memblk[i].start_paddr >> PA_SECTION_SHIFT;
    5.70 -		esec = (node_memblk[i].start_paddr + node_memblk[i].size +
    5.71 -			((1L << PA_SECTION_SHIFT) - 1)) >> PA_SECTION_SHIFT;
    5.72 -		if (section >= ssec && section < esec)
    5.73 -			return node_memblk[i].nid;
    5.74 -	}
    5.75 -
    5.76 -	return 0;
    5.77 -}
    5.78 -#endif

     6.1 --- a/xen/arch/ia64/linux-xen/setup.c	Thu Jun 19 12:48:04 2008 +0900
     6.2 +++ b/xen/arch/ia64/linux-xen/setup.c	Thu Jun 19 12:48:04 2008 +0900
     6.3 @@ -41,10 +41,8 @@
     6.4  #include <linux/serial_core.h>
     6.5  #include <linux/efi.h>
     6.6  #include <linux/initrd.h>
     6.7 -#ifndef XEN
     6.8  #include <linux/platform.h>
     6.9  #include <linux/pm.h>
    6.10 -#endif
    6.11  
    6.12  #include <asm/ia32.h>
    6.13  #include <asm/machvec.h>

     7.1 --- a/xen/arch/ia64/linux/Makefile	Thu Jun 19 12:48:04 2008 +0900
     7.2 +++ b/xen/arch/ia64/linux/Makefile	Thu Jun 19 12:48:04 2008 +0900
     7.3 @@ -14,6 +14,7 @@ obj-y += linuxextable.o
     7.4  obj-y += machvec.o
     7.5  obj-y += memcpy_mck.o
     7.6  obj-y += memset.o
     7.7 +obj-y += numa.o
     7.8  obj-y += strlen.o
     7.9  
    7.10  obj-y += __divsi3.o

     8.1 --- a/xen/arch/ia64/linux/README.origin	Thu Jun 19 12:48:04 2008 +0900
     8.2 +++ b/xen/arch/ia64/linux/README.origin	Thu Jun 19 12:48:04 2008 +0900
     8.3 @@ -10,6 +10,7 @@ hpsim.S			-> linux/arch/ia64/hp/sim/hpsi
     8.4  irq_lsapic.c		-> linux/arch/ia64/kernel/irq_lsapic.c
     8.5  linuxextable.c		-> linux/kernel/extable.c
     8.6  machvec.c		-> linux/arch/ia64/kernel/machvec.c
     8.7 +numa.c			-> linux/arch/ia64/mm/numa.c
     8.8  patch.c			-> linux/arch/ia64/kernel/patch.c
     8.9  pcdp.h			-> linux/drivers/firmware/pcdp.h
    8.10  

     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/xen/arch/ia64/linux/numa.c	Thu Jun 19 12:48:04 2008 +0900
     9.3 @@ -0,0 +1,49 @@
     9.4 +/*
     9.5 + * This file is subject to the terms and conditions of the GNU General Public
     9.6 + * License.  See the file "COPYING" in the main directory of this archive
     9.7 + * for more details.
     9.8 + *
     9.9 + * This file contains NUMA specific variables and functions which can
    9.10 + * be split away from DISCONTIGMEM and are used on NUMA machines with
    9.11 + * contiguous memory.
    9.12 + * 
    9.13 + *                         2002/08/07 Erich Focht <efocht@ess.nec.de>
    9.14 + */
    9.15 +
    9.16 +#include <linux/config.h>
    9.17 +#include <linux/cpu.h>
    9.18 +#include <linux/kernel.h>
    9.19 +#include <linux/mm.h>
    9.20 +#include <linux/node.h>
    9.21 +#include <linux/init.h>
    9.22 +#include <linux/bootmem.h>
    9.23 +#include <asm/mmzone.h>
    9.24 +#include <asm/numa.h>
    9.25 +
    9.26 +
    9.27 +/*
    9.28 + * The following structures are usually initialized by ACPI or
    9.29 + * similar mechanisms and describe the NUMA characteristics of the machine.
    9.30 + */
    9.31 +int num_node_memblks;
    9.32 +struct node_memblk_s node_memblk[NR_NODE_MEMBLKS];
    9.33 +struct node_cpuid_s node_cpuid[NR_CPUS];
    9.34 +/*
    9.35 + * This is a matrix with "distances" between nodes, they should be
    9.36 + * proportional to the memory access latency ratios.
    9.37 + */
    9.38 +u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
    9.39 +
    9.40 +/* Identify which cnode a physical address resides on */
    9.41 +int
    9.42 +paddr_to_nid(unsigned long paddr)
    9.43 +{
    9.44 +	int	i;
    9.45 +
    9.46 +	for (i = 0; i < num_node_memblks; i++)
    9.47 +		if (paddr >= node_memblk[i].start_paddr &&
    9.48 +		    paddr < node_memblk[i].start_paddr + node_memblk[i].size)
    9.49 +			break;
    9.50 +
    9.51 +	return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
    9.52 +}

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h	Thu Jun 19 12:48:04 2008 +0900
    10.3 @@ -0,0 +1,1 @@
    10.4 +/* This file is intentionally left empty. */

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/xen/include/asm-ia64/linux-null/asm/cyclone.h	Thu Jun 19 12:48:04 2008 +0900
    11.3 @@ -0,0 +1,1 @@
    11.4 +/* This file is intentionally left empty. */

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/xen/include/asm-ia64/linux-null/asm/scatterlist.h	Thu Jun 19 12:48:04 2008 +0900
    12.3 @@ -0,0 +1,1 @@
    12.4 +/* This file is intentionally left empty. */

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/xen/include/asm-ia64/linux-null/asm/xen/hypervisor.h	Thu Jun 19 12:48:04 2008 +0900
    13.3 @@ -0,0 +1,1 @@
    13.4 +/* This file is intentionally left empty. */

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/xen/include/asm-ia64/linux-null/linux/node.h	Thu Jun 19 12:48:04 2008 +0900
    14.3 @@ -0,0 +1,1 @@
    14.4 +/* This file is intentionally left empty. */

    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/xen/include/asm-ia64/linux-null/linux/platform.h	Thu Jun 19 12:48:04 2008 +0900
    15.3 @@ -0,0 +1,1 @@
    15.4 +/* This file is intentionally left empty. */

    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/xen/include/asm-ia64/linux-null/linux/pm.h	Thu Jun 19 12:48:04 2008 +0900
    16.3 @@ -0,0 +1,1 @@
    16.4 +/* This file is intentionally left empty. */

    17.1 --- a/xen/include/asm-ia64/linux-xen/asm/pci.h	Thu Jun 19 12:48:04 2008 +0900
    17.2 +++ b/xen/include/asm-ia64/linux-xen/asm/pci.h	Thu Jun 19 12:48:04 2008 +0900
    17.3 @@ -11,9 +11,7 @@
    17.4  #endif
    17.5  
    17.6  #include <asm/io.h>
    17.7 -#ifndef XEN
    17.8  #include <asm/scatterlist.h>
    17.9 -#endif
   17.10  
   17.11  /*
   17.12   * Can be used to override the logic in pci_scan_bus for skipping already-configured bus
   17.13 @@ -60,9 +58,7 @@ pcibios_penalize_isa_irq (int irq, int a
   17.14  #define HAVE_ARCH_PCI_MWI 1
   17.15  extern int pcibios_prep_mwi (struct pci_dev *);
   17.16  
   17.17 -#ifndef XEN
   17.18  #include <asm-generic/pci-dma-compat.h>
   17.19 -#endif
   17.20  
   17.21  /* pci_unmap_{single,page} is not a nop, thus... */
   17.22  #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	\