[PATCH 1/9] x86: apic - rearrange maxcpu definition

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Cyrill Gorcunov
Date: Sunday, August 17, 2008 - 12:41 pm

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 arch/x86/kernel/apic_32.c |    4 ++--
 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 41134d4..8d1febf 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);
 static int enabled_via_apicbase;
 
 static unsigned long apic_phys;
+unsigned int __cpuinitdata maxcpus = NR_CPUS;
+
 
 /*
  * Get the LAPIC version
@@ -1459,8 +1461,6 @@ void disconnect_bsp_APIC(int virt_wire_setup)
 	}
 }
 
-unsigned int __cpuinitdata maxcpus = NR_CPUS;
-
 void __cpuinit generic_processor_info(int apicid, int version)
 {
 	int cpu;
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 5e07381..6aa0f60 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 = {
 static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
 
 static unsigned long apic_phys;
+unsigned int __cpuinitdata maxcpus = NR_CPUS;
 
 unsigned long mp_lapic_addr;
 
-unsigned int __cpuinitdata maxcpus = NR_CPUS;
 /*
  * Get the LAPIC version
  */
-- 
1.6.0.rc1.34.g0fe8c

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/9] -tip/apic merging one more series, Cyrill Gorcunov, (Sun Aug 17, 12:41 pm)
[PATCH 1/9] x86: apic - rearrange maxcpu definition, Cyrill Gorcunov, (Sun Aug 17, 12:41 pm)
[PATCH 2/9] x86: apic - unify setup_boot_APIC_clock, Cyrill Gorcunov, (Sun Aug 17, 12:41 pm)
[PATCH 3/9] x86: apic - unify disable_local_APIC, Cyrill Gorcunov, (Sun Aug 17, 12:41 pm)
[PATCH 4/9] x86: apic - unify disable_local_APIC, Cyrill Gorcunov, (Sun Aug 17, 12:41 pm)
[PATCH 5/9] x86: apic - unify connect_bsp_APIC, Cyrill Gorcunov, (Sun Aug 17, 12:41 pm)
[PATCH 6/9] x86: apic - unify lapic_setup_esr, Cyrill Gorcunov, (Sun Aug 17, 12:41 pm)
[PATCH 7/9] x86: apic - unify __setup_APIC_LVTT, Cyrill Gorcunov, (Sun Aug 17, 12:41 pm)
[PATCH 8/9] x86: apic - unify disconnect_bsp_APIC, Cyrill Gorcunov, (Sun Aug 17, 12:41 pm)
[PATCH 9/9] x86: apic - generic_processor_info, Cyrill Gorcunov, (Sun Aug 17, 12:41 pm)
Re: [PATCH 0/9] -tip/apic merging one more series, Yinghai Lu, (Sun Aug 17, 2:53 pm)
Re: [PATCH 0/9] -tip/apic merging one more series, Cyrill Gorcunov, (Sun Aug 17, 9:22 pm)
Re: [PATCH 0/9] -tip/apic merging one more series, Ingo Molnar, (Mon Aug 18, 12:18 am)
Re: [PATCH 0/9] -tip/apic merging one more series, Ingo Molnar, (Mon Aug 18, 12:24 am)
Re: [PATCH 0/9] -tip/apic merging one more series, Cyrill Gorcunov, (Mon Aug 18, 12:41 am)