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 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
mm
/
tlb_nohash_low.S
diff --git
a/arch/powerpc/mm/tlb_nohash_low.S
b/arch/powerpc/mm/tlb_nohash_low.S
index
cfa7682
..
af405ee
100644
(file)
--- a/
arch/powerpc/mm/tlb_nohash_low.S
+++ b/
arch/powerpc/mm/tlb_nohash_low.S
@@
-200,6
+200,7
@@
_GLOBAL(_tlbivax_bcast)
rlwimi r5,r4,0,16,31
wrteei 0
mtspr SPRN_MMUCR,r5
rlwimi r5,r4,0,16,31
wrteei 0
mtspr SPRN_MMUCR,r5
+ isync
/* tlbivax 0,r3 - use .long to avoid binutils deps */
.long 0x7c000624 | (r3 << 11)
isync
/* tlbivax 0,r3 - use .long to avoid binutils deps */
.long 0x7c000624 | (r3 << 11)
isync
@@
-366,7
+367,7
@@
_GLOBAL(set_context)
#error Unsupported processor type !
#endif
#error Unsupported processor type !
#endif
-#if defined(CONFIG_
FSL_BOOK
E)
+#if defined(CONFIG_
PPC_FSL_BOOK3
E)
/*
* extern void loadcam_entry(unsigned int index)
*
/*
* extern void loadcam_entry(unsigned int index)
*