Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
d3b38333
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d3b38333
编写于
5月 28, 2010
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'ht-delete-2.6.35' into release
上级
edbe77ba
68ca4069
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
6 addition
and
24 deletion
+6
-24
Documentation/kernel-parameters.txt
Documentation/kernel-parameters.txt
+1
-2
arch/ia64/include/asm/acpi.h
arch/ia64/include/asm/acpi.h
+0
-1
arch/x86/include/asm/acpi.h
arch/x86/include/asm/acpi.h
+0
-2
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/boot.c
+3
-16
arch/x86/lguest/boot.c
arch/x86/lguest/boot.c
+0
-1
drivers/acpi/tables.c
drivers/acpi/tables.c
+2
-2
未找到文件。
Documentation/kernel-parameters.txt
浏览文件 @
d3b38333
...
...
@@ -143,11 +143,10 @@ and is between 256 and 4096 characters. It is defined in the file
acpi= [HW,ACPI,X86]
Advanced Configuration and Power Interface
Format: { force | off |
ht |
strict | noirq | rsdt }
Format: { force | off | strict | noirq | rsdt }
force -- enable ACPI if default was off
off -- disable ACPI if default was on
noirq -- do not use ACPI for IRQ routing
ht -- run only enough ACPI to enable Hyper Threading
strict -- Be less tolerant of platforms that are not
strictly ACPI specification compliant.
rsdt -- prefer RSDT over (default) XSDT
...
...
arch/ia64/include/asm/acpi.h
浏览文件 @
d3b38333
...
...
@@ -94,7 +94,6 @@ ia64_acpi_release_global_lock (unsigned int *lock)
#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 */
#define acpi_ht 0
/* no HT-only mode on IA64 */
#endif
#define acpi_processor_cstate_check(x) (x)
/* no idle limits on IA64 :) */
static
inline
void
disable_acpi
(
void
)
{
}
...
...
arch/x86/include/asm/acpi.h
浏览文件 @
d3b38333
...
...
@@ -85,7 +85,6 @@ extern int acpi_ioapic;
extern
int
acpi_noirq
;
extern
int
acpi_strict
;
extern
int
acpi_disabled
;
extern
int
acpi_ht
;
extern
int
acpi_pci_disabled
;
extern
int
acpi_skip_timer_override
;
extern
int
acpi_use_timer_override
;
...
...
@@ -97,7 +96,6 @@ void acpi_pic_sci_set_trigger(unsigned int, u16);
static
inline
void
disable_acpi
(
void
)
{
acpi_disabled
=
1
;
acpi_ht
=
0
;
acpi_pci_disabled
=
1
;
acpi_noirq
=
1
;
}
...
...
arch/x86/kernel/acpi/boot.c
浏览文件 @
d3b38333
...
...
@@ -63,7 +63,6 @@ EXPORT_SYMBOL(acpi_disabled);
int
acpi_noirq
;
/* skip ACPI IRQ initialization */
int
acpi_pci_disabled
;
/* skip ACPI PCI scan and IRQ initialization */
EXPORT_SYMBOL
(
acpi_pci_disabled
);
int
acpi_ht
__initdata
=
1
;
/* enable HT */
int
acpi_lapic
;
int
acpi_ioapic
;
...
...
@@ -1464,9 +1463,8 @@ void __init acpi_boot_table_init(void)
/*
* If acpi_disabled, bail out
* One exception: acpi=ht continues far enough to enumerate LAPICs
*/
if
(
acpi_disabled
&&
!
acpi_ht
)
if
(
acpi_disabled
)
return
;
/*
...
...
@@ -1497,9 +1495,8 @@ int __init early_acpi_boot_init(void)
{
/*
* If acpi_disabled, bail out
* One exception: acpi=ht continues far enough to enumerate LAPICs
*/
if
(
acpi_disabled
&&
!
acpi_ht
)
if
(
acpi_disabled
)
return
1
;
/*
...
...
@@ -1517,9 +1514,8 @@ int __init acpi_boot_init(void)
/*
* If acpi_disabled, bail out
* One exception: acpi=ht continues far enough to enumerate LAPICs
*/
if
(
acpi_disabled
&&
!
acpi_ht
)
if
(
acpi_disabled
)
return
1
;
acpi_table_parse
(
ACPI_SIG_BOOT
,
acpi_parse_sbf
);
...
...
@@ -1554,21 +1550,12 @@ static int __init parse_acpi(char *arg)
/* acpi=force to over-ride black-list */
else
if
(
strcmp
(
arg
,
"force"
)
==
0
)
{
acpi_force
=
1
;
acpi_ht
=
1
;
acpi_disabled
=
0
;
}
/* acpi=strict disables out-of-spec workarounds */
else
if
(
strcmp
(
arg
,
"strict"
)
==
0
)
{
acpi_strict
=
1
;
}
/* Limit ACPI just to boot-time to enable HT */
else
if
(
strcmp
(
arg
,
"ht"
)
==
0
)
{
if
(
!
acpi_force
)
{
printk
(
KERN_WARNING
"acpi=ht will be removed in Linux-2.6.35
\n
"
);
disable_acpi
();
}
acpi_ht
=
1
;
}
/* acpi=rsdt use RSDT instead of XSDT */
else
if
(
strcmp
(
arg
,
"rsdt"
)
==
0
)
{
acpi_rsdt_forced
=
1
;
...
...
arch/x86/lguest/boot.c
浏览文件 @
d3b38333
...
...
@@ -1390,7 +1390,6 @@ __init void lguest_init(void)
#endif
#ifdef CONFIG_ACPI
acpi_disabled
=
1
;
acpi_ht
=
0
;
#endif
/*
...
...
drivers/acpi/tables.c
浏览文件 @
d3b38333
...
...
@@ -213,7 +213,7 @@ acpi_table_parse_entries(char *id,
unsigned
long
table_end
;
acpi_size
tbl_size
;
if
(
acpi_disabled
&&
!
acpi_ht
)
if
(
acpi_disabled
)
return
-
ENODEV
;
if
(
!
handler
)
...
...
@@ -280,7 +280,7 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler)
struct
acpi_table_header
*
table
=
NULL
;
acpi_size
tbl_size
;
if
(
acpi_disabled
&&
!
acpi_ht
)
if
(
acpi_disabled
)
return
-
ENODEV
;
if
(
!
handler
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录