diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-06 08:56:43 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-06 08:56:43 +0100 |
| commit | 301a36fa700f9add6e14f5a95c7573e01578343a (patch) | |
| tree | 6ff94ff3b08b838353b9127eb5f8055b3de6b25f /arch/m68k/kernel/signal.c | |
| parent | ARM: 8611/1: l2x0: add PMU support (diff) | |
| parent | ARM: sa1111: provide to_sa1111_device() macro (diff) | |
| download | linux-dev-301a36fa700f9add6e14f5a95c7573e01578343a.tar.xz linux-dev-301a36fa700f9add6e14f5a95c7573e01578343a.zip | |
Merge branches 'misc' and 'sa1111-base' into for-linus
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 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 |