Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
c94c0d20
cloud-kernel
项目概览
bug2833
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c94c0d20
编写于
7月 23, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/home/rmk/linux-2.6-arm
上级
8ed693d2
53776eb4
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
59 addition
and
35 deletion
+59
-35
arch/arm/boot/compressed/head-shark.S
arch/arm/boot/compressed/head-shark.S
+33
-9
arch/arm/kernel/smp.c
arch/arm/kernel/smp.c
+3
-3
arch/arm/mach-integrator/platsmp.c
arch/arm/mach-integrator/platsmp.c
+4
-4
arch/arm/mach-s3c2410/dma.c
arch/arm/mach-s3c2410/dma.c
+1
-1
arch/arm/nwfpe/fpa11.h
arch/arm/nwfpe/fpa11.h
+1
-3
arch/arm/nwfpe/fpmodule.c
arch/arm/nwfpe/fpmodule.c
+1
-1
arch/arm/nwfpe/fpmodule.inl
arch/arm/nwfpe/fpmodule.inl
+7
-7
drivers/video/imxfb.c
drivers/video/imxfb.c
+7
-7
drivers/video/imxfb.h
drivers/video/imxfb.h
+1
-0
include/asm-arm/arch-imx/imxfb.h
include/asm-arm/arch-imx/imxfb.h
+1
-0
未找到文件。
arch/arm/boot/compressed/head-shark.S
浏览文件 @
c94c0d20
...
...
@@ -63,8 +63,8 @@ __beginning: mov r4, r0 @ save the entry to the firmware
mov
pc
,
r2
__copy_target
:
.
long
0x0850
8000
__copy_end
:
.
long
0x0860
8000
__copy_target
:
.
long
0x0850
7FFC
__copy_end
:
.
long
0x0860
7FFC
.
word
_start
.
word
__bss_start
...
...
@@ -73,9 +73,10 @@ __copy_end: .long 0x08608000
__temp_stack
:
.
space
128
__mmu_off
:
adr
r0
,
__ofw_data
adr
r0
,
__ofw_data
@
read
the
1
.
entry
of
the
memory
map
ldr
r0
,
[
r0
,
#
4
]
orr
r0
,
r0
,
#
0x00600000
sub
r0
,
r0
,
#
4
ldr
r1
,
__copy_end
ldr
r3
,
__copy_target
...
...
@@ -89,20 +90,43 @@ __mmu_off:
*
from
0x08500000
to
0x08508000
if
we
have
only
8
MB
*/
/*
As
we
get
more
2
.6
-
kernels
it
gets
more
and
more
*
uncomfortable
to
be
bound
to
kernel
images
of
1
MB
only
.
*
So
we
add
a
loop
here
,
to
be
able
to
copy
some
more
.
*
Alexander
Schulz
2005
-
07
-
17
*/
mov
r4
,
#
3
@
How
many
megabytes
to
copy
__MoveCode
:
sub
r4
,
r4
,
#
1
__Copy
:
ldr
r2
,
[
r0
],
#-
4
str
r2
,
[
r1
],
#-
4
teq
r1
,
r3
bne
__Copy
/
*
The
firmware
maps
us
in
blocks
of
1
MB
,
the
next
block
is
_below_
the
last
one
.
So
our
decrementing
source
pointer
ist
right
here
,
but
the
destination
pointer
must
be
increased
by
2
MB
*/
add
r1
,
r1
,
#
0x00200000
add
r3
,
r3
,
#
0x00100000
teq
r4
,
#
0
bne
__MoveCode
/
*
and
jump
to
it
*/
adr
r2
,
__go_on
adr
r0
,
__ofw_data
adr
r2
,
__go_on
@
where
we
want
to
jump
adr
r0
,
__ofw_data
@
read
the
1
.
entry
of
the
memory
map
ldr
r0
,
[
r0
,
#
4
]
sub
r2
,
r2
,
r0
sub
r2
,
r2
,
#
0x00500000
ldr
r0
,
__copy_target
sub
r2
,
r2
,
r0
@
we
are
mapped
add
0e50
now
,
sub
that
(-
0e00
)
sub
r2
,
r2
,
#
0x00500000
@
-
0050
ldr
r0
,
__copy_target
@
and
add
0850
8000
instead
add
r0
,
r0
,
#
4
add
r2
,
r2
,
r0
mov
pc
,
r2
mov
pc
,
r2
@
and
jump
there
__go_on
:
adr
sp
,
__temp_stack
...
...
arch/arm/kernel/smp.c
浏览文件 @
c94c0d20
...
...
@@ -78,7 +78,7 @@ struct smp_call_struct {
static
struct
smp_call_struct
*
volatile
smp_call_function_data
;
static
DEFINE_SPINLOCK
(
smp_call_function_lock
);
int
__init
__cpu_up
(
unsigned
int
cpu
)
int
__
cpu
init
__cpu_up
(
unsigned
int
cpu
)
{
struct
task_struct
*
idle
;
pgd_t
*
pgd
;
...
...
@@ -159,7 +159,7 @@ int __init __cpu_up(unsigned int cpu)
* This is the secondary CPU boot entry. We're using this CPUs
* idle thread stack, but a set of temporary page tables.
*/
asmlinkage
void
__init
secondary_start_kernel
(
void
)
asmlinkage
void
__
cpu
init
secondary_start_kernel
(
void
)
{
struct
mm_struct
*
mm
=
&
init_mm
;
unsigned
int
cpu
=
smp_processor_id
();
...
...
@@ -209,7 +209,7 @@ asmlinkage void __init secondary_start_kernel(void)
* Called by both boot and secondaries to move global data into
* per-processor storage.
*/
void
__init
smp_store_cpu_info
(
unsigned
int
cpuid
)
void
__
cpu
init
smp_store_cpu_info
(
unsigned
int
cpuid
)
{
struct
cpuinfo_arm
*
cpu_info
=
&
per_cpu
(
cpu_data
,
cpuid
);
...
...
arch/arm/mach-integrator/platsmp.c
浏览文件 @
c94c0d20
...
...
@@ -27,12 +27,12 @@ extern void integrator_secondary_startup(void);
* control for which core is the next to come out of the secondary
* boot "holding pen"
*/
volatile
int
__initdata
pen_release
=
-
1
;
unsigned
long
__initdata
phys_pen_release
=
0
;
volatile
int
__
cpu
initdata
pen_release
=
-
1
;
unsigned
long
__
cpu
initdata
phys_pen_release
=
0
;
static
DEFINE_SPINLOCK
(
boot_lock
);
void
__init
platform_secondary_init
(
unsigned
int
cpu
)
void
__
cpu
init
platform_secondary_init
(
unsigned
int
cpu
)
{
/*
* the primary core may have used a "cross call" soft interrupt
...
...
@@ -61,7 +61,7 @@ void __init platform_secondary_init(unsigned int cpu)
spin_unlock
(
&
boot_lock
);
}
int
__init
boot_secondary
(
unsigned
int
cpu
,
struct
task_struct
*
idle
)
int
__
cpu
init
boot_secondary
(
unsigned
int
cpu
,
struct
task_struct
*
idle
)
{
unsigned
long
timeout
;
...
...
arch/arm/mach-s3c2410/dma.c
浏览文件 @
c94c0d20
...
...
@@ -436,7 +436,7 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
buf
=
kmem_cache_alloc
(
dma_kmem
,
GFP_ATOMIC
);
if
(
buf
==
NULL
)
{
pr_debug
(
"%s: out of memory (%d alloc)
\n
"
,
pr_debug
(
"%s: out of memory (%
l
d alloc)
\n
"
,
__FUNCTION__
,
sizeof
(
*
buf
));
return
-
ENOMEM
;
}
...
...
arch/arm/nwfpe/fpa11.h
浏览文件 @
c94c0d20
...
...
@@ -29,9 +29,7 @@
* stack+task struct. Use the same method as 'current' uses to
* reach them.
*/
register
unsigned
long
*
user_registers
asm
(
"sl"
);
#define GET_USERREG() (user_registers)
#define GET_USERREG() ((struct pt_regs *)(THREAD_START_SP + (unsigned long)current_thread_info()) - 1)
#include <linux/config.h>
#include <linux/thread_info.h>
...
...
arch/arm/nwfpe/fpmodule.c
浏览文件 @
c94c0d20
...
...
@@ -132,7 +132,7 @@ void float_raise(signed char flags)
printk
(
KERN_DEBUG
"NWFPE: %s[%d] takes exception %08x at %p from %08lx
\n
"
,
current
->
comm
,
current
->
pid
,
flags
,
__builtin_return_address
(
0
),
GET_USERREG
()
[
15
]
);
__builtin_return_address
(
0
),
GET_USERREG
()
->
ARM_pc
);
#endif
/* Keep SoftFloat exception flags up to date. */
...
...
arch/arm/nwfpe/fpmodule.inl
浏览文件 @
c94c0d20
...
...
@@ -28,8 +28,8 @@ static inline unsigned long readRegister(const unsigned int nReg)
for this in this routine. LDF/STF instructions with Rn = PC
depend on the PC being correct, as they use PC+8 in their
address calculations. */
unsigned long *userRegister
s = GET_USERREG();
unsigned int val =
userRegister
s[nReg];
struct pt_regs *reg
s = GET_USERREG();
unsigned int val =
regs->ureg
s[nReg];
if (REG_PC == nReg)
val -= 4;
return val;
...
...
@@ -38,8 +38,8 @@ static inline unsigned long readRegister(const unsigned int nReg)
static inline void
writeRegister(const unsigned int nReg, const unsigned long val)
{
unsigned long *userRegister
s = GET_USERREG();
userRegister
s[nReg] = val;
struct pt_regs *reg
s = GET_USERREG();
regs->ureg
s[nReg] = val;
}
static inline unsigned long readCPSR(void)
...
...
@@ -63,12 +63,12 @@ static inline unsigned long readConditionCodes(void)
static inline void writeConditionCodes(const unsigned long val)
{
unsigned long *userRegister
s = GET_USERREG();
struct pt_regs *reg
s = GET_USERREG();
unsigned long rval;
/*
* Operate directly on userRegisters since
* the CPSR may be the PC register itself.
*/
rval =
userRegisters[REG_CPSR]
& ~CC_MASK;
userRegisters[REG_CPSR]
= rval | (val & CC_MASK);
rval =
regs->ARM_cpsr
& ~CC_MASK;
regs->ARM_cpsr
= rval | (val & CC_MASK);
}
drivers/video/imxfb.c
浏览文件 @
c94c0d20
...
...
@@ -249,9 +249,6 @@ static void imxfb_enable_controller(struct imxfb_info *fbi)
/* disable hardware cursor */
LCDC_CPOS
&=
~
(
CPOS_CC0
|
CPOS_CC1
);
/* fixed burst length (see erratum 11) */
LCDC_DMACR
=
DMACR_BURST
|
DMACR_HM
(
8
)
|
DMACR_TM
(
2
);
LCDC_RMCR
=
RMCR_LCDC_EN
;
if
(
fbi
->
backlight_power
)
...
...
@@ -359,6 +356,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
LCDC_PCR
=
fbi
->
pcr
;
LCDC_PWMR
=
fbi
->
pwmr
;
LCDC_LSCR1
=
fbi
->
lscr1
;
LCDC_DMACR
=
fbi
->
dmacr
;
return
0
;
}
...
...
@@ -509,6 +507,7 @@ static int __init imxfb_init_fbinfo(struct device *dev)
fbi
->
cmap_inverse
=
inf
->
cmap_inverse
;
fbi
->
pcr
=
inf
->
pcr
;
fbi
->
lscr1
=
inf
->
lscr1
;
fbi
->
dmacr
=
inf
->
dmacr
;
fbi
->
pwmr
=
inf
->
pwmr
;
fbi
->
lcd_power
=
inf
->
lcd_power
;
fbi
->
backlight_power
=
inf
->
backlight_power
;
...
...
@@ -642,12 +641,12 @@ static int imxfb_remove(struct device *dev)
{
struct
platform_device
*
pdev
=
to_platform_device
(
dev
);
struct
fb_info
*
info
=
dev_get_drvdata
(
dev
);
struct
imxfb_info
*
fbi
=
info
->
par
;
struct
resource
*
res
;
res
=
platform_get_resource
(
pdev
,
IORESOURCE_MEM
,
0
);
/* disable LCD controller */
LCDC_RMCR
&=
~
RMCR_LCDC_EN
;
imxfb_disable_controller
(
fbi
);
unregister_framebuffer
(
info
);
...
...
@@ -663,8 +662,9 @@ static int imxfb_remove(struct device *dev)
void
imxfb_shutdown
(
struct
device
*
dev
)
{
/* disable LCD Controller */
LCDC_RMCR
&=
~
RMCR_LCDC_EN
;
struct
fb_info
*
info
=
dev_get_drvdata
(
dev
);
struct
imxfb_info
*
fbi
=
info
->
par
;
imxfb_disable_controller
(
fbi
);
}
static
struct
device_driver
imxfb_driver
=
{
...
...
drivers/video/imxfb.h
浏览文件 @
c94c0d20
...
...
@@ -54,6 +54,7 @@ struct imxfb_info {
u_int
pcr
;
u_int
pwmr
;
u_int
lscr1
;
u_int
dmacr
;
u_int
cmap_inverse
:
1
,
cmap_static:
1
,
unused:
30
;
...
...
include/asm-arm/arch-imx/imxfb.h
浏览文件 @
c94c0d20
...
...
@@ -25,6 +25,7 @@ struct imxfb_mach_info {
u_int
pcr
;
u_int
pwmr
;
u_int
lscr1
;
u_int
dmacr
;
u_char
*
fixed_screen_cpu
;
dma_addr_t
fixed_screen_dma
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录