# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1213166280 -32400
# Node ID 91d1e9603110f50e46f39cc24dbac8340b0f4b76
# Parent 6aed5cd65ae0efb5d4bc0478c97363a26fa3ff7a
[IA64] removed an unused header file.
removed an unused header file and MAX_NUMNODES were defined in
two place. so removed unnecessary MAX_NUMNODES definitions.
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
diff --git a/xen/arch/ia64/xen/acpi.c b/xen/arch/ia64/xen/acpi.c
--- a/xen/arch/ia64/xen/acpi.c
+++ b/xen/arch/ia64/xen/acpi.c
@@ -54,6 +54,7 @@
#ifdef XEN
#include <xen/errno.h>
#include <xen/nodemask.h>
+extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
#endif
#define BAD_MADT_ENTRY(entry, end) ( \
diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -33,10 +33,8 @@
#endif
#define CONFIG_NUMA
#define CONFIG_ACPI_NUMA
-#define NODES_SHIFT 8
-#define MAX_NUMNODES (1 << NODES_SHIFT)
-#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
-#define MAX_PXM_DOMAINS 256
+#define NODES_SHIFT 8 /* linux/asm/numnodes.h */
+#define NR_NODE_MEMBLKS (MAX_NUMNODES*2) /* linux-xen/asm/acpi.h */
#else
#undef CONFIG_SMP
#define NR_CPUS 1
diff --git a/xen/include/asm-ia64/linux-xen/asm/acpi.h
b/xen/include/asm-ia64/linux-xen/asm/acpi.h
--- a/xen/include/asm-ia64/linux-xen/asm/acpi.h
+++ b/xen/include/asm-ia64/linux-xen/asm/acpi.h
@@ -108,10 +108,8 @@
extern unsigned int get_cpei_target_cpu(void);
#ifdef CONFIG_ACPI_NUMA
-#ifndef XEN
/* Proximity bitmap length; _PXM is at most 255 (8 bit)*/
#define MAX_PXM_DOMAINS (256)
-#endif
extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS];
extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
#endif
diff --git a/xen/include/asm-ia64/linux-xen/asm/numa.h
b/xen/include/asm-ia64/linux-xen/asm/numa.h
--- a/xen/include/asm-ia64/linux-xen/asm/numa.h
+++ b/xen/include/asm-ia64/linux-xen/asm/numa.h
@@ -26,7 +26,11 @@
#include <asm/mmzone.h>
extern u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
+#ifndef XEN
extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
+#else
+extern cpumask_t node_to_cpu_mask[] __cacheline_aligned;
+#endif
/* Stuff below this line could be architecture independent */
@@ -49,7 +53,11 @@
int nid; /* logical node containing this CPU */
};
+#ifndef XEN
extern struct node_memblk_s node_memblk[NR_NODE_MEMBLKS];
+#else
+extern struct node_memblk_s node_memblk[];
+#endif
extern struct node_cpuid_s node_cpuid[NR_CPUS];
/*
@@ -60,7 +68,11 @@
* proportional to the memory access latency ratios.
*/
+#ifndef XEN
extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
+#else
+extern u8 numa_slit[];
+#endif
#define node_distance(from,to) (numa_slit[(from) * num_online_nodes() + (to)])
extern int paddr_to_nid(unsigned long paddr);
diff --git a/xen/include/asm-ia64/linux/README.origin
b/xen/include/asm-ia64/linux/README.origin
--- a/xen/include/asm-ia64/linux/README.origin
+++ b/xen/include/asm-ia64/linux/README.origin
@@ -13,7 +13,6 @@
kmalloc_sizes.h -> linux/include/linux/kmalloc_sizes.h
linkage.h -> linux/include/linux/linkage.h
notifier.h -> linux/include/linux/notifier.h
-numa.h -> linux/include/linux/numa.h
percpu.h -> linux/include/linux/percpu.h
preempt.h -> linux/include/linux/preempt.h
seqlock.h -> linux/include/linux/seqlock.h
diff --git a/xen/include/asm-ia64/linux/numa.h
b/xen/include/asm-ia64/linux/numa.h
deleted file mode 100644
--- a/xen/include/asm-ia64/linux/numa.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _LINUX_NUMA_H
-#define _LINUX_NUMA_H
-
-#include <linux/config.h>
-
-#ifndef CONFIG_FLATMEM
-#include <asm/numnodes.h>
-#endif
-
-#ifndef NODES_SHIFT
-#define NODES_SHIFT 0
-#endif
-
-#define MAX_NUMNODES (1 << NODES_SHIFT)
-
-#endif /* _LINUX_NUMA_H */
4-remove-unused-linux-numa-h.patch
Description: Text Data
_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel
|
Home