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

Commit 152475cb authored by Herbert Poetzl's avatar Herbert Poetzl Committed by Linus Torvalds
Browse files

[PATCH] don't call check_acpi_pci() on x86 with ACPI disabled 



check_acpi_pci() is called from arch/i386/kernel/setup.c even if
CONFIG_ACPI is not defined, but the code in include/asm/acpi.h doesn't
provide it in this case.

Signed-off-by: default avatarHerbert Pötzl <herbert@13thfloor.at>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9430d58e

include/asm-i386/acpi.h

+6 −4
Original line number Diff line number Diff line
@@ -103,6 +103,12 @@ __acpi_release_global_lock (unsigned int *lock) 
        :"=r"(n_hi), "=r"(n_lo)     \

        :"0"(n_hi), "1"(n_lo))



#ifdef CONFIG_X86_IO_APIC

extern void check_acpi_pci(void);

#else

static inline void check_acpi_pci(void) { }

#endif



#ifdef CONFIG_ACPI 

extern int acpi_lapic;

extern int acpi_ioapic;
@@ -128,8 +134,6 @@ extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); 
extern int skip_ioapic_setup;

extern int acpi_skip_timer_override;



extern void check_acpi_pci(void);



static inline void disable_ioapic_setup(void)

{

	skip_ioapic_setup = 1;
@@ -142,8 +146,6 @@ static inline int ioapic_setup_disabled(void) 


#else

static inline void disable_ioapic_setup(void) { }

static inline void check_acpi_pci(void) { }



#endif



static inline void acpi_noirq_set(void) { acpi_noirq = 1; }