diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-11 17:10:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-11 17:10:05 -0700 |
| commit | 47ea8dd8710ba32391b729c95bea005b6fd86243 (patch) | |
| tree | 387e2f5868d4d53156784e90291dfaa1931eaccd /arch/x86/vdso/vdso2c.h | |
| parent | bae78dc25993f62194ee53da67b14e3d5007c6c4 (diff) | |
| parent | d093601be5e97d2729614419d0d256ed3b6a56b0 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"A couple of further build fixes for the VDSO code.
This is turning into a bit of a headache, and Andy has already come up
with a more ultimate cleanup, but most likely that is 3.17 material"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-32, vdso: Fix vDSO build error due to missing align_vdso_addr()
x86-64, vdso: Fix vDSO build breakage due to empty .rela.dyn
Diffstat (limited to 'arch/x86/vdso/vdso2c.h')
| -rw-r--r-- | arch/x86/vdso/vdso2c.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h index df95a2fdff73..11b65d4f9414 100644 --- a/arch/x86/vdso/vdso2c.h +++ b/arch/x86/vdso/vdso2c.h @@ -93,6 +93,9 @@ static void BITSFUNC(copy_section)(struct BITSFUNC(fake_sections) *out, uint64_t flags = GET_LE(&in->sh_flags); bool copy = flags & SHF_ALLOC && + (GET_LE(&in->sh_size) || + (GET_LE(&in->sh_type) != SHT_RELA && + GET_LE(&in->sh_type) != SHT_REL)) && strcmp(name, ".altinstructions") && strcmp(name, ".altinstr_replacement"); |