projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[linux-block.git]
/
arch
/
arm
/
mm
/
proc-xscale.S
diff --git
a/arch/arm/mm/proc-xscale.S
b/arch/arm/mm/proc-xscale.S
index e766f889bfd6d1b4159c6724a975468dbba56892..d19b1cfcad91e69934945d180c404298c33c2287 100644
(file)
--- a/
arch/arm/mm/proc-xscale.S
+++ b/
arch/arm/mm/proc-xscale.S
@@
-558,8
+558,6
@@
ENTRY(cpu_xscale_do_resume)
ENDPROC(cpu_xscale_do_resume)
#endif
- __CPUINIT
-
.type __xscale_setup, #function
__xscale_setup:
mcr p15, 0, ip, c7, c7, 0 @ invalidate I, D caches & BTB