diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /arch/m68k/kernel/signal.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
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) | |||
| 213 | 213 | ||
| 214 | static inline void adjustformat(struct pt_regs *regs) | 214 | static inline void adjustformat(struct pt_regs *regs) |
| 215 | { | 215 | { |
| 216 | ((struct switch_stack *)regs - 1)->a5 = current->mm->start_data; | ||
| 217 | /* | 216 | /* |
| 218 | * set format byte to make stack appear modulo 4, which it will | 217 | * set format byte to make stack appear modulo 4, which it will |
| 219 | * be when doing the rte | 218 | * be when doing the rte |