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/signal32.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/signal32.h')
| -rw-r--r-- | arch/arm64/include/asm/signal32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h index eeaa97559bab..522c3456141e 100644 --- a/arch/arm64/include/asm/signal32.h +++ b/arch/arm64/include/asm/signal32.h @@ -17,7 +17,7 @@ #define __ASM_SIGNAL32_H #ifdef __KERNEL__ -#ifdef CONFIG_COMPAT +#ifdef CONFIG_AARCH32_EL0 #include <linux/compat.h> #define AARCH32_KERN_SIGRET_CODE_OFFSET 0x500 @@ -47,6 +47,6 @@ static inline int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t static inline void compat_setup_restart_syscall(struct pt_regs *regs) { } -#endif /* CONFIG_COMPAT */ +#endif /* CONFIG_AARCH32_EL0 */ #endif /* __KERNEL__ */ #endif /* __ASM_SIGNAL32_H */ |