Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
ad363f80
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,发现更多精彩内容 >>
提交
ad363f80
编写于
2月 02, 2007
作者:
A
Alexey Starikovskiy
提交者:
Len Brown
2月 02, 2007
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ACPICA: Remove duplicate table definitions.
Signed-off-by:
N
Len Brown
<
len.brown@intel.com
>
上级
cee324b1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
81 deletion
+20
-81
arch/i386/kernel/acpi/boot.c
arch/i386/kernel/acpi/boot.c
+14
-15
drivers/acpi/ec.c
drivers/acpi/ec.c
+4
-4
include/acpi/actbl.h
include/acpi/actbl.h
+2
-3
include/linux/acpi.h
include/linux/acpi.h
+0
-59
未找到文件。
arch/i386/kernel/acpi/boot.c
浏览文件 @
ad363f80
...
...
@@ -204,9 +204,9 @@ int __init acpi_parse_mcfg(struct acpi_table_header *header)
return
-
ENOMEM
;
}
memcpy
(
pci_mmcfg_config
,
&
mcfg
->
config
,
config_size
);
memcpy
(
pci_mmcfg_config
,
&
mcfg
[
1
]
,
config_size
);
for
(
i
=
0
;
i
<
pci_mmcfg_config_num
;
++
i
)
{
if
(
mcfg
->
config
[
i
].
base_reserved
)
{
if
(
pci_mmcfg_
config
[
i
].
base_reserved
)
{
printk
(
KERN_ERR
PREFIX
"MMCONFIG not in low 4GB of memory
\n
"
);
kfree
(
pci_mmcfg_config
);
...
...
@@ -233,11 +233,11 @@ static int __init acpi_parse_madt(struct acpi_table_header *header)
return
-
ENODEV
;
}
if
(
madt
->
lapic_
address
)
{
acpi_lapic_addr
=
(
u64
)
madt
->
lapic_
address
;
if
(
madt
->
address
)
{
acpi_lapic_addr
=
(
u64
)
madt
->
address
;
printk
(
KERN_DEBUG
PREFIX
"Local APIC address 0x%08x
\n
"
,
madt
->
lapic_
address
);
madt
->
address
);
}
acpi_madt_oem_check
(
madt
->
header
.
oem_id
,
madt
->
header
.
oem_table_id
);
...
...
@@ -654,7 +654,7 @@ static int __init acpi_parse_hpet(struct acpi_table_header *header)
return
-
ENODEV
;
}
if
(
hpet_tbl
->
addr
.
space_id
!=
ACPI_SPACE_MEM
)
{
if
(
hpet_tbl
->
addr
ess
.
space_id
!=
ACPI_SPACE_MEM
)
{
printk
(
KERN_WARNING
PREFIX
"HPET timers must be located in "
"memory.
\n
"
);
return
-
1
;
...
...
@@ -667,29 +667,28 @@ static int __init acpi_parse_hpet(struct acpi_table_header *header)
hpet_res
->
name
=
(
void
*
)
&
hpet_res
[
1
];
hpet_res
->
flags
=
IORESOURCE_MEM
|
IORESOURCE_BUSY
;
snprintf
((
char
*
)
hpet_res
->
name
,
HPET_RESOURCE_NAME_SIZE
,
"HPET %u"
,
hpet_tbl
->
number
);
"HPET %u"
,
hpet_tbl
->
sequence
);
hpet_res
->
end
=
(
1
*
1024
)
-
1
;
}
#ifdef CONFIG_X86_64
vxtime
.
hpet_address
=
hpet_tbl
->
addr
.
addrl
|
((
long
)
hpet_tbl
->
addr
.
addrh
<<
32
);
#ifdef CONFIG_X86_64
vxtime
.
hpet_address
=
hpet_tbl
->
address
.
address
;
printk
(
KERN_INFO
PREFIX
"HPET id: %#x base: %#lx
\n
"
,
hpet_tbl
->
id
,
vxtime
.
hpet_address
);
hpet_tbl
->
id
,
vxtime
.
hpet_address
);
res_start
=
vxtime
.
hpet_address
;
#else
/* X86 */
#else
/* X86 */
{
extern
unsigned
long
hpet_address
;
hpet_address
=
hpet_tbl
->
addr
.
addrl
;
hpet_address
=
hpet_tbl
->
addr
ess
.
address
;
printk
(
KERN_INFO
PREFIX
"HPET id: %#x base: %#lx
\n
"
,
hpet_tbl
->
id
,
hpet_address
);
hpet_tbl
->
id
,
hpet_address
);
res_start
=
hpet_address
;
}
#endif
/* X86 */
#endif
/* X86 */
if
(
hpet_res
)
{
hpet_res
->
start
=
res_start
;
...
...
drivers/acpi/ec.c
浏览文件 @
ad363f80
...
...
@@ -889,14 +889,14 @@ static int __init acpi_ec_get_real_ecdt(void)
if
(
acpi_ec_mode
==
EC_INTR
)
{
init_waitqueue_head
(
&
ec_ecdt
->
wait
);
}
ec_ecdt
->
command_addr
=
ecdt_ptr
->
ec_
control
.
address
;
ec_ecdt
->
data_addr
=
ecdt_ptr
->
ec_
data
.
address
;
ec_ecdt
->
gpe
=
ecdt_ptr
->
gpe
_bit
;
ec_ecdt
->
command_addr
=
ecdt_ptr
->
control
.
address
;
ec_ecdt
->
data_addr
=
ecdt_ptr
->
data
.
address
;
ec_ecdt
->
gpe
=
ecdt_ptr
->
gpe
;
/* use the GL just to be safe */
ec_ecdt
->
global_lock
=
TRUE
;
ec_ecdt
->
uid
=
ecdt_ptr
->
uid
;
status
=
acpi_get_handle
(
NULL
,
ecdt_ptr
->
ec_
id
,
&
ec_ecdt
->
handle
);
status
=
acpi_get_handle
(
NULL
,
ecdt_ptr
->
id
,
&
ec_ecdt
->
handle
);
if
(
ACPI_FAILURE
(
status
))
{
goto
error
;
}
...
...
include/acpi/actbl.h
浏览文件 @
ad363f80
...
...
@@ -289,8 +289,7 @@ enum acpi_prefered_pm_profiles {
/*
* Get the remaining ACPI tables
*/
/*
Don't include any new tables definitions for now.
#include <acpi/actbl1.h>
*/
#endif
/* __ACTBL_H__ */
include/linux/acpi.h
浏览文件 @
ad363f80
...
...
@@ -60,15 +60,6 @@ typedef struct {
/* Multiple APIC Description Table (MADT) */
struct
acpi_table_madt
{
struct
acpi_table_header
header
;
u32
lapic_address
;
struct
{
u32
pcat_compat
:
1
;
u32
reserved
:
31
;
}
flags
;
}
__attribute__
((
packed
));
enum
acpi_madt_entry_id
{
ACPI_MADT_LAPIC
=
0
,
ACPI_MADT_IOAPIC
,
...
...
@@ -185,15 +176,6 @@ struct acpi_gen_regaddr {
u32
addrh
;
}
__attribute__
((
packed
));
struct
acpi_table_hpet
{
struct
acpi_table_header
header
;
u32
id
;
struct
acpi_gen_regaddr
addr
;
u8
number
;
u16
min_tick
;
u8
page_protect
;
}
__attribute__
((
packed
));
/*
* Simple Boot Flags
* http://www.microsoft.com/whdc/hwdev/resources/specs/simp_bios.mspx
...
...
@@ -218,12 +200,6 @@ struct acpi_table_sbf
* http://www.microsoft.com/whdc/hwdev/platform/proc/SRAT.mspx
*/
struct
acpi_table_srat
{
struct
acpi_table_header
header
;
u32
table_revision
;
u64
reserved
;
}
__attribute__
((
packed
));
enum
acpi_srat_entry_id
{
ACPI_SRAT_PROCESSOR_AFFINITY
=
0
,
ACPI_SRAT_MEMORY_AFFINITY
,
...
...
@@ -267,36 +243,6 @@ enum acpi_address_range_id {
ACPI_ADDRESS_RANGE_COUNT
};
/*
* System Locality Information Table (SLIT)
* see http://devresource.hp.com/devresource/docs/techpapers/ia64/slit.pdf
*/
struct
acpi_table_slit
{
struct
acpi_table_header
header
;
u64
localities
;
u8
entry
[
1
];
/* real size = localities^2 */
}
__attribute__
((
packed
));
/* Smart Battery Description Table (SBST) */
struct
acpi_table_sbst
{
struct
acpi_table_header
header
;
u32
warning
;
/* Warn user */
u32
low
;
/* Critical sleep */
u32
critical
;
/* Critical shutdown */
}
__attribute__
((
packed
));
/* Embedded Controller Boot Resources Table (ECDT) */
struct
acpi_table_ecdt
{
struct
acpi_table_header
header
;
struct
acpi_generic_address
ec_control
;
struct
acpi_generic_address
ec_data
;
u32
uid
;
u8
gpe_bit
;
char
ec_id
[
0
];
}
__attribute__
((
packed
));
/* PCI MMCONFIG */
...
...
@@ -309,11 +255,6 @@ struct acpi_table_mcfg_config {
u8
end_bus_number
;
u8
reserved
[
4
];
}
__attribute__
((
packed
));
struct
acpi_table_mcfg
{
struct
acpi_table_header
header
;
u8
reserved
[
8
];
struct
acpi_table_mcfg_config
config
[
0
];
}
__attribute__
((
packed
));
/* Table Handlers */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录