Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (47ea8dd8) · Commits · 戴 / test

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

arch/x86/vdso/vdso2c.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -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");

arch/x86/vdso/vma.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,9 @@ struct linux_binprm;
		Only used for the 64-bit and x32 vdsos. */
		static unsigned long vdso_addr(unsigned long start, unsigned len)
		{
		#ifdef CONFIG_X86_32
		return 0;
		#else
		unsigned long addr, end;
		unsigned offset;
		end = (start + PMD_SIZE - 1) & PMD_MASK;
		@@ -83,6 +86,7 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
		addr = align_vdso_addr(addr);

		return addr;
		#endif
		}

		static int map_vdso(const struct vdso_image *image, bool calculate_addr)

Admin message