projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kvack.org/~bcrl/aio-fixes
[cascardo/linux.git]
/
arch
/
arm
/
mm
/
cache-nop.S
diff --git
a/arch/arm/mm/cache-nop.S
b/arch/arm/mm/cache-nop.S
index
8e12ddc
..
f1cc986
100644
(file)
--- a/
arch/arm/mm/cache-nop.S
+++ b/
arch/arm/mm/cache-nop.S
@@
-5,11
+5,12
@@
*/
#include <linux/linkage.h>
#include <linux/init.h>
*/
#include <linux/linkage.h>
#include <linux/init.h>
+#include <asm/assembler.h>
#include "proc-macros.S"
ENTRY(nop_flush_icache_all)
#include "proc-macros.S"
ENTRY(nop_flush_icache_all)
-
mov pc,
lr
+
ret
lr
ENDPROC(nop_flush_icache_all)
.globl nop_flush_kern_cache_all
ENDPROC(nop_flush_icache_all)
.globl nop_flush_kern_cache_all
@@
-29,7
+30,7
@@
ENDPROC(nop_flush_icache_all)
ENTRY(nop_coherent_user_range)
mov r0, 0
ENTRY(nop_coherent_user_range)
mov r0, 0
-
mov pc,
lr
+
ret
lr
ENDPROC(nop_coherent_user_range)
.globl nop_flush_kern_dcache_area
ENDPROC(nop_coherent_user_range)
.globl nop_flush_kern_dcache_area