Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
f5137a45
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
161
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看板
提交
f5137a45
编写于
11年前
作者:
R
Russell King
浏览文件
操作
浏览文件
下载
差异文件
Merge branches 'fixes' and 'misc' into for-linus
上级
54c0a4b4
d326b65c
c5ca95b5
master
alk-4.19.24
alk-4.19.30
alk-4.19.34
alk-4.19.36
alk-4.19.43
alk-4.19.48
alk-4.19.57
ck-4.19.67
ck-4.19.81
ck-4.19.91
github/fork/deepanshu1422/fix-typo-in-comment
github/fork/haosdent/fix-typo
linux-next
v4.19.91
v4.19.90
v4.19.89
v4.19.88
v4.19.87
v4.19.86
v4.19.85
v4.19.84
v4.19.83
v4.19.82
v4.19.81
v4.19.80
v4.19.79
v4.19.78
v4.19.77
v4.19.76
v4.19.75
v4.19.74
v4.19.73
v4.19.72
v4.19.71
v4.19.70
v4.19.69
v4.19.68
v4.19.67
v4.19.66
v4.19.65
v4.19.64
v4.19.63
v4.19.62
v4.19.61
v4.19.60
v4.19.59
v4.19.58
v4.19.57
v4.19.56
v4.19.55
v4.19.54
v4.19.53
v4.19.52
v4.19.51
v4.19.50
v4.19.49
v4.19.48
v4.19.47
v4.19.46
v4.19.45
v4.19.44
v4.19.43
v4.19.42
v4.19.41
v4.19.40
v4.19.39
v4.19.38
v4.19.37
v4.19.36
v4.19.35
v4.19.34
v4.19.33
v4.19.32
v4.19.31
v4.19.30
v4.19.29
v4.19.28
v4.19.27
v4.19.26
v4.19.25
v4.19.24
v4.19.23
v4.19.22
v4.19.21
v4.19.20
v4.19.19
v4.19.18
v4.19.17
v4.19.16
v4.19.15
v4.19.14
v4.19.13
v4.19.12
v4.19.11
v4.19.10
v4.19.9
v4.19.8
v4.19.7
v4.19.6
v4.19.5
v4.19.4
v4.19.3
v4.19.2
v4.19.1
v4.19
v4.19-rc8
v4.19-rc7
v4.19-rc6
v4.19-rc5
v4.19-rc4
v4.19-rc3
v4.19-rc2
v4.19-rc1
ck-release-21
ck-release-20
ck-release-19.2
ck-release-19.1
ck-release-19
ck-release-18
ck-release-17.2
ck-release-17.1
ck-release-17
ck-release-16
ck-release-15.1
ck-release-15
ck-release-14
ck-release-13.2
ck-release-13
ck-release-12
ck-release-11
ck-release-10
ck-release-9
ck-release-7
alk-release-15
alk-release-14
alk-release-13.2
alk-release-13
alk-release-12
alk-release-11
alk-release-10
alk-release-9
alk-release-7
无相关合并请求
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
48 addition
and
3 deletion
+48
-3
arch/arm/Makefile
arch/arm/Makefile
+1
-1
arch/arm/include/asm/io.h
arch/arm/include/asm/io.h
+6
-0
arch/arm/kernel/entry-armv.S
arch/arm/kernel/entry-armv.S
+2
-0
arch/arm/kernel/head.S
arch/arm/kernel/head.S
+2
-1
arch/arm/kernel/io.c
arch/arm/kernel/io.c
+35
-0
arch/arm/mm/init.c
arch/arm/mm/init.c
+2
-1
未找到文件。
arch/arm/Makefile
浏览文件 @
f5137a45
...
...
@@ -96,7 +96,7 @@ tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
tune-y
:=
$
(
tune-y
)
ifeq
($(CONFIG_AEABI),y)
CFLAGS_ABI
:=
-mabi
=
aapcs-linux
-mno-thumb-interwork
CFLAGS_ABI
:=
-mabi
=
aapcs-linux
-mno-thumb-interwork
-mfpu
=
vfp
else
CFLAGS_ABI
:=
$(
call
cc-option,-mapcs-32,-mabi
=
apcs-gnu
)
$(
call
cc-option,-mno-thumb-interwork,
)
endif
...
...
This diff is collapsed.
Click to expand it.
arch/arm/include/asm/io.h
浏览文件 @
f5137a45
...
...
@@ -37,6 +37,12 @@
#define isa_page_to_bus page_to_phys
#define isa_bus_to_virt phys_to_virt
/*
* Atomic MMIO-wide IO modify
*/
extern
void
atomic_io_modify
(
void
__iomem
*
reg
,
u32
mask
,
u32
set
);
extern
void
atomic_io_modify_relaxed
(
void
__iomem
*
reg
,
u32
mask
,
u32
set
);
/*
* Generic IO read/write. These perform native-endian accesses. Note
* that some architectures will want to re-define __raw_{read,write}w.
...
...
This diff is collapsed.
Click to expand it.
arch/arm/kernel/entry-armv.S
浏览文件 @
f5137a45
...
...
@@ -451,9 +451,11 @@ __und_usr_thumb:
.
arch
armv6t2
#endif
2
:
ldrht
r5
,
[
r4
]
ARM_BE8
(
rev16
r5
,
r5
)
@
little
endian
instruction
cmp
r5
,
#
0xe800
@
32
bit
instruction
if
xx
!=
0
blo
__und_usr_fault_16
@
16
bit
undefined
instruction
3
:
ldrht
r0
,
[
r2
]
ARM_BE8
(
rev16
r0
,
r0
)
@
little
endian
instruction
add
r2
,
r2
,
#
2
@
r2
is
PC
+
2
,
make
it
PC
+
4
str
r2
,
[
sp
,
#
S_PC
]
@
it
's a 2x16bit instr, update
orr
r0
,
r0
,
r5
,
lsl
#
16
...
...
This diff is collapsed.
Click to expand it.
arch/arm/kernel/head.S
浏览文件 @
f5137a45
...
...
@@ -52,7 +52,8 @@
.
equ
swapper_pg_dir
,
KERNEL_RAM_VADDR
-
PG_DIR_SIZE
.
macro
pgtbl
,
rd
,
phys
add
\
rd
,
\
phys
,
#
TEXT_OFFSET
-
PG_DIR_SIZE
add
\
rd
,
\
phys
,
#
TEXT_OFFSET
sub
\
rd
,
\
rd
,
#
PG_DIR_SIZE
.
endm
/*
...
...
This diff is collapsed.
Click to expand it.
arch/arm/kernel/io.c
浏览文件 @
f5137a45
#include <linux/export.h>
#include <linux/types.h>
#include <linux/io.h>
#include <linux/spinlock.h>
static
DEFINE_RAW_SPINLOCK
(
__io_lock
);
/*
* Generic atomic MMIO modify.
*
* Allows thread-safe access to registers shared by unrelated subsystems.
* The access is protected by a single MMIO-wide lock.
*/
void
atomic_io_modify_relaxed
(
void
__iomem
*
reg
,
u32
mask
,
u32
set
)
{
unsigned
long
flags
;
u32
value
;
raw_spin_lock_irqsave
(
&
__io_lock
,
flags
);
value
=
readl_relaxed
(
reg
)
&
~
mask
;
value
|=
(
set
&
mask
);
writel_relaxed
(
value
,
reg
);
raw_spin_unlock_irqrestore
(
&
__io_lock
,
flags
);
}
EXPORT_SYMBOL
(
atomic_io_modify_relaxed
);
void
atomic_io_modify
(
void
__iomem
*
reg
,
u32
mask
,
u32
set
)
{
unsigned
long
flags
;
u32
value
;
raw_spin_lock_irqsave
(
&
__io_lock
,
flags
);
value
=
readl_relaxed
(
reg
)
&
~
mask
;
value
|=
(
set
&
mask
);
writel
(
value
,
reg
);
raw_spin_unlock_irqrestore
(
&
__io_lock
,
flags
);
}
EXPORT_SYMBOL
(
atomic_io_modify
);
/*
* Copy data from IO memory space to "real" memory space.
...
...
This diff is collapsed.
Click to expand it.
arch/arm/mm/init.c
浏览文件 @
f5137a45
...
...
@@ -290,10 +290,11 @@ void __init arm_memblock_init(struct meminfo *mi,
#endif
#ifdef CONFIG_BLK_DEV_INITRD
/* FDT scan will populate initrd_start */
if
(
initrd_start
)
{
if
(
initrd_start
&&
!
phys_initrd_size
)
{
phys_initrd_start
=
__virt_to_phys
(
initrd_start
);
phys_initrd_size
=
initrd_end
-
initrd_start
;
}
initrd_start
=
initrd_end
=
0
;
if
(
phys_initrd_size
&&
!
memblock_is_region_memory
(
phys_initrd_start
,
phys_initrd_size
))
{
pr_err
(
"INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd
\n
"
,
...
...
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部