[IA64] remove some #ifndef XEN using empty headerfiles.
authorIsaku Yamahata <yamahata@valinux.co.jp>
Thu, 19 Jun 2008 03:48:04 +0000 (12:48 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Thu, 19 Jun 2008 03:48:04 +0000 (12:48 +0900)
move mm_numa.c from linux-xen to linux because now mm_numa.c is
identical to linux files.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
17 files changed:
xen/arch/ia64/linux-xen/Makefile
xen/arch/ia64/linux-xen/README.origin
xen/arch/ia64/linux-xen/acpi.c
xen/arch/ia64/linux-xen/iosapic.c
xen/arch/ia64/linux-xen/mm_numa.c [deleted file]
xen/arch/ia64/linux-xen/setup.c
xen/arch/ia64/linux/Makefile
xen/arch/ia64/linux/README.origin
xen/arch/ia64/linux/numa.c [new file with mode: 0644]
xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h [new file with mode: 0644]
xen/include/asm-ia64/linux-null/asm/cyclone.h [new file with mode: 0644]
xen/include/asm-ia64/linux-null/asm/scatterlist.h [new file with mode: 0644]
xen/include/asm-ia64/linux-null/asm/xen/hypervisor.h [new file with mode: 0644]
xen/include/asm-ia64/linux-null/linux/node.h [new file with mode: 0644]
xen/include/asm-ia64/linux-null/linux/platform.h [new file with mode: 0644]
xen/include/asm-ia64/linux-null/linux/pm.h [new file with mode: 0644]
xen/include/asm-ia64/linux-xen/asm/pci.h

index 7dac5a43e795163c56843df068d935733c30a48d..64c66af49839063939e241f832d497cd0c201410 100644 (file)
@@ -20,7 +20,6 @@ obj-y += unaligned.o
 obj-y += unwind.o
 obj-y += iosapic.o
 obj-y += numa.o
-obj-y += mm_numa.o
 obj-y += perfmon.o
 obj-y += perfmon_default_smpl.o
 obj-y += acpi.o
index 2a35e6fb372bcf437b7dc1a7c7462f7e28345c23..482a2ff79bd460fe6734e87f223673aecf1e70cf 100644 (file)
@@ -15,7 +15,6 @@ mca.c                 -> linux/arch/ia64/kernel/mca.c
 mca_asm.S              -> linux/arch/ia64/kernel/mca_asm.S
 minstate.h             -> linux/arch/ia64/kernel/minstate.h
 mm_contig.c            -> linux/arch/ia64/mm/contig.c
-mm_numa.c              -> linux/arch/ia64/mm/numa.c
 numa.c                 -> linux/arch/ia64/kernel/numa.c
 process-linux-xen.c    -> linux/arch/ia64/kernel/process.c
 sal.c                  -> linux/arch/ia64/kernel/sal.c
index 6158305181644962dcca2c76cb1de1a409ed8531..5abc74c568dc61e25a4d5a6da0f3f681fb79b92b 100644 (file)
 #include <asm/system.h>
 #include <asm/numa.h>
 #include <asm/sal.h>
-#ifndef XEN
 #include <asm/cyclone.h>
 #include <asm/xen/hypervisor.h>
-#else
+#ifdef XEN
 #include <asm/hw_irq.h>
 extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
 #endif
index 64cc108a6fa59643f2ce32143648a835f21a492a..409ac8995c2d0480122f6337bd563f1a28dc5124 100644 (file)
@@ -75,9 +75,8 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
-#ifndef XEN
 #include <linux/pci.h>
-#else
+#ifdef XEN
 #include <xen/errno.h>
 #endif
 #include <linux/smp.h>
diff --git a/xen/arch/ia64/linux-xen/mm_numa.c b/xen/arch/ia64/linux-xen/mm_numa.c
deleted file mode 100644 (file)
index c1b919b..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * This file contains NUMA specific variables and functions which can
- * be split away from DISCONTIGMEM and are used on NUMA machines with
- * contiguous memory.
- * 
- *                         2002/08/07 Erich Focht <efocht@ess.nec.de>
- */
-
-#include <linux/config.h>
-#include <linux/cpu.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#ifndef XEN
-#include <linux/node.h>
-#endif
-#include <linux/init.h>
-#include <linux/bootmem.h>
-#include <asm/mmzone.h>
-#include <asm/numa.h>
-
-
-/*
- * The following structures are usually initialized by ACPI or
- * similar mechanisms and describe the NUMA characteristics of the machine.
- */
-int num_node_memblks;
-struct node_memblk_s node_memblk[NR_NODE_MEMBLKS];
-struct node_cpuid_s node_cpuid[NR_CPUS];
-/*
- * This is a matrix with "distances" between nodes, they should be
- * proportional to the memory access latency ratios.
- */
-u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
-
-/* Identify which cnode a physical address resides on */
-int
-paddr_to_nid(unsigned long paddr)
-{
-       int     i;
-
-       for (i = 0; i < num_node_memblks; i++)
-               if (paddr >= node_memblk[i].start_paddr &&
-                   paddr < node_memblk[i].start_paddr + node_memblk[i].size)
-                       break;
-
-       return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
-}
-
-#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA)
-/*
- * Because of holes evaluate on section limits.
- * If the section of memory exists, then return the node where the section
- * resides.  Otherwise return node 0 as the default.  This is used by
- * SPARSEMEM to allocate the SPARSEMEM sectionmap on the NUMA node where
- * the section resides.
- */
-int early_pfn_to_nid(unsigned long pfn)
-{
-       int i, section = pfn >> PFN_SECTION_SHIFT, ssec, esec;
-
-       for (i = 0; i < num_node_memblks; i++) {
-               ssec = node_memblk[i].start_paddr >> PA_SECTION_SHIFT;
-               esec = (node_memblk[i].start_paddr + node_memblk[i].size +
-                       ((1L << PA_SECTION_SHIFT) - 1)) >> PA_SECTION_SHIFT;
-               if (section >= ssec && section < esec)
-                       return node_memblk[i].nid;
-       }
-
-       return 0;
-}
-#endif
index a4696e9518ed1ad12e90f8d80f83936c553f2ea2..32067f56d7f148ec3ce483d4dcf070d10ffb187d 100644 (file)
 #include <linux/serial_core.h>
 #include <linux/efi.h>
 #include <linux/initrd.h>
-#ifndef XEN
 #include <linux/platform.h>
 #include <linux/pm.h>
-#endif
 
 #include <asm/ia32.h>
 #include <asm/machvec.h>
index 5b51bc0b577455a0b5ca54a94aba19a8134ba059..db279dcd3dcce5bcd17e6c22e89e4e1ed68e5baf 100644 (file)
@@ -14,6 +14,7 @@ obj-y += linuxextable.o
 obj-y += machvec.o
 obj-y += memcpy_mck.o
 obj-y += memset.o
+obj-y += numa.o
 obj-y += strlen.o
 
 obj-y += __divsi3.o
index 131752965340773c3bc7d5efed57c75be3543831..31ab3e940e4a763421024333bfb431fe168a92db 100644 (file)
@@ -10,6 +10,7 @@ hpsim.S                       -> linux/arch/ia64/hp/sim/hpsim.S
 irq_lsapic.c           -> linux/arch/ia64/kernel/irq_lsapic.c
 linuxextable.c         -> linux/kernel/extable.c
 machvec.c              -> linux/arch/ia64/kernel/machvec.c
+numa.c                 -> linux/arch/ia64/mm/numa.c
 patch.c                        -> linux/arch/ia64/kernel/patch.c
 pcdp.h                 -> linux/drivers/firmware/pcdp.h
 
diff --git a/xen/arch/ia64/linux/numa.c b/xen/arch/ia64/linux/numa.c
new file mode 100644 (file)
index 0000000..77118bb
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * This file contains NUMA specific variables and functions which can
+ * be split away from DISCONTIGMEM and are used on NUMA machines with
+ * contiguous memory.
+ * 
+ *                         2002/08/07 Erich Focht <efocht@ess.nec.de>
+ */
+
+#include <linux/config.h>
+#include <linux/cpu.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/node.h>
+#include <linux/init.h>
+#include <linux/bootmem.h>
+#include <asm/mmzone.h>
+#include <asm/numa.h>
+
+
+/*
+ * The following structures are usually initialized by ACPI or
+ * similar mechanisms and describe the NUMA characteristics of the machine.
+ */
+int num_node_memblks;
+struct node_memblk_s node_memblk[NR_NODE_MEMBLKS];
+struct node_cpuid_s node_cpuid[NR_CPUS];
+/*
+ * This is a matrix with "distances" between nodes, they should be
+ * proportional to the memory access latency ratios.
+ */
+u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
+
+/* Identify which cnode a physical address resides on */
+int
+paddr_to_nid(unsigned long paddr)
+{
+       int     i;
+
+       for (i = 0; i < num_node_memblks; i++)
+               if (paddr >= node_memblk[i].start_paddr &&
+                   paddr < node_memblk[i].start_paddr + node_memblk[i].size)
+                       break;
+
+       return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
+}
diff --git a/xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h b/xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h
new file mode 100644 (file)
index 0000000..29f4f4c
--- /dev/null
@@ -0,0 +1 @@
+/* This file is intentionally left empty. */
diff --git a/xen/include/asm-ia64/linux-null/asm/cyclone.h b/xen/include/asm-ia64/linux-null/asm/cyclone.h
new file mode 100644 (file)
index 0000000..29f4f4c
--- /dev/null
@@ -0,0 +1 @@
+/* This file is intentionally left empty. */
diff --git a/xen/include/asm-ia64/linux-null/asm/scatterlist.h b/xen/include/asm-ia64/linux-null/asm/scatterlist.h
new file mode 100644 (file)
index 0000000..29f4f4c
--- /dev/null
@@ -0,0 +1 @@
+/* This file is intentionally left empty. */
diff --git a/xen/include/asm-ia64/linux-null/asm/xen/hypervisor.h b/xen/include/asm-ia64/linux-null/asm/xen/hypervisor.h
new file mode 100644 (file)
index 0000000..29f4f4c
--- /dev/null
@@ -0,0 +1 @@
+/* This file is intentionally left empty. */
diff --git a/xen/include/asm-ia64/linux-null/linux/node.h b/xen/include/asm-ia64/linux-null/linux/node.h
new file mode 100644 (file)
index 0000000..29f4f4c
--- /dev/null
@@ -0,0 +1 @@
+/* This file is intentionally left empty. */
diff --git a/xen/include/asm-ia64/linux-null/linux/platform.h b/xen/include/asm-ia64/linux-null/linux/platform.h
new file mode 100644 (file)
index 0000000..29f4f4c
--- /dev/null
@@ -0,0 +1 @@
+/* This file is intentionally left empty. */
diff --git a/xen/include/asm-ia64/linux-null/linux/pm.h b/xen/include/asm-ia64/linux-null/linux/pm.h
new file mode 100644 (file)
index 0000000..29f4f4c
--- /dev/null
@@ -0,0 +1 @@
+/* This file is intentionally left empty. */
index 0e4e0d85d1221db42e88b0f9e71c8de32010b04e..10f9c41e7bb01ab89c495e44b52f3c901ed4fd47 100644 (file)
@@ -11,9 +11,7 @@
 #endif
 
 #include <asm/io.h>
-#ifndef XEN
 #include <asm/scatterlist.h>
-#endif
 
 /*
  * Can be used to override the logic in pci_scan_bus for skipping already-configured bus
@@ -60,9 +58,7 @@ pcibios_penalize_isa_irq (int irq, int active)
 #define HAVE_ARCH_PCI_MWI 1
 extern int pcibios_prep_mwi (struct pci_dev *);
 
-#ifndef XEN
 #include <asm-generic/pci-dma-compat.h>
-#endif
 
 /* pci_unmap_{single,page} is not a nop, thus... */
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)      \