diff options
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/highmem.h | 12 | ||||
| -rw-r--r-- | include/asm-mips/keyboard.h | 1 | ||||
| -rw-r--r-- | include/asm-mips/posix_types.h | 4 | ||||
| -rw-r--r-- | include/asm-mips/signal.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/system.h | 1 |
5 files changed, 15 insertions, 5 deletions
diff --git a/include/asm-mips/highmem.h b/include/asm-mips/highmem.h index 032acd2ee..011247f16 100644 --- a/include/asm-mips/highmem.h +++ b/include/asm-mips/highmem.h @@ -20,9 +20,17 @@ extern pte_t *kmap_pte; extern pgprot_t kmap_prot; #define kmap_init() do { } while(0) -#define kmap(page) page_address(page) + +static __inline__ unsigned long kmap(struct page * page) { + return page_address(page); +} + #define kunmap(page) do { } while(0) -#define kmap_atomic(page, type) page_address(page) + +static __inline__ unsigned long kmap_atomic(struct page *page, int type) { + return page_address(page) +} + #define kunmap_atomic(page, type) do { } while(0) #endif /* _ASM_HIGHMEM_H */ diff --git a/include/asm-mips/keyboard.h b/include/asm-mips/keyboard.h index 70c4d8174..303f98958 100644 --- a/include/asm-mips/keyboard.h +++ b/include/asm-mips/keyboard.h @@ -25,6 +25,7 @@ extern char pckbd_unexpected_up(unsigned char keycode); extern void pckbd_leds(unsigned char leds); extern void pckbd_init_hw(void); extern unsigned char pckbd_sysrq_xlate[128]; +extern void kbd_forward_char (int ch); #define kbd_setkeycode pckbd_setkeycode #define kbd_getkeycode pckbd_getkeycode diff --git a/include/asm-mips/posix_types.h b/include/asm-mips/posix_types.h index a1e1080e7..83fd8fbc2 100644 --- a/include/asm-mips/posix_types.h +++ b/include/asm-mips/posix_types.h @@ -20,8 +20,8 @@ typedef unsigned long __kernel_ino_t; typedef unsigned long __kernel_mode_t; typedef unsigned long __kernel_nlink_t; typedef long __kernel_off_t; -typedef long __kernel_pid_t; -typedef long __kernel_ipc_pid_t; +typedef int __kernel_pid_t; +typedef int __kernel_ipc_pid_t; typedef long __kernel_uid_t; typedef long __kernel_gid_t; typedef unsigned int __kernel_size_t; diff --git a/include/asm-mips/signal.h b/include/asm-mips/signal.h index 59a30e987..50d6224d9 100644 --- a/include/asm-mips/signal.h +++ b/include/asm-mips/signal.h @@ -17,7 +17,7 @@ #define _NSIG_WORDS (_NSIG / _NSIG_BPW) typedef struct { - __u32 sig[_NSIG_WORDS]; + unsigned long sig[_NSIG_WORDS]; } sigset_t; typedef unsigned long old_sigset_t; /* at least 32 bits */ diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index a1f553488..91a7b05fb 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h @@ -267,6 +267,7 @@ extern void __die(const char *, struct pt_regs *, const char *where, unsigned long line) __attribute__((noreturn)); extern void __die_if_kernel(const char *, struct pt_regs *, const char *where, unsigned long line); +extern int abs(int); #define die(msg, regs) \ __die(msg, regs, __FILE__ ":"__FUNCTION__, __LINE__) |