From: Greg Kroah-Hartman Date: Fri, 6 Mar 2015 06:30:43 +0000 (-0800) Subject: mips patch fixes X-Git-Tag: v3.10.71~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23117c097cc74df75c591ac57d89d322c619ca5f;p=thirdparty%2Fkernel%2Fstable-queue.git 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 a577681ff2d..1304a80a92b 100644 --- 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 +[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 Signed-off-by: Greg Kroah-Hartman --- - 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 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 a577681ff2d..1304a80a92b 100644 --- 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 +[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 Signed-off-by: Greg Kroah-Hartman --- - 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 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