Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
062dfa43
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,发现更多精彩内容 >>
提交
062dfa43
编写于
12月 12, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/home/rmk/linux-2.6-arm
上级
7c9dfb59
22f975f4
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
15 addition
and
12 deletion
+15
-12
Documentation/arm/00-INDEX
Documentation/arm/00-INDEX
+2
-0
arch/arm/kernel/ptrace.c
arch/arm/kernel/ptrace.c
+9
-0
drivers/char/watchdog/mpcore_wdt.c
drivers/char/watchdog/mpcore_wdt.c
+0
-4
include/asm-arm/arch-pxa/irq.h
include/asm-arm/arch-pxa/irq.h
+0
-5
include/asm-arm/io.h
include/asm-arm/io.h
+3
-3
include/asm-arm/memory.h
include/asm-arm/memory.h
+1
-0
未找到文件。
Documentation/arm/00-INDEX
浏览文件 @
062dfa43
...
...
@@ -16,5 +16,7 @@ empeg
- Empeg documentation
mem_alignment
- alignment abort handler documentation
memory.txt
- description of the virtual memory layout
nwfpe
- NWFPE floating point emulator documentation
arch/arm/kernel/ptrace.c
浏览文件 @
062dfa43
...
...
@@ -242,6 +242,15 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in
*/
long
aluop1
,
aluop2
,
ccbit
;
if
((
insn
&
0x0fffffd0
)
==
0x012fff10
)
{
/*
* bx or blx
*/
alt
=
get_user_reg
(
child
,
insn
&
15
);
break
;
}
if
((
insn
&
0xf000
)
!=
0xf000
)
break
;
...
...
drivers/char/watchdog/mpcore_wdt.c
浏览文件 @
062dfa43
...
...
@@ -180,10 +180,6 @@ static ssize_t mpcore_wdt_write(struct file *file, const char *data, size_t len,
{
struct
mpcore_wdt
*
wdt
=
file
->
private_data
;
/* Can't seek (pwrite) on this device */
if
(
ppos
!=
&
file
->
f_pos
)
return
-
ESPIPE
;
/*
* Refresh the timer.
*/
...
...
include/asm-arm/arch-pxa/irq.h
浏览文件 @
062dfa43
...
...
@@ -12,8 +12,3 @@
#define fixup_irq(x) (x)
/*
* This prototype is required for cascading of multiplexed interrupts.
* Since it doesn't exist elsewhere, we'll put it here for now.
*/
extern
void
do_IRQ
(
int
irq
,
struct
pt_regs
*
regs
);
include/asm-arm/io.h
浏览文件 @
062dfa43
...
...
@@ -42,9 +42,9 @@ extern void __raw_writesb(void __iomem *addr, const void *data, int bytelen);
extern
void
__raw_writesw
(
void
__iomem
*
addr
,
const
void
*
data
,
int
wordlen
);
extern
void
__raw_writesl
(
void
__iomem
*
addr
,
const
void
*
data
,
int
longlen
);
extern
void
__raw_readsb
(
void
__iomem
*
addr
,
void
*
data
,
int
bytelen
);
extern
void
__raw_readsw
(
void
__iomem
*
addr
,
void
*
data
,
int
wordlen
);
extern
void
__raw_readsl
(
void
__iomem
*
addr
,
void
*
data
,
int
longlen
);
extern
void
__raw_readsb
(
const
void
__iomem
*
addr
,
void
*
data
,
int
bytelen
);
extern
void
__raw_readsw
(
const
void
__iomem
*
addr
,
void
*
data
,
int
wordlen
);
extern
void
__raw_readsl
(
const
void
__iomem
*
addr
,
void
*
data
,
int
longlen
);
#define __raw_writeb(v,a) (__chk_io_ptr(a), *(volatile unsigned char __force *)(a) = (v))
#define __raw_writew(v,a) (__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v))
...
...
include/asm-arm/memory.h
浏览文件 @
062dfa43
...
...
@@ -122,6 +122,7 @@ static inline void *phys_to_virt(unsigned long x)
*/
#define __pa(x) __virt_to_phys((unsigned long)(x))
#define __va(x) ((void *)__phys_to_virt((unsigned long)(x)))
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
/*
* Virtual <-> DMA view memory address translations
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录