Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
8466361a
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
8466361a
编写于
8月 24, 2005
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ACPI] delete CONFIG_ACPI_INTERPRETER
it is a synonym for CONFIG_ACPI Signed-off-by:
N
Len Brown
<
len.brown@intel.com
>
上级
888ba6c6
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
13 addition
and
43 deletion
+13
-43
arch/i386/defconfig
arch/i386/defconfig
+0
-1
arch/i386/kernel/acpi/boot.c
arch/i386/kernel/acpi/boot.c
+3
-5
arch/i386/kernel/mpparse.c
arch/i386/kernel/mpparse.c
+2
-2
arch/i386/kernel/setup.c
arch/i386/kernel/setup.c
+1
-1
arch/i386/mach-es7000/es7000plat.c
arch/i386/mach-es7000/es7000plat.c
+2
-2
arch/ia64/configs/bigsur_defconfig
arch/ia64/configs/bigsur_defconfig
+0
-1
arch/ia64/configs/sn2_defconfig
arch/ia64/configs/sn2_defconfig
+0
-1
arch/ia64/configs/tiger_defconfig
arch/ia64/configs/tiger_defconfig
+0
-1
arch/ia64/configs/zx1_defconfig
arch/ia64/configs/zx1_defconfig
+0
-1
arch/ia64/defconfig
arch/ia64/defconfig
+0
-1
arch/x86_64/defconfig
arch/x86_64/defconfig
+0
-1
drivers/acpi/Kconfig
drivers/acpi/Kconfig
+0
-10
drivers/acpi/Makefile
drivers/acpi/Makefile
+2
-2
drivers/char/ipmi/ipmi_si_intf.c
drivers/char/ipmi/ipmi_si_intf.c
+3
-3
include/linux/acpi.h
include/linux/acpi.h
+0
-11
未找到文件。
arch/i386/defconfig
浏览文件 @
8466361a
...
...
@@ -131,7 +131,6 @@ CONFIG_SOFTWARE_SUSPEND=y
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SLEEP_PROC_FS=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)
#endif
/*CONFIG_X86_LOCAL_APIC */
#if
defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
#if
def CONFIG_X86_IO_APIC
static
int
__init
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)
printk
(
KERN_WARNING
PREFIX
"Unable to map FADT
\n
"
);
return
0
;
}
#ifdef CONFIG_ACPI_INTERPRETER
/* initialize sci_int early for INT_SRC_OVR MADT parsing */
acpi_fadt
.
sci_int
=
fadt
->
sci_int
;
#endif
#ifdef CONFIG_ACPI_BUS
/* initialize rev and apic_phys_dest_mode for x86_64 genapic */
...
...
@@ -735,7 +733,7 @@ static int __init acpi_parse_madt_lapic_entries(void)
}
#endif
/* CONFIG_X86_LOCAL_APIC */
#if
defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
#if
def CONFIG_X86_IO_APIC
/*
* Parse IOAPIC related entries in MADT
* returns 0 on success, < 0 on error
...
...
@@ -810,7 +808,7 @@ static inline int acpi_parse_madt_ioapic_entries(void)
{
return
-
1
;
}
#endif
/* !(CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER)
*/
#endif
/* !CONFIG_X86_IO_APIC
*/
static
void
__init
acpi_process_madt
(
void
)
{
...
...
arch/i386/kernel/mpparse.c
浏览文件 @
8466361a
...
...
@@ -854,7 +854,7 @@ void __init mp_register_lapic (
MP_processor_info
(
&
processor
);
}
#if
defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
#if
def CONFIG_X86_IO_APIC
#define MP_ISA_BUS 0
#define MP_MAX_IOAPIC_PIN 127
...
...
@@ -1136,5 +1136,5 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
return
gsi
;
}
#endif
/* CONFIG_X86_IO_APIC
&& CONFIG_ACPI_INTERPRETER
*/
#endif
/* CONFIG_X86_IO_APIC */
#endif
/* CONFIG_ACPI */
arch/i386/kernel/setup.c
浏览文件 @
8466361a
...
...
@@ -87,7 +87,7 @@ EXPORT_SYMBOL(boot_cpu_data);
unsigned
long
mmu_cr4_features
;
#ifdef CONFIG_ACPI
_INTERPRETER
#ifdef CONFIG_ACPI
int
acpi_disabled
=
0
;
#else
int
acpi_disabled
=
1
;
...
...
arch/i386/mach-es7000/es7000plat.c
浏览文件 @
8466361a
...
...
@@ -51,7 +51,7 @@ struct mip_reg *host_reg;
int
mip_port
;
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.
...
...
@@ -73,7 +73,7 @@ es7000_rename_gsi(int ioapic, int gsi)
return
gsi
;
}
#endif
// (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER)
#endif
/* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */
/*
* Parse the OEM Table
...
...
arch/ia64/configs/bigsur_defconfig
浏览文件 @
8466361a
...
...
@@ -107,7 +107,6 @@ CONFIG_ACPI=y
#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=m
...
...
arch/ia64/configs/sn2_defconfig
浏览文件 @
8466361a
...
...
@@ -130,7 +130,6 @@ CONFIG_ACPI=y
#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI_INTERPRETER=y
# CONFIG_ACPI_BUTTON is not set
CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_HOTKEY=m
...
...
arch/ia64/configs/tiger_defconfig
浏览文件 @
8466361a
...
...
@@ -128,7 +128,6 @@ CONFIG_ACPI=y
#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_BUTTON=m
# CONFIG_ACPI_VIDEO is not set
# CONFIG_ACPI_HOTKEY is not set
...
...
arch/ia64/configs/zx1_defconfig
浏览文件 @
8466361a
...
...
@@ -128,7 +128,6 @@ CONFIG_ACPI=y
#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_HOTKEY=m
...
...
arch/ia64/defconfig
浏览文件 @
8466361a
...
...
@@ -118,7 +118,6 @@ CONFIG_ACPI=y
#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=m
...
...
arch/x86_64/defconfig
浏览文件 @
8466361a
...
...
@@ -135,7 +135,6 @@ CONFIG_PM_STD_PARTITION=""
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_AC=y
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
...
...
drivers/acpi/Kconfig
浏览文件 @
8466361a
...
...
@@ -43,12 +43,6 @@ config ACPI
if ACPI
config ACPI_INTERPRETER
bool
default y
if ACPI_INTERPRETER
config ACPI_SLEEP
bool "Sleep States (EXPERIMENTAL)"
depends on X86 && (!SMP || SUSPEND_SMP)
...
...
@@ -126,7 +120,6 @@ config ACPI_VIDEO
config ACPI_HOTKEY
tristate "Generic Hotkey"
depends on ACPI_INTERPRETER
depends on EXPERIMENTAL
depends on !IA64_SGI_SN
default n
...
...
@@ -257,7 +250,6 @@ config ACPI_CUSTOM_DSDT_FILE
config ACPI_BLACKLIST_YEAR
int "Disable ACPI for systems before Jan 1st this year"
depends on ACPI_INTERPRETER
default 0
help
enter a 4-digit year, eg. 2001 to disable ACPI by default
...
...
@@ -303,8 +295,6 @@ config ACPI_SYSTEM
This driver will enable your system to shut down using ACPI, and
dump your ACPI DSDT table using /proc/acpi/dsdt.
endif # ACPI_INTERPRETER
config X86_PM_TIMER
bool "Power Management Timer Support"
depends on X86
...
...
drivers/acpi/Makefile
浏览文件 @
8466361a
...
...
@@ -16,12 +16,12 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS)
# ACPI Boot-Time Table Parsing
#
obj-y
+=
tables.o
obj-
$(CONFIG_ACPI_INTERPRETER)
+=
blacklist.o
obj-
y
+=
blacklist.o
#
# ACPI Core Subsystem (Interpreter)
#
obj-
$(CONFIG_ACPI_INTERPRETER)
+=
osl.o utils.o
\
obj-
y
+=
osl.o utils.o
\
dispatcher/ events/ executer/ hardware/
\
namespace/ parser/ resources/ tables/
\
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"
#define IPMI_MEM_ADDR_SPACE 1
#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
)
{
int
i
;
...
...
@@ -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>
...
...
@@ -2067,7 +2067,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
rv
=
try_init_mem
(
intf_num
,
&
new_smi
);
if
(
rv
)
rv
=
try_init_port
(
intf_num
,
&
new_smi
);
#ifdef CONFIG_ACPI
_INTERPRETER
#ifdef CONFIG_ACPI
if
((
rv
)
&&
(
si_trydefaults
))
{
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);
#endif
/*CONFIG_ACPI_EC*/
#ifdef CONFIG_ACPI_INTERPRETER
extern
int
acpi_blacklisted
(
void
);
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 */
#ifdef CONFIG_ACPI
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录