diff options
| author | Ulf Carlsson <md1ulfc@mdstud.chalmers.se> | 2000-07-04 09:40:28 +0000 |
|---|---|---|
| committer | Ulf Carlsson <md1ulfc@mdstud.chalmers.se> | 2000-07-04 09:40:28 +0000 |
| commit | 6bfb3b8f2afaaa0ca16118347e82d5d0590606cc (patch) | |
| tree | 74390fb673209eef3316cd8f30b98090d8c7c2ce | |
| parent | 4eb414488b8e84070c6615072b64eddd7c62c91d (diff) | |
Fix some types and some more %ld mess.
| -rw-r--r-- | arch/mips/kernel/traps.c | 6 | ||||
| -rw-r--r-- | include/asm-mips/posix_types.h | 14 | ||||
| -rw-r--r-- | include/asm-mips/types.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 4972885c2..3af7202f7 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -209,7 +209,7 @@ extern void __die(const char * str, struct pt_regs * regs, const char *where, printk(" in %s, line %ld", where, line); printk(":\n"); show_regs(regs); - printk("Process %s (pid: %ld, stackpage=%08lx)\n", + printk("Process %s (pid: %d, stackpage=%08lx)\n", current->comm, current->pid, (unsigned long) current); show_stack((unsigned int *) regs->regs[29]); show_trace((unsigned int *) regs->regs[29]); @@ -230,7 +230,7 @@ void __die_if_kernel(const char * str, struct pt_regs * regs, const char *where, extern const struct exception_table_entry __start___dbe_table[]; extern const struct exception_table_entry __stop___dbe_table[]; -static void __declare_dbe_table(void) +void __declare_dbe_table(void) { __asm__ __volatile__( ".section\t__dbe_table,\"a\"\n\t" @@ -527,7 +527,7 @@ void simulate_sc(struct pt_regs *regp, unsigned int opcode) void do_ri(struct pt_regs *regs) { lock_kernel(); - printk("[%s:%ld] Illegal instruction at %08lx ra=%08lx\n", + printk("[%s:%d] Illegal instruction at %08lx ra=%08lx\n", current->comm, current->pid, regs->cp0_epc, regs->regs[31]); unlock_kernel(); if (compute_return_epc(regs)) diff --git a/include/asm-mips/posix_types.h b/include/asm-mips/posix_types.h index 83fd8fbc2..6c48b3f83 100644 --- a/include/asm-mips/posix_types.h +++ b/include/asm-mips/posix_types.h @@ -15,15 +15,15 @@ * assume GCC is being used. */ -typedef unsigned long __kernel_dev_t; +typedef unsigned int __kernel_dev_t; typedef unsigned long __kernel_ino_t; -typedef unsigned long __kernel_mode_t; -typedef unsigned long __kernel_nlink_t; +typedef unsigned int __kernel_mode_t; +typedef int __kernel_nlink_t; typedef long __kernel_off_t; typedef int __kernel_pid_t; typedef int __kernel_ipc_pid_t; -typedef long __kernel_uid_t; -typedef long __kernel_gid_t; +typedef int __kernel_uid_t; +typedef int __kernel_gid_t; typedef unsigned int __kernel_size_t; typedef int __kernel_ssize_t; typedef int __kernel_ptrdiff_t; @@ -35,8 +35,8 @@ typedef char * __kernel_caddr_t; typedef unsigned short __kernel_uid16_t; typedef unsigned short __kernel_gid16_t; -typedef long __kernel_uid32_t; -typedef long __kernel_gid32_t; +typedef int __kernel_uid32_t; +typedef int __kernel_gid32_t; typedef __kernel_uid_t __kernel_old_uid_t; typedef __kernel_gid_t __kernel_old_gid_t; diff --git a/include/asm-mips/types.h b/include/asm-mips/types.h index d7bf84ee4..638f75163 100644 --- a/include/asm-mips/types.h +++ b/include/asm-mips/types.h @@ -10,7 +10,7 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -typedef unsigned long umode_t; +typedef unsigned short umode_t; /* * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the |