diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 13:08:34 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 13:08:34 +0100 |
| commit | 9466d6036f73481104039fbe99338baed11c8fea (patch) | |
| tree | cc889fa3071be5fba09417eb17be3c8d2c5271d0 /arch/x86/mach-generic/es7000.c | |
| parent | 1f3f424a6bee9de4d839be9951f4296333fac014 (diff) | |
| parent | 83b19597f793fd5f91533bda0dc2eb3d21936798 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo into cpus4096
Diffstat (limited to 'arch/x86/mach-generic/es7000.c')
| -rw-r--r-- | arch/x86/mach-generic/es7000.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c index 7b4e6d0d169..4ba5ccaa158 100644 --- a/arch/x86/mach-generic/es7000.c +++ b/arch/x86/mach-generic/es7000.c @@ -87,7 +87,7 @@ static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) } #endif -static cpumask_t vector_allocation_domain(int cpu) +static void vector_allocation_domain(int cpu, cpumask_t *retmask) { /* Careful. Some cpus do not strictly honor the set of cpus * specified in the interrupt destination when using lowest @@ -97,8 +97,7 @@ static cpumask_t vector_allocation_domain(int cpu) * deliver interrupts to the wrong hyperthread when only one * hyperthread was specified in the interrupt desitination. */ - cpumask_t domain = { { [0] = APIC_ALL_CPUS, } }; - return domain; + *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; } struct genapic __initdata_refok apic_es7000 = APIC_INIT("es7000", probe_es7000); |