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
Unified · Split
| @@ -130,7 +130,6 @@ extern int handle_kernel_fault(struct pt_regs *regs); · 129 unmodified lines | |||
| 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; \ |