lkml.org 
[lkml]   [2013]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 23/27] x86: Move declaration for mp_register_ioapic()
    Date
    Address compiling problem that Fengguang report.

    Reported-by: Fengguang Wu <wfg@linux.intel.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/include/asm/mpspec.h | 19 ++++++++++++++++++-
    1 file changed, 18 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
    index e70b7e5..13439c5 100644
    --- a/arch/x86/include/asm/mpspec.h
    +++ b/arch/x86/include/asm/mpspec.h
    @@ -95,10 +95,27 @@ static inline void early_reserve_e820_mpc_new(void) { }
    #endif

    void __cpuinit generic_processor_info(int apicid, int version);
    -#ifdef CONFIG_ACPI
    +
    +#ifdef CONFIG_X86_IO_APIC
    int __mp_register_ioapic(int id, u32 address, u32 gsi_base, bool hot);
    int mp_unregister_ioapic(u32 gsi_base);
    extern void mp_register_ioapic(int id, u32 address, u32 gsi_base);
    +#else
    +static inline int __mp_register_ioapic(int id, u32 address, u32 gsi_base,
    + bool hot)
    +{
    + return 0;
    +}
    +static inline int mp_unregister_ioapic(u32 gsi_base)
    +{
    + return 0;
    +}
    +static inline void mp_register_ioapic(int id, u32 address, u32 gsi_base)
    +{
    +}
    +#endif
    +
    +#ifdef CONFIG_ACPI
    extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
    u32 gsi);
    extern void mp_config_acpi_legacy_irqs(void);
    --
    1.8.1.4


    \
     
     \ /
      Last update: 2013-06-08 01:01    [W:2.106 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site