diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-06 22:43:03 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-06 22:43:03 -0800 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /arch/arm/kernel/elf.c | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'arch/arm/kernel/elf.c')
| -rw-r--r-- | arch/arm/kernel/elf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c index 513f332f040..84849098c8e 100644 --- a/arch/arm/kernel/elf.c +++ b/arch/arm/kernel/elf.c @@ -21,12 +21,16 @@ int elf_check_arch(const struct elf32_hdr *x) eflags = x->e_flags; if ((eflags & EF_ARM_EABI_MASK) == EF_ARM_EABI_UNKNOWN) { + unsigned int flt_fmt; + /* APCS26 is only allowed if the CPU supports it */ if ((eflags & EF_ARM_APCS_26) && !(elf_hwcap & HWCAP_26BIT)) return 0; + flt_fmt = eflags & (EF_ARM_VFP_FLOAT | EF_ARM_SOFT_FLOAT); + /* VFP requires the supporting code */ - if ((eflags & EF_ARM_VFP_FLOAT) && !(elf_hwcap & HWCAP_VFP)) + if (flt_fmt == EF_ARM_VFP_FLOAT && !(elf_hwcap & HWCAP_VFP)) return 0; } return 1; |