Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
1 年多 前同步成功

通知 161
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 8466361a 编写于 作者: L Len Brown
浏览文件
操作

[ACPI] delete CONFIG_ACPI_INTERPRETER 

it is a synonym for CONFIG_ACPI
Signed-off-by: NLen Brown <len.brown@intel.com>
上级 888ba6c6
显示空白变更内容
内联 并排
Showing with 13 addition and 43 deletion
arch/i386/defconfig
浏览文件 @ 8466361a
...@@ -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_INTERPRETER=y
CONFIG_ACPI_SLEEP=y CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SLEEP_PROC_FS=y CONFIG_ACPI_SLEEP_PROC_FS=y
CONFIG_ACPI_AC=y CONFIG_ACPI_AC=y
......
arch/i386/kernel/acpi/boot.c
浏览文件 @ 8466361a
...@@ -303,7 +303,7 @@ acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end) ...@@ -303,7 +303,7 @@ acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end)
#endif /*CONFIG_X86_LOCAL_APIC */ #endif /*CONFIG_X86_LOCAL_APIC */
#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER) #ifdef CONFIG_X86_IO_APIC
static int __init static int __init
acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end) acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)
...@@ -634,10 +634,8 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) ...@@ -634,10 +634,8 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
printk(KERN_WARNING PREFIX "Unable to map FADT\n"); printk(KERN_WARNING PREFIX "Unable to map FADT\n");
return 0; return 0;
} }
#ifdef CONFIG_ACPI_INTERPRETER
/* initialize sci_int early for INT_SRC_OVR MADT parsing */ /* initialize sci_int early for INT_SRC_OVR MADT parsing */
acpi_fadt.sci_int = fadt->sci_int; acpi_fadt.sci_int = fadt->sci_int;
#endif
#ifdef CONFIG_ACPI_BUS #ifdef CONFIG_ACPI_BUS
/* initialize rev and apic_phys_dest_mode for x86_64 genapic */ /* initialize rev and apic_phys_dest_mode for x86_64 genapic */
...@@ -735,7 +733,7 @@ static int __init acpi_parse_madt_lapic_entries(void) ...@@ -735,7 +733,7 @@ static int __init acpi_parse_madt_lapic_entries(void)
} }
#endif /* CONFIG_X86_LOCAL_APIC */ #endif /* CONFIG_X86_LOCAL_APIC */
#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER) #ifdef CONFIG_X86_IO_APIC
/* /*
* Parse IOAPIC related entries in MADT * Parse IOAPIC related entries in MADT
* returns 0 on success, < 0 on error * returns 0 on success, < 0 on error
...@@ -810,7 +808,7 @@ static inline int acpi_parse_madt_ioapic_entries(void) ...@@ -810,7 +808,7 @@ static inline int acpi_parse_madt_ioapic_entries(void)
{ {
return -1; return -1;
} }
#endif /* !(CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER) */ #endif /* !CONFIG_X86_IO_APIC */
static void __init acpi_process_madt(void) static void __init acpi_process_madt(void)
{ {
......
arch/i386/kernel/mpparse.c
浏览文件 @ 8466361a
...@@ -854,7 +854,7 @@ void __init mp_register_lapic ( ...@@ -854,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) #ifdef CONFIG_X86_IO_APIC
#define MP_ISA_BUS 0 #define MP_ISA_BUS 0
#define MP_MAX_IOAPIC_PIN 127 #define MP_MAX_IOAPIC_PIN 127
...@@ -1136,5 +1136,5 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low) ...@@ -1136,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 */ #endif /* CONFIG_X86_IO_APIC */
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
arch/i386/kernel/setup.c
浏览文件 @ 8466361a
...@@ -87,7 +87,7 @@ EXPORT_SYMBOL(boot_cpu_data); ...@@ -87,7 +87,7 @@ EXPORT_SYMBOL(boot_cpu_data);
unsigned long mmu_cr4_features; unsigned long mmu_cr4_features;
#ifdef CONFIG_ACPI_INTERPRETER #ifdef CONFIG_ACPI
int acpi_disabled = 0; int acpi_disabled = 0;
#else #else
int acpi_disabled = 1; int acpi_disabled = 1;
......
arch/i386/mach-es7000/es7000plat.c
浏览文件 @ 8466361a
...@@ -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) #if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
/* /*
* 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) #endif /* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */
/* /*
* Parse the OEM Table * Parse the OEM Table
......
arch/ia64/configs/bigsur_defconfig
浏览文件 @ 8466361a
...@@ -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_INTERPRETER=y
CONFIG_ACPI_BUTTON=m CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=m CONFIG_ACPI_FAN=m
......
arch/ia64/configs/sn2_defconfig
浏览文件 @ 8466361a
...@@ -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_INTERPRETER=y
# CONFIG_ACPI_BUTTON is not set # CONFIG_ACPI_BUTTON is not set
CONFIG_ACPI_VIDEO=m CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_HOTKEY=m CONFIG_ACPI_HOTKEY=m
......
arch/ia64/configs/tiger_defconfig
浏览文件 @ 8466361a
...@@ -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_INTERPRETER=y
CONFIG_ACPI_BUTTON=m CONFIG_ACPI_BUTTON=m
# CONFIG_ACPI_VIDEO is not set # CONFIG_ACPI_VIDEO is not set
# CONFIG_ACPI_HOTKEY is not set # CONFIG_ACPI_HOTKEY is not set
......
arch/ia64/configs/zx1_defconfig
浏览文件 @ 8466361a
...@@ -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_INTERPRETER=y
CONFIG_ACPI_BUTTON=y CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_VIDEO=m CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_HOTKEY=m CONFIG_ACPI_HOTKEY=m
......
arch/ia64/defconfig
浏览文件 @ 8466361a
...@@ -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_INTERPRETER=y
CONFIG_ACPI_BUTTON=m CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=m CONFIG_ACPI_FAN=m
......
arch/x86_64/defconfig
浏览文件 @ 8466361a
...@@ -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_INTERPRETER=y
CONFIG_ACPI_AC=y CONFIG_ACPI_AC=y
CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y CONFIG_ACPI_BUTTON=y
......
drivers/acpi/Kconfig
浏览文件 @ 8466361a
...@@ -43,12 +43,6 @@ config ACPI ...@@ -43,12 +43,6 @@ config ACPI
if ACPI if ACPI
config ACPI_INTERPRETER
bool
default y
if ACPI_INTERPRETER
config ACPI_SLEEP config ACPI_SLEEP
bool "Sleep States (EXPERIMENTAL)" bool "Sleep States (EXPERIMENTAL)"
depends on X86 && (!SMP || SUSPEND_SMP) depends on X86 && (!SMP || SUSPEND_SMP)
...@@ -126,7 +120,6 @@ config ACPI_VIDEO ...@@ -126,7 +120,6 @@ config ACPI_VIDEO
config ACPI_HOTKEY config ACPI_HOTKEY
tristate "Generic Hotkey" tristate "Generic Hotkey"
depends on ACPI_INTERPRETER
depends on EXPERIMENTAL depends on EXPERIMENTAL
depends on !IA64_SGI_SN depends on !IA64_SGI_SN
default n default n
...@@ -257,7 +250,6 @@ config ACPI_CUSTOM_DSDT_FILE ...@@ -257,7 +250,6 @@ config ACPI_CUSTOM_DSDT_FILE
config ACPI_BLACKLIST_YEAR config ACPI_BLACKLIST_YEAR
int "Disable ACPI for systems before Jan 1st this year" int "Disable ACPI for systems before Jan 1st this year"
depends on ACPI_INTERPRETER
default 0 default 0
help help
enter a 4-digit year, eg. 2001 to disable ACPI by default enter a 4-digit year, eg. 2001 to disable ACPI by default
...@@ -303,8 +295,6 @@ config ACPI_SYSTEM ...@@ -303,8 +295,6 @@ config ACPI_SYSTEM
This driver will enable your system to shut down using ACPI, and This driver will enable your system to shut down using ACPI, and
dump your ACPI DSDT table using /proc/acpi/dsdt. dump your ACPI DSDT table using /proc/acpi/dsdt.
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
......
drivers/acpi/Makefile
浏览文件 @ 8466361a
...@@ -16,12 +16,12 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS) ...@@ -16,12 +16,12 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS)
# ACPI Boot-Time Table Parsing # ACPI Boot-Time Table Parsing
# #
obj-y += tables.o obj-y += tables.o
obj-$(CONFIG_ACPI_INTERPRETER) += blacklist.o obj-y += blacklist.o
# #
# ACPI Core Subsystem (Interpreter) # ACPI Core Subsystem (Interpreter)
# #
obj-$(CONFIG_ACPI_INTERPRETER) += osl.o utils.o \ obj-y += osl.o utils.o \
dispatcher/ events/ executer/ hardware/ \ dispatcher/ events/ executer/ hardware/ \
namespace/ parser/ resources/ tables/ \ namespace/ parser/ resources/ tables/ \
utilities/ utilities/
......
drivers/char/ipmi/ipmi_si_intf.c
浏览文件 @ 8466361a
...@@ -986,7 +986,7 @@ MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for" ...@@ -986,7 +986,7 @@ MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for"
#define IPMI_MEM_ADDR_SPACE 1 #define IPMI_MEM_ADDR_SPACE 1
#define IPMI_IO_ADDR_SPACE 2 #define IPMI_IO_ADDR_SPACE 2
#if defined(CONFIG_ACPI_INTERPRETER) || defined(CONFIG_X86) || defined(CONFIG_PCI) #if defined(CONFIG_ACPI) || defined(CONFIG_X86) || defined(CONFIG_PCI)
static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr) static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr)
{ {
int i; int i;
...@@ -1362,7 +1362,7 @@ static int try_init_mem(int intf_num, struct smi_info **new_info) ...@@ -1362,7 +1362,7 @@ static int try_init_mem(int intf_num, struct smi_info **new_info)
} }
#ifdef CONFIG_ACPI_INTERPRETER #ifdef CONFIG_ACPI
#include <linux/acpi.h> #include <linux/acpi.h>
...@@ -2067,7 +2067,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi) ...@@ -2067,7 +2067,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
rv = try_init_mem(intf_num, &new_smi); rv = try_init_mem(intf_num, &new_smi);
if (rv) if (rv)
rv = try_init_port(intf_num, &new_smi); rv = try_init_port(intf_num, &new_smi);
#ifdef CONFIG_ACPI_INTERPRETER #ifdef CONFIG_ACPI
if ((rv) && (si_trydefaults)) { if ((rv) && (si_trydefaults)) {
rv = try_init_acpi(intf_num, &new_smi); rv = try_init_acpi(intf_num, &new_smi);
} }
......
include/linux/acpi.h
浏览文件 @ 8466361a
...@@ -488,20 +488,9 @@ extern int ec_write(u8 addr, u8 val); ...@@ -488,20 +488,9 @@ extern int ec_write(u8 addr, u8 val);
#endif /*CONFIG_ACPI_EC*/ #endif /*CONFIG_ACPI_EC*/
#ifdef CONFIG_ACPI_INTERPRETER
extern int acpi_blacklisted(void); extern int acpi_blacklisted(void);
extern void acpi_bios_year(char *s); extern void acpi_bios_year(char *s);
#else /*!CONFIG_ACPI_INTERPRETER*/
static inline int acpi_blacklisted(void)
{
return 0;
}
#endif /*!CONFIG_ACPI_INTERPRETER*/
#define ACPI_CSTATE_LIMIT_DEFINED /* for driver builds */ #define ACPI_CSTATE_LIMIT_DEFINED /* for driver builds */
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或