diff options
author | Alexander Gordeev <agordeev@redhat.com> | 2012-06-14 03:50:11 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-06-14 06:53:15 -0400 |
commit | 49ad3fd4834182cce9725abb98e080b479fed464 (patch) | |
tree | 33ed157cca98abad6c240fa77985c54fd0e72123 | |
parent | ea3807ea52a53f2cdfd60c89d8491fc9a8208d1c (diff) |
x86/apic/es7000+summit: Fix compile warning in cpu_mask_to_apicid()
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/20120614075010.GG3383@dhcp-26-207.brq.redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/kernel/apic/es7000_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/apic/summit_32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c index effece2ea0db..0c1347df3ad0 100644 --- a/arch/x86/kernel/apic/es7000_32.c +++ b/arch/x86/kernel/apic/es7000_32.c | |||
@@ -554,8 +554,8 @@ es7000_cpu_mask_to_apicid_and(const struct cpumask *inmask, | |||
554 | const struct cpumask *andmask, | 554 | const struct cpumask *andmask, |
555 | unsigned int *apicid) | 555 | unsigned int *apicid) |
556 | { | 556 | { |
557 | *apicid = early_per_cpu(x86_cpu_to_logical_apicid, 0); | ||
558 | cpumask_var_t cpumask; | 557 | cpumask_var_t cpumask; |
558 | *apicid = early_per_cpu(x86_cpu_to_logical_apicid, 0); | ||
559 | 559 | ||
560 | if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC)) | 560 | if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC)) |
561 | return 0; | 561 | return 0; |
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c index b53fd6c9993a..e6cc1829f7c8 100644 --- a/arch/x86/kernel/apic/summit_32.c +++ b/arch/x86/kernel/apic/summit_32.c | |||
@@ -291,8 +291,8 @@ summit_cpu_mask_to_apicid_and(const struct cpumask *inmask, | |||
291 | const struct cpumask *andmask, | 291 | const struct cpumask *andmask, |
292 | unsigned int *apicid) | 292 | unsigned int *apicid) |
293 | { | 293 | { |
294 | *apicid = early_per_cpu(x86_cpu_to_logical_apicid, 0); | ||
295 | cpumask_var_t cpumask; | 294 | cpumask_var_t cpumask; |
295 | *apicid = early_per_cpu(x86_cpu_to_logical_apicid, 0); | ||
296 | 296 | ||
297 | if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC)) | 297 | if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC)) |
298 | return 0; | 298 | return 0; |