summaryrefslogtreecommitdiffstats
path: root/arch/microblaze/kernel/misc.S
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-08-10 02:02:33 +0200
committerNeilBrown <neilb@suse.de>2010-08-10 02:02:33 +0200
commitfd8aa2c1811bf60ccb2d5de0579c6f62aec1772d (patch)
tree311567d03758afc3a93b4273fe172836e89bb01d /arch/microblaze/kernel/misc.S
parentmd: clean up do_md_stop (diff)
parentMerge branch 'async' of macbook:git/btrfs-unstable (diff)
downloadlinux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.tar.xz
linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.zip
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
Diffstat (limited to 'arch/microblaze/kernel/misc.S')
-rw-r--r--arch/microblaze/kernel/misc.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/misc.S b/arch/microblaze/kernel/misc.S
index 0fb5fc6c1fc2..206da3da361f 100644
--- 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