git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-ia64
/
numa.h
diff --git
a/include/asm-ia64/numa.h
b/include/asm-ia64/numa.h
index
6459f61
..
7d5e2cc
100644
(file)
--- a/
include/asm-ia64/numa.h
+++ b/
include/asm-ia64/numa.h
@@
-11,7
+11,6
@@
#ifndef _ASM_IA64_NUMA_H
#define _ASM_IA64_NUMA_H
#ifndef _ASM_IA64_NUMA_H
#define _ASM_IA64_NUMA_H
-#include <linux/config.h>
#ifdef CONFIG_NUMA
#ifdef CONFIG_NUMA
@@
-23,7
+22,7
@@
#include <asm/mmzone.h>
#include <asm/mmzone.h>
-extern u
8
cpu_to_node_map[NR_CPUS] __cacheline_aligned;
+extern u
16
cpu_to_node_map[NR_CPUS] __cacheline_aligned;
extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
/* Stuff below this line could be architecture independent */
extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
/* Stuff below this line could be architecture independent */
@@
-59,13
+58,19
@@
extern struct node_cpuid_s node_cpuid[NR_CPUS];
*/
extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
*/
extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
-#define node_distance(from,to) (numa_slit[
from * numnodes + to
])
+#define node_distance(from,to) (numa_slit[
(from) * num_online_nodes() + (to)
])
extern int paddr_to_nid(unsigned long paddr);
#define local_nodeid (cpu_to_node_map[smp_processor_id()])
extern int paddr_to_nid(unsigned long paddr);
#define local_nodeid (cpu_to_node_map[smp_processor_id()])
+extern void map_cpu_to_node(int cpu, int nid);
+extern void unmap_cpu_from_node(int cpu, int nid);
+
+
#else /* !CONFIG_NUMA */
#else /* !CONFIG_NUMA */
+#define map_cpu_to_node(cpu, nid) do{}while(0)
+#define unmap_cpu_from_node(cpu, nid) do{}while(0)
#define paddr_to_nid(addr) 0
#define paddr_to_nid(addr) 0