Commit 76efaa97 authored by Russell King's avatar Russell King

[ARM PATCH] 1426/1: Remove rambase from head.S

Patch from Dirk Behme

Cleanup arch/arm/kernel/head.S a little bit by removing the unused rambase from pgtbl and krnladr macros.
parent 82d9f062
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
.globl swapper_pg_dir .globl swapper_pg_dir
.equ swapper_pg_dir, TEXTADDR - 0x4000 .equ swapper_pg_dir, TEXTADDR - 0x4000
.macro pgtbl, reg, rambase .macro pgtbl, reg
adr \reg, stext adr \reg, stext
sub \reg, \reg, #0x4000 sub \reg, \reg, #0x4000
.endm .endm
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
* can convert the page table base address to the base address of the section * can convert the page table base address to the base address of the section
* containing both. * containing both.
*/ */
.macro krnladr, rd, pgtable, rambase .macro krnladr, rd, pgtable
bic \rd, \pgtable, #0x000ff000 bic \rd, \pgtable, #0x000ff000
.endm .endm
...@@ -164,7 +164,7 @@ __mmap_switched: ...@@ -164,7 +164,7 @@ __mmap_switched:
* r8 = page table flags * r8 = page table flags
*/ */
__create_page_tables: __create_page_tables:
pgtbl r4, r5 @ page table address pgtbl r4 @ page table address
/* /*
* Clear the 16K level 1 swapper page table * Clear the 16K level 1 swapper page table
...@@ -184,7 +184,7 @@ __create_page_tables: ...@@ -184,7 +184,7 @@ __create_page_tables:
* cater for the MMU enable. This identity mapping * cater for the MMU enable. This identity mapping
* will be removed by paging_init() * will be removed by paging_init()
*/ */
krnladr r2, r4, r5 @ start of kernel krnladr r2, r4 @ start of kernel
add r3, r8, r2 @ flags + kernel base add r3, r8, r2 @ flags + kernel base
str r3, [r4, r2, lsr #18] @ identity mapping str r3, [r4, r2, lsr #18] @ identity mapping
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment