Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 16 insertions, 1 deletions

diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 152734055403..6e1c44a935d4 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -11,7 +11,22 @@
 
 /* This macro obfuscates arithmetic on a variable address so that gcc
    shouldn't recognize the original var, and make assumptions about it */
+/*
+ * Versions of the ppc64 compiler before 4.1 had a bug where use of
+ * RELOC_HIDE could trash r30. The bug can be worked around by changing
+ * the inline assembly constraint from =g to =r, in this particular
+ * case either is valid.
+ */
 #define RELOC_HIDE(ptr, off)                                    \
   ({ unsigned long __ptr;                                       \
-    __asm__ ("" : "=g"(__ptr) : "0"(ptr));              \
+    __asm__ ("" : "=r"(__ptr) : "0"(ptr));              \
     (typeof(ptr)) (__ptr + (off)); })
+
+
+#define inline          inline          __attribute__((always_inline))
+#define __inline__      __inline__      __attribute__((always_inline))
+#define __inline        __inline        __attribute__((always_inline))
+#define __deprecated                    __attribute__((deprecated))
+#define  noinline                       __attribute__((noinline))
+#define __attribute_pure__              __attribute__((pure))
+#define __attribute_const__             __attribute__((__const__))