diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-01-25 10:46:21 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-01-25 10:46:21 -0800 |
| commit | 7e3b1207705c10ada363bbc7d0235730ce1f5b79 (patch) | |
| tree | cd1eb567acb4e72c1bdfbe8b59746c73b8627ee5 /arch/mips/mm/tlbex.c | |
| parent | 143c6fe3a415edf2dde3f507b3a00998b4c4001e (diff) | |
| parent | 20437f79f6627a31752f422688a6047c25cefcf1 (diff) | |
Merge branch 'enable-devices' into omap-for-v4.5/fixes
Diffstat (limited to 'arch/mips/mm/tlbex.c')
| -rw-r--r-- | arch/mips/mm/tlbex.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 32e0be27673f..5a04b6f5c6fb 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c @@ -240,9 +240,8 @@ static void output_pgtable_bits_defines(void) pr_define("_PAGE_MODIFIED_SHIFT %d\n", _PAGE_MODIFIED_SHIFT); #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT pr_define("_PAGE_HUGE_SHIFT %d\n", _PAGE_HUGE_SHIFT); - pr_define("_PAGE_SPLITTING_SHIFT %d\n", _PAGE_SPLITTING_SHIFT); #endif -#ifdef CONFIG_CPU_MIPSR2 +#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) if (cpu_has_rixi) { #ifdef _PAGE_NO_EXEC_SHIFT pr_define("_PAGE_NO_EXEC_SHIFT %d\n", _PAGE_NO_EXEC_SHIFT); |