summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-15 04:54:37 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-15 04:54:37 +0300
commit4ef870e373382f18de214f61e5d5eb83b62b7aa5 (patch)
tree688ffee634c6d1f468b253bf8909933cc802a3ad
parent118253a593bd1c57de2d1193df1ccffe1abe745b (diff)
parent0b98027122d0715aa2dc39882e4c295112275785 (diff)
downloadlinux-4ef870e373382f18de214f61e5d5eb83b62b7aa5.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fix from Greg Ungerer: "This contains only a single fix for a register corruption problem on certain types of m68k flat format binaries" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: fix user a5 register being overwritten
-rw-r--r--arch/m68k/kernel/signal.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index 2dcee3a88867..9202f82dfce6 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -213,7 +213,6 @@ static inline int frame_extra_sizes(int f)
static inline void adjustformat(struct pt_regs *regs)
{
- ((struct switch_stack *)regs - 1)->a5 = current->mm->start_data;
/*
* set format byte to make stack appear modulo 4, which it will
* be when doing the rte