git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dwmw2/mtd-2.6.35
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
setup_percpu.c
diff --git
a/arch/x86/kernel/setup_percpu.c
b/arch/x86/kernel/setup_percpu.c
index
ef6370b
..
de3b63a
100644
(file)
--- a/
arch/x86/kernel/setup_percpu.c
+++ b/
arch/x86/kernel/setup_percpu.c
@@
-21,12
+21,6
@@
#include <asm/cpu.h>
#include <asm/stackprotector.h>
#include <asm/cpu.h>
#include <asm/stackprotector.h>
-#ifdef CONFIG_DEBUG_PER_CPU_MAPS
-# define DBG(fmt, ...) pr_dbg(fmt, ##__VA_ARGS__)
-#else
-# define DBG(fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0)
-#endif
-
DEFINE_PER_CPU(int, cpu_number);
EXPORT_PER_CPU_SYMBOL(cpu_number);
DEFINE_PER_CPU(int, cpu_number);
EXPORT_PER_CPU_SYMBOL(cpu_number);
@@
-247,7
+241,7
@@
void __init setup_per_cpu_areas(void)
#endif
#endif
/*
#endif
#endif
/*
- * Up to this point, the boot CPU has been using .
data.init
+ * Up to this point, the boot CPU has been using .
init.data
* area. Reload any changed state for the boot CPU.
*/
if (cpu == boot_cpu_id)
* area. Reload any changed state for the boot CPU.
*/
if (cpu == boot_cpu_id)
@@
-265,10
+259,10
@@
void __init setup_per_cpu_areas(void)
#if defined(CONFIG_X86_64) && defined(CONFIG_NUMA)
/*
#if defined(CONFIG_X86_64) && defined(CONFIG_NUMA)
/*
- * make sure boot cpu n
ode_number
is right, when boot cpu is on the
+ * make sure boot cpu n
uma_node
is right, when boot cpu is on the
* node that doesn't have mem installed
*/
* node that doesn't have mem installed
*/
-
per_cpu(node_number, boot_cpu_id) = cpu_to_node(boot_cpu_id
);
+
set_cpu_numa_node(boot_cpu_id, early_cpu_to_node(boot_cpu_id)
);
#endif
/* Setup node to cpumask map */
#endif
/* Setup node to cpumask map */