diff options
author | Linus Torvalds | 2016-11-27 17:22:59 +0100 |
---|---|---|
committer | Linus Torvalds | 2016-11-27 17:22:59 +0100 |
commit | ff17bf8a0d2d60a343db304b835c0e83efa660d9 (patch) | |
tree | 7781eb9ef0c122bd548149695f7d2b20751ce0b0 /arch/mips/include/asm/mipsregs.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
parent | MIPS: mm: Fix output of __do_page_fault (diff) | |
download | kernel-qcow2-linux-ff17bf8a0d2d60a343db304b835c0e83efa660d9.tar.gz kernel-qcow2-linux-ff17bf8a0d2d60a343db304b835c0e83efa660d9.tar.xz kernel-qcow2-linux-ff17bf8a0d2d60a343db304b835c0e83efa660d9.zip |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"Another round of MIPS fixes for 4.9:
- Fix unreadable output in __do_page_fault due to the KERN_CONT
patchset
- Correctly handle MIPS R6 fixes to the c0_wired register"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: mm: Fix output of __do_page_fault
MIPS: Mask out limit field when calculating wired entry count
Diffstat (limited to 'arch/mips/include/asm/mipsregs.h')
-rw-r--r-- | arch/mips/include/asm/mipsregs.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h index 7dd2dd47909a..df78b2ca70eb 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h @@ -215,6 +215,12 @@ #endif /* + * Wired register bits + */ +#define MIPSR6_WIRED_LIMIT (_ULCAST_(0xffff) << 16) +#define MIPSR6_WIRED_WIRED (_ULCAST_(0xffff) << 0) + +/* * Values used for computation of new tlb entries */ #define PL_4K 12 |