From: Isaku Yamahata Date: Thu, 19 Jun 2008 03:48:04 +0000 (+0900) Subject: [IA64] remove some #ifndef XEN using empty headerfiles. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14193 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fe6de66ce66c5a98048e8c98faec4a9add3c7e8f;p=xen.git [IA64] remove some #ifndef XEN using empty headerfiles. move mm_numa.c from linux-xen to linux because now mm_numa.c is identical to linux files. Signed-off-by: Isaku Yamahata --- diff --git a/xen/arch/ia64/linux-xen/Makefile b/xen/arch/ia64/linux-xen/Makefile index 7dac5a43e7..64c66af498 100644 --- a/xen/arch/ia64/linux-xen/Makefile +++ b/xen/arch/ia64/linux-xen/Makefile @@ -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 diff --git a/xen/arch/ia64/linux-xen/README.origin b/xen/arch/ia64/linux-xen/README.origin index 2a35e6fb37..482a2ff79b 100644 --- a/xen/arch/ia64/linux-xen/README.origin +++ b/xen/arch/ia64/linux-xen/README.origin @@ -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 diff --git a/xen/arch/ia64/linux-xen/acpi.c b/xen/arch/ia64/linux-xen/acpi.c index 6158305181..5abc74c568 100644 --- a/xen/arch/ia64/linux-xen/acpi.c +++ b/xen/arch/ia64/linux-xen/acpi.c @@ -51,10 +51,9 @@ #include #include #include -#ifndef XEN #include #include -#else +#ifdef XEN #include extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES]; #endif diff --git a/xen/arch/ia64/linux-xen/iosapic.c b/xen/arch/ia64/linux-xen/iosapic.c index 64cc108a6f..409ac8995c 100644 --- a/xen/arch/ia64/linux-xen/iosapic.c +++ b/xen/arch/ia64/linux-xen/iosapic.c @@ -75,9 +75,8 @@ #include #include #include -#ifndef XEN #include -#else +#ifdef XEN #include #endif #include diff --git a/xen/arch/ia64/linux-xen/mm_numa.c b/xen/arch/ia64/linux-xen/mm_numa.c deleted file mode 100644 index c1b919bf40..0000000000 --- a/xen/arch/ia64/linux-xen/mm_numa.c +++ /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 - */ - -#include -#include -#include -#include -#ifndef XEN -#include -#endif -#include -#include -#include -#include - - -/* - * 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 diff --git a/xen/arch/ia64/linux-xen/setup.c b/xen/arch/ia64/linux-xen/setup.c index a4696e9518..32067f56d7 100644 --- a/xen/arch/ia64/linux-xen/setup.c +++ b/xen/arch/ia64/linux-xen/setup.c @@ -41,10 +41,8 @@ #include #include #include -#ifndef XEN #include #include -#endif #include #include diff --git a/xen/arch/ia64/linux/Makefile b/xen/arch/ia64/linux/Makefile index 5b51bc0b57..db279dcd3d 100644 --- a/xen/arch/ia64/linux/Makefile +++ b/xen/arch/ia64/linux/Makefile @@ -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 diff --git a/xen/arch/ia64/linux/README.origin b/xen/arch/ia64/linux/README.origin index 1317529653..31ab3e940e 100644 --- a/xen/arch/ia64/linux/README.origin +++ b/xen/arch/ia64/linux/README.origin @@ -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 index 0000000000..77118bbf3d --- /dev/null +++ b/xen/arch/ia64/linux/numa.c @@ -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 + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +/* + * 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 index 0000000000..29f4f4cd69 --- /dev/null +++ b/xen/include/asm-ia64/linux-null/asm-generic/pci-dma-compat.h @@ -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 index 0000000000..29f4f4cd69 --- /dev/null +++ b/xen/include/asm-ia64/linux-null/asm/cyclone.h @@ -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 index 0000000000..29f4f4cd69 --- /dev/null +++ b/xen/include/asm-ia64/linux-null/asm/scatterlist.h @@ -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 index 0000000000..29f4f4cd69 --- /dev/null +++ b/xen/include/asm-ia64/linux-null/asm/xen/hypervisor.h @@ -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 index 0000000000..29f4f4cd69 --- /dev/null +++ b/xen/include/asm-ia64/linux-null/linux/node.h @@ -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 index 0000000000..29f4f4cd69 --- /dev/null +++ b/xen/include/asm-ia64/linux-null/linux/platform.h @@ -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 index 0000000000..29f4f4cd69 --- /dev/null +++ b/xen/include/asm-ia64/linux-null/linux/pm.h @@ -0,0 +1 @@ +/* This file is intentionally left empty. */ diff --git a/xen/include/asm-ia64/linux-xen/asm/pci.h b/xen/include/asm-ia64/linux-xen/asm/pci.h index 0e4e0d85d1..10f9c41e7b 100644 --- a/xen/include/asm-ia64/linux-xen/asm/pci.h +++ b/xen/include/asm-ia64/linux-xen/asm/pci.h @@ -11,9 +11,7 @@ #endif #include -#ifndef XEN #include -#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 -#endif /* pci_unmap_{single,page} is not a nop, thus... */ #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \