diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /include/asm-mips/paccess.h | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/asm-mips/paccess.h')
| -rw-r--r-- | include/asm-mips/paccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/paccess.h b/include/asm-mips/paccess.h index 147844ef103b..8c08fa904b2c 100644 --- a/include/asm-mips/paccess.h +++ b/include/asm-mips/paccess.h | |||
| @@ -34,7 +34,7 @@ struct __large_pstruct { unsigned long buf[100]; }; | |||
| 34 | #define __get_dbe(x,ptr,size) \ | 34 | #define __get_dbe(x,ptr,size) \ |
| 35 | ({ \ | 35 | ({ \ |
| 36 | long __gu_err; \ | 36 | long __gu_err; \ |
| 37 | __typeof(*(ptr)) __gu_val; \ | 37 | __typeof__(*(ptr)) __gu_val; \ |
| 38 | unsigned long __gu_addr; \ | 38 | unsigned long __gu_addr; \ |
| 39 | __asm__("":"=r" (__gu_val)); \ | 39 | __asm__("":"=r" (__gu_val)); \ |
| 40 | __gu_addr = (unsigned long) (ptr); \ | 40 | __gu_addr = (unsigned long) (ptr); \ |