git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/percpu
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
setup_percpu.c
diff --git
a/arch/x86/kernel/setup_percpu.c
b/arch/x86/kernel/setup_percpu.c
index
90b8e15
..
e553803
100644
(file)
--- a/
arch/x86/kernel/setup_percpu.c
+++ b/
arch/x86/kernel/setup_percpu.c
@@
-80,7
+80,7
@@
static inline void setup_node_to_cpumask_map(void) { }
#ifdef CONFIG_X86_64
/* correctly size the local cpu masks */
-static void setup_cpu_local_masks(void)
+static void
__init
setup_cpu_local_masks(void)
{
alloc_bootmem_cpumask_var(&cpu_initialized_mask);
alloc_bootmem_cpumask_var(&cpu_callin_mask);