diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-21 22:14:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-22 15:51:45 -0700 |
| commit | 44231b7fee3f086cf367588c7c79ec3b5d7619b2 (patch) | |
| tree | 0640eac8bec7bcf649aec0bc516904f189553a7d /arch/sparc/vdso | |
| parent | 3fe5d7e861286c0b80573f094e32dd9736370d69 (diff) | |
| download | linux-44231b7fee3f086cf367588c7c79ec3b5d7619b2.tar.bz2 | |
sparc: Set DISABLE_BRANCH_PROFILING in VDSO CFLAGS.
Not in vclock_gettime.c itself.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/vdso')
| -rw-r--r-- | arch/sparc/vdso/Makefile | 3 | ||||
| -rw-r--r-- | arch/sparc/vdso/vclock_gettime.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/sparc/vdso/Makefile b/arch/sparc/vdso/Makefile index dc85570d8839..7ea03dd2bd62 100644 --- a/arch/sparc/vdso/Makefile +++ b/arch/sparc/vdso/Makefile @@ -58,7 +58,8 @@ CFL := $(PROFILING) -mcmodel=medlow -fPIC -O2 -fasynchronous-unwind-tables \ -m64 -ffixed-g2 -ffixed-g3 -fcall-used-g4 -fcall-used-g5 -ffixed-g6 \ -ffixed-g7 $(filter -g%,$(KBUILD_CFLAGS)) \ $(call cc-option, -fno-stack-protector) -fno-omit-frame-pointer \ - -foptimize-sibling-calls -DBUILD_VDSO + -foptimize-sibling-calls \ + -DDISABLE_BRANCH_PROFILING -DBUILD_VDSO $(vobjs): KBUILD_CFLAGS += $(CFL) diff --git a/arch/sparc/vdso/vclock_gettime.c b/arch/sparc/vdso/vclock_gettime.c index 4e853d1582c7..7b5bf63fc0f5 100644 --- a/arch/sparc/vdso/vclock_gettime.c +++ b/arch/sparc/vdso/vclock_gettime.c @@ -12,11 +12,6 @@ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. */ -/* Disable profiling for userspace code: */ -#ifndef DISABLE_BRANCH_PROFILING -#define DISABLE_BRANCH_PROFILING -#endif - #include <linux/kernel.h> #include <linux/time.h> #include <linux/string.h> |