mips patch fixes

diff --git a/queue-3.10/mips-export-fp-functions-used-by-lose_fpu-1-for-kvm.patch b/queue-3.10/mips-export-fp-functions-used-by-lose_fpu-1-for-kvm.patch
index a577681ff2dfff6fd163d1e0a805765b2a394332..1304a80a92b23d2453f81d9f764e1007f476b7b4 100644 (file)
--- a/queue-3.10/mips-export-fp-functions-used-by-lose_fpu-1-for-kvm.patch
+++ b/queue-3.10/mips-export-fp-functions-used-by-lose_fpu-1-for-kvm.patch
@@ -25,11 +25,15 @@ Cc: kvm@vger.kernel.org
 Cc: linux-mips@linux-mips.org
 Patchwork: https://patchwork.linux-mips.org/patch/9260/
 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+[james.hogan@imgtec.com: Only export when CPU_R4K_FPU=y prior to v3.16,
+ so as not to break the Octeon build which excludes FPU support. KVM
+ depends on MIPS32r2 anyway.]
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- arch/mips/kernel/mips_ksyms.c |    6 ++++++
- 1 file changed, 6 insertions(+)
+ arch/mips/kernel/mips_ksyms.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 --- a/arch/mips/kernel/mips_ksyms.c
 +++ b/arch/mips/kernel/mips_ksyms.c
@@ -41,13 +45,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  extern void *__bzero(void *__s, size_t __count);
  extern long __strncpy_from_user_nocheck_asm(char *__to,
-@@ -26,6 +27,11 @@ extern long __strnlen_user_nocheck_asm(c
+@@ -26,6 +27,13 @@ extern long __strnlen_user_nocheck_asm(c
  extern long __strnlen_user_asm(const char *s);
  
  /*
 + * Core architecture code
 + */
++#ifdef CONFIG_CPU_R4K_FPU
 +EXPORT_SYMBOL_GPL(_save_fp);
++#endif
 +
 +/*
   * String functions

diff --git a/queue-3.14/mips-export-fp-functions-used-by-lose_fpu-1-for-kvm.patch b/queue-3.14/mips-export-fp-functions-used-by-lose_fpu-1-for-kvm.patch
index a577681ff2dfff6fd163d1e0a805765b2a394332..1304a80a92b23d2453f81d9f764e1007f476b7b4 100644 (file)
--- a/queue-3.14/mips-export-fp-functions-used-by-lose_fpu-1-for-kvm.patch
+++ b/queue-3.14/mips-export-fp-functions-used-by-lose_fpu-1-for-kvm.patch
@@ -25,11 +25,15 @@ Cc: kvm@vger.kernel.org
 Cc: linux-mips@linux-mips.org
 Patchwork: https://patchwork.linux-mips.org/patch/9260/
 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+[james.hogan@imgtec.com: Only export when CPU_R4K_FPU=y prior to v3.16,
+ so as not to break the Octeon build which excludes FPU support. KVM
+ depends on MIPS32r2 anyway.]
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- arch/mips/kernel/mips_ksyms.c |    6 ++++++
- 1 file changed, 6 insertions(+)
+ arch/mips/kernel/mips_ksyms.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 --- a/arch/mips/kernel/mips_ksyms.c
 +++ b/arch/mips/kernel/mips_ksyms.c
@@ -41,13 +45,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  extern void *__bzero(void *__s, size_t __count);
  extern long __strncpy_from_user_nocheck_asm(char *__to,
-@@ -26,6 +27,11 @@ extern long __strnlen_user_nocheck_asm(c
+@@ -26,6 +27,13 @@ extern long __strnlen_user_nocheck_asm(c
  extern long __strnlen_user_asm(const char *s);
  
  /*
 + * Core architecture code
 + */
++#ifdef CONFIG_CPU_R4K_FPU
 +EXPORT_SYMBOL_GPL(_save_fp);
++#endif
 +
 +/*
   * String functions