From: Greg Kroah-Hartman Date: Fri, 5 Jul 2019 16:18:13 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v5.1.17~24 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7247e4386435f9c50a4f53e6b61b9fa430fda95;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: arc-handle-gcc-generated-__builtin_trap-for-older-compiler.patch --- diff --git a/queue-4.4/arc-handle-gcc-generated-__builtin_trap-for-older-compiler.patch b/queue-4.4/arc-handle-gcc-generated-__builtin_trap-for-older-compiler.patch new file mode 100644 index 00000000000..7d694b14ca3 --- /dev/null +++ b/queue-4.4/arc-handle-gcc-generated-__builtin_trap-for-older-compiler.patch @@ -0,0 +1,37 @@ +From af1be2e21203867cb958aaceed5366e2e24b88e8 Mon Sep 17 00:00:00 2001 +From: Vineet Gupta +Date: Fri, 8 Dec 2017 08:45:57 -0800 +Subject: ARC: handle gcc generated __builtin_trap for older compiler + +From: Vineet Gupta + +commit af1be2e21203867cb958aaceed5366e2e24b88e8 upstream. + +ARC gcc prior to GNU 2018.03 release didn't have a target specific +__builtin_trap() implementation, generating default abort() call. + +Implement the abort() call - emulating what newer gcc does for the same, +as suggested by Arnd. + +Acked-by: Arnd Bergmann +Signed-off-by: Vineet Gupta +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arc/kernel/traps.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/arch/arc/kernel/traps.c ++++ b/arch/arc/kernel/traps.c +@@ -155,3 +155,11 @@ void do_insterror_or_kprobe(unsigned lon + + insterror_is_error(address, regs); + } ++ ++/* ++ * abort() call generated by older gcc for __builtin_trap() ++ */ ++void abort(void) ++{ ++ __asm__ __volatile__("trap_s 5\n"); ++} diff --git a/queue-4.4/series b/queue-4.4/series index 1ff0e7d06a6..d716e137881 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -67,3 +67,4 @@ alsa-usb-audio-fix-sign-unintended-sign-extension-on-left-shifts.patch lib-mpi-fix-karactx-leak-in-mpi_powm.patch btrfs-ensure-replaced-device-doesn-t-have-pending-chunk-allocation.patch tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch +arc-handle-gcc-generated-__builtin_trap-for-older-compiler.patch