diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-22 01:33:17 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-22 01:33:17 (GMT) |
commit | 1aaaa9acaea1dd2878d6c92b45e4c117ef425baf (patch) | |
tree | f1fe5948a6da8850862ae751da0b62dac351517f /arch/m68k/kernel/signal.c | |
parent | 73577d61799e8d8bb7d69a9acdc54923e5998138 (diff) | |
parent | fa8410b355251fd30341662a40ac6b22d3e38468 (diff) | |
download | linux-1aaaa9acaea1dd2878d6c92b45e4c117ef425baf.tar.xz |
Merge 4.8-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k/kernel/signal.c')
-rw-r--r-- | arch/m68k/kernel/signal.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index 2dcee3a..9202f82 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 |