WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] [IA64] removed an unused header file.

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] [IA64] removed an unused header file.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 02 Jul 2008 05:40:20 -0700
Delivery-date: Wed, 02 Jul 2008 05:40:34 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1213166280 -32400
# Node ID cddaea5d65280df6f6f484247be8c6bda05487e7
# Parent  cfbc535ebf6f3f33be596e15dccdc2a32d6d7c4e
[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>
---
 xen/include/asm-ia64/linux/numa.h         |   16 ----------------
 xen/arch/ia64/xen/acpi.c                  |    1 +
 xen/include/asm-ia64/config.h             |    6 ++----
 xen/include/asm-ia64/linux-xen/asm/acpi.h |    2 --
 xen/include/asm-ia64/linux-xen/asm/numa.h |   12 ++++++++++++
 xen/include/asm-ia64/linux/README.origin  |    1 -
 6 files changed, 15 insertions(+), 23 deletions(-)

diff -r cfbc535ebf6f -r cddaea5d6528 xen/arch/ia64/xen/acpi.c
--- a/xen/arch/ia64/xen/acpi.c  Wed Jun 11 16:57:42 2008 +0900
+++ b/xen/arch/ia64/xen/acpi.c  Wed Jun 11 15:38:00 2008 +0900
@@ -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 -r cfbc535ebf6f -r cddaea5d6528 xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h     Wed Jun 11 16:57:42 2008 +0900
+++ b/xen/include/asm-ia64/config.h     Wed Jun 11 15:38:00 2008 +0900
@@ -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 -r cfbc535ebf6f -r cddaea5d6528 xen/include/asm-ia64/linux-xen/asm/acpi.h
--- a/xen/include/asm-ia64/linux-xen/asm/acpi.h Wed Jun 11 16:57:42 2008 +0900
+++ b/xen/include/asm-ia64/linux-xen/asm/acpi.h Wed Jun 11 15:38:00 2008 +0900
@@ -108,10 +108,8 @@ extern unsigned int get_cpei_target_cpu(
 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 -r cfbc535ebf6f -r cddaea5d6528 xen/include/asm-ia64/linux-xen/asm/numa.h
--- a/xen/include/asm-ia64/linux-xen/asm/numa.h Wed Jun 11 16:57:42 2008 +0900
+++ b/xen/include/asm-ia64/linux-xen/asm/numa.h Wed Jun 11 15:38:00 2008 +0900
@@ -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 @@ struct node_cpuid_s {
        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 @@ extern struct node_cpuid_s node_cpuid[NR
  * 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 -r cfbc535ebf6f -r cddaea5d6528 xen/include/asm-ia64/linux/README.origin
--- a/xen/include/asm-ia64/linux/README.origin  Wed Jun 11 16:57:42 2008 +0900
+++ b/xen/include/asm-ia64/linux/README.origin  Wed Jun 11 15:38:00 2008 +0900
@@ -13,7 +13,6 @@ kmalloc_sizes.h               -> linux/include/linux/
 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 -r cfbc535ebf6f -r cddaea5d6528 xen/include/asm-ia64/linux/numa.h
--- a/xen/include/asm-ia64/linux/numa.h Wed Jun 11 16:57:42 2008 +0900
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] [IA64] removed an unused header file., Xen patchbot-unstable <=