Subject: + mips-replace-config_mips64-and-config_mips32_r2.patch added to -mm tree
To: pebolle@xxxxxxxxxx,aaro.koskinen@xxxxxx,aba@xxxxxxxxx,chenhc@xxxxxxxxxx,linux@xxxxxxxxxxxx,paul.burton@xxxxxxxxxx,ralf@xxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 13 Mar 2014 14:58:05 -0700
The patch titled
Subject: mips: replace CONFIG_MIPS64 and CONFIG_MIPS32_R2
has been added to the -mm tree. Its filename is
mips-replace-config_mips64-and-config_mips32_r2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mips-replace-config_mips64-and-config_mips32_r2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mips-replace-config_mips64-and-config_mips32_r2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Paul Bolle <pebolle@xxxxxxxxxx>
Subject: mips: replace CONFIG_MIPS64 and CONFIG_MIPS32_R2
Commit 597ce1723e0f ("MIPS: Support for 64-bit FP with O32 binaries")
introduced references to two undefined Kconfig macros. CONFIG_MIPS32_R2
should clearly be replaced with CONFIG_CPU_MIPS32_R2. And CONFIG_MIPS64
should apparently be replaced with CONFIG_64BIT.
Signed-off-by: Paul Bolle <pebolle@xxxxxxxxxx>
Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx>
Tested-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Tested-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Paul Burton <paul.burton@xxxxxxxxxx>
Cc: Andreas Barth <aba@xxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/mips/include/asm/asmmacro.h | 4 ++--
arch/mips/include/asm/fpu.h | 2 +-
arch/mips/kernel/r4k_fpu.S | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff -puN arch/mips/include/asm/asmmacro.h~mips-replace-config_mips64-and-config_mips32_r2 arch/mips/include/asm/asmmacro.h
--- a/arch/mips/include/asm/asmmacro.h~mips-replace-config_mips64-and-config_mips32_r2
+++ a/arch/mips/include/asm/asmmacro.h
@@ -106,7 +106,7 @@
.endm
.macro fpu_save_double thread status tmp
-#if defined(CONFIG_MIPS64) || defined(CONFIG_CPU_MIPS32_R2)
+#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2)
sll \tmp, \status, 5
bgez \tmp, 10f
fpu_save_16odd \thread
@@ -159,7 +159,7 @@
.endm
.macro fpu_restore_double thread status tmp
-#if defined(CONFIG_MIPS64) || defined(CONFIG_CPU_MIPS32_R2)
+#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2)
sll \tmp, \status, 5
bgez \tmp, 10f # 16 register mode?
diff -puN arch/mips/include/asm/fpu.h~mips-replace-config_mips64-and-config_mips32_r2 arch/mips/include/asm/fpu.h
--- a/arch/mips/include/asm/fpu.h~mips-replace-config_mips64-and-config_mips32_r2
+++ a/arch/mips/include/asm/fpu.h
@@ -57,7 +57,7 @@ static inline int __enable_fpu(enum fpu_
return 0;
case FPU_64BIT:
-#if !(defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_MIPS64))
+#if !(defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_64BIT))
/* we only have a 32-bit FPU */
return SIGFPE;
#endif
diff -puN arch/mips/kernel/r4k_fpu.S~mips-replace-config_mips64-and-config_mips32_r2 arch/mips/kernel/r4k_fpu.S
--- a/arch/mips/kernel/r4k_fpu.S~mips-replace-config_mips64-and-config_mips32_r2
+++ a/arch/mips/kernel/r4k_fpu.S
@@ -35,9 +35,9 @@
LEAF(_save_fp_context)
cfc1 t1, fcr31
-#if defined(CONFIG_64BIT) || defined(CONFIG_MIPS32_R2)
+#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2)
.set push
-#ifdef CONFIG_MIPS32_R2
+#ifdef CONFIG_CPU_MIPS32_R2
.set mips64r2
mfc0 t0, CP0_STATUS
sll t0, t0, 5
@@ -148,9 +148,9 @@ LEAF(_save_fp_context32)
LEAF(_restore_fp_context)
EX lw t0, SC_FPC_CSR(a0)
-#if defined(CONFIG_64BIT) || defined(CONFIG_MIPS32_R2)
+#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2)
.set push
-#ifdef CONFIG_MIPS32_R2
+#ifdef CONFIG_CPU_MIPS32_R2
.set mips64r2
mfc0 t0, CP0_STATUS
sll t0, t0, 5
_
Patches currently in -mm which might be from pebolle@xxxxxxxxxx are
origin.patch
mips-replace-config_mips64-and-config_mips32_r2.patch
mips-fpu-fix-conflict-of-register-usage.patch
maintainers-update-ibm-serveraid-raid-info.patch
maintainers-mark-superh-orphan.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
