diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-12 19:15:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-12 19:15:39 -0500 |
| commit | f2ea97cbae25af2ec2ccfe892211c39147a8b4dc (patch) | |
| tree | d3576ac9e9b4354fddfac44c745099321193442f /arch/m68k | |
| parent | 73c0d7522c2fb001c5da7f6d9138d23f468a7de7 (diff) | |
| parent | e95c3f7a09ed3996d8ccb9679f3bf38ba9b498d7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu into akpm
Pull m68knommu fix from Greg Ungerer:
"This contains a single critical fix for the non-MMU m68k platforms.
The change of the kernel exec code path has revealed a problem in the
start thread code that causes crashing on boot. This is the fix for
it."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: fix trap on execing /bin/init
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/processor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h index ae700f49e51d..b0768a657920 100644 --- a/arch/m68k/include/asm/processor.h +++ b/arch/m68k/include/asm/processor.h | |||
| @@ -130,7 +130,6 @@ extern int handle_kernel_fault(struct pt_regs *regs); | |||
| 130 | #define start_thread(_regs, _pc, _usp) \ | 130 | #define start_thread(_regs, _pc, _usp) \ |
| 131 | do { \ | 131 | do { \ |
| 132 | (_regs)->pc = (_pc); \ | 132 | (_regs)->pc = (_pc); \ |
| 133 | ((struct switch_stack *)(_regs))[-1].a6 = 0; \ | ||
| 134 | setframeformat(_regs); \ | 133 | setframeformat(_regs); \ |
| 135 | if (current->mm) \ | 134 | if (current->mm) \ |
| 136 | (_regs)->d5 = current->mm->start_data; \ | 135 | (_regs)->d5 = current->mm->start_data; \ |