Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
8d717a52
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
154
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,发现更多精彩内容 >>
提交
8d717a52
编写于
5月 22, 2010
作者:
R
Russell King
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ARM: Convert platform reservations to use LMB rather than bootmem
Signed-off-by:
N
Russell King
<
rmk+kernel@arm.linux.org.uk
>
上级
2778f620
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
32 addition
and
31 deletion
+32
-31
arch/arm/include/asm/memblock.h
arch/arm/include/asm/memblock.h
+2
-1
arch/arm/kernel/setup.c
arch/arm/kernel/setup.c
+1
-1
arch/arm/mach-clps711x/edb7211-arch.c
arch/arm/mach-clps711x/edb7211-arch.c
+2
-2
arch/arm/mach-integrator/core.c
arch/arm/mach-integrator/core.c
+2
-2
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmt5.c
+2
-2
arch/arm/mach-pxa/palmtreo.c
arch/arm/mach-pxa/palmtreo.c
+3
-3
arch/arm/mach-s3c2410/mach-h1940.c
arch/arm/mach-s3c2410/mach-h1940.c
+3
-3
arch/arm/mach-s3c2440/mach-rx1950.c
arch/arm/mach-s3c2440/mach-rx1950.c
+3
-3
arch/arm/mach-s3c2440/mach-rx3715.c
arch/arm/mach-s3c2440/mach-rx3715.c
+3
-3
arch/arm/mach-u300/u300.c
arch/arm/mach-u300/u300.c
+2
-2
arch/arm/mm/init.c
arch/arm/mm/init.c
+6
-5
arch/arm/mm/mm.h
arch/arm/mm/mm.h
+1
-2
arch/arm/mm/mmu.c
arch/arm/mm/mmu.c
+1
-1
arch/arm/mm/nommu.c
arch/arm/mm/nommu.c
+1
-1
未找到文件。
arch/arm/include/asm/memblock.h
浏览文件 @
8d717a52
...
...
@@ -9,7 +9,8 @@ extern phys_addr_t lowmem_end_addr;
#endif
struct
meminfo
;
struct
machine_desc
;
extern
void
arm_memblock_init
(
struct
meminfo
*
);
extern
void
arm_memblock_init
(
struct
meminfo
*
,
struct
machine_desc
*
);
#endif
arch/arm/kernel/setup.c
浏览文件 @
8d717a52
...
...
@@ -716,7 +716,7 @@ void __init setup_arch(char **cmdline_p)
parse_early_param
();
arm_memblock_init
(
&
meminfo
);
arm_memblock_init
(
&
meminfo
,
mdesc
);
paging_init
(
mdesc
);
request_standard_resources
(
&
meminfo
,
mdesc
);
...
...
arch/arm/mach-clps711x/edb7211-arch.c
浏览文件 @
8d717a52
...
...
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/init.h>
#include <linux/
bootmem
.h>
#include <linux/
memblock
.h>
#include <linux/types.h>
#include <linux/string.h>
...
...
@@ -33,7 +33,7 @@ extern void edb7211_map_io(void);
/* Reserve screen memory region at the start of main system memory. */
static
void
__init
edb7211_reserve
(
void
)
{
reserve_bootmem
(
PHYS_OFFSET
,
0x00020000
,
BOOTMEM_DEFAULT
);
memblock_reserve
(
PHYS_OFFSET
,
0x00020000
);
}
static
void
__init
...
...
arch/arm/mach-integrator/core.c
浏览文件 @
8d717a52
...
...
@@ -14,7 +14,7 @@
#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/
bootmem
.h>
#include <linux/
memblock
.h>
#include <linux/sched.h>
#include <linux/smp.h>
#include <linux/termios.h>
...
...
@@ -225,5 +225,5 @@ EXPORT_SYMBOL(cm_control);
*/
void
__init
integrator_reserve
(
void
)
{
reserve_bootmem
(
PHYS_OFFSET
,
__pa
(
swapper_pg_dir
)
-
PHYS_OFFSET
,
BOOTMEM_DEFAUL
T
);
memblock_reserve
(
PHYS_OFFSET
,
__pa
(
swapper_pg_dir
)
-
PHYS_OFFSE
T
);
}
arch/arm/mach-pxa/palmt5.c
浏览文件 @
8d717a52
...
...
@@ -21,7 +21,7 @@
#include <linux/irq.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
#include <linux/
bootmem
.h>
#include <linux/
memblock
.h>
#include <linux/pda_power.h>
#include <linux/pwm_backlight.h>
#include <linux/gpio.h>
...
...
@@ -399,7 +399,7 @@ static void __init palmt5_udc_init(void)
static
void
__init
palmt5_reserve
(
void
)
{
reserve_bootmem
(
0xa0200000
,
0x1000
,
BOOTMEM_EXCLUSIVE
);
memblock_reserve
(
0xa0200000
,
0x1000
);
}
static
void
__init
palmt5_init
(
void
)
...
...
arch/arm/mach-pxa/palmtreo.c
浏览文件 @
8d717a52
...
...
@@ -20,7 +20,7 @@
#include <linux/irq.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
#include <linux/
bootmem
.h>
#include <linux/
memblock
.h>
#include <linux/pda_power.h>
#include <linux/pwm_backlight.h>
#include <linux/gpio.h>
...
...
@@ -636,8 +636,8 @@ static void __init treo_lcd_power_init(void)
static
void
__init
treo_reserve
(
void
)
{
reserve_bootmem
(
0xa0000000
,
0x1000
,
BOOTMEM_EXCLUSIVE
);
reserve_bootmem
(
0xa2000000
,
0x1000
,
BOOTMEM_EXCLUSIVE
);
memblock_reserve
(
0xa0000000
,
0x1000
);
memblock_reserve
(
0xa2000000
,
0x1000
);
}
static
void
__init
treo_init
(
void
)
...
...
arch/arm/mach-s3c2410/mach-h1940.c
浏览文件 @
8d717a52
...
...
@@ -15,7 +15,7 @@
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/list.h>
#include <linux/
bootmem
.h>
#include <linux/
memblock
.h>
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/sysdev.h>
...
...
@@ -308,8 +308,8 @@ static void __init h1940_map_io(void)
/* H1940 and RX3715 need to reserve this for suspend */
static
void
__init
h1940_reserve
(
void
)
{
reserve_bootmem
(
0x30003000
,
0x1000
,
BOOTMEM_DEFAULT
);
reserve_bootmem
(
0x30081000
,
0x1000
,
BOOTMEM_DEFAULT
);
memblock_reserve
(
0x30003000
,
0x1000
);
memblock_reserve
(
0x30081000
,
0x1000
);
}
static
void
__init
h1940_init_irq
(
void
)
...
...
arch/arm/mach-s3c2440/mach-rx1950.c
浏览文件 @
8d717a52
...
...
@@ -15,7 +15,7 @@
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/list.h>
#include <linux/
bootmem
.h>
#include <linux/
memblock
.h>
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/init.h>
...
...
@@ -574,8 +574,8 @@ static void __init rx1950_init_machine(void)
/* H1940 and RX3715 need to reserve this for suspend */
static
void
__init
rx1950_reserve
(
void
)
{
reserve_bootmem
(
0x30003000
,
0x1000
,
BOOTMEM_DEFAULT
);
reserve_bootmem
(
0x30081000
,
0x1000
,
BOOTMEM_DEFAULT
);
memblock_reserve
(
0x30003000
,
0x1000
);
memblock_reserve
(
0x30081000
,
0x1000
);
}
MACHINE_START
(
RX1950
,
"HP iPAQ RX1950"
)
...
...
arch/arm/mach-s3c2440/mach-rx3715.c
浏览文件 @
8d717a52
...
...
@@ -15,7 +15,7 @@
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/list.h>
#include <linux/
bootmem
.h>
#include <linux/
memblock
.h>
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/tty.h>
...
...
@@ -195,8 +195,8 @@ static void __init rx3715_map_io(void)
/* H1940 and RX3715 need to reserve this for suspend */
static
void
__init
rx3715_reserve
(
void
)
{
reserve_bootmem
(
0x30003000
,
0x1000
,
BOOTMEM_DEFAULT
);
reserve_bootmem
(
0x30081000
,
0x1000
,
BOOTMEM_DEFAULT
);
memblock_reserve
(
0x30003000
,
0x1000
);
memblock_reserve
(
0x30081000
,
0x1000
);
}
static
void
__init
rx3715_init_irq
(
void
)
...
...
arch/arm/mach-u300/u300.c
浏览文件 @
8d717a52
...
...
@@ -14,7 +14,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/
bootmem
.h>
#include <linux/
memblock
.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <mach/hardware.h>
...
...
@@ -33,7 +33,7 @@ static void __init u300_reserve(void)
#ifdef CONFIG_MACH_U300_SINGLE_RAM
#if ((CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1) == 1) && \
CONFIG_MACH_U300_2MB_ALIGNMENT_FIX
reserve_bootmem
(
PHYS_OFFSET
,
0x00100000
,
BOOTMEM_DEFAULT
);
memblock_reserve
(
PHYS_OFFSET
,
0x00100000
);
#endif
#endif
}
...
...
arch/arm/mm/init.c
浏览文件 @
8d717a52
...
...
@@ -271,7 +271,7 @@ static void arm_memory_present(struct meminfo *mi)
}
#endif
void
__init
arm_memblock_init
(
struct
meminfo
*
mi
)
void
__init
arm_memblock_init
(
struct
meminfo
*
mi
,
struct
machine_desc
*
mdesc
)
{
int
i
;
...
...
@@ -297,11 +297,15 @@ void __init arm_memblock_init(struct meminfo *mi)
arm_mm_memblock_reserve
();
/* reserve any platform specific memblock areas */
if
(
mdesc
->
reserve
)
mdesc
->
reserve
();
memblock_analyze
();
memblock_dump_all
();
}
void
__init
bootmem_init
(
struct
machine_desc
*
mdesc
)
void
__init
bootmem_init
(
void
)
{
struct
meminfo
*
mi
=
&
meminfo
;
unsigned
long
min
,
max_low
,
max_high
;
...
...
@@ -312,9 +316,6 @@ void __init bootmem_init(struct machine_desc *mdesc)
arm_bootmem_init
(
mi
,
min
,
max_low
);
if
(
mdesc
->
reserve
)
mdesc
->
reserve
();
/*
* Sparsemem tries to allocate bootmem in memory_present(),
* so must be done after the fixed reservations
...
...
arch/arm/mm/mm.h
浏览文件 @
8d717a52
...
...
@@ -28,6 +28,5 @@ extern void __flush_dcache_page(struct address_space *mapping, struct page *page
#endif
struct
machine_desc
;
void
__init
bootmem_init
(
struct
machine_desc
*
);
void
__init
bootmem_init
(
void
);
void
arm_mm_memblock_reserve
(
void
);
arch/arm/mm/mmu.c
浏览文件 @
8d717a52
...
...
@@ -1006,7 +1006,7 @@ void __init paging_init(struct machine_desc *mdesc)
/* allocate the zero page. */
zero_page
=
early_alloc
(
PAGE_SIZE
);
bootmem_init
(
mdesc
);
bootmem_init
();
empty_zero_page
=
virt_to_page
(
zero_page
);
__flush_dcache_page
(
NULL
,
empty_zero_page
);
...
...
arch/arm/mm/nommu.c
浏览文件 @
8d717a52
...
...
@@ -33,7 +33,7 @@ void __init arm_mm_memblock_reserve(void)
*/
void
__init
paging_init
(
struct
machine_desc
*
mdesc
)
{
bootmem_init
(
mdesc
);
bootmem_init
();
}
/*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录