Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
+3
arch/x86/vdso/vdso2c.h
+3
arch/x86/vdso/vdso2c.h
···
93
93
uint64_t flags = GET_LE(&in->sh_flags);
94
94
95
95
bool copy = flags & SHF_ALLOC &&
96
+
(GET_LE(&in->sh_size) ||
97
+
(GET_LE(&in->sh_type) != SHT_RELA &&
98
+
GET_LE(&in->sh_type) != SHT_REL)) &&
96
99
strcmp(name, ".altinstructions") &&
97
100
strcmp(name, ".altinstr_replacement");
98
101
+4
arch/x86/vdso/vma.c
+4
arch/x86/vdso/vma.c
···
62
62
Only used for the 64-bit and x32 vdsos. */
63
63
static unsigned long vdso_addr(unsigned long start, unsigned len)
64
64
{
65
+
#ifdef CONFIG_X86_32
66
+
return 0;
67
+
#else
65
68
unsigned long addr, end;
66
69
unsigned offset;
67
70
end = (start + PMD_SIZE - 1) & PMD_MASK;
···
86
83
addr = align_vdso_addr(addr);
87
84
88
85
return addr;
86
+
#endif
89
87
}
90
88
91
89
static int map_vdso(const struct vdso_image *image, bool calculate_addr)