diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-18 12:45:49 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-18 20:07:12 -0400 |
commit | b6c8051311e1a14d229df05ea39d0a1b2ce90cdd (patch) | |
tree | bbf35f7b2b0f3e80c36150f13da48a45fd553716 /arch/x86/kernel | |
parent | d5e629a6f88137fb77c4cc857be5ea7c3f27110d (diff) |
x86: apic - rearrange maxcpu definition
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/apic_32.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/apic_64.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 41134d4e6a66..8d1febf05da1 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -114,6 +114,8 @@ static DEFINE_PER_CPU(struct clock_event_device, lapic_events); | |||
114 | static int enabled_via_apicbase; | 114 | static int enabled_via_apicbase; |
115 | 115 | ||
116 | static unsigned long apic_phys; | 116 | static unsigned long apic_phys; |
117 | unsigned int __cpuinitdata maxcpus = NR_CPUS; | ||
118 | |||
117 | 119 | ||
118 | /* | 120 | /* |
119 | * Get the LAPIC version | 121 | * Get the LAPIC version |
@@ -1459,8 +1461,6 @@ void disconnect_bsp_APIC(int virt_wire_setup) | |||
1459 | } | 1461 | } |
1460 | } | 1462 | } |
1461 | 1463 | ||
1462 | unsigned int __cpuinitdata maxcpus = NR_CPUS; | ||
1463 | |||
1464 | void __cpuinit generic_processor_info(int apicid, int version) | 1464 | void __cpuinit generic_processor_info(int apicid, int version) |
1465 | { | 1465 | { |
1466 | int cpu; | 1466 | int cpu; |
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index ad532dccd11e..46acb9b47ae7 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -98,10 +98,10 @@ static struct clock_event_device lapic_clockevent = { | |||
98 | static DEFINE_PER_CPU(struct clock_event_device, lapic_events); | 98 | static DEFINE_PER_CPU(struct clock_event_device, lapic_events); |
99 | 99 | ||
100 | static unsigned long apic_phys; | 100 | static unsigned long apic_phys; |
101 | unsigned int __cpuinitdata maxcpus = NR_CPUS; | ||
101 | 102 | ||
102 | unsigned long mp_lapic_addr; | 103 | unsigned long mp_lapic_addr; |
103 | 104 | ||
104 | unsigned int __cpuinitdata maxcpus = NR_CPUS; | ||
105 | /* | 105 | /* |
106 | * Get the LAPIC version | 106 | * Get the LAPIC version |
107 | */ | 107 | */ |