diff options
| author | Greg Ungerer <gerg@linux-m68k.org> | 2016-07-21 16:28:48 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2016-07-25 14:40:28 +1000 |
| commit | 89e6ffd9f03936d9f6f0332426e4a3cf379b90bd (patch) | |
| tree | 0a889cd15af53bece41ba4997111809fa3f4be73 /arch/m68k | |
| parent | 47ef4ad2684d380dd6d596140fb79395115c3950 (diff) | |
| download | talos-obmc-linux-89e6ffd9f03936d9f6f0332426e4a3cf379b90bd.tar.gz talos-obmc-linux-89e6ffd9f03936d9f6f0332426e4a3cf379b90bd.zip | |
m68k: fix bFLT executable running on MMU enabled systems
Even after recent changes to support running flat format executables on
MMU enabled systems (by nicolas.pitre@linaro.org) they still failed to
run on m68k/ColdFire MMU enabled systems. On trying to run a flat format
binary the application would immediately crash with a SIGSEGV.
Code to setup the D5 register with the base of the application data
region was only in the non-MMU code path, so it was not being set for
the MMU enabled case. Flat binaries on m68k/ColdFire use this to support
GOT/PIC flat built application code.
Fix this so that D5 is always setup when loading/running a bFLT executable
on m68k systems.
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/flat.h | 6 | ||||
| -rw-r--r-- | arch/m68k/include/asm/processor.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h index f9454b89a51b..f46c2f044f8c 100644 --- a/arch/m68k/include/asm/flat.h +++ b/arch/m68k/include/asm/flat.h @@ -18,4 +18,10 @@ static inline int flat_set_persistent(unsigned long relval, return 0; } +#define FLAT_PLAT_INIT(regs) \ + do { \ + if (current->mm) \ + (regs)->d5 = current->mm->start_data; \ + } while (0) + #endif /* __M68KNOMMU_FLAT_H__ */ diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h index a6ce2ec8d693..46672d1f4d62 100644 --- a/arch/m68k/include/asm/processor.h +++ b/arch/m68k/include/asm/processor.h @@ -131,8 +131,6 @@ extern int handle_kernel_fault(struct pt_regs *regs); do { \ (_regs)->pc = (_pc); \ setframeformat(_regs); \ - if (current->mm) \ - (_regs)->d5 = current->mm->start_data; \ (_regs)->sr &= ~0x2000; \ wrusp(_usp); \ } while(0) |
