Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
a571a79a
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
a571a79a
编写于
15年前
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'memhotplug-crash' into release
上级
6a614877
5d2619fc
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
25 addition
and
9 deletion
+25
-9
drivers/acpi/acpi_memhotplug.c
drivers/acpi/acpi_memhotplug.c
+25
-9
未找到文件。
drivers/acpi/acpi_memhotplug.c
浏览文件 @
a571a79a
...
...
@@ -38,6 +38,9 @@
#define _COMPONENT ACPI_MEMORY_DEVICE_COMPONENT
#undef PREFIX
#define PREFIX "ACPI:memory_hp:"
ACPI_MODULE_NAME
(
"acpi_memhotplug"
);
MODULE_AUTHOR
(
"Naveen B S <naveen.b.s@intel.com>"
);
MODULE_DESCRIPTION
(
"Hotplug Mem Driver"
);
...
...
@@ -153,6 +156,7 @@ acpi_memory_get_device(acpi_handle handle,
acpi_handle
phandle
;
struct
acpi_device
*
device
=
NULL
;
struct
acpi_device
*
pdevice
=
NULL
;
int
result
;
if
(
!
acpi_bus_get_device
(
handle
,
&
device
)
&&
device
)
...
...
@@ -165,9 +169,9 @@ acpi_memory_get_device(acpi_handle handle,
}
/* Get the parent device */
status
=
acpi_bus_get_device
(
phandle
,
&
pdevice
);
if
(
ACPI_FAILURE
(
status
)
)
{
ACPI_EXCEPTION
((
AE_INFO
,
status
,
"Cannot get acpi bus device"
)
);
result
=
acpi_bus_get_device
(
phandle
,
&
pdevice
);
if
(
result
)
{
printk
(
KERN_WARNING
PREFIX
"Cannot get acpi bus device"
);
return
-
EINVAL
;
}
...
...
@@ -175,9 +179,9 @@ acpi_memory_get_device(acpi_handle handle,
* Now add the notified device. This creates the acpi_device
* and invokes .add function
*/
status
=
acpi_bus_add
(
&
device
,
pdevice
,
handle
,
ACPI_BUS_TYPE_DEVICE
);
if
(
ACPI_FAILURE
(
status
)
)
{
ACPI_EXCEPTION
((
AE_INFO
,
status
,
"Cannot add acpi bus"
)
);
result
=
acpi_bus_add
(
&
device
,
pdevice
,
handle
,
ACPI_BUS_TYPE_DEVICE
);
if
(
result
)
{
printk
(
KERN_WARNING
PREFIX
"Cannot add acpi bus"
);
return
-
EINVAL
;
}
...
...
@@ -238,7 +242,12 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
num_enabled
++
;
continue
;
}
/*
* If the memory block size is zero, please ignore it.
* Don't try to do the following memory hotplug flowchart.
*/
if
(
!
info
->
length
)
continue
;
if
(
node
<
0
)
node
=
memory_add_physaddr_to_nid
(
info
->
start_addr
);
...
...
@@ -253,8 +262,15 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
mem_device
->
state
=
MEMORY_INVALID_STATE
;
return
-
EINVAL
;
}
return
result
;
/*
* Sometimes the memory device will contain several memory blocks.
* When one memory block is hot-added to the system memory, it will
* be regarded as a success.
* Otherwise if the last memory block can't be hot-added to the system
* memory, it will be failure and the memory device can't be bound with
* driver.
*/
return
0
;
}
static
int
acpi_memory_powerdown_device
(
struct
acpi_memory_device
*
mem_device
)
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部