git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
head.S
diff --git
a/arch/arm/kernel/head.S
b/arch/arm/kernel/head.S
index
04b66a9
..
2242f5f
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>
@@
-24,14
+23,6
@@
#include <asm/thread_info.h>
#include <asm/system.h>
#include <asm/thread_info.h>
#include <asm/system.h>
-#define PROCINFO_MMUFLAGS 8
-#define PROCINFO_INITFUNC 12
-
-#define MACHINFO_TYPE 0
-#define MACHINFO_PHYSIO 4
-#define MACHINFO_PGOFFIO 8
-#define MACHINFO_NAME 12
-
#define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET)
/*
#define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET)
/*
@@
-79,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
@@
-112,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?
@@
-229,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
@@
-280,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