From 24ac8fcb2f81f198675a94b5e8d9bfaec139526d Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Mon, 18 Aug 2008 20:45:49 +0400 Subject: [PATCH] --- yaml --- r: 112723 b: refs/heads/master c: b6c8051311e1a14d229df05ea39d0a1b2ce90cdd h: refs/heads/master i: 112721: 4f4f0631d386007c7f76ca13bf52cbbc8e912500 112719: 86c03fc89a1fa2da932639e79ff11b7c72c80666 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic_32.c | 4 ++-- trunk/arch/x86/kernel/apic_64.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b949dbc71c8b..8ba8b79b2288 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5e629a6f88137fb77c4cc857be5ea7c3f27110d +refs/heads/master: b6c8051311e1a14d229df05ea39d0a1b2ce90cdd diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c index 41134d4e6a66..8d1febf05da1 100644 --- a/trunk/arch/x86/kernel/apic_32.c +++ b/trunk/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/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c index ad532dccd11e..46acb9b47ae7 100644 --- a/trunk/arch/x86/kernel/apic_64.c +++ b/trunk/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 */