commented early_printk patch because of rejects.
[linux-flexiantxendom0-3.2.10.git] / include / asm-mips / paccess.h
index e67d89c..36cec9e 100644 (file)
 #ifndef _ASM_PACCESS_H
 #define _ASM_PACCESS_H
 
+#include <linux/config.h>
 #include <linux/errno.h>
 
+#ifdef CONFIG_MIPS32
+#define __PA_ADDR      ".word"
+#endif
+#ifdef CONFIG_MIPS64
+#define __PA_ADDR      ".dword"
+#endif
+
 extern asmlinkage void handle_ibe(void);
 extern asmlinkage void handle_dbe(void);
 
@@ -24,76 +32,79 @@ extern asmlinkage void handle_dbe(void);
 struct __large_pstruct { unsigned long buf[100]; };
 #define __mp(x) (*(struct __large_pstruct *)(x))
 
-#define __get_dbe(x,ptr,size) ({ \
-int __gu_err; \
-__typeof(*(ptr)) __gu_val; \
-unsigned long __gu_addr; \
-__asm__("":"=r" (__gu_val)); \
-__gu_addr = (unsigned long) (ptr); \
-__asm__("":"=r" (__gu_err)); \
-switch (size) { \
-case 1: __get_dbe_asm("lb"); break; \
-case 2: __get_dbe_asm("lh"); break; \
-case 4: __get_dbe_asm("lw"); break; \
-case 8:  __get_dbe_asm("ld"); break; \
-default: __get_dbe_unknown(); break; \
-} x = (__typeof__(*(ptr))) __gu_val; __gu_err; })
+#define __get_dbe(x,ptr,size)                                          \
+({                                                                     \
+       long __gu_err;                                                  \
+       __typeof(*(ptr)) __gu_val;                                      \
+       unsigned long __gu_addr;                                        \
+       __asm__("":"=r" (__gu_val));                                    \
+       __gu_addr = (unsigned long) (ptr);                              \
+       __asm__("":"=r" (__gu_err));                                    \
+       switch (size) {                                                 \
+       case 1: __get_dbe_asm("lb"); break;                             \
+       case 2: __get_dbe_asm("lh"); break;                             \
+       case 4: __get_dbe_asm("lw"); break;                             \
+       case 8:  __get_dbe_asm("ld"); break;                            \
+       default: __get_dbe_unknown(); break;                            \
+       }                                                               \
+       x = (__typeof__(*(ptr))) __gu_val;                              \
+       __gu_err;                                                       \
+})
 
-#define __get_dbe_asm(insn) \
-({ \
-__asm__ __volatile__( \
-       ".set\tpush\n\t" \
-       ".set\tnoreorder\n\t" \
-       insn "\t%1,%2\n\t" \
-       "1:\tmove\t%0,$0\n" \
-       ".set\tpop\n\t" \
-       "2:\n\t" \
-       ".section\t.fixup,\"ax\"\n" \
-       "3:\tli\t%0,%3\n\t" \
-       "move\t%1,$0\n\t" \
-       "j\t2b\n\t" \
-       ".previous\n\t" \
-       ".section\t__dbe_table,\"a\"\n\t" \
-       ".word\t1b-4,3b\n\t" \
-       ".previous" \
-       :"=r" (__gu_err), "=r" (__gu_val) \
-       :"o" (__mp(__gu_addr)), "i" (-EFAULT)); })
+#define __get_dbe_asm(insn)                                            \
+({                                                                     \
+       __asm__ __volatile__(                                           \
+       "1:\t" insn "\t%1,%2\n\t"                                       \
+       "move\t%0,$0\n"                                                 \
+       "2:\n\t"                                                        \
+       ".section\t.fixup,\"ax\"\n"                                     \
+       "3:\tli\t%0,%3\n\t"                                             \
+       "move\t%1,$0\n\t"                                               \
+       "j\t2b\n\t"                                                     \
+       ".previous\n\t"                                                 \
+       ".section\t__dbe_table,\"a\"\n\t"                               \
+       __PA_ADDR "\t1b, 3b\n\t"                                        \
+       ".previous"                                                     \
+       :"=r" (__gu_err), "=r" (__gu_val)                               \
+       :"o" (__mp(__gu_addr)), "i" (-EFAULT));                         \
+})
 
 extern void __get_dbe_unknown(void);
 
-#define __put_dbe(x,ptr,size) ({ \
-int __pu_err; \
-__typeof__(*(ptr)) __pu_val; \
-unsigned long __pu_addr; \
-__pu_val = (x); \
-__pu_addr = (unsigned long) (ptr); \
-__asm__("":"=r" (__pu_err)); \
-switch (size) { \
-case 1: __put_dbe_asm("sb"); break; \
-case 2: __put_dbe_asm("sh"); break; \
-case 4: __put_dbe_asm("sw"); break; \
-case 8: __put_dbe_asm("sd"); break; \
-default: __put_dbe_unknown(); break; \
-} __pu_err; })
+#define __put_dbe(x,ptr,size)                                          \
+({                                                                     \
+       long __pu_err;                                                  \
+       __typeof__(*(ptr)) __pu_val;                                    \
+       long __pu_addr;                                                 \
+       __pu_val = (x);                                                 \
+       __pu_addr = (long) (ptr);                                       \
+       __asm__("":"=r" (__pu_err));                                    \
+       switch (size) {                                                 \
+       case 1: __put_dbe_asm("sb"); break;                             \
+       case 2: __put_dbe_asm("sh"); break;                             \
+       case 4: __put_dbe_asm("sw"); break;                             \
+       case 8: __put_dbe_asm("sd"); break;                             \
+       default: __put_dbe_unknown(); break;                            \
+       }                                                               \
+       __pu_err;                                                       \
+})
 
-#define __put_dbe_asm(insn) \
-({ \
-__asm__ __volatile__( \
-       ".set\tpush\n\t" \
-       ".set\tnoreorder\n\t" \
-       insn "\t%1,%2\n\t" \
-       "1:\tmove\t%0,$0\n" \
-       ".set\tpop\n\t" \
-       "2:\n\t" \
-       ".section\t.fixup,\"ax\"\n" \
-       "3:\tli\t%0,%3\n\t" \
-       "j\t2b\n\t" \
-       ".previous\n\t" \
-       ".section\t__dbe_table,\"a\"\n\t" \
-       ".word\t1b-4,3b\n\t" \
-       ".previous" \
-       :"=r" (__pu_err) \
-       :"r" (__pu_val), "o" (__mp(__pu_addr)), "i" (-EFAULT)); })
+#define __put_dbe_asm(insn)                                            \
+({                                                                     \
+       __asm__ __volatile__(                                           \
+       "1:\t" insn "\t%1,%2\n\t"                                       \
+       "move\t%0,$0\n"                                                 \
+       "2:\n\t"                                                        \
+       ".section\t.fixup,\"ax\"\n"                                     \
+       "3:\tli\t%0,%3\n\t"                                             \
+       "j\t2b\n\t"                                                     \
+       ".previous\n\t"                                                 \
+       ".section\t__dbe_table,\"a\"\n\t"                               \
+       __PA_ADDR "\t1b, 3b\n\t"                                        \
+       ".previous"                                                     \
+       : "=r" (__pu_err)                                               \
+       : "r" (__pu_val), "o" (__mp(__pu_addr)), "i" (-EFAULT));        \
+})
 
 extern void __put_dbe_unknown(void);