projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pxa-fixes'
[powerpc.git]
/
include
/
asm-mips
/
paccess.h
diff --git
a/include/asm-mips/paccess.h
b/include/asm-mips/paccess.h
index
46f2d23
..
c2394f8
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
@@
-26,16
+25,16
@@
extern asmlinkage void handle_ibe(void);
extern asmlinkage void handle_dbe(void);
extern asmlinkage void handle_ibe(void);
extern asmlinkage void handle_dbe(void);
-#define put_dbe(x,
ptr) __put_dbe((x),(ptr),
sizeof(*(ptr)))
-#define get_dbe(x,
ptr) __get_dbe((x),(ptr),
sizeof(*(ptr)))
+#define put_dbe(x,
ptr) __put_dbe((x), (ptr),
sizeof(*(ptr)))
+#define get_dbe(x,
ptr) __get_dbe((x), (ptr),
sizeof(*(ptr)))
struct __large_pstruct { unsigned long buf[100]; };
#define __mp(x) (*(struct __large_pstruct *)(x))
struct __large_pstruct { unsigned long buf[100]; };
#define __mp(x) (*(struct __large_pstruct *)(x))
-#define __get_dbe(x,
ptr,size)
\
+#define __get_dbe(x,
ptr, size)
\
({ \
long __gu_err; \
({ \
long __gu_err; \
- __typeof
(*(ptr)) __gu_val;
\
+ __typeof
__(*(ptr)) __gu_val;
\
unsigned long __gu_addr; \
__asm__("":"=r" (__gu_val)); \
__gu_addr = (unsigned long) (ptr); \
unsigned long __gu_addr; \
__asm__("":"=r" (__gu_val)); \
__gu_addr = (unsigned long) (ptr); \
@@
-71,7
+70,7
@@
struct __large_pstruct { unsigned long buf[100]; };
extern void __get_dbe_unknown(void);
extern void __get_dbe_unknown(void);
-#define __put_dbe(x,
ptr,size)
\
+#define __put_dbe(x,
ptr, size)
\
({ \
long __pu_err; \
__typeof__(*(ptr)) __pu_val; \
({ \
long __pu_err; \
__typeof__(*(ptr)) __pu_val; \