lkml.org 
[lkml]   [2008]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] x86: Move es7000_plat out of mpparse.c
    Date
    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
    ---

    arch/x86/kernel/mpparse.c | 11 ++++++-----
    arch/x86/mach-es7000/es7000plat.c | 2 ++
    include/asm-x86/system.h | 1 -
    3 files changed, 8 insertions(+), 6 deletions(-)


    diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
    index 5a18b2b..ff13423 100644
    --- a/arch/x86/kernel/mpparse.c
    +++ b/arch/x86/kernel/mpparse.c
    @@ -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).
    diff --git a/arch/x86/mach-es7000/es7000plat.c b/arch/x86/mach-es7000/es7000plat.c
    index f5d6f7d..67f5abb 100644
    --- a/arch/x86/mach-es7000/es7000plat.c
    +++ b/arch/x86/mach-es7000/es7000plat.c
    @@ -75,6 +75,8 @@ es7000_rename_gsi(int ioapic, int gsi)
    return gsi;
    }

    +int es7000_plat;
    +
    void __init
    setup_unisys(void)
    {
    diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h
    index df7133c..0cc278d 100644
    --- a/include/asm-x86/system.h
    +++ b/include/asm-x86/system.h
    @@ -318,7 +318,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);


    \
     
     \ /
      Last update: 2008-05-12 17:27    [W:0.045 / U:0.008 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site