Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
a52e8381
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
a52e8381
编写于
11月 08, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
上级
be9d1227
da160546
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
1 deletion
+4
-1
arch/sparc64/mm/fault.c
arch/sparc64/mm/fault.c
+1
-1
drivers/sbus/char/openprom.c
drivers/sbus/char/openprom.c
+3
-0
未找到文件。
arch/sparc64/mm/fault.c
浏览文件 @
a52e8381
...
@@ -109,7 +109,7 @@ static void bad_kernel_pc(struct pt_regs *regs)
...
@@ -109,7 +109,7 @@ static void bad_kernel_pc(struct pt_regs *regs)
* this. Additionally, to prevent kswapd from ripping ptes from
* this. Additionally, to prevent kswapd from ripping ptes from
* under us, raise interrupts around the time that we look at the
* under us, raise interrupts around the time that we look at the
* pte, kswapd will have to wait to get his smp ipi response from
* pte, kswapd will have to wait to get his smp ipi response from
* us.
This saves us having to get page_table_
lock.
* us.
vmtruncate likewise. This saves us having to get pte
lock.
*/
*/
static
unsigned
int
get_user_insn
(
unsigned
long
tpc
)
static
unsigned
int
get_user_insn
(
unsigned
long
tpc
)
{
{
...
...
drivers/sbus/char/openprom.c
浏览文件 @
a52e8381
...
@@ -596,6 +596,8 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd,
...
@@ -596,6 +596,8 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd,
lock_kernel
();
lock_kernel
();
break
;
break
;
}
}
return
rval
;
}
}
static
int
openprom_open
(
struct
inode
*
inode
,
struct
file
*
file
)
static
int
openprom_open
(
struct
inode
*
inode
,
struct
file
*
file
)
...
@@ -623,6 +625,7 @@ static struct file_operations openprom_fops = {
...
@@ -623,6 +625,7 @@ static struct file_operations openprom_fops = {
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
.
llseek
=
no_llseek
,
.
llseek
=
no_llseek
,
.
ioctl
=
openprom_ioctl
,
.
ioctl
=
openprom_ioctl
,
.
compat_ioctl
=
openprom_compat_ioctl
,
.
open
=
openprom_open
,
.
open
=
openprom_open
,
.
release
=
openprom_release
,
.
release
=
openprom_release
,
};
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录