From 6f76e5ae5a5b6f730b01cd4ddec4c3e50c92c8e5 Mon Sep 17 00:00:00 2001 From: Ulf Carlsson Date: Tue, 4 Jul 2000 08:37:54 +0000 Subject: Make pid_t int. Change printf()'s according to that. Declare stuff. --- arch/mips/arc/memory.c | 2 +- drivers/sgi/char/streamable.c | 4 ++-- drivers/sgi/char/usema.c | 16 ++++++++-------- include/asm-mips/highmem.h | 12 ++++++++++-- include/asm-mips/keyboard.h | 1 + include/asm-mips/posix_types.h | 4 ++-- include/asm-mips/signal.h | 2 +- include/asm-mips/system.h | 1 + 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/arch/mips/arc/memory.c b/arch/mips/arc/memory.c index 22c868ca1..49de2ffa9 100644 --- a/arch/mips/arc/memory.c +++ b/arch/mips/arc/memory.c @@ -144,7 +144,7 @@ static inline struct prom_pmemblock *find_largest_memblock(void) void __init prom_meminit(void) { struct prom_pmemblock *largest; - unsigned long bootmap_size, kbegin, kend; + unsigned long bootmap_size; struct linux_mdesc *p; int totram; int i = 0; diff --git a/drivers/sgi/char/streamable.c b/drivers/sgi/char/streamable.c index b07bedece..1f354d80f 100644 --- a/drivers/sgi/char/streamable.c +++ b/drivers/sgi/char/streamable.c @@ -52,14 +52,14 @@ get_sioc (struct strioctl *sioc, unsigned long arg) static int sgi_gfx_open (struct inode *inode, struct file *file) { - printk ("GFX: Opened by %ld\n", current->pid); + printk ("GFX: Opened by %d\n", current->pid); return 0; } static int sgi_gfx_close (struct inode *inode, struct file *file) { - printk ("GFX: Closed by %ld\n", current->pid); + printk ("GFX: Closed by %d\n", current->pid); return 0; } diff --git a/drivers/sgi/char/usema.c b/drivers/sgi/char/usema.c index 9ab379ed1..c9fbe87d4 100644 --- a/drivers/sgi/char/usema.c +++ b/drivers/sgi/char/usema.c @@ -67,7 +67,7 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, struct irix_usema *usema = file->private_data; int retval; - printk("[%s:%ld] wants ioctl 0x%xd (arg 0x%lx)", + printk("[%s:%d] wants ioctl 0x%xd (arg 0x%lx)", current->comm, current->pid, cmd, arg); switch(cmd) { @@ -79,7 +79,7 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, usattach_t *attach = (usattach_t *)arg; retval = verify_area(VERIFY_READ, attach, sizeof(usattach_t)); if (retval) { - printk("[%s:%ld] sgi_usema_ioctl(UIOCATTACHSEMA): " + printk("[%s:%d] sgi_usema_ioctl(UIOCATTACHSEMA): " "verify_area failure", current->comm, current->pid); return retval; @@ -87,7 +87,7 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, if (usema == 0) return -EINVAL; - printk("UIOCATTACHSEMA: attaching usema %p to process %ld\n", + printk("UIOCATTACHSEMA: attaching usema %p to process %d\n", usema, current->pid); /* XXX what is attach->us_handle for? */ return sgi_usema_attach(attach, usema); @@ -101,12 +101,12 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, retval = verify_area(VERIFY_READ, attach, sizeof(usattach_t)); if (retval) { - printk("[%s:%ld] sgi_usema_ioctl(UIOC*BLOCK): " + printk("[%s:%d] sgi_usema_ioctl(UIOC*BLOCK): " "verify_area failure", current->comm, current->pid); return retval; } - printk("UIOC*BLOCK: putting process %ld to sleep on usema %p", + printk("UIOC*BLOCK: putting process %d to sleep on usema %p", current->pid, usema); if (cmd == UIOCNOIBLOCK) interruptible_sleep_on(&usema->proc_list); @@ -121,13 +121,13 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, retval = verify_area(VERIFY_READ, attach, sizeof(usattach_t)); if (retval) { - printk("[%s:%ld] sgi_usema_ioctl(UIOC*BLOCK): " + printk("[%s:%d] sgi_usema_ioctl(UIOC*BLOCK): " "verify_area failure", current->comm, current->pid); return retval; } - printk("[%s:%ld] releasing usema %p", + printk("[%s:%d] releasing usema %p", current->comm, current->pid, usema); wake_up(&usema->proc_list); return 0; @@ -141,7 +141,7 @@ sgi_usemaclone_poll(struct file *filp, poll_table *wait) { struct irix_usema *usema = filp->private_data; - printk("[%s:%ld] wants to poll usema %p", + printk("[%s:%d] wants to poll usema %p", current->comm, current->pid, usema); return 0; 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__) -- cgit v1.2.3