Commit f2ea97cb authored Feb 12, 2013 by Linus Torvalds

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

parents 73c0d752 e95c3f7a

arch/m68k/include/asm/processor.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@ extern int handle_kernel_fault(struct pt_regs *regs);
		#define start_thread(_regs, _pc, _usp) \
		do { \
		(_regs)->pc = (_pc); \
		((struct switch_stack *)(_regs))[-1].a6 = 0; \
		setframeformat(_regs); \
		if (current->mm) \
		(_regs)->d5 = current->mm->start_data; \