diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-11-19 18:39:06 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-11-19 18:39:06 +0300 |
| commit | bb1c80c6451b8bd578acd1663529de3a29205167 (patch) | |
| tree | 044703ef1a4cc521557fb9ed15c9d343c85a35f6 /arch/arm64/include/asm/processor.h | |
| parent | fcfb41ff5e1e8d54b27e2e8412b776b194e1fdbc (diff) | |
| parent | a33d84566e90cc279db7cc54de45ab92ce10bdf6 (diff) | |
Merge branch 'tracking-ilp32' into merge-linux-linaroll-20141119.0linux-linaro-3.18-rc5-2014.11ll_20141119.0
Diffstat (limited to 'arch/arm64/include/asm/processor.h')
| -rw-r--r-- | arch/arm64/include/asm/processor.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 1e894f7d5e22..cd532822d8b8 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -104,6 +104,17 @@ static inline void start_thread(struct pt_regs *regs, unsigned long pc, static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc, unsigned long sp) { +#ifdef CONFIG_ARM64_ILP32 + /* + * ILP32 thread are started the same way as LP64 threads. + * Note we cannot use is_ilp32_compat_task here as that + * would introduce a header depency issue. + */ + if (!test_thread_flag(TIF_AARCH32)) { + start_thread(regs, pc, sp); + return; + } +#endif start_thread_common(regs, pc); regs->pstate = COMPAT_PSR_MODE_USR; if (pc & 1) |