Patch "MIPS: Fix some missing CONFIG_CPU_MIPSR6 #ifdefs" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Mar 1, 2016

Subsystems (2)

Stable branch MIPS

lore

Share & tools

lore

[email protected]

author maintainer Applied

2016-03-01 19:10 UTC #0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: Fix some missing CONFIG_CPU_MIPSR6 #ifdefs

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-fix-some-missing-config_cpu_mipsr6-ifdefs.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 4f33f6c522948fffc345261896042b58dea23754 Mon Sep 17 00:00:00 2001

From: Huacai Chen <[email protected]>
Date: Thu, 21 Jan 2016 21:09:52 +0800
Subject: MIPS: Fix some missing CONFIG_CPU_MIPSR6 #ifdefs

From: Huacai Chen <[email protected]>

commit 4f33f6c522948fffc345261896042b58dea23754 upstream.

Commit be0c37c985eddc4 (MIPS: Rearrange PTE bits into fixed positions.) defines fixed PTE bits for MIPS R2. Then, commit d7b631419b3d230a4d383 (MIPS: pgtable-bits: Fix XPA damage to R6 definitions.) adds the MIPS R6 definitions in the same way as MIPS R2. But some R6 #ifdefs in the later commit are missing, so in this patch I fix that.

Signed-off-by Huacai Chen <[email protected]>

Cc Aurelien Jarno <[email protected]>

Cc Steven J. Hill <[email protected]>

Cc Fuxin Zhang <[email protected]>

Cc Zhangjin Wu <[email protected]>

Cc [email protected]

Patchwork: https://patchwork.linux-mips.org/patch/12164/

Signed-off-by Ralf Baechle <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 arch/mips/include/asm/pgtable.h |    4 ++--
 arch/mips/mm/tlbex.c            |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

arch/mips/include/asm/pgtable.h +2 -2

@@ -353,7 +353,7 @@ static inline pte_t pte_mkdirty(pte_t pt
 static inline pte_t pte_mkyoung(pte_t pte)
 {
 	pte_val(pte) |= _PAGE_ACCESSED;
-#ifdef CONFIG_CPU_MIPSR2
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
 	if (!(pte_val(pte) & _PAGE_NO_READ))
 		pte_val(pte) |= _PAGE_SILENT_READ;
 	else

@@ -560,7 +560,7 @@ static inline pmd_t pmd_mkyoung(pmd_t pm
 {
 	pmd_val(pmd) |= _PAGE_ACCESSED;
 
-#ifdef CONFIG_CPU_MIPSR2
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
 	if (!(pmd_val(pmd) & _PAGE_NO_READ))
 		pmd_val(pmd) |= _PAGE_SILENT_READ;
 	else

arch/mips/mm/tlbex.c +1 -1

@@ -242,7 +242,7 @@ static void output_pgtable_bits_defines(
 	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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/mips-loongson-3-fix-smp_ask_c0count-ipi-handler.patch queue-4.4/mips-hpet-choose-a-safe-value-for-the-etime-check.patch queue-4.4/mips-fix-some-missing-config_cpu_mipsr6-ifdefs.patch