diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /include/asm-mips/mipsregs.h | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-mips/mipsregs.h')
| -rw-r--r-- | include/asm-mips/mipsregs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-mips/mipsregs.h b/include/asm-mips/mipsregs.h index 5af7517fce8a..98b68089aa53 100644 --- a/include/asm-mips/mipsregs.h +++ b/include/asm-mips/mipsregs.h | |||
| @@ -1451,12 +1451,10 @@ static inline void __emt(unsigned int previous) | |||
| 1451 | { | 1451 | { |
| 1452 | if ((previous & __EMT_ENABLE)) | 1452 | if ((previous & __EMT_ENABLE)) |
| 1453 | __asm__ __volatile__( | 1453 | __asm__ __volatile__( |
| 1454 | " .set noreorder \n" | ||
| 1455 | " .set mips32r2 \n" | 1454 | " .set mips32r2 \n" |
| 1456 | " .word 0x41600be1 # emt \n" | 1455 | " .word 0x41600be1 # emt \n" |
| 1457 | " ehb \n" | 1456 | " ehb \n" |
| 1458 | " .set mips0 \n" | 1457 | " .set mips0 \n"); |
| 1459 | " .set reorder \n"); | ||
| 1460 | } | 1458 | } |
| 1461 | 1459 | ||
| 1462 | static inline void __ehb(void) | 1460 | static inline void __ehb(void) |