linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Andy Lutomirski <luto@mit.edu>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	luto@mit.edu, tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/vdso] x86: Remove unnecessary compile flag tweaks for vsyscall code
Date: Thu, 11 Aug 2011 00:01:25 GMT	[thread overview]
Message-ID: <tip-f3fb5b7bb70d6e679c15fef85707810a067f5fb6@git.kernel.org> (raw)
In-Reply-To: <835cd05a4c7740544d09723d6ba48f4406f9826c.1312988155.git.luto@mit.edu>

Commit-ID:  f3fb5b7bb70d6e679c15fef85707810a067f5fb6
Gitweb:     http://git.kernel.org/tip/f3fb5b7bb70d6e679c15fef85707810a067f5fb6
Author:     Andy Lutomirski <luto@mit.edu>
AuthorDate: Wed, 10 Aug 2011 11:15:30 -0400
Committer:  H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Wed, 10 Aug 2011 18:55:29 -0500

x86: Remove unnecessary compile flag tweaks for vsyscall code

As of commit 98d0ac38ca7b1b7a552c9a2359174ff84decb600
Author: Andy Lutomirski <luto@mit.edu>
Date:   Thu Jul 14 06:47:22 2011 -0400

    x86-64: Move vread_tsc and vread_hpet into the vDSO

user code no longer directly calls into code in arch/x86/kernel/, so
we don't need compile flag hacks to make it safe.  All vdso code is
in the vdso directory now.

Signed-off-by: Andy Lutomirski <luto@mit.edu>
Link: http://lkml.kernel.org/r/835cd05a4c7740544d09723d6ba48f4406f9826c.1312988155.git.luto@mit.edu
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 arch/x86/kernel/Makefile      |   13 -------------
 arch/x86/kernel/vsyscall_64.c |    3 ---
 2 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 2deef3d..3d1ac39 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -17,19 +17,6 @@ CFLAGS_REMOVE_ftrace.o = -pg
 CFLAGS_REMOVE_early_printk.o = -pg
 endif
 
-#
-# vsyscalls (which work on the user stack) should have
-# no stack-protector checks:
-#
-nostackp := $(call cc-option, -fno-stack-protector)
-CFLAGS_vsyscall_64.o	:= $(PROFILING) -g0 $(nostackp)
-CFLAGS_hpet.o		:= $(nostackp)
-CFLAGS_paravirt.o	:= $(nostackp)
-GCOV_PROFILE_vsyscall_64.o	:= n
-GCOV_PROFILE_hpet.o		:= n
-GCOV_PROFILE_tsc.o		:= n
-GCOV_PROFILE_paravirt.o		:= n
-
 obj-y			:= process_$(BITS).o signal.o entry_$(BITS).o
 obj-y			+= traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
 obj-y			+= time.o ioport.o ldt.o dumpstack.o
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 93a0d46..bf8e9ff 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -18,9 +18,6 @@
  *  use the vDSO.
  */
 
-/* Disable profiling for userspace code: */
-#define DISABLE_BRANCH_PROFILING
-
 #include <linux/time.h>
 #include <linux/init.h>
 #include <linux/kernel.h>

  reply	other threads:[~2011-08-11  0:01 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-10 15:15 [PATCH 0/3] vsyscall emulation compatibility fixes Andy Lutomirski
2011-08-10 15:15 ` [PATCH 1/3] x86: Remove unnecessary compile flag tweaks for vsyscall code Andy Lutomirski
2011-08-11  0:01   ` tip-bot for Andy Lutomirski [this message]
2011-08-10 15:15 ` [PATCH 2/3] x86-64: Wire up getcpu syscall Andy Lutomirski
2011-08-11  0:01   ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-08-11  0:31   ` tip-bot for Andy Lutomirski
2011-08-10 15:15 ` [PATCH 3/3] x86-64: Rework vsyscall emulation and add vsyscall= parameter Andy Lutomirski
2011-08-10 17:21   ` H. Peter Anvin
2011-08-10 17:47     ` Andrew Lutomirski
2011-08-10 21:14       ` H. Peter Anvin
2011-08-10 21:18         ` Andrew Lutomirski
2011-08-10 22:20           ` H. Peter Anvin
2011-08-10 22:56             ` Andrew Lutomirski
2011-08-11  0:02   ` [tip:x86/vdso] " tip-bot for Andy Lutomirski
2011-08-11  0:31   ` tip-bot for Andy Lutomirski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-f3fb5b7bb70d6e679c15fef85707810a067f5fb6@git.kernel.org \
    --to=luto@mit.edu \
    --cc=hpa@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).