diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-02 11:04:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-02 11:04:29 -0700 |
| commit | be67d60ba944bdd38571b79bdcd506e34c0f16c1 (patch) | |
| tree | 8b829fefea32222290d0ff58f1ef9d7e90479377 /arch/x86/entry/vdso/vdso2c.h | |
| parent | 66188fb11a82692629e85b6cbc3ecc08c752d2dc (diff) | |
| parent | 2fa5f04f85730d0c4f49f984b7efeb4f8d5bd1fc (diff) | |
| download | blackbird-op-linux-be67d60ba944bdd38571b79bdcd506e34c0f16c1.tar.gz blackbird-op-linux-be67d60ba944bdd38571b79bdcd506e34c0f16c1.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"The last regression fixes for 4.8 final:
- Two patches addressing the fallout of the CR4 optimizations which
caused CR4-less machines to fail.
- Fix the VDSO build on big endian machines
- Take care of FPU initialization if no CPUID is available otherwise
task struct size ends up being zero
- Fix up context tracking in case load_gs_index fails"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/entry/64: Fix context tracking state warning when load_gs_index fails
x86/boot: Initialize FPU and X86_FEATURE_ALWAYS even if we don't have CPUID
x86/vdso: Fix building on big endian host
x86/boot: Fix another __read_cr4() case on 486
x86/init: Fix cr4_init_shadow() on CR4-less machines
Diffstat (limited to 'arch/x86/entry/vdso/vdso2c.h')
| -rw-r--r-- | arch/x86/entry/vdso/vdso2c.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h index 4f741192846d..3dab75f2a673 100644 --- a/arch/x86/entry/vdso/vdso2c.h +++ b/arch/x86/entry/vdso/vdso2c.h @@ -22,7 +22,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, ELF(Phdr) *pt = (ELF(Phdr) *)(raw_addr + GET_LE(&hdr->e_phoff)); - if (hdr->e_type != ET_DYN) + if (GET_LE(&hdr->e_type) != ET_DYN) fail("input is not a shared object\n"); /* Walk the segment table. */ |
