Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
4897313a
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看板
提交
4897313a
编写于
13年前
作者:
T
Tony Luck
浏览文件
操作
浏览文件
下载
差异文件
Pull misc-2.6.39 into release branch
上级
521cb40b
b4a6b343
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
10 addition
and
3 deletion
+10
-3
arch/ia64/configs/generic_defconfig
arch/ia64/configs/generic_defconfig
+1
-0
arch/ia64/configs/gensparse_defconfig
arch/ia64/configs/gensparse_defconfig
+1
-0
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/dma-mapping.h
+2
-0
arch/ia64/kernel/mca.c
arch/ia64/kernel/mca.c
+4
-1
arch/ia64/sn/kernel/setup.c
arch/ia64/sn/kernel/setup.c
+1
-1
arch/ia64/sn/pci/tioca_provider.c
arch/ia64/sn/pci/tioca_provider.c
+1
-1
未找到文件。
arch/ia64/configs/generic_defconfig
浏览文件 @
4897313a
...
...
@@ -233,3 +233,4 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRC_T10DIF=y
CONFIG_MISC_DEVICES=y
This diff is collapsed.
Click to expand it.
arch/ia64/configs/gensparse_defconfig
浏览文件 @
4897313a
...
...
@@ -208,3 +208,4 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_MUTEXES=y
CONFIG_CRYPTO_MD5=y
CONFIG_MISC_DEVICES=y
This diff is collapsed.
Click to expand it.
arch/ia64/include/asm/dma-mapping.h
浏览文件 @
4897313a
...
...
@@ -12,6 +12,8 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
#define DMA_ERROR_CODE 0
extern
struct
dma_map_ops
*
dma_ops
;
extern
struct
ia64_machine_vector
ia64_mv
;
extern
void
set_iommu_machvec
(
void
);
...
...
This diff is collapsed.
Click to expand it.
arch/ia64/kernel/mca.c
浏览文件 @
4897313a
...
...
@@ -582,6 +582,8 @@ ia64_mca_cpe_int_handler (int cpe_irq, void *arg)
/* Get the CPE error record and log it */
ia64_mca_log_sal_error_record
(
SAL_INFO_TYPE_CPE
);
local_irq_disable
();
return
IRQ_HANDLED
;
}
...
...
@@ -1859,7 +1861,8 @@ ia64_mca_cpu_init(void *cpu_data)
data
=
mca_bootmem
();
first_time
=
0
;
}
else
data
=
__get_free_pages
(
GFP_KERNEL
,
get_order
(
sz
));
data
=
(
void
*
)
__get_free_pages
(
GFP_KERNEL
,
get_order
(
sz
));
if
(
!
data
)
panic
(
"Could not allocate MCA memory for cpu %d
\n
"
,
cpu
);
...
...
This diff is collapsed.
Click to expand it.
arch/ia64/sn/kernel/setup.c
浏览文件 @
4897313a
...
...
@@ -592,7 +592,7 @@ void __cpuinit sn_cpu_init(void)
/*
* Don't check status. The SAL call is not supported on all PROMs
* but a failure is harmless.
* Architec
htual
lly, cpu_init is always called twice on cpu 0. We
* Architec
tura
lly, cpu_init is always called twice on cpu 0. We
* should set cpu_number on cpu 0 once.
*/
if
(
cpuid
==
0
)
{
...
...
This diff is collapsed.
Click to expand it.
arch/ia64/sn/pci/tioca_provider.c
浏览文件 @
4897313a
...
...
@@ -509,7 +509,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir)
* use the GART mapped mode.
*/
static
u64
tioca_dma_map
(
struct
pci_dev
*
pdev
,
u
64
paddr
,
size_t
byte_count
,
int
dma_flags
)
tioca_dma_map
(
struct
pci_dev
*
pdev
,
u
nsigned
long
paddr
,
size_t
byte_count
,
int
dma_flags
)
{
u64
mapaddr
;
...
...
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部