Merge tags 'compiler-attributes-for-linus-v5.0-rc3' and 'clang-format-for-linus-v5...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Jan 2019 18:23:42 +0000 (07:23 +1300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Jan 2019 18:23:42 +0000 (07:23 +1300)
Pull misc clang fixes from Miguel Ojeda:

  - A fix for OPTIMIZER_HIDE_VAR from Michael S Tsirkin

  - Update clang-format with the latest for_each macro list from Jason
    Gunthorpe

* tag 'compiler-attributes-for-linus-v5.0-rc3' of git://github.com/ojeda/linux:
  include/linux/compiler*.h: fix OPTIMIZER_HIDE_VAR

* tag 'clang-format-for-linus-v5.0-rc3' of git://github.com/ojeda/linux:
  clang-format: Update .clang-format with the latest for_each macro list

1  2  3 
include/linux/compiler-gcc.h

index dd8268f5f5f0a79680a36c5adfaf79ecca81f2b8,7b834e37d0c03d7502f08e8522b2c7d21ec11d1f,dd8268f5f5f0a79680a36c5adfaf79ecca81f2b8..e8579412ad214cbfc28124bc5ce1078981d391d9
        (typeof(ptr)) (__ptr + (off));                                  \
   })
   
- -/* Make the optimizer believe the variable can be manipulated arbitrarily. */
- -#define OPTIMIZER_HIDE_VAR(var)                                              \
- -     __asm__ ("" : "=r" (var) : "0" (var))
- -
   /*
    * A trick to suppress uninitialized variable warning without generating any
    * code
    */
   #define uninitialized_var(x) x = x
   
 - #ifdef RETPOLINE
 + #ifdef CONFIG_RETPOLINE
   #define __noretpoline __attribute__((__indirect_branch__("keep")))
   #endif