Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b6f2e64 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by H. Peter Anvin
Browse files

x86, vdso: Remove vestiges of VDSO_PRELINK and some outdated comments 



These definitions had no effect.

Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/946c104e40c47319f8ab406e54118799cb55bd99.1399317206.git.luto@amacapital.net


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent f40c3300

arch/x86/vdso/vdso.lds.S

+1 −6
Original line number Diff line number Diff line 
/*

 * Linker script for 64-bit vDSO.

 * We #include the file to define the layout details.

 * Here we only choose the prelinked virtual address.

 *

 * This file defines the version script giving the user-exported symbols in

 * the DSO.  We can define local symbols here called VDSO* to make their

 * values visible using the asm-x86/vdso.h macros from the kernel proper.

 * the DSO.

 */



#define VDSO_PRELINK 0xffffffffff700000

#include "vdso-layout.lds.S"



/*
@@ -28,5 +25,3 @@ VERSION { 
	local: *;

	};

}
 


VDSO64_PRELINK = VDSO_PRELINK;

arch/x86/vdso/vdso32/vdso32.lds.S

+1 −4
Original line number Diff line number Diff line 
/*

 * Linker script for 32-bit vDSO.

 * We #include the file to define the layout details.

 * Here we only choose the prelinked virtual address.

 *

 * This file defines the version script giving the user-exported symbols in

 * the DSO.  We can define local symbols here called VDSO* to make their

 * values visible using the asm-x86/vdso.h macros from the kernel proper.

 * the DSO.

 */



#include <asm/page.h>



#define BUILD_VDSO32

#define VDSO_PRELINK 0



#include "../vdso-layout.lds.S"

arch/x86/vdso/vdsox32.lds.S

+1 −6
Original line number Diff line number Diff line 
/*

 * Linker script for x32 vDSO.

 * We #include the file to define the layout details.

 * Here we only choose the prelinked virtual address.

 *

 * This file defines the version script giving the user-exported symbols in

 * the DSO.  We can define local symbols here called VDSO* to make their

 * values visible using the asm-x86/vdso.h macros from the kernel proper.

 * the DSO.

 */



#define VDSO_PRELINK 0

#include "vdso-layout.lds.S"



/*
@@ -24,5 +21,3 @@ VERSION { 
	local: *;

	};

}
 


VDSOX32_PRELINK = VDSO_PRELINK;