Commit 4ef870e3 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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
parents 118253a5 0b980271
...@@ -213,7 +213,6 @@ static inline int frame_extra_sizes(int f) ...@@ -213,7 +213,6 @@ static inline int frame_extra_sizes(int f)
static inline void adjustformat(struct pt_regs *regs) 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 * set format byte to make stack appear modulo 4, which it will
* be when doing the rte * be when doing the rte
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment