projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[cascardo/linux.git]
/
include
/
asm-mips
/
paccess.h
diff --git
a/include/asm-mips/paccess.h
b/include/asm-mips/paccess.h
index
309bc30
..
147844e
100644
(file)
--- a/
include/asm-mips/paccess.h
+++ b/
include/asm-mips/paccess.h
@@
-13,7
+13,6
@@
#ifndef _ASM_PACCESS_H
#define _ASM_PACCESS_H
#ifndef _ASM_PACCESS_H
#define _ASM_PACCESS_H
-#include <linux/config.h>
#include <linux/errno.h>
#ifdef CONFIG_32BIT
#include <linux/errno.h>
#ifdef CONFIG_32BIT
@@
-52,7
+51,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
+66,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
+89,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
+103,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);