Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32c50612 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Thomas Gleixner
Browse files

x86: move es7000_plat out of mpparse.c 



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 11a62a05

arch/x86/kernel/mpparse.c

+6 −5
Original line number Diff line number Diff line
@@ -793,15 +793,14 @@ void __init find_smp_config(void) 
                            ACPI-based MP Configuration

   -------------------------------------------------------------------------- */



/*

 * Keep this outside and initialized to 0, for !CONFIG_ACPI builds:

 */

int es7000_plat;



#ifdef CONFIG_ACPI



#ifdef	CONFIG_X86_IO_APIC



#if defined(CONFIG_X86_ES7000) || defined(CONFIG_X86_GENERICARCH)

extern int es7000_plat;

#endif



#define MP_ISA_BUS		0



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);

	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

	 */

	if (es7000_plat == 1)

		return;

#endif



	/*

	 * Locate the IOAPIC that manages the ISA IRQs (0-15).

arch/x86/mach-es7000/es7000plat.c

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ static struct mip_reg *host_reg; 
static int 			mip_port;

static unsigned long		mip_addr, host_addr;



int es7000_plat;



/*

 * GSI override for ES7000 platforms.

 */

include/asm-x86/system.h

+0 −1
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ static inline void clflush(volatile void *__p) 
void disable_hlt(void);

void enable_hlt(void);



extern int es7000_plat;

void cpu_idle_wait(void);



extern unsigned long arch_align_stack(unsigned long sp);