diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 09:07:00 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 09:07:00 -0800 |
commit | e45521a8d44da2c4efd17fc8e853f7917e99b57a (patch) | |
tree | 71c95c906588e182b82a1ef45ca8dad3fc1a29f6 /arch/mips/kernel/smtc.c | |
parent | 79d26287021d3158e3cb8da820f1b8233564dd3b (diff) | |
parent | 2806ccd7ad9073f4f1a065b5672d7592e7838e97 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Delete duplicate call to load_irq_save.
[MIPS] SMTC: Fix cp0 hazard.
Diffstat (limited to 'arch/mips/kernel/smtc.c')
-rw-r--r-- | arch/mips/kernel/smtc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 802febed7df5..a8b387197d5b 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c @@ -261,6 +261,7 @@ void smtc_configure_tlb(void) } } write_c0_mvpcontrol(read_c0_mvpcontrol() | MVPCONTROL_STLB); + ehb(); /* * Setup kernel data structures to use software total, |