diff options
| author | Rabin Vincent <rabin@rab.in> | 2010-01-18 15:04:32 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-18 14:12:11 +0000 |
| commit | a7b22962776109b5bfe3a3efa4f42622318c547d (patch) | |
| tree | f3ed45fc8504a862f909f55a3a4ba93bb11f9ec2 | |
| parent | b53e9b5ebd5c6e718f54bcacd4e97b71533ca681 (diff) | |
| download | linux-a7b22962776109b5bfe3a3efa4f42622318c547d.tar.gz | |
ARM: 5883/1: Revert "disable NX support for OABI-supporting kernels"
This reverts commit 14f0aa359365e8a93a77b71e3b840274b9b4dcb1.
That commit was needed earlier because system call restarting for
OABI (compat) required an executable stack and thus had problems
with NX. Since ab72b00734ae4d0b ("ARM: Fix signal restart issues
with NX and OABI compat") has reworked the code to not require an
executable stack anymore, we can re-enable NX support for kernels
with OABI (compat) support.
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/kernel/elf.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c index 950391f194c4..d4a0da1e48f4 100644 --- a/arch/arm/kernel/elf.c +++ b/arch/arm/kernel/elf.c @@ -78,15 +78,6 @@ int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack) return 1; if (cpu_architecture() < CPU_ARCH_ARMv6) return 1; -#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT) - /* - * If we have support for OABI programs, we can never allow NX - * support - our signal syscall restart mechanism relies upon - * being able to execute code placed on the user stack. - */ - return 1; -#else return 0; -#endif } EXPORT_SYMBOL(arm_elf_read_implies_exec); |