diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-06 10:29:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-06 10:29:33 -0700 |
commit | dadde13ad86bf45bc71f0663a6ce3dfe5dd4ecc5 (patch) | |
tree | 8dd0a19bc2fd65e05fe7678babbd9a95e53d727b /include/asm-mips/mipsregs.h | |
parent | 23c1fb52961bc24bd3a8078eefc49eed533b2b38 (diff) | |
parent | 4b3e975e4a06f1710693c5aa51b8f98facfa9863 (diff) | |
download | kernel-crypto-dadde13ad86bf45bc71f0663a6ce3dfe5dd4ecc5.tar.gz kernel-crypto-dadde13ad86bf45bc71f0663a6ce3dfe5dd4ecc5.tar.xz kernel-crypto-dadde13ad86bf45bc71f0663a6ce3dfe5dd4ecc5.zip |
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] Fix scheduling latency issue on 24K, 34K and 74K cores
[MIPS] Add macros to encode processor revisions.
[MIPS] RM7000: Enable ICACHE_REFILLS_WORKAROUND_WAR.
[MIPS] SMTC: Fix cut'n'paste bug in Kconfig.debug
[MIPS] Change libgcc-style functions from lib-y to obj-y
[MIPS] Fix timer/performance interrupt detection
[MIPS] AP/SP: Avoid triggering the 34K E125 performance issue
[MIPS] 64-bit TO_PHYS_MASK macro for RM9000 processors
Diffstat (limited to 'include/asm-mips/mipsregs.h')
-rw-r--r-- | include/asm-mips/mipsregs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-mips/mipsregs.h b/include/asm-mips/mipsregs.h index 9985cb7c16e..89c81922d47 100644 --- a/include/asm-mips/mipsregs.h +++ b/include/asm-mips/mipsregs.h @@ -534,6 +534,8 @@ #define MIPS_CONF3_LPA (_ULCAST_(1) << 7) #define MIPS_CONF3_DSP (_ULCAST_(1) << 10) +#define MIPS_CONF7_WII (_ULCAST_(1) << 31) + /* * Bits in the MIPS32/64 coprocessor 1 (FPU) revision register. */ |