diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-01 19:02:50 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-01 19:02:50 +0200 |
commit | 4420471f14b79f2a42e4603be7794ea49b68bca4 (patch) | |
tree | d391d25458bc0aa86dcf2823fd6c1464883b0533 /arch/x86/kernel/apic/x2apic_uv_x.c | |
parent | 15e957d08dd4a841359cfec59ecb74041e0097aa (diff) | |
parent | e0e42142bab96404de535cceb85d6533d5ad7942 (diff) | |
download | kernel_samsung_smdk4412-4420471f14b79f2a42e4603be7794ea49b68bca4.tar.gz kernel_samsung_smdk4412-4420471f14b79f2a42e4603be7794ea49b68bca4.tar.bz2 kernel_samsung_smdk4412-4420471f14b79f2a42e4603be7794ea49b68bca4.zip |
Merge branch 'x86/apic' into irq/numa
Conflicts:
arch/x86/kernel/apic/io_apic.c
Merge reason: non-trivial interaction between ongoing work in io_apic.c
and the NUMA migration feature in the irq tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/x2apic_uv_x.c')
-rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 2bda6935297..93d604dee9b 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -105,7 +105,7 @@ static void uv_vector_allocation_domain(int cpu, struct cpumask *retmask) cpumask_set_cpu(cpu, retmask); } -static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip) +static int __cpuinit uv_wakeup_secondary(int phys_apicid, unsigned long start_rip) { #ifdef CONFIG_SMP unsigned long val; |