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

Commit 73679e50 authored by Pranith Kumar's avatar Pranith Kumar Committed by H. Peter Anvin
Browse files

compiler-intel.h: Remove duplicate definition 



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

Signed-off-by: default avatarPranith Kumar <bobby.prani@gmail.com>
Link: http://lkml.kernel.org/r/CAJhHMCAnYPy0%2BqD-1KBnJPLt3XgAjdR12j%2BySSnPgmZcpbE7HQ@mail.gmail.com


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

include/linux/compiler-intel.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -13,12 +13,9 @@ 
/* Intel ECC compiler doesn't support gcc specific asm stmts.

/* Intel ECC compiler doesn't support gcc specific asm stmts.

 * It uses intrinsics to do the equivalent things.

 * It uses intrinsics to do the equivalent things.

 */

 */

#undef barrier

#undef RELOC_HIDE

#undef RELOC_HIDE

#undef OPTIMIZER_HIDE_VAR

#undef OPTIMIZER_HIDE_VAR





#define barrier() __memory_barrier()



#define RELOC_HIDE(ptr, off)					\

#define RELOC_HIDE(ptr, off)					\

  ({ unsigned long __ptr;					\

  ({ unsigned long __ptr;					\

     __ptr = (unsigned long) (ptr);				\

     __ptr = (unsigned long) (ptr);				\