diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
| commit | 9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch) | |
| tree | b19e6acb5a67af31a4e7742e05c2166dc3f1444c /include/asm-mips64 | |
| parent | 72919904796333a20c6a5d5c380091b42e407aa9 (diff) | |
Merge with Linux 2.3.22.
Diffstat (limited to 'include/asm-mips64')
| -rw-r--r-- | include/asm-mips64/bcache.h | 10 | ||||
| -rw-r--r-- | include/asm-mips64/paccess.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-mips64/bcache.h b/include/asm-mips64/bcache.h index 0df4edb7d..4ab0fca19 100644 --- a/include/asm-mips64/bcache.h +++ b/include/asm-mips64/bcache.h @@ -28,22 +28,22 @@ extern void sni_pcimt_sc_init(void); extern struct bcache_ops *bcops; -void inline bc_enable(void) +extern inline void bc_enable(void) { bcops->bc_enable(); } -void inline bc_disable(void) +extern inline void bc_disable(void) { - bcops->bc_disble(); + bcops->bc_disable(); } -void bc_wback_inv(unsigned long page, unsigned long size) +extern inline void bc_wback_inv(unsigned long page, unsigned long size) { bcops->bc_wback_inv(page, size); } -void bc_inv(unsigned long page, unsigned long size) +extern inline void bc_inv(unsigned long page, unsigned long size) { bcops->bc_inv(page, size); } diff --git a/include/asm-mips64/paccess.h b/include/asm-mips64/paccess.h index 0b97674cf..115da0cf2 100644 --- a/include/asm-mips64/paccess.h +++ b/include/asm-mips64/paccess.h @@ -19,8 +19,8 @@ #define put_dbe(x,ptr) __put_dbe((x),(ptr),sizeof(*(ptr))) #define get_dbe(x,ptr) __get_dbe((x),(ptr),sizeof(*(ptr))) -struct __large_struct { unsigned long buf[100]; }; -#define __m(x) (*(struct __large_struct *)(x)) +struct __large_pstruct { unsigned long buf[100]; }; +#define __m(x) (*(struct __large_pstruct *)(x)) #define __get_dbe(x,ptr,size) ({ \ long __gu_err; \ |