lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: move es7000_plat out of mpparse.c

Browse Source 
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alexey Starikovskiy
2008-05-14 19:02:51 +04:00
committed by Thomas Gleixner
parent 11a62a0560
commit 32c5061265
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/mpparse.c
View File

@@ -793,15 +793,14 @@ void __init find_smp_config(void)
ACPI-based MP Configuration ACPI-based MP Configuration
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
/*
* Keep this outside and initialized to 0, for !CONFIG_ACPI builds:
*/
int es7000_plat;
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)
extern int es7000_plat;
#endif
#define MP_ISA_BUS 0 #define MP_ISA_BUS 0
static struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS]; static struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS];
@@ -928,11 +927,13 @@ void __init mp_config_acpi_legacy_irqs(void)
set_bit(MP_ISA_BUS, mp_bus_not_pci); set_bit(MP_ISA_BUS, mp_bus_not_pci);
Dprintk("Bus #%d is ISA\n", MP_ISA_BUS); Dprintk("Bus #%d is ISA\n", MP_ISA_BUS);
#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)
/* /*
* Older generations of ES7000 have no legacy identity mappings * Older generations of ES7000 have no legacy identity mappings
*/ */
if (es7000_plat == 1) if (es7000_plat == 1)
return; return;
#endif
/* /*
* Locate the IOAPIC that manages the ISA IRQs (0-15). * Locate the IOAPIC that manages the ISA IRQs (0-15).

2
arch/x86/mach-es7000/es7000plat.c
View File

@@ -52,6 +52,8 @@ static struct mip_reg *host_reg;
static int mip_port; static int mip_port;
static unsigned long mip_addr, host_addr; static unsigned long mip_addr, host_addr;
int es7000_plat;
/* /*
* GSI override for ES7000 platforms. * GSI override for ES7000 platforms.
*/ */

1
include/asm-x86/system.h
View File

@@ -303,7 +303,6 @@ static inline void clflush(volatile void *__p)
void disable_hlt(void); void disable_hlt(void);
void enable_hlt(void); void enable_hlt(void);
extern int es7000_plat;
void cpu_idle_wait(void); void cpu_idle_wait(void);
extern unsigned long arch_align_stack(unsigned long sp); extern unsigned long arch_align_stack(unsigned long sp);