diff options
| author | Andy Lutomirski <luto@amacapital.net> | 2014-06-24 22:46:52 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-06-24 22:53:00 +0200 |
| commit | 46b57a76930f01ebf31230ed35af5beeccb5ad95 (patch) | |
| tree | f8fbe49060b0a52f8aa28175364d6c3d1017346c /arch/x86/vdso/vclock_gettime.c | |
| parent | x86_32, signal: Fix vdso rt_sigreturn (diff) | |
| download | linux-46b57a76930f01ebf31230ed35af5beeccb5ad95.tar.xz linux-46b57a76930f01ebf31230ed35af5beeccb5ad95.zip | |
x86/vdso: Move DISABLE_BRANCH_PROFILING into the vdso makefile
DISABLE_BRANCH_PROFILING turns off branch profiling (i.e. a
redefinition of 'if'). Branch profiling depends on a bunch of
kernel-internal symbols and generates extra output sections, none of
which are useful or functional in the vDSO.
It's currently turned off for vclock_gettime.c, but vgetcpu.c also
triggers branch profiling, so just turn it off in the makefile.
This fixes the build on some configurations: the vdso could contain
undefined symbols, and the fake section table overflowed due to
ftrace's added sections.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/bf1ec29e03b2bbc081f6dcaefa64db1c3a83fb21.1403642755.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/vdso/vclock_gettime.c')
| -rw-r--r-- | arch/x86/vdso/vclock_gettime.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c index b2e4f493e5b0..9793322751e0 100644 --- a/arch/x86/vdso/vclock_gettime.c +++ b/arch/x86/vdso/vclock_gettime.c @@ -11,9 +11,6 @@ * Check with readelf after changing. */ -/* Disable profiling for userspace code: */ -#define DISABLE_BRANCH_PROFILING - #include <uapi/linux/time.h> #include <asm/vgtod.h> #include <asm/hpet.h> |