git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[sfrench/cifs-2.6.git]
/
arch
/
microblaze
/
kernel
/
misc.S
diff --git
a/arch/microblaze/kernel/misc.S
b/arch/microblaze/kernel/misc.S
index 0fb5fc6c1fc24343777e8053706e746df8daa49d..206da3da361fa305843b1641e8627d0ffa3d3242 100644
(file)
--- a/
arch/microblaze/kernel/misc.S
+++ b/
arch/microblaze/kernel/misc.S
@@
-76,7
+76,7
@@
early_console_reg_tlb_alloc:
* the UARTs nice and early. We use a 4k real==virtual mapping.
*/
ori r4, r0, MICROBLAZE_TLB_SIZE - 1
- mts rtlbx, r4 /* TLB slot
2
*/
+ mts rtlbx, r4 /* TLB slot
63
*/
or r4,r5,r0
andi r4,r4,0xfffff000