Commit 7946c2be authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/asm' into x86/urgent, to pick up fix 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 609c19a3 57f90c3d

arch/x86/entry/vdso/vdso2c.h

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 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)

		fail("input is not a shared object\n");



	/* Walk the segment table. */

	for (i = 0; i < GET_LE(&hdr->e_phnum); i++) {

		if (GET_LE(&pt[i].p_type) == PT_LOAD) {
@@ -49,6 +52,9 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, 
	if (stripped_len < load_size)

		fail("stripped input is too short\n");



	if (!dyn)

		fail("input has no PT_DYNAMIC section -- your toolchain is buggy\n");



	/* Walk the dynamic table */

	for (i = 0; dyn + i < dyn_end &&

		     GET_LE(&dyn[i].d_tag) != DT_NULL; i++) {