Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
a4e884a3
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
158
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a4e884a3
编写于
4月 17, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes
First ever true git merge. Let's see if it actually works.
上级
ce1dc02f
cc56449f
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
41 addition
and
88 deletion
+41
-88
arch/arm/kernel/process.c
arch/arm/kernel/process.c
+11
-4
arch/arm/kernel/traps.c
arch/arm/kernel/traps.c
+2
-6
arch/arm/lib/changebit.S
arch/arm/lib/changebit.S
+2
-9
arch/arm/lib/clearbit.S
arch/arm/lib/clearbit.S
+2
-11
arch/arm/lib/setbit.S
arch/arm/lib/setbit.S
+2
-9
arch/arm/lib/testchangebit.S
arch/arm/lib/testchangebit.S
+2
-13
arch/arm/lib/testclearbit.S
arch/arm/lib/testclearbit.S
+2
-13
arch/arm/lib/testsetbit.S
arch/arm/lib/testsetbit.S
+2
-13
arch/arm/mach-footbridge/dc21285-timer.c
arch/arm/mach-footbridge/dc21285-timer.c
+2
-2
arch/arm/mach-sa1100/h3600.c
arch/arm/mach-sa1100/h3600.c
+1
-1
include/asm-arm/arch-ebsa285/debug-macro.S
include/asm-arm/arch-ebsa285/debug-macro.S
+5
-2
include/asm-arm/arch-rpc/debug-macro.S
include/asm-arm/arch-rpc/debug-macro.S
+4
-1
include/asm-arm/ptrace.h
include/asm-arm/ptrace.h
+1
-4
include/asm-arm/system.h
include/asm-arm/system.h
+3
-0
未找到文件。
arch/arm/kernel/process.c
浏览文件 @
a4e884a3
...
...
@@ -168,12 +168,11 @@ void machine_restart(char * __unused)
EXPORT_SYMBOL
(
machine_restart
);
void
show_regs
(
struct
pt_regs
*
regs
)
void
__show_regs
(
struct
pt_regs
*
regs
)
{
unsigned
long
flags
;
flags
=
condition_codes
(
regs
);
unsigned
long
flags
=
condition_codes
(
regs
);
printk
(
"CPU: %d
\n
"
,
smp_processor_id
());
print_symbol
(
"PC is at %s
\n
"
,
instruction_pointer
(
regs
));
print_symbol
(
"LR is at %s
\n
"
,
regs
->
ARM_lr
);
printk
(
"pc : [<%08lx>] lr : [<%08lx>] %s
\n
"
...
...
@@ -213,6 +212,14 @@ void show_regs(struct pt_regs * regs)
}
}
void
show_regs
(
struct
pt_regs
*
regs
)
{
printk
(
"
\n
"
);
printk
(
"Pid: %d, comm: %20s
\n
"
,
current
->
pid
,
current
->
comm
);
__show_regs
(
regs
);
__backtrace
();
}
void
show_fpregs
(
struct
user_fp
*
regs
)
{
int
i
;
...
...
arch/arm/kernel/traps.c
浏览文件 @
a4e884a3
...
...
@@ -31,9 +31,6 @@
#include "ptrace.h"
extern
void
c_backtrace
(
unsigned
long
fp
,
int
pmode
);
extern
void
show_pte
(
struct
mm_struct
*
mm
,
unsigned
long
addr
);
const
char
*
processor_modes
[]
=
{
"USER_26"
,
"FIQ_26"
,
"IRQ_26"
,
"SVC_26"
,
"UK4_26"
,
"UK5_26"
,
"UK6_26"
,
"UK7_26"
,
"UK8_26"
,
"UK9_26"
,
"UK10_26"
,
"UK11_26"
,
"UK12_26"
,
"UK13_26"
,
"UK14_26"
,
"UK15_26"
,
...
...
@@ -216,8 +213,7 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
printk
(
"Internal error: %s: %x [#%d]
\n
"
,
str
,
err
,
++
die_counter
);
print_modules
();
printk
(
"CPU: %d
\n
"
,
smp_processor_id
());
show_regs
(
regs
);
__show_regs
(
regs
);
printk
(
"Process %s (pid: %d, stack limit = 0x%p)
\n
"
,
tsk
->
comm
,
tsk
->
pid
,
tsk
->
thread_info
+
1
);
...
...
@@ -482,7 +478,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
current
->
pid
,
current
->
comm
,
no
);
dump_instr
(
regs
);
if
(
user_mode
(
regs
))
{
show_regs
(
regs
);
__
show_regs
(
regs
);
c_backtrace
(
regs
->
ARM_fp
,
processor_mode
(
regs
));
}
}
...
...
arch/arm/lib/changebit.S
浏览文件 @
a4e884a3
...
...
@@ -9,6 +9,7 @@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
#include "bitops.h"
.
text
/*
Purpose
:
Function
to
change
a
bit
...
...
@@ -17,12 +18,4 @@
ENTRY
(
_change_bit_be
)
eor
r0
,
r0
,
#
0x18
@
big
endian
byte
ordering
ENTRY
(
_change_bit_le
)
and
r2
,
r0
,
#
7
mov
r3
,
#
1
mov
r3
,
r3
,
lsl
r2
save_and_disable_irqs
ip
,
r2
ldrb
r2
,
[
r1
,
r0
,
lsr
#
3
]
eor
r2
,
r2
,
r3
strb
r2
,
[
r1
,
r0
,
lsr
#
3
]
restore_irqs
ip
RETINSTR
(
mov
,
pc
,
lr
)
bitop
eor
arch/arm/lib/clearbit.S
浏览文件 @
a4e884a3
...
...
@@ -9,6 +9,7 @@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
#include "bitops.h"
.
text
/*
...
...
@@ -18,14 +19,4 @@
ENTRY
(
_clear_bit_be
)
eor
r0
,
r0
,
#
0x18
@
big
endian
byte
ordering
ENTRY
(
_clear_bit_le
)
and
r2
,
r0
,
#
7
mov
r3
,
#
1
mov
r3
,
r3
,
lsl
r2
save_and_disable_irqs
ip
,
r2
ldrb
r2
,
[
r1
,
r0
,
lsr
#
3
]
bic
r2
,
r2
,
r3
strb
r2
,
[
r1
,
r0
,
lsr
#
3
]
restore_irqs
ip
RETINSTR
(
mov
,
pc
,
lr
)
bitop
bic
arch/arm/lib/setbit.S
浏览文件 @
a4e884a3
...
...
@@ -9,6 +9,7 @@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
#include "bitops.h"
.
text
/*
...
...
@@ -18,12 +19,4 @@
ENTRY
(
_set_bit_be
)
eor
r0
,
r0
,
#
0x18
@
big
endian
byte
ordering
ENTRY
(
_set_bit_le
)
and
r2
,
r0
,
#
7
mov
r3
,
#
1
mov
r3
,
r3
,
lsl
r2
save_and_disable_irqs
ip
,
r2
ldrb
r2
,
[
r1
,
r0
,
lsr
#
3
]
orr
r2
,
r2
,
r3
strb
r2
,
[
r1
,
r0
,
lsr
#
3
]
restore_irqs
ip
RETINSTR
(
mov
,
pc
,
lr
)
bitop
orr
arch/arm/lib/testchangebit.S
浏览文件 @
a4e884a3
...
...
@@ -9,21 +9,10 @@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
#include "bitops.h"
.
text
ENTRY
(
_test_and_change_bit_be
)
eor
r0
,
r0
,
#
0x18
@
big
endian
byte
ordering
ENTRY
(
_test_and_change_bit_le
)
add
r1
,
r1
,
r0
,
lsr
#
3
and
r3
,
r0
,
#
7
mov
r0
,
#
1
save_and_disable_irqs
ip
,
r2
ldrb
r2
,
[
r1
]
tst
r2
,
r0
,
lsl
r3
eor
r2
,
r2
,
r0
,
lsl
r3
strb
r2
,
[
r1
]
restore_irqs
ip
moveq
r0
,
#
0
RETINSTR
(
mov
,
pc
,
lr
)
testop
eor
,
strb
arch/arm/lib/testclearbit.S
浏览文件 @
a4e884a3
...
...
@@ -9,21 +9,10 @@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
#include "bitops.h"
.
text
ENTRY
(
_test_and_clear_bit_be
)
eor
r0
,
r0
,
#
0x18
@
big
endian
byte
ordering
ENTRY
(
_test_and_clear_bit_le
)
add
r1
,
r1
,
r0
,
lsr
#
3
@
Get
byte
offset
and
r3
,
r0
,
#
7
@
Get
bit
offset
mov
r0
,
#
1
save_and_disable_irqs
ip
,
r2
ldrb
r2
,
[
r1
]
tst
r2
,
r0
,
lsl
r3
bic
r2
,
r2
,
r0
,
lsl
r3
strb
r2
,
[
r1
]
restore_irqs
ip
moveq
r0
,
#
0
RETINSTR
(
mov
,
pc
,
lr
)
testop
bicne
,
strneb
arch/arm/lib/testsetbit.S
浏览文件 @
a4e884a3
...
...
@@ -9,21 +9,10 @@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
#include "bitops.h"
.
text
ENTRY
(
_test_and_set_bit_be
)
eor
r0
,
r0
,
#
0x18
@
big
endian
byte
ordering
ENTRY
(
_test_and_set_bit_le
)
add
r1
,
r1
,
r0
,
lsr
#
3
@
Get
byte
offset
and
r3
,
r0
,
#
7
@
Get
bit
offset
mov
r0
,
#
1
save_and_disable_irqs
ip
,
r2
ldrb
r2
,
[
r1
]
tst
r2
,
r0
,
lsl
r3
orr
r2
,
r2
,
r0
,
lsl
r3
strb
r2
,
[
r1
]
restore_irqs
ip
moveq
r0
,
#
0
RETINSTR
(
mov
,
pc
,
lr
)
testop
orreq
,
streqb
arch/arm/mach-footbridge/dc21285-timer.c
浏览文件 @
a4e884a3
...
...
@@ -51,8 +51,6 @@ static struct irqaction footbridge_timer_irq = {
*/
static
void
__init
footbridge_timer_init
(
void
)
{
isa_rtc_init
();
timer1_latch
=
(
mem_fclk_21285
+
8
*
HZ
)
/
(
16
*
HZ
);
*
CSR_TIMER1_CLR
=
0
;
...
...
@@ -60,6 +58,8 @@ static void __init footbridge_timer_init(void)
*
CSR_TIMER1_CNTL
=
TIMER_CNTL_ENABLE
|
TIMER_CNTL_AUTORELOAD
|
TIMER_CNTL_DIV16
;
setup_irq
(
IRQ_TIMER1
,
&
footbridge_timer_irq
);
isa_rtc_init
();
}
struct
sys_timer
footbridge_timer
=
{
...
...
arch/arm/mach-sa1100/h3600.c
浏览文件 @
a4e884a3
...
...
@@ -130,7 +130,7 @@ static int h3600_irda_set_power(struct device *dev, unsigned int state)
return
0
;
}
static
void
h3600_irda_set_speed
(
struct
device
*
dev
,
int
speed
)
static
void
h3600_irda_set_speed
(
struct
device
*
dev
,
unsigned
int
speed
)
{
if
(
speed
<
4000000
)
{
clr_h3600_egpio
(
IPAQ_EGPIO_IR_FSEL
);
...
...
include/asm-arm/arch-ebsa285/debug-macro.S
浏览文件 @
a4e884a3
...
...
@@ -45,9 +45,12 @@
.
equ
dc21285_low
,
ARMCSR_BASE
&
0x00ffffff
.
macro
addruart
,
rx
mov
\
rx
,
#
dc21285_high
mrc
p15
,
0
,
\
rx
,
c1
,
c0
tst
\
rx
,
#
1
@
MMU
enabled
?
moveq
\
rx
,
#
0x42000000
movne
\
rx
,
#
dc21285_high
.
if
dc21285_low
orr
\
rx
,
\
rx
,
#
dc21285_low
orr
ne
\
rx
,
\
rx
,
#
dc21285_low
.
endif
.
endm
...
...
include/asm-arm/arch-rpc/debug-macro.S
浏览文件 @
a4e884a3
...
...
@@ -12,7 +12,10 @@
*/
.
macro
addruart
,
rx
mov
\
rx
,
#
0xe0000000
mrc
p15
,
0
,
\
rx
,
c1
,
c0
tst
\
rx
,
#
1
@
MMU
enabled
?
moveq
\
rx
,
#
0x03000000
movne
\
rx
,
#
0xe0000000
orr
\
rx
,
\
rx
,
#
0x00010000
orr
\
rx
,
\
rx
,
#
0x00000fe0
.
endm
...
...
include/asm-arm/ptrace.h
浏览文件 @
a4e884a3
...
...
@@ -142,11 +142,8 @@ extern unsigned long profile_pc(struct pt_regs *regs);
#endif
#ifdef __KERNEL__
extern
void
show_regs
(
struct
pt_regs
*
);
#define predicate(x) (x & 0xf0000000)
#define predicate(x) ((x) & 0xf0000000)
#define PREDICATE_ALWAYS 0xe0000000
#endif
#endif
/* __ASSEMBLY__ */
...
...
include/asm-arm/system.h
浏览文件 @
a4e884a3
...
...
@@ -99,6 +99,9 @@ void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
#define tas(ptr) (xchg((ptr),1))
extern
asmlinkage
void
__backtrace
(
void
);
extern
asmlinkage
void
c_backtrace
(
unsigned
long
fp
,
int
pmode
);
extern
void
show_pte
(
struct
mm_struct
*
mm
,
unsigned
long
addr
);
extern
void
__show_regs
(
struct
pt_regs
*
);
extern
int
cpu_architecture
(
void
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录