Commit 8989e1cc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-config' 

* acpi-config:
  ACPI / processor: Introduce ARCH_MIGHT_HAVE_ACPI_PDC
  ACPI: Don't use acpi_lapic in ACPI core code
  ACPI: add config for BIOS table scan
parents 7e1c1a82 46ba51ea

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config IA64 
	select ARCH_MIGHT_HAVE_PC_SERIO

	select PCI if (!IA64_HP_SIM)

	select ACPI if (!IA64_HP_SIM)

	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI

	select PM if (!IA64_HP_SIM)

	select HAVE_UNSTABLE_SCHED_CLOCK

	select HAVE_IDE

arch/ia64/include/asm/acpi.h

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ extern int acpi_lapic; 
#define acpi_noirq 0	/* ACPI always enabled on IA64 */

#define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */

#define acpi_strict 1	/* no ACPI spec workarounds on IA64 */



static inline bool acpi_has_cpu_in_madt(void)

{

	return !!acpi_lapic;

}

#endif

#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */

static inline void disable_acpi(void) { }

arch/x86/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config X86_64 
### Arch settings

config X86

	def_bool y

	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI

	select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO
@@ -132,6 +133,7 @@ config X86 
	select GENERIC_CPU_AUTOPROBE

	select HAVE_ARCH_AUDITSYSCALL

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ACPI_LEGACY_TABLES_LOOKUP if ACPI



config INSTRUCTION_DECODER

	def_bool y

arch/x86/include/asm/acpi.h

+5 −0
Original line number Diff line number Diff line
@@ -121,6 +121,11 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf) 
		buf[2] &= ~(ACPI_PDC_C_C2C3_FFH);

}



static inline bool acpi_has_cpu_in_madt(void)

{

	return !!acpi_lapic;

}



#else /* !CONFIG_ACPI */



#define acpi_lapic 0

drivers/acpi/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ menuconfig ACPI 


if ACPI



config ACPI_LEGACY_TABLES_LOOKUP

	bool



config ARCH_MIGHT_HAVE_ACPI_PDC

	bool



config ACPI_SLEEP

	bool

	depends on SUSPEND || HIBERNATION