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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
mm
/
proc-arm1020.S
diff --git
a/arch/arm/mm/proc-arm1020.S
b/arch/arm/mm/proc-arm1020.S
index
1f32523
..
9595888
100644
(file)
--- a/
arch/arm/mm/proc-arm1020.S
+++ b/
arch/arm/mm/proc-arm1020.S
@@
-28,11
+28,11
@@
#include <linux/config.h>
#include <linux/init.h>
#include <asm/assembler.h>
#include <linux/config.h>
#include <linux/init.h>
#include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
+#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
#include <asm/procinfo.h>
#include <asm/ptrace.h>
#include <asm/pgtable.h>
#include <asm/procinfo.h>
#include <asm/ptrace.h>
-#include <asm/hardware.h>
/*
* This is the maximum size of an area which will be invalidated
/*
* This is the maximum size of an area which will be invalidated
@@
-445,14
+445,14
@@
__arm1020_setup:
/*
* R
* .RVI ZFRS BLDP WCAM
/*
* R
* .RVI ZFRS BLDP WCAM
- * .0
.1 1001 ..11 0101 /* FIXME: why no V bit? */
+ * .0
11 1001 ..11 0101
*/
.type arm1020_cr1_clear, #object
.type arm1020_cr1_set, #object
arm1020_cr1_clear:
.word 0x593f
arm1020_cr1_set:
*/
.type arm1020_cr1_clear, #object
.type arm1020_cr1_set, #object
arm1020_cr1_clear:
.word 0x593f
arm1020_cr1_set:
- .word 0x
1
935
+ .word 0x
3
935
__INITDATA
__INITDATA
@@
-509,7
+509,7
@@
cpu_arm1020_name:
.align
.align
- .section ".proc.info", #alloc, #execinstr
+ .section ".proc.info
.init
", #alloc, #execinstr
.type __arm1020_proc_info,#object
__arm1020_proc_info:
.type __arm1020_proc_info,#object
__arm1020_proc_info: