Skip to content

L
linux
Commit 888ba6c6 authored by Len Brown's avatar Len Brown
Browse files
Options

[ACPI] delete CONFIG_ACPI_BOOT 

it has been a synonym for CONFIG_ACPI since 2.6.12
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 84ffa747
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 68 deletions
arch/i386/Kconfig
View file @ 888ba6c6
...@@ -1203,7 +1203,6 @@ config PCI_DIRECT ...@@ -1203,7 +1203,6 @@ config PCI_DIRECT
config PCI_MMCONFIG config PCI_MMCONFIG
bool bool
depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
select ACPI_BOOT
default y default y
source "drivers/pci/pcie/Kconfig" source "drivers/pci/pcie/Kconfig"
......
arch/i386/defconfig
View file @ 888ba6c6
...@@ -131,7 +131,6 @@ CONFIG_SOFTWARE_SUSPEND=y ...@@ -131,7 +131,6 @@ CONFIG_SOFTWARE_SUSPEND=y
# ACPI (Advanced Configuration and Power Interface) Support # ACPI (Advanced Configuration and Power Interface) Support
# #
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_SLEEP=y CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SLEEP_PROC_FS=y CONFIG_ACPI_SLEEP_PROC_FS=y
......
arch/i386/kernel/Makefile
View file @ 888ba6c6
...@@ -11,7 +11,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ ...@@ -11,7 +11,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
obj-y += cpu/ obj-y += cpu/
obj-y += timers/ obj-y += timers/
obj-$(CONFIG_ACPI_BOOT) += acpi/ obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o
obj-$(CONFIG_MCA) += mca.o obj-$(CONFIG_MCA) += mca.o
obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_MSR) += msr.o
......
arch/i386/kernel/acpi/Makefile
View file @ 888ba6c6
obj-$(CONFIG_ACPI_BOOT) := boot.o obj-y := boot.o
obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o
obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
......
arch/i386/kernel/io_apic.c
View file @ 888ba6c6
...@@ -2421,7 +2421,7 @@ device_initcall(ioapic_init_sysfs); ...@@ -2421,7 +2421,7 @@ device_initcall(ioapic_init_sysfs);
ACPI-based IOAPIC Configuration ACPI-based IOAPIC Configuration
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
int __init io_apic_get_unique_id (int ioapic, int apic_id) int __init io_apic_get_unique_id (int ioapic, int apic_id)
{ {
...@@ -2574,4 +2574,4 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a ...@@ -2574,4 +2574,4 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
return 0; return 0;
} }
#endif /*CONFIG_ACPI_BOOT*/ #endif /* CONFIG_ACPI */
arch/i386/kernel/mpparse.c
View file @ 888ba6c6
...@@ -653,8 +653,6 @@ void __init get_smp_config (void) ...@@ -653,8 +653,6 @@ void __init get_smp_config (void)
struct intel_mp_floating *mpf = mpf_found; struct intel_mp_floating *mpf = mpf_found;
/* /*
* ACPI may be used to obtain the entire SMP configuration or just to
* enumerate/configure processors (CONFIG_ACPI_BOOT). Note that
* ACPI supports both logical (e.g. Hyper-Threading) and physical * ACPI supports both logical (e.g. Hyper-Threading) and physical
* processors, where MPS only supports physical. * processors, where MPS only supports physical.
*/ */
...@@ -810,7 +808,7 @@ void __init find_smp_config (void) ...@@ -810,7 +808,7 @@ void __init find_smp_config (void)
ACPI-based MP Configuration ACPI-based MP Configuration
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
void __init mp_register_lapic_address ( void __init mp_register_lapic_address (
u64 address) u64 address)
...@@ -856,7 +854,7 @@ void __init mp_register_lapic ( ...@@ -856,7 +854,7 @@ void __init mp_register_lapic (
MP_processor_info(&processor); MP_processor_info(&processor);
} }
#if defined(CONFIG_X86_IO_APIC) && (defined(CONFIG_ACPI_INTERPRETER) || defined(CONFIG_ACPI_BOOT)) #if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
#define MP_ISA_BUS 0 #define MP_ISA_BUS 0
#define MP_MAX_IOAPIC_PIN 127 #define MP_MAX_IOAPIC_PIN 127
...@@ -1138,5 +1136,5 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low) ...@@ -1138,5 +1136,5 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
return gsi; return gsi;
} }
#endif /*CONFIG_X86_IO_APIC && (CONFIG_ACPI_INTERPRETER || CONFIG_ACPI_BOOT)*/ #endif /* CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER */
#endif /*CONFIG_ACPI_BOOT*/ #endif /* CONFIG_ACPI */
arch/i386/kernel/setup.c
View file @ 888ba6c6
...@@ -94,7 +94,7 @@ unsigned long mmu_cr4_features; ...@@ -94,7 +94,7 @@ unsigned long mmu_cr4_features;
#endif #endif
EXPORT_SYMBOL(acpi_disabled); EXPORT_SYMBOL(acpi_disabled);
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
int __initdata acpi_force = 0; int __initdata acpi_force = 0;
extern acpi_interrupt_flags acpi_sci_flags; extern acpi_interrupt_flags acpi_sci_flags;
#endif #endif
...@@ -794,7 +794,7 @@ static void __init parse_cmdline_early (char ** cmdline_p) ...@@ -794,7 +794,7 @@ static void __init parse_cmdline_early (char ** cmdline_p)
} }
#endif #endif
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
/* "acpi=off" disables both ACPI table parsing and interpreter */ /* "acpi=off" disables both ACPI table parsing and interpreter */
else if (!memcmp(from, "acpi=off", 8)) { else if (!memcmp(from, "acpi=off", 8)) {
disable_acpi(); disable_acpi();
...@@ -850,7 +850,7 @@ static void __init parse_cmdline_early (char ** cmdline_p) ...@@ -850,7 +850,7 @@ static void __init parse_cmdline_early (char ** cmdline_p)
else if (!memcmp(from, "noapic", 6)) else if (!memcmp(from, "noapic", 6))
disable_ioapic_setup(); disable_ioapic_setup();
#endif /* CONFIG_X86_LOCAL_APIC */ #endif /* CONFIG_X86_LOCAL_APIC */
#endif /* CONFIG_ACPI_BOOT */ #endif /* CONFIG_ACPI */
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
/* enable local APIC */ /* enable local APIC */
...@@ -1575,7 +1575,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -1575,7 +1575,7 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled) if (efi_enabled)
efi_map_memmap(); efi_map_memmap();
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
/* /*
* Parse the ACPI tables for possible boot-time SMP configuration. * Parse the ACPI tables for possible boot-time SMP configuration.
*/ */
......
arch/i386/mach-es7000/es7000plat.c
View file @ 888ba6c6
...@@ -51,7 +51,7 @@ struct mip_reg *host_reg; ...@@ -51,7 +51,7 @@ struct mip_reg *host_reg;
int mip_port; int mip_port;
unsigned long mip_addr, host_addr; unsigned long mip_addr, host_addr;
#if defined(CONFIG_X86_IO_APIC) && (defined(CONFIG_ACPI_INTERPRETER) || defined(CONFIG_ACPI_BOOT)) #if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
/* /*
* GSI override for ES7000 platforms. * GSI override for ES7000 platforms.
...@@ -73,7 +73,7 @@ es7000_rename_gsi(int ioapic, int gsi) ...@@ -73,7 +73,7 @@ es7000_rename_gsi(int ioapic, int gsi)
return gsi; return gsi;
} }
#endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER || CONFIG_ACPI_BOOT) #endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER)
/* /*
* Parse the OEM Table * Parse the OEM Table
......
arch/ia64/configs/bigsur_defconfig
View file @ 888ba6c6
...@@ -107,7 +107,6 @@ CONFIG_ACPI=y ...@@ -107,7 +107,6 @@ CONFIG_ACPI=y
# #
# ACPI (Advanced Configuration and Power Interface) Support # ACPI (Advanced Configuration and Power Interface) Support
# #
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_BUTTON=m CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m CONFIG_ACPI_VIDEO=m
......
arch/ia64/configs/sn2_defconfig
View file @ 888ba6c6
...@@ -130,7 +130,6 @@ CONFIG_ACPI=y ...@@ -130,7 +130,6 @@ CONFIG_ACPI=y
# #
# ACPI (Advanced Configuration and Power Interface) Support # ACPI (Advanced Configuration and Power Interface) Support
# #
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y CONFIG_ACPI_INTERPRETER=y
# CONFIG_ACPI_BUTTON is not set # CONFIG_ACPI_BUTTON is not set
CONFIG_ACPI_VIDEO=m CONFIG_ACPI_VIDEO=m
......
arch/ia64/configs/tiger_defconfig
View file @ 888ba6c6
...@@ -128,7 +128,6 @@ CONFIG_ACPI=y ...@@ -128,7 +128,6 @@ CONFIG_ACPI=y
# #
# ACPI (Advanced Configuration and Power Interface) Support # ACPI (Advanced Configuration and Power Interface) Support
# #
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_BUTTON=m CONFIG_ACPI_BUTTON=m
# CONFIG_ACPI_VIDEO is not set # CONFIG_ACPI_VIDEO is not set
......
arch/ia64/configs/zx1_defconfig
View file @ 888ba6c6
...@@ -128,7 +128,6 @@ CONFIG_ACPI=y ...@@ -128,7 +128,6 @@ CONFIG_ACPI=y
# #
# ACPI (Advanced Configuration and Power Interface) Support # ACPI (Advanced Configuration and Power Interface) Support
# #
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_BUTTON=y CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_VIDEO=m CONFIG_ACPI_VIDEO=m
......
arch/ia64/defconfig
View file @ 888ba6c6
...@@ -118,7 +118,6 @@ CONFIG_ACPI=y ...@@ -118,7 +118,6 @@ CONFIG_ACPI=y
# #
# ACPI (Advanced Configuration and Power Interface) Support # ACPI (Advanced Configuration and Power Interface) Support
# #
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_BUTTON=m CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m CONFIG_ACPI_VIDEO=m
......
arch/ia64/kernel/acpi.c
View file @ 888ba6c6
...@@ -132,7 +132,7 @@ const char *acpi_get_sysname(void) ...@@ -132,7 +132,7 @@ const char *acpi_get_sysname(void)
#endif #endif
} }
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
#define ACPI_MAX_PLATFORM_INTERRUPTS 256 #define ACPI_MAX_PLATFORM_INTERRUPTS 256
...@@ -917,4 +917,4 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base) ...@@ -917,4 +917,4 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
EXPORT_SYMBOL(acpi_unregister_ioapic); EXPORT_SYMBOL(acpi_unregister_ioapic);
#endif /* CONFIG_ACPI_BOOT */ #endif /* CONFIG_ACPI */
arch/ia64/kernel/setup.c
View file @ 888ba6c6
...@@ -384,7 +384,7 @@ setup_arch (char **cmdline_p) ...@@ -384,7 +384,7 @@ setup_arch (char **cmdline_p)
if (early_console_setup(*cmdline_p) == 0) if (early_console_setup(*cmdline_p) == 0)
mark_bsp_online(); mark_bsp_online();
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
/* Initialize the ACPI boot-time table parser */ /* Initialize the ACPI boot-time table parser */
acpi_table_init(); acpi_table_init();
# ifdef CONFIG_ACPI_NUMA # ifdef CONFIG_ACPI_NUMA
...@@ -420,7 +420,7 @@ setup_arch (char **cmdline_p) ...@@ -420,7 +420,7 @@ setup_arch (char **cmdline_p)
cpu_init(); /* initialize the bootstrap CPU */ cpu_init(); /* initialize the bootstrap CPU */
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
acpi_boot_init(); acpi_boot_init();
#endif #endif
......
arch/ia64/kernel/topology.c
View file @ 888ba6c6
...@@ -36,7 +36,7 @@ int arch_register_cpu(int num) ...@@ -36,7 +36,7 @@ int arch_register_cpu(int num)
parent = &sysfs_nodes[cpu_to_node(num)]; parent = &sysfs_nodes[cpu_to_node(num)];
#endif /* CONFIG_NUMA */ #endif /* CONFIG_NUMA */
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
/* /*
* If CPEI cannot be re-targetted, and this is * If CPEI cannot be re-targetted, and this is
* CPEI target, then dont create the control file * CPEI target, then dont create the control file
......
arch/x86_64/Kconfig
View file @ 888ba6c6
...@@ -144,7 +144,6 @@ config X86_CPUID ...@@ -144,7 +144,6 @@ config X86_CPUID
with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
/dev/cpu/31/cpuid. /dev/cpu/31/cpuid.
# disable it for opteron optimized builds because it pulls in ACPI_BOOT
config X86_HT config X86_HT
bool bool
depends on SMP && !MK8 depends on SMP && !MK8
...@@ -461,7 +460,6 @@ config PCI_DIRECT ...@@ -461,7 +460,6 @@ config PCI_DIRECT
config PCI_MMCONFIG config PCI_MMCONFIG
bool "Support mmconfig PCI config space access" bool "Support mmconfig PCI config space access"
depends on PCI && ACPI depends on PCI && ACPI
select ACPI_BOOT
config UNORDERED_IO config UNORDERED_IO
bool "Unordered IO mapping access" bool "Unordered IO mapping access"
......
arch/x86_64/defconfig
View file @ 888ba6c6
...@@ -135,7 +135,6 @@ CONFIG_PM_STD_PARTITION="" ...@@ -135,7 +135,6 @@ CONFIG_PM_STD_PARTITION=""
# ACPI (Advanced Configuration and Power Interface) Support # ACPI (Advanced Configuration and Power Interface) Support
# #
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_AC=y CONFIG_ACPI_AC=y
CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BATTERY=y
......
arch/x86_64/kernel/Makefile
View file @ 888ba6c6
...@@ -12,7 +12,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \ ...@@ -12,7 +12,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \
obj-$(CONFIG_X86_MCE) += mce.o obj-$(CONFIG_X86_MCE) += mce.o
obj-$(CONFIG_X86_MCE_INTEL) += mce_intel.o obj-$(CONFIG_X86_MCE_INTEL) += mce_intel.o
obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/ obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/
obj-$(CONFIG_ACPI_BOOT) += acpi/ obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_X86_CPUID) += cpuid.o obj-$(CONFIG_X86_CPUID) += cpuid.o
......
arch/x86_64/kernel/acpi/Makefile
View file @ 888ba6c6
obj-$(CONFIG_ACPI_BOOT) := boot.o obj-y := boot.o
boot-$(CONFIG_ACPI_BOOT) := ../../../i386/kernel/acpi/boot.o boot-y := ../../../i386/kernel/acpi/boot.o
obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o
arch/x86_64/kernel/io_apic.c
View file @ 888ba6c6
...@@ -1841,7 +1841,7 @@ device_initcall(ioapic_init_sysfs); ...@@ -1841,7 +1841,7 @@ device_initcall(ioapic_init_sysfs);
ACPI-based IOAPIC Configuration ACPI-based IOAPIC Configuration
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
#define IO_APIC_MAX_ID 0xFE #define IO_APIC_MAX_ID 0xFE
...@@ -1923,7 +1923,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a ...@@ -1923,7 +1923,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
return 0; return 0;
} }
#endif /*CONFIG_ACPI_BOOT*/ #endif /* CONFIG_ACPI */
/* /*
......
arch/x86_64/kernel/mpparse.c
View file @ 888ba6c6
...@@ -74,7 +74,7 @@ static unsigned int num_processors = 0; ...@@ -74,7 +74,7 @@ static unsigned int num_processors = 0;
physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE; physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;
/* ACPI MADT entry parsing functions */ /* ACPI MADT entry parsing functions */
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
extern struct acpi_boot_flags acpi_boot; extern struct acpi_boot_flags acpi_boot;
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
extern int acpi_parse_lapic (acpi_table_entry_header *header); extern int acpi_parse_lapic (acpi_table_entry_header *header);
...@@ -84,7 +84,7 @@ extern int acpi_parse_lapic_nmi (acpi_table_entry_header *header); ...@@ -84,7 +84,7 @@ extern int acpi_parse_lapic_nmi (acpi_table_entry_header *header);
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
extern int acpi_parse_ioapic (acpi_table_entry_header *header); extern int acpi_parse_ioapic (acpi_table_entry_header *header);
#endif /*CONFIG_X86_IO_APIC*/ #endif /*CONFIG_X86_IO_APIC*/
#endif /*CONFIG_ACPI_BOOT*/ #endif /*CONFIG_ACPI*/
u8 bios_cpu_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID }; u8 bios_cpu_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };
...@@ -519,8 +519,6 @@ void __init get_smp_config (void) ...@@ -519,8 +519,6 @@ void __init get_smp_config (void)
struct intel_mp_floating *mpf = mpf_found; struct intel_mp_floating *mpf = mpf_found;
/* /*
* ACPI may be used to obtain the entire SMP configuration or just to
* enumerate/configure processors (CONFIG_ACPI_BOOT). Note that
* ACPI supports both logical (e.g. Hyper-Threading) and physical * ACPI supports both logical (e.g. Hyper-Threading) and physical
* processors, where MPS only supports physical. * processors, where MPS only supports physical.
*/ */
...@@ -673,7 +671,7 @@ void __init find_smp_config (void) ...@@ -673,7 +671,7 @@ void __init find_smp_config (void)
ACPI-based MP Configuration ACPI-based MP Configuration
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
void __init mp_register_lapic_address ( void __init mp_register_lapic_address (
u64 address) u64 address)
...@@ -994,4 +992,4 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low) ...@@ -994,4 +992,4 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
} }
#endif /*CONFIG_X86_IO_APIC*/ #endif /*CONFIG_X86_IO_APIC*/
#endif /*CONFIG_ACPI_BOOT*/ #endif /*CONFIG_ACPI*/
arch/x86_64/kernel/setup.c
View file @ 888ba6c6
...@@ -71,7 +71,7 @@ unsigned long mmu_cr4_features; ...@@ -71,7 +71,7 @@ unsigned long mmu_cr4_features;
int acpi_disabled; int acpi_disabled;
EXPORT_SYMBOL(acpi_disabled); EXPORT_SYMBOL(acpi_disabled);
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
extern int __initdata acpi_ht; extern int __initdata acpi_ht;
extern acpi_interrupt_flags acpi_sci_flags; extern acpi_interrupt_flags acpi_sci_flags;
int __initdata acpi_force = 0; int __initdata acpi_force = 0;
...@@ -294,7 +294,7 @@ static __init void parse_cmdline_early (char ** cmdline_p) ...@@ -294,7 +294,7 @@ static __init void parse_cmdline_early (char ** cmdline_p)
maxcpus = simple_strtoul(from + 8, NULL, 0); maxcpus = simple_strtoul(from + 8, NULL, 0);
} }
#endif #endif
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
/* "acpi=off" disables both ACPI table parsing and interpreter init */ /* "acpi=off" disables both ACPI table parsing and interpreter init */
if (!memcmp(from, "acpi=off", 8)) if (!memcmp(from, "acpi=off", 8))
disable_acpi(); disable_acpi();
...@@ -566,7 +566,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -566,7 +566,7 @@ void __init setup_arch(char **cmdline_p)
init_memory_mapping(0, (end_pfn_map << PAGE_SHIFT)); init_memory_mapping(0, (end_pfn_map << PAGE_SHIFT));
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
/* /*
* Initialize the ACPI boot-time table parser (gets the RSDP and SDT). * Initialize the ACPI boot-time table parser (gets the RSDP and SDT).
* Call this early for SRAT node setup. * Call this early for SRAT node setup.
...@@ -658,7 +658,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -658,7 +658,7 @@ void __init setup_arch(char **cmdline_p)
check_ioapic(); check_ioapic();
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
/* /*
* Read APIC and some other early information from ACPI tables. * Read APIC and some other early information from ACPI tables.
*/ */
......
drivers/Makefile
View file @ 888ba6c6
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_PCI) += pci/
obj-$(CONFIG_PARISC) += parisc/ obj-$(CONFIG_PARISC) += parisc/
obj-y += video/ obj-y += video/
obj-$(CONFIG_ACPI_BOOT) += acpi/ obj-$(CONFIG_ACPI) += acpi/
# PnP must come after ACPI since it will eventually need to check if acpi # PnP must come after ACPI since it will eventually need to check if acpi
# was used and do nothing if so # was used and do nothing if so
obj-$(CONFIG_PNP) += pnp/ obj-$(CONFIG_PNP) += pnp/
......
drivers/acpi/Kconfig
View file @ 888ba6c6
...@@ -43,10 +43,6 @@ config ACPI ...@@ -43,10 +43,6 @@ config ACPI
if ACPI if ACPI
config ACPI_BOOT
bool
default y
config ACPI_INTERPRETER config ACPI_INTERPRETER
bool bool
default y default y
...@@ -312,7 +308,7 @@ endif # ACPI_INTERPRETER ...@@ -312,7 +308,7 @@ endif # ACPI_INTERPRETER
config X86_PM_TIMER config X86_PM_TIMER
bool "Power Management Timer Support" bool "Power Management Timer Support"
depends on X86 depends on X86
depends on ACPI_BOOT && EXPERIMENTAL depends on EXPERIMENTAL
depends on !X86_64 depends on !X86_64
default n default n
help help
......
drivers/acpi/Makefile
View file @ 888ba6c6
...@@ -15,7 +15,7 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS) ...@@ -15,7 +15,7 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS)
# #
# ACPI Boot-Time Table Parsing # ACPI Boot-Time Table Parsing
# #
obj-$(CONFIG_ACPI_BOOT) += tables.o obj-y += tables.o
obj-$(CONFIG_ACPI_INTERPRETER) += blacklist.o obj-$(CONFIG_ACPI_INTERPRETER) += blacklist.o
# #
......
include/asm-i386/acpi.h
View file @ 888ba6c6
...@@ -103,7 +103,7 @@ __acpi_release_global_lock (unsigned int *lock) ...@@ -103,7 +103,7 @@ __acpi_release_global_lock (unsigned int *lock)
:"=r"(n_hi), "=r"(n_lo) \ :"=r"(n_hi), "=r"(n_lo) \
:"0"(n_hi), "1"(n_lo)) :"0"(n_hi), "1"(n_lo))
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
extern int acpi_lapic; extern int acpi_lapic;
extern int acpi_ioapic; extern int acpi_ioapic;
extern int acpi_noirq; extern int acpi_noirq;
...@@ -146,7 +146,7 @@ static inline void check_acpi_pci(void) { } ...@@ -146,7 +146,7 @@ static inline void check_acpi_pci(void) { }
#endif #endif
#else /* CONFIG_ACPI_BOOT */ #else /* !CONFIG_ACPI */
# define acpi_lapic 0 # define acpi_lapic 0
# define acpi_ioapic 0 # define acpi_ioapic 0
......
include/asm-i386/fixmap.h
View file @ 888ba6c6
...@@ -76,7 +76,7 @@ enum fixed_addresses { ...@@ -76,7 +76,7 @@ enum fixed_addresses {
FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
#endif #endif
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
FIX_ACPI_BEGIN, FIX_ACPI_BEGIN,
FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
#endif #endif
......
include/asm-i386/io_apic.h
View file @ 888ba6c6
...@@ -195,12 +195,12 @@ extern int skip_ioapic_setup; ...@@ -195,12 +195,12 @@ extern int skip_ioapic_setup;
*/ */
#define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs) #define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs)
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
extern int io_apic_get_unique_id (int ioapic, int apic_id); extern int io_apic_get_unique_id (int ioapic, int apic_id);
extern int io_apic_get_version (int ioapic); extern int io_apic_get_version (int ioapic);
extern int io_apic_get_redir_entries (int ioapic); extern int io_apic_get_redir_entries (int ioapic);
extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low); extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low);
#endif /*CONFIG_ACPI_BOOT*/ #endif /* CONFIG_ACPI */
extern int (*ioapic_renumber_irq)(int ioapic, int irq); extern int (*ioapic_renumber_irq)(int ioapic, int irq);
......
include/asm-i386/mpspec.h
View file @ 888ba6c6
...@@ -26,14 +26,14 @@ extern unsigned long mp_lapic_addr; ...@@ -26,14 +26,14 @@ extern unsigned long mp_lapic_addr;
extern int pic_mode; extern int pic_mode;
extern int using_apic_timer; extern int using_apic_timer;
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
extern void mp_register_lapic (u8 id, u8 enabled); extern void mp_register_lapic (u8 id, u8 enabled);
extern void mp_register_lapic_address (u64 address); extern void mp_register_lapic_address (u64 address);
extern void mp_register_ioapic (u8 id, u32 address, u32 gsi_base); extern void mp_register_ioapic (u8 id, u32 address, u32 gsi_base);
extern void mp_override_legacy_irq (u8 bus_irq, u8 polarity, u8 trigger, u32 gsi); extern void mp_override_legacy_irq (u8 bus_irq, u8 polarity, u8 trigger, u32 gsi);
extern void mp_config_acpi_legacy_irqs (void); extern void mp_config_acpi_legacy_irqs (void);
extern int mp_register_gsi (u32 gsi, int edge_level, int active_high_low); extern int mp_register_gsi (u32 gsi, int edge_level, int active_high_low);
#endif /*CONFIG_ACPI_BOOT*/ #endif /* CONFIG_ACPI */
#define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_APICS) #define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_APICS)
......
include/asm-x86_64/acpi.h
View file @ 888ba6c6
...@@ -101,7 +101,7 @@ __acpi_release_global_lock (unsigned int *lock) ...@@ -101,7 +101,7 @@ __acpi_release_global_lock (unsigned int *lock)
:"=r"(n_hi), "=r"(n_lo) \ :"=r"(n_hi), "=r"(n_lo) \
:"0"(n_hi), "1"(n_lo)) :"0"(n_hi), "1"(n_lo))
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
extern int acpi_lapic; extern int acpi_lapic;
extern int acpi_ioapic; extern int acpi_ioapic;
extern int acpi_noirq; extern int acpi_noirq;
...@@ -122,10 +122,10 @@ static inline void disable_acpi(void) ...@@ -122,10 +122,10 @@ static inline void disable_acpi(void)
extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
#else /* !CONFIG_ACPI_BOOT */ #else /* !CONFIG_ACPI */
#define acpi_lapic 0 #define acpi_lapic 0
#define acpi_ioapic 0 #define acpi_ioapic 0
#endif /* !CONFIG_ACPI_BOOT */ #endif /* !CONFIG_ACPI */
extern int acpi_numa; extern int acpi_numa;
extern int acpi_scan_nodes(unsigned long start, unsigned long end); extern int acpi_scan_nodes(unsigned long start, unsigned long end);
......
include/asm-x86_64/io_apic.h
View file @ 888ba6c6
...@@ -201,7 +201,7 @@ extern int skip_ioapic_setup; ...@@ -201,7 +201,7 @@ extern int skip_ioapic_setup;
*/ */
#define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs) #define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs)
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
extern int io_apic_get_version (int ioapic); extern int io_apic_get_version (int ioapic);
extern int io_apic_get_redir_entries (int ioapic); extern int io_apic_get_redir_entries (int ioapic);
extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int); extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int);
......
include/asm-x86_64/mpspec.h
View file @ 888ba6c6
...@@ -179,7 +179,7 @@ extern int mpc_default_type; ...@@ -179,7 +179,7 @@ extern int mpc_default_type;
extern unsigned long mp_lapic_addr; extern unsigned long mp_lapic_addr;
extern int pic_mode; extern int pic_mode;
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
extern void mp_register_lapic (u8 id, u8 enabled); extern void mp_register_lapic (u8 id, u8 enabled);
extern void mp_register_lapic_address (u64 address); extern void mp_register_lapic_address (u64 address);
......
include/linux/acpi.h
View file @ 888ba6c6
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <asm/acpi.h> #include <asm/acpi.h>
#ifdef CONFIG_ACPI_BOOT #ifdef CONFIG_ACPI
enum acpi_irq_model_id { enum acpi_irq_model_id {
ACPI_IRQ_MODEL_PIC = 0, ACPI_IRQ_MODEL_PIC = 0,
...@@ -429,11 +429,11 @@ extern int pci_mmcfg_config_num; ...@@ -429,11 +429,11 @@ extern int pci_mmcfg_config_num;
extern int sbf_port ; extern int sbf_port ;
#else /*!CONFIG_ACPI_BOOT*/ #else /* !CONFIG_ACPI */
#define acpi_mp_config 0 #define acpi_mp_config 0
#endif /*!CONFIG_ACPI_BOOT*/ #endif /* !CONFIG_ACPI */
int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7