linux-next: manual merge of the akpm-current tree with the compiler-attributes tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the akpm-current tree got conflicts in:

  include/linux/compiler-gcc.h
  include/linux/compiler_types.h

between commit:

  a3f8a30f3f00 ("Compiler Attributes: use feature checks instead of version checks")

from the compiler-attributes tree and commit:

  b6fbc7334215 ("include/linux/compiler*.h: add version detection to asm_volatile_goto")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/compiler-gcc.h
index cfac027e1625,d8d314bfc23e..000000000000
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@@ -116,8 -130,34 +116,8 @@@
  #define randomized_struct_fields_end	} __randomize_layout;
  #endif
  
 -/*
 - * When used with Link Time Optimization, gcc can optimize away C functions or
 - * variables which are referenced only from assembly code.  __visible tells the
 - * optimizer that something else uses this function or variable, thus preventing
 - * this.
 - */
 -#define __visible	__attribute__((externally_visible))
 -
 -/* gcc version specific checks */
 -
 -#if GCC_VERSION >= 40900 && !defined(__CHECKER__)
 -/*
 - * __assume_aligned(n, k): Tell the optimizer that the returned
 - * pointer can be assumed to be k modulo n. The second argument is
 - * optional (default 0), so we use a variadic macro to make the
 - * shorthand.
 - *
 - * Beware: Do not apply this to functions which may return
 - * ERR_PTRs. Also, it is probably unwise to apply it to functions
 - * returning extra information in the low bits (but in that case the
 - * compiler should see some alignment anyway, when the return value is
 - * massaged by 'flags = ptr & 3; ptr &= ~3;').
 - */
 -#define __assume_aligned(a, ...) __attribute__((__assume_aligned__(a, ## __VA_ARGS__)))
 -#endif
 -
  /*
-  * GCC 'asm goto' miscompiles certain code sequences:
+  * GCC < 4.8.2 'asm goto' miscompiles certain code sequences:
   *
   *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
   *
diff --cc include/linux/compiler_types.h
index 3439d7d0249a,c2ded31a4cec..000000000000
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@@ -130,6 -140,21 +130,10 @@@ struct ftrace_likely_data 
  # define randomized_struct_fields_end
  #endif
  
 -#ifndef __visible
 -#define __visible
 -#endif
 -
 -/*
 - * Assume alignment of return value.
 - */
 -#ifndef __assume_aligned
 -#define __assume_aligned(a, ...)
 -#endif
 -
+ #ifndef asm_volatile_goto
+ #define asm_volatile_goto(x...) asm goto(x)
+ #endif
+ 
  /* Are two types/vars the same type (ignoring qualifiers)? */
  #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))

Attachment: pgp7FeQ1bztiW.pgp
Description: OpenPGP digital signature