From edc7a1e78004932c08b0eb79cb24257a8babdfba Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 16 Feb 2008 23:02:03 -0800 Subject: [PATCH] --- yaml --- r: 88599 b: refs/heads/master c: 04adf11435a5187383c35017a94b55701984243b h: refs/heads/master i: 88597: 69b939461123bf5b9e4ac7fbb894f625bb2aed5f 88595: 8baf16896f85f4a49f4ee553c47f87da355a7ba8 88591: 3b4c6f3a12aeb05990d6a0c7c835d4bbaaa799d4 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/numa_64.c | 2 -- trunk/include/asm-x86/pda.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f7d1346fd113..f3cba3cfde9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: beafe91f1c2c49713221ca2616755e1f3d472084 +refs/heads/master: 04adf11435a5187383c35017a94b55701984243b diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c index 16b82ad34b96..18267a02e67a 100644 --- a/trunk/arch/x86/mm/numa_64.c +++ b/trunk/arch/x86/mm/numa_64.c @@ -548,8 +548,6 @@ void __cpuinit numa_set_node(int cpu, int node) { int *cpu_to_node_map = x86_cpu_to_node_map_early_ptr; - cpu_pda(cpu)->nodenumber = node; - if(cpu_to_node_map) cpu_to_node_map[cpu] = node; else if(per_cpu_offset(cpu)) diff --git a/trunk/include/asm-x86/pda.h b/trunk/include/asm-x86/pda.h index c0305bff0f19..d9dc209c24ad 100644 --- a/trunk/include/asm-x86/pda.h +++ b/trunk/include/asm-x86/pda.h @@ -22,7 +22,6 @@ struct x8664_pda { offset 40!!! */ #endif char *irqstackptr; - unsigned int nodenumber; /* number of current node */ unsigned int __softirq_pending; unsigned int __nmi_count; /* number of NMI on this CPUs */ short mmu_state;