diff --git a/[refs] b/[refs] index 47b811579781..bf022a9ca670 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3ca901f94b3299dfe3a814770d751844608419f +refs/heads/master: 62fe164c5b036f4bdb19fbfb8f18a75631e67eee diff --git a/trunk/include/asm-x86/system_64.h b/trunk/include/asm-x86/system_64.h index 14ad6138439b..560470ea27c8 100644 --- a/trunk/include/asm-x86/system_64.h +++ b/trunk/include/asm-x86/system_64.h @@ -73,8 +73,6 @@ #define read_barrier_depends() do {} while(0) #define set_mb(var, value) do { (void) xchg(&var, value); } while (0) -#define warn_if_not_ulong(x) do { unsigned long foo; (void) (&(x) == &foo); } while (0) - static inline unsigned long read_cr8(void) { unsigned long cr8;