Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
7fb574a9
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,发现更多精彩内容 >>
提交
7fb574a9
编写于
7月 14, 2011
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branches 'd3cold', 'bugzilla-37412' and 'bugzilla-38152' into release
上级
b4a03b9a
4d2b2956
07e49a7a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
32 addition
and
18 deletion
+32
-18
drivers/acpi/apei/hest.c
drivers/acpi/apei/hest.c
+11
-1
drivers/acpi/osl.c
drivers/acpi/osl.c
+0
-17
include/acpi/acpiosxf.h
include/acpi/acpiosxf.h
+3
-0
include/acpi/platform/aclinux.h
include/acpi/platform/aclinux.h
+18
-0
未找到文件。
drivers/acpi/apei/hest.c
浏览文件 @
7fb574a9
...
...
@@ -139,13 +139,23 @@ static int __init hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data)
{
struct
platform_device
*
ghes_dev
;
struct
ghes_arr
*
ghes_arr
=
data
;
int
rc
;
int
rc
,
i
;
if
(
hest_hdr
->
type
!=
ACPI_HEST_TYPE_GENERIC_ERROR
)
return
0
;
if
(
!
((
struct
acpi_hest_generic
*
)
hest_hdr
)
->
enabled
)
return
0
;
for
(
i
=
0
;
i
<
ghes_arr
->
count
;
i
++
)
{
struct
acpi_hest_header
*
hdr
;
ghes_dev
=
ghes_arr
->
ghes_devs
[
i
];
hdr
=
*
(
struct
acpi_hest_header
**
)
ghes_dev
->
dev
.
platform_data
;
if
(
hdr
->
source_id
==
hest_hdr
->
source_id
)
{
pr_warning
(
FW_WARN
HEST_PFX
"Duplicated hardware error source ID: %d.
\n
"
,
hdr
->
source_id
);
return
-
EIO
;
}
}
ghes_dev
=
platform_device_alloc
(
"GHES"
,
hest_hdr
->
source_id
);
if
(
!
ghes_dev
)
return
-
ENOMEM
;
...
...
drivers/acpi/osl.c
浏览文件 @
7fb574a9
...
...
@@ -1332,23 +1332,6 @@ int acpi_resources_are_enforced(void)
}
EXPORT_SYMBOL
(
acpi_resources_are_enforced
);
/*
* Create and initialize a spinlock.
*/
acpi_status
acpi_os_create_lock
(
acpi_spinlock
*
out_handle
)
{
spinlock_t
*
lock
;
lock
=
ACPI_ALLOCATE
(
sizeof
(
spinlock_t
));
if
(
!
lock
)
return
AE_NO_MEMORY
;
spin_lock_init
(
lock
);
*
out_handle
=
lock
;
return
AE_OK
;
}
/*
* Deallocate the memory for a spinlock.
*/
...
...
include/acpi/acpiosxf.h
浏览文件 @
7fb574a9
...
...
@@ -98,8 +98,11 @@ acpi_os_table_override(struct acpi_table_header *existing_table,
/*
* Spinlock primitives
*/
#ifndef acpi_os_create_lock
acpi_status
acpi_os_create_lock
(
acpi_spinlock
*
out_handle
);
#endif
void
acpi_os_delete_lock
(
acpi_spinlock
handle
);
...
...
include/acpi/platform/aclinux.h
浏览文件 @
7fb574a9
...
...
@@ -159,6 +159,24 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
} while (0)
#endif
/*
* When lockdep is enabled, the spin_lock_init() macro stringifies it's
* argument and uses that as a name for the lock in debugging.
* By executing spin_lock_init() in a macro the key changes from "lock" for
* all locks to the name of the argument of acpi_os_create_lock(), which
* prevents lockdep from reporting false positives for ACPICA locks.
*/
#define acpi_os_create_lock(__handle) \
({ \
spinlock_t *lock = ACPI_ALLOCATE(sizeof(*lock)); \
\
if (lock) { \
*(__handle) = lock; \
spin_lock_init(*(__handle)); \
} \
lock ? AE_OK : AE_NO_MEMORY; \
})
#endif
/* __KERNEL__ */
#endif
/* __ACLINUX_H__ */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录