diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:35:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:35:57 +0100 |
| commit | 64b36ca7f408e0bd45487c8c28f168f11f3b6dcd (patch) | |
| tree | 0b8ed22d46d775f04d441e8c480c12ec297a005b /arch/arm/kernel/elf.c | |
| parent | 00a8bf859331e349713274825e6fbf20bf2ac15a (diff) | |
| parent | 402a917aca5daca69fcc91f43e6f1e6939cf393b (diff) | |
| download | kernel_samsung_smdk4412-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.zip kernel_samsung_smdk4412-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.gz kernel_samsung_smdk4412-64b36ca7f408e0bd45487c8c28f168f11f3b6dcd.tar.bz2 | |
Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core
Diffstat (limited to 'arch/arm/kernel/elf.c')
| -rw-r--r-- | arch/arm/kernel/elf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c index 8484909..d4a0da1 100644 --- a/arch/arm/kernel/elf.c +++ b/arch/arm/kernel/elf.c @@ -74,9 +74,9 @@ EXPORT_SYMBOL(elf_set_personality); */ int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack) { - if (executable_stack != EXSTACK_ENABLE_X) + if (executable_stack != EXSTACK_DISABLE_X) return 1; - if (cpu_architecture() <= CPU_ARCH_ARMv6) + if (cpu_architecture() < CPU_ARCH_ARMv6) return 1; return 0; } |