aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-05-19 11:47:03 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 06:01:25 -0400
commitbab4b27c00c4880737c18bb91138b1a7dd94164c (patch)
tree0a2fc200264e3ca89b4e87679b7fd76f866789c4
parentf3918352909f839a7b0dbf9b3f81d2e183c46f88 (diff)
x86: move smp_found_config
-rw-r--r--arch/x86/kernel/apic_32.c3
-rw-r--r--arch/x86/kernel/apic_64.c3
-rw-r--r--arch/x86/kernel/mpparse.c8
-rw-r--r--arch/x86/mach-visws/mpparse.c5
-rw-r--r--arch/x86/mach-voyager/voyager_smp.c5
5 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 848c603457fe..c304759f0834 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -78,6 +78,9 @@ int apic_verbosity;
78 78
79int pic_mode; 79int pic_mode;
80 80
81/* Have we found an MP table */
82int smp_found_config;
83
81static unsigned int calibration_result; 84static unsigned int calibration_result;
82 85
83static int lapic_next_event(unsigned long delta, 86static int lapic_next_event(unsigned long delta,
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 5910020c3f24..54087f920f2f 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -56,6 +56,9 @@ EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);
56 */ 56 */
57int apic_verbosity; 57int apic_verbosity;
58 58
59/* Have we found an MP table */
60int smp_found_config;
61
59static struct resource lapic_resource = { 62static struct resource lapic_resource = {
60 .name = "Local APIC", 63 .name = "Local APIC",
61 .flags = IORESOURCE_MEM | IORESOURCE_BUSY, 64 .flags = IORESOURCE_MEM | IORESOURCE_BUSY,
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index b72c04602ad2..d67cd7600a21 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -32,9 +32,6 @@
32#include <mach_mpparse.h> 32#include <mach_mpparse.h>
33#endif 33#endif
34 34
35/* Have we found an MP table */
36int smp_found_config;
37
38/* 35/*
39 * Various Linux-internal data structures created from the 36 * Various Linux-internal data structures created from the
40 * MP-table. 37 * MP-table.
@@ -639,7 +636,9 @@ static void __init __get_smp_config(unsigned early)
639 * override the defaults. 636 * override the defaults.
640 */ 637 */
641 if (!smp_read_mpc(phys_to_virt(mpf->mpf_physptr), early)) { 638 if (!smp_read_mpc(phys_to_virt(mpf->mpf_physptr), early)) {
639#ifdef CONFIG_X86_LOCAL_APIC
642 smp_found_config = 0; 640 smp_found_config = 0;
641#endif
643 printk(KERN_ERR 642 printk(KERN_ERR
644 "BIOS bug, MP table errors detected!...\n"); 643 "BIOS bug, MP table errors detected!...\n");
645 printk(KERN_ERR "... disabling SMP support. " 644 printk(KERN_ERR "... disabling SMP support. "
@@ -706,8 +705,9 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
706 !mpf_checksum((unsigned char *)bp, 16) && 705 !mpf_checksum((unsigned char *)bp, 16) &&
707 ((mpf->mpf_specification == 1) 706 ((mpf->mpf_specification == 1)
708 || (mpf->mpf_specification == 4))) { 707 || (mpf->mpf_specification == 4))) {
709 708#ifdef CONFIG_X86_LOCAL_APIC
710 smp_found_config = 1; 709 smp_found_config = 1;
710#endif
711 mpf_found = mpf; 711 mpf_found = mpf;
712#ifdef CONFIG_X86_32 712#ifdef CONFIG_X86_32
713 printk(KERN_INFO "found SMP MP-table at [%p] %08lx\n", 713 printk(KERN_INFO "found SMP MP-table at [%p] %08lx\n",
diff --git a/arch/x86/mach-visws/mpparse.c b/arch/x86/mach-visws/mpparse.c
index b7d063e7de1f..a2fb78c0d154 100644
--- a/arch/x86/mach-visws/mpparse.c
+++ b/arch/x86/mach-visws/mpparse.c
@@ -8,9 +8,6 @@
8#include "cobalt.h" 8#include "cobalt.h"
9#include "mach_apic.h" 9#include "mach_apic.h"
10 10
11/* Have we found an MP table */
12int smp_found_config;
13
14extern unsigned int __cpuinitdata maxcpus; 11extern unsigned int __cpuinitdata maxcpus;
15 12
16/* 13/*
@@ -74,7 +71,9 @@ void __init find_smp_config(void)
74 if (ncpus > maxcpus) 71 if (ncpus > maxcpus)
75 ncpus = maxcpus; 72 ncpus = maxcpus;
76 73
74#ifdef CONFIG_X86_LOCAL_APIC
77 smp_found_config = 1; 75 smp_found_config = 1;
76#endif
78 while (ncpus--) 77 while (ncpus--)
79 MP_processor_info(mp++); 78 MP_processor_info(mp++);
80 79
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
index 7bbebbfe8c4e..8dedd01e909f 100644
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@ -59,11 +59,6 @@ __u32 voyager_quad_processors = 0;
59 * activity count. Finally exported by i386_ksyms.c */ 59 * activity count. Finally exported by i386_ksyms.c */
60static int voyager_extended_cpus = 1; 60static int voyager_extended_cpus = 1;
61 61
62/* Have we found an SMP box - used by time.c to do the profiling
63 interrupt for timeslicing; do not set to 1 until the per CPU timer
64 interrupt is active */
65int smp_found_config = 0;
66
67/* Used for the invalidate map that's also checked in the spinlock */ 62/* Used for the invalidate map that's also checked in the spinlock */
68static volatile unsigned long smp_invalidate_needed; 63static volatile unsigned long smp_invalidate_needed;
69 64