summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-06-28 08:31:57 +0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-06-28 08:31:57 +0800
commit139ca258055057e64d59ec92b6fd1ad3ca3a9fbc (patch)
treebe958e05a82256227f79f4ae397f847dcc391495
parentc84afab02c311b08b5cb8ea758cc177f81c95d11 (diff)
parent19e5e2ae9c883f5651eaaeab2f258e2c4b78fda3 (diff)
Merge tag 'csky-for-linus-5.2-fixup-gcc-unwind' of git://github.com/c-sky/csky-linux
Pull arch/csky fixup from Guo Ren: "A fixup patch for rt_sigframe in signal.c" * tag 'csky-for-linus-5.2-fixup-gcc-unwind' of git://github.com/c-sky/csky-linux: csky: Fixup libgcc unwind error
-rw-r--r--arch/csky/kernel/signal.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/csky/kernel/signal.c b/arch/csky/kernel/signal.c
index 04a43cfd4e09..d47a3381aad8 100644
--- a/arch/csky/kernel/signal.c
+++ b/arch/csky/kernel/signal.c
@@ -39,6 +39,11 @@ static int save_fpu_state(struct sigcontext __user *sc)
#endif
struct rt_sigframe {
+ /*
+ * pad[3] is compatible with the same struct defined in
+ * gcc/libgcc/config/csky/linux-unwind.h
+ */
+ int pad[3];
struct siginfo info;
struct ucontext uc;
};