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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mm
/
proc-arm926.S
diff --git
a/arch/arm/mm/proc-arm926.S
b/arch/arm/mm/proc-arm926.S
index
44a7a65
..
5b80b6b
100644
(file)
--- a/
arch/arm/mm/proc-arm926.S
+++ b/
arch/arm/mm/proc-arm926.S
@@
-28,9
+28,9
@@
#include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h>
#include <linux/linkage.h>
#include <linux/init.h>
#include <asm/assembler.h>
+#include <asm/elf.h>
#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
-#include <asm/procinfo.h>
#include <asm/page.h>
#include <asm/ptrace.h>
#include "proc-macros.S"
#include <asm/page.h>
#include <asm/ptrace.h>
#include "proc-macros.S"
@@
-348,12
+348,12
@@
ENTRY(cpu_arm926_switch_mm)
mov pc, lr
/*
mov pc, lr
/*
- * cpu_arm926_set_pte
(ptep, pte
)
+ * cpu_arm926_set_pte
_ext(ptep, pte, ext
)
*
* Set a PTE and flush it out
*/
.align 5
*
* Set a PTE and flush it out
*/
.align 5
-ENTRY(cpu_arm926_set_pte)
+ENTRY(cpu_arm926_set_pte
_ext
)
#ifdef CONFIG_MMU
str r1, [r0], #-2048 @ linux version
#ifdef CONFIG_MMU
str r1, [r0], #-2048 @ linux version
@@
-439,7
+439,7
@@
arm926_processor_functions:
.word cpu_arm926_do_idle
.word cpu_arm926_dcache_clean_area
.word cpu_arm926_switch_mm
.word cpu_arm926_do_idle
.word cpu_arm926_dcache_clean_area
.word cpu_arm926_switch_mm
- .word cpu_arm926_set_pte
+ .word cpu_arm926_set_pte
_ext
.size arm926_processor_functions, . - arm926_processor_functions
.section ".rodata"
.size arm926_processor_functions, . - arm926_processor_functions
.section ".rodata"
@@
-480,7
+480,7
@@
__arm926_proc_info:
b __arm926_setup
.long cpu_arch_name
.long cpu_elf_name
b __arm926_setup
.long cpu_arch_name
.long cpu_elf_name
- .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_
VFP|HWCAP_
EDSP|HWCAP_JAVA
+ .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_JAVA
.long cpu_arm926_name
.long arm926_processor_functions
.long v4wbi_tlb_fns
.long cpu_arm926_name
.long arm926_processor_functions
.long v4wbi_tlb_fns