pandora: defconfig: update

[pandora-kernel.git] / arch / powerpc / include / asm / ppc_asm.h

diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 368f72f..0f3a740 100644 (file)
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -292,11 +292,16 @@ n:
  *      ld     rY,ADDROFF(name)(rX)
  */
 #ifdef __powerpc64__
+#ifdef HAVE_AS_ATHIGH
+#define __AS_ATHIGH high
+#else
+#define __AS_ATHIGH h
+#endif
 #define LOAD_REG_IMMEDIATE(reg,expr)           \
        lis     (reg),(expr)@highest;           \
        ori     (reg),(reg),(expr)@higher;      \
        rldicr  (reg),(reg),32,31;              \
-       oris    (reg),(reg),(expr)@h;           \
+       oris    reg,reg,(expr)@__AS_ATHIGH;     \
        ori     (reg),(reg),(expr)@l;
 
 #define LOAD_REG_ADDR(reg,name)                        \