diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 14:41:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 14:41:20 -0700 |
| commit | b69d3987f4360a5e7e9e55465b3cdd0cc204b79e (patch) | |
| tree | 8b2142b2ed4a4951b4d7fc13739b6207730e6b04 /arch/x86/mach-visws/mpparse.c | |
| parent | 57675e6e75c18f279b944dc2397cc9fd0053845e (diff) | |
| parent | a4928cffe6435caf427ae673131a633c1329dbf3 (diff) | |
| download | op-kernel-dev-b69d3987f4360a5e7e9e55465b3cdd0cc204b79e.zip op-kernel-dev-b69d3987f4360a5e7e9e55465b3cdd0cc204b79e.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
"make namespacecheck" fixes
x86: fix compilation error in VisWS
x86: voyager fix
x86: Drop duplicate from setup.c
intel-iommu.c: dma ops fix
Diffstat (limited to 'arch/x86/mach-visws/mpparse.c')
| -rw-r--r-- | arch/x86/mach-visws/mpparse.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/x86/mach-visws/mpparse.c b/arch/x86/mach-visws/mpparse.c index 2a8456a..57484e9 100644 --- a/arch/x86/mach-visws/mpparse.c +++ b/arch/x86/mach-visws/mpparse.c @@ -11,22 +11,9 @@ /* Have we found an MP table */ int smp_found_config; -/* - * Various Linux-internal data structures created from the - * MP-table. - */ -int apic_version [MAX_APICS]; - int pic_mode; -unsigned long mp_lapic_addr; - -/* Processor that is doing the boot up */ -unsigned int boot_cpu_physical_apicid = -1U; - -/* Bitmask of physically existing CPUs */ -physid_mask_t phys_cpu_present_map; -unsigned int __initdata maxcpus = NR_CPUS; +extern unsigned int __cpuinitdata maxcpus; /* * The Visual Workstation is Intel MP compliant in the hardware |
