Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/gerg/m68knommu

Pull m68knommu fix from Greg Ungerer:
 "This contains only a single fix for a register corruption problem on
  certain types of m68k flat format binaries"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix user a5 register being overwritten
  • Loading branch information
torvalds committed Aug 15, 2016
2 parents 118253a + 0b98027 commit 4ef870e
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/m68k/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4ef870e

Please sign in to comment.