git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-mips
/
paccess.h
diff --git
a/include/asm-mips/paccess.h
b/include/asm-mips/paccess.h
index
36cec9e
..
46f2d23
100644
(file)
--- a/
include/asm-mips/paccess.h
+++ b/
include/asm-mips/paccess.h
@@
-16,10
+16,10
@@
#include <linux/config.h>
#include <linux/errno.h>
#include <linux/config.h>
#include <linux/errno.h>
-#ifdef CONFIG_
MIPS32
+#ifdef CONFIG_
32BIT
#define __PA_ADDR ".word"
#endif
#define __PA_ADDR ".word"
#endif
-#ifdef CONFIG_
MIPS64
+#ifdef CONFIG_
64BIT
#define __PA_ADDR ".dword"
#endif
#define __PA_ADDR ".dword"
#endif
@@
-52,7
+52,7
@@
struct __large_pstruct { unsigned long buf[100]; };
})
#define __get_dbe_asm(insn) \
})
#define __get_dbe_asm(insn) \
-
({
\
+
{
\
__asm__ __volatile__( \
"1:\t" insn "\t%1,%2\n\t" \
"move\t%0,$0\n" \
__asm__ __volatile__( \
"1:\t" insn "\t%1,%2\n\t" \
"move\t%0,$0\n" \
@@
-67,7
+67,7
@@
struct __large_pstruct { unsigned long buf[100]; };
".previous" \
:"=r" (__gu_err), "=r" (__gu_val) \
:"o" (__mp(__gu_addr)), "i" (-EFAULT)); \
".previous" \
:"=r" (__gu_err), "=r" (__gu_val) \
:"o" (__mp(__gu_addr)), "i" (-EFAULT)); \
-}
)
+}
extern void __get_dbe_unknown(void);
extern void __get_dbe_unknown(void);
@@
-90,7
+90,7
@@
extern void __get_dbe_unknown(void);
})
#define __put_dbe_asm(insn) \
})
#define __put_dbe_asm(insn) \
-
({
\
+
{
\
__asm__ __volatile__( \
"1:\t" insn "\t%1,%2\n\t" \
"move\t%0,$0\n" \
__asm__ __volatile__( \
"1:\t" insn "\t%1,%2\n\t" \
"move\t%0,$0\n" \
@@
-104,7
+104,7
@@
extern void __get_dbe_unknown(void);
".previous" \
: "=r" (__pu_err) \
: "r" (__pu_val), "o" (__mp(__pu_addr)), "i" (-EFAULT)); \
".previous" \
: "=r" (__pu_err) \
: "r" (__pu_val), "o" (__mp(__pu_addr)), "i" (-EFAULT)); \
-}
)
+}
extern void __put_dbe_unknown(void);
extern void __put_dbe_unknown(void);