diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
| commit | 8f04915532485d81e7f6c580a396ea7b01094221 (patch) | |
| tree | c5740e961a025f2fb6b520a2bc5937f19d4345ab /arch/x86/kernel/setup_percpu.c | |
| parent | 8f5140a6a0b1a9aa79585b0008e88c5d266c5c1d (diff) | |
| parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/x86/kernel/setup_percpu.c')
| -rw-r--r-- | arch/x86/kernel/setup_percpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 55c46074eba..01161077a49 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
| @@ -136,7 +136,7 @@ static void __init setup_cpu_pda_map(void) | |||
| 136 | #ifdef CONFIG_X86_64 | 136 | #ifdef CONFIG_X86_64 |
| 137 | 137 | ||
| 138 | /* correctly size the local cpu masks */ | 138 | /* correctly size the local cpu masks */ |
| 139 | static void setup_cpu_local_masks(void) | 139 | static void __init setup_cpu_local_masks(void) |
| 140 | { | 140 | { |
| 141 | alloc_bootmem_cpumask_var(&cpu_initialized_mask); | 141 | alloc_bootmem_cpumask_var(&cpu_initialized_mask); |
| 142 | alloc_bootmem_cpumask_var(&cpu_callin_mask); | 142 | alloc_bootmem_cpumask_var(&cpu_callin_mask); |