git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
arm
/
kernel
/
head.S
diff --git
a/arch/arm/kernel/head.S
b/arch/arm/kernel/head.S
index
04f7344
..
5365d4e
100644
(file)
--- a/
arch/arm/kernel/head.S
+++ b/
arch/arm/kernel/head.S
@@
-11,7
+11,6
@@
*
* Kernel startup code for all 32-bit CPUs
*/
*
* Kernel startup code for all 32-bit CPUs
*/
-#include <linux/config.h>
#include <linux/linkage.h>
#include <linux/init.h>
#include <linux/linkage.h>
#include <linux/init.h>
@@
-71,7
+70,7
@@
__INIT
.type stext, %function
ENTRY(stext)
__INIT
.type stext, %function
ENTRY(stext)
- msr cpsr_c, #PSR_F_BIT | PSR_I_BIT |
MODE_SVC
@ ensure svc mode
+ msr cpsr_c, #PSR_F_BIT | PSR_I_BIT |
SVC_MODE
@ ensure svc mode
@ and irqs disabled
mrc p15, 0, r9, c0, c0 @ get processor id
bl __lookup_processor_type @ r5=procinfo r9=cpuid
@ and irqs disabled
mrc p15, 0, r9, c0, c0 @ get processor id
bl __lookup_processor_type @ r5=procinfo r9=cpuid
@@
-104,7
+103,7
@@
ENTRY(secondary_startup)
* the processor type - there is no need to check the machine type
* as it has already been validated by the primary processor.
*/
* the processor type - there is no need to check the machine type
* as it has already been validated by the primary processor.
*/
- msr cpsr_c, #PSR_F_BIT | PSR_I_BIT |
MODE_SVC
+ msr cpsr_c, #PSR_F_BIT | PSR_I_BIT |
SVC_MODE
mrc p15, 0, r9, c0, c0 @ get processor id
bl __lookup_processor_type
movs r10, r5 @ invalid processor?
mrc p15, 0, r9, c0, c0 @ get processor id
bl __lookup_processor_type
movs r10, r5 @ invalid processor?
@@
-115,18
+114,18
@@
ENTRY(secondary_startup)
* Use the page tables supplied from __cpu_up.
*/
adr r4, __secondary_data
* Use the page tables supplied from __cpu_up.
*/
adr r4, __secondary_data
- ldmia r4, {r5, r
6
, r13} @ address to jump to after
+ ldmia r4, {r5, r
7
, r13} @ address to jump to after
sub r4, r4, r5 @ mmu has been enabled
sub r4, r4, r5 @ mmu has been enabled
- ldr r4, [r
6
, r4] @ get secondary_data.pgdir
+ ldr r4, [r
7
, r4] @ get secondary_data.pgdir
adr lr, __enable_mmu @ return address
adr lr, __enable_mmu @ return address
- add pc, r10, #
12
@ initialise processor
+ add pc, r10, #
PROCINFO_INITFUNC
@ initialise processor
@ (return control reg)
/*
* r6 = &secondary_data
*/
ENTRY(__secondary_switched)
@ (return control reg)
/*
* r6 = &secondary_data
*/
ENTRY(__secondary_switched)
- ldr sp, [r
6
, #4] @ get secondary_data.stack
+ ldr sp, [r
7
, #4] @ get secondary_data.stack
mov fp, #0
b secondary_start_kernel
mov fp, #0
b secondary_start_kernel
@@
-221,7
+220,7
@@
__create_page_tables:
teq r0, r6
bne 1b
teq r0, r6
bne 1b
- ldr r7, [r10, #PROCINFO_MM
UFLAGS] @
mmuflags
+ ldr r7, [r10, #PROCINFO_MM
_MMUFLAGS] @ mm_
mmuflags
/*
* Create identity mapping for first MB of kernel to
/*
* Create identity mapping for first MB of kernel to
@@
-272,8
+271,7
@@
__create_page_tables:
#endif
#ifdef CONFIG_DEBUG_LL
#endif
#ifdef CONFIG_DEBUG_LL
- bic r7, r7, #0x0c @ turn off cacheable
- @ and bufferable bits
+ ldr r7, [r10, #PROCINFO_IO_MMUFLAGS] @ io_mmuflags
/*
* Map in IO space for serial debugging.
* This allows debug messages to be output
/*
* Map in IO space for serial debugging.
* This allows debug messages to be output