All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Pranith Kumar <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	bobby.prani@gmail.com, tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/build] compiler-intel.h: Remove duplicate definition
Date: Tue, 15 Apr 2014 09:18:46 -0700	[thread overview]
Message-ID: <tip-73679e50820123ebdedc67ebcda4562d1d6e4aba@git.kernel.org> (raw)
In-Reply-To: <CAJhHMCAnYPy0+qD-1KBnJPLt3XgAjdR12j+ySSnPgmZcpbE7HQ@mail.gmail.com>

Commit-ID:  73679e50820123ebdedc67ebcda4562d1d6e4aba
Gitweb:     http://git.kernel.org/tip/73679e50820123ebdedc67ebcda4562d1d6e4aba
Author:     Pranith Kumar <bobby.prani@gmail.com>
AuthorDate: Tue, 15 Apr 2014 12:05:22 -0400
Committer:  H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Tue, 15 Apr 2014 09:15:39 -0700

compiler-intel.h: Remove duplicate definition

barrier is already defined as __memory_barrier in compiler.h
Remove this unnecessary redefinition.

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Link: http://lkml.kernel.org/r/CAJhHMCAnYPy0%2BqD-1KBnJPLt3XgAjdR12j%2BySSnPgmZcpbE7HQ@mail.gmail.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 include/linux/compiler-intel.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h
index 5529c52..ba147a1 100644
--- a/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
@@ -13,12 +13,9 @@
 /* Intel ECC compiler doesn't support gcc specific asm stmts.
  * It uses intrinsics to do the equivalent things.
  */
-#undef barrier
 #undef RELOC_HIDE
 #undef OPTIMIZER_HIDE_VAR
 
-#define barrier() __memory_barrier()
-
 #define RELOC_HIDE(ptr, off)					\
   ({ unsigned long __ptr;					\
      __ptr = (unsigned long) (ptr);				\

      reply	other threads:[~2014-04-15 16:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-15 16:05 [PATCH 1/1] include/linux/compiler-intel.h: remove duplicate definition Pranith Kumar
2014-04-15 16:18 ` tip-bot for Pranith Kumar [this message]

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-73679e50820123ebdedc67ebcda4562d1d6e4aba@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=bobby.prani@gmail.com \
    --cc=hpa@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.