diff options
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/binfmt_elfo32.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/gdb-stub.c | 8 | ||||
-rw-r--r-- | arch/mips/kernel/i8259.c | 14 | ||||
-rw-r--r-- | arch/mips/kernel/irixelf.c | 8 | ||||
-rw-r--r-- | arch/mips/kernel/irixsig.c | 8 | ||||
-rw-r--r-- | arch/mips/kernel/irq.c | 4 | ||||
-rw-r--r-- | arch/mips/kernel/kspd.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/linux32.c | 10 | ||||
-rw-r--r-- | arch/mips/kernel/signal.c | 4 | ||||
-rw-r--r-- | arch/mips/kernel/smtc.c | 6 | ||||
-rw-r--r-- | arch/mips/kernel/syscall.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/sysirix.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/vpe.c | 2 |
13 files changed, 36 insertions, 36 deletions
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c index 993f7ec70f35..da41eac195ca 100644 --- a/arch/mips/kernel/binfmt_elfo32.c +++ b/arch/mips/kernel/binfmt_elfo32.c | |||
@@ -110,7 +110,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) | |||
110 | } | 110 | } |
111 | 111 | ||
112 | #undef ELF_CORE_COPY_REGS | 112 | #undef ELF_CORE_COPY_REGS |
113 | #define ELF_CORE_COPY_REGS(_dest,_regs) elf32_core_copy_regs(_dest,_regs); | 113 | #define ELF_CORE_COPY_REGS(_dest, _regs) elf32_core_copy_regs(_dest, _regs); |
114 | 114 | ||
115 | void elf32_core_copy_regs(elf_gregset_t grp, struct pt_regs *regs) | 115 | void elf32_core_copy_regs(elf_gregset_t grp, struct pt_regs *regs) |
116 | { | 116 | { |
diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c index 989d06c3827b..c33f6f22d86a 100644 --- a/arch/mips/kernel/gdb-stub.c +++ b/arch/mips/kernel/gdb-stub.c | |||
@@ -902,7 +902,7 @@ void handle_exception(struct gdb_regs *regs) | |||
902 | hex2mem(ptr, (char *)®s->frame_ptr, 2*sizeof(long), 0, 0); | 902 | hex2mem(ptr, (char *)®s->frame_ptr, 2*sizeof(long), 0, 0); |
903 | ptr += 2*(2*sizeof(long)); | 903 | ptr += 2*(2*sizeof(long)); |
904 | hex2mem(ptr, (char *)®s->cp0_index, 16*sizeof(long), 0, 0); | 904 | hex2mem(ptr, (char *)®s->cp0_index, 16*sizeof(long), 0, 0); |
905 | strcpy(output_buffer,"OK"); | 905 | strcpy(output_buffer, "OK"); |
906 | } | 906 | } |
907 | break; | 907 | break; |
908 | 908 | ||
@@ -919,7 +919,7 @@ void handle_exception(struct gdb_regs *regs) | |||
919 | break; | 919 | break; |
920 | strcpy(output_buffer, "E03"); | 920 | strcpy(output_buffer, "E03"); |
921 | } else | 921 | } else |
922 | strcpy(output_buffer,"E01"); | 922 | strcpy(output_buffer, "E01"); |
923 | break; | 923 | break; |
924 | 924 | ||
925 | /* | 925 | /* |
@@ -996,7 +996,7 @@ void handle_exception(struct gdb_regs *regs) | |||
996 | ptr = &input_buffer[1]; | 996 | ptr = &input_buffer[1]; |
997 | if (!hexToInt(&ptr, &baudrate)) | 997 | if (!hexToInt(&ptr, &baudrate)) |
998 | { | 998 | { |
999 | strcpy(output_buffer,"B01"); | 999 | strcpy(output_buffer, "B01"); |
1000 | break; | 1000 | break; |
1001 | } | 1001 | } |
1002 | 1002 | ||
@@ -1015,7 +1015,7 @@ void handle_exception(struct gdb_regs *regs) | |||
1015 | break; | 1015 | break; |
1016 | default: | 1016 | default: |
1017 | baudrate = 0; | 1017 | baudrate = 0; |
1018 | strcpy(output_buffer,"B02"); | 1018 | strcpy(output_buffer, "B02"); |
1019 | goto x1; | 1019 | goto x1; |
1020 | } | 1020 | } |
1021 | 1021 | ||
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c index a860b21e63e9..471013577108 100644 --- a/arch/mips/kernel/i8259.c +++ b/arch/mips/kernel/i8259.c | |||
@@ -127,14 +127,14 @@ static inline int i8259A_irq_real(unsigned int irq) | |||
127 | int irqmask = 1 << irq; | 127 | int irqmask = 1 << irq; |
128 | 128 | ||
129 | if (irq < 8) { | 129 | if (irq < 8) { |
130 | outb(0x0B,PIC_MASTER_CMD); /* ISR register */ | 130 | outb(0x0B, PIC_MASTER_CMD); /* ISR register */ |
131 | value = inb(PIC_MASTER_CMD) & irqmask; | 131 | value = inb(PIC_MASTER_CMD) & irqmask; |
132 | outb(0x0A,PIC_MASTER_CMD); /* back to the IRR register */ | 132 | outb(0x0A, PIC_MASTER_CMD); /* back to the IRR register */ |
133 | return value; | 133 | return value; |
134 | } | 134 | } |
135 | outb(0x0B,PIC_SLAVE_CMD); /* ISR register */ | 135 | outb(0x0B, PIC_SLAVE_CMD); /* ISR register */ |
136 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); | 136 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); |
137 | outb(0x0A,PIC_SLAVE_CMD); /* back to the IRR register */ | 137 | outb(0x0A, PIC_SLAVE_CMD); /* back to the IRR register */ |
138 | return value; | 138 | return value; |
139 | } | 139 | } |
140 | 140 | ||
@@ -175,12 +175,12 @@ handle_real_irq: | |||
175 | if (irq & 8) { | 175 | if (irq & 8) { |
176 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ | 176 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ |
177 | outb(cached_slave_mask, PIC_SLAVE_IMR); | 177 | outb(cached_slave_mask, PIC_SLAVE_IMR); |
178 | outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ | 178 | outb(0x60+(irq&7), PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ |
179 | outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */ | 179 | outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */ |
180 | } else { | 180 | } else { |
181 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ | 181 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ |
182 | outb(cached_master_mask, PIC_MASTER_IMR); | 182 | outb(cached_master_mask, PIC_MASTER_IMR); |
183 | outb(0x60+irq,PIC_MASTER_CMD); /* 'Specific EOI to master */ | 183 | outb(0x60+irq, PIC_MASTER_CMD); /* 'Specific EOI to master */ |
184 | } | 184 | } |
185 | smtc_im_ack_irq(irq); | 185 | smtc_im_ack_irq(irq); |
186 | spin_unlock_irqrestore(&i8259A_lock, flags); | 186 | spin_unlock_irqrestore(&i8259A_lock, flags); |
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c index e3b4b547a822..8ef5cf4cc423 100644 --- a/arch/mips/kernel/irixelf.c +++ b/arch/mips/kernel/irixelf.c | |||
@@ -231,16 +231,16 @@ static unsigned long * create_irix_tables(char * p, int argc, int envc, | |||
231 | sp -= argc+1; | 231 | sp -= argc+1; |
232 | argv = sp; | 232 | argv = sp; |
233 | 233 | ||
234 | __put_user((elf_addr_t)argc,--sp); | 234 | __put_user((elf_addr_t)argc, --sp); |
235 | current->mm->arg_start = (unsigned long) p; | 235 | current->mm->arg_start = (unsigned long) p; |
236 | while (argc-->0) { | 236 | while (argc-->0) { |
237 | __put_user((unsigned long)p,argv++); | 237 | __put_user((unsigned long)p, argv++); |
238 | p += strlen_user(p); | 238 | p += strlen_user(p); |
239 | } | 239 | } |
240 | __put_user((unsigned long) NULL, argv); | 240 | __put_user((unsigned long) NULL, argv); |
241 | current->mm->arg_end = current->mm->env_start = (unsigned long) p; | 241 | current->mm->arg_end = current->mm->env_start = (unsigned long) p; |
242 | while (envc-->0) { | 242 | while (envc-->0) { |
243 | __put_user((unsigned long)p,envp++); | 243 | __put_user((unsigned long)p, envp++); |
244 | p += strlen_user(p); | 244 | p += strlen_user(p); |
245 | } | 245 | } |
246 | __put_user((unsigned long) NULL, envp); | 246 | __put_user((unsigned long) NULL, envp); |
@@ -831,7 +831,7 @@ static int load_irix_library(struct file *file) | |||
831 | int retval; | 831 | int retval; |
832 | unsigned int bss; | 832 | unsigned int bss; |
833 | int error; | 833 | int error; |
834 | int i,j, k; | 834 | int i, j, k; |
835 | 835 | ||
836 | error = kernel_read(file, 0, (char *) &elf_ex, sizeof(elf_ex)); | 836 | error = kernel_read(file, 0, (char *) &elf_ex, sizeof(elf_ex)); |
837 | if (error != sizeof(elf_ex)) | 837 | if (error != sizeof(elf_ex)) |
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index 28b2a8f00911..85c2e389edd6 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c | |||
@@ -163,9 +163,9 @@ static inline int handle_signal(unsigned long sig, siginfo_t *info, | |||
163 | ret = setup_irix_frame(ka, regs, sig, oldset); | 163 | ret = setup_irix_frame(ka, regs, sig, oldset); |
164 | 164 | ||
165 | spin_lock_irq(¤t->sighand->siglock); | 165 | spin_lock_irq(¤t->sighand->siglock); |
166 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); | 166 | sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); |
167 | if (!(ka->sa.sa_flags & SA_NODEFER)) | 167 | if (!(ka->sa.sa_flags & SA_NODEFER)) |
168 | sigaddset(¤t->blocked,sig); | 168 | sigaddset(¤t->blocked, sig); |
169 | recalc_sigpending(); | 169 | recalc_sigpending(); |
170 | spin_unlock_irq(¤t->sighand->siglock); | 170 | spin_unlock_irq(¤t->sighand->siglock); |
171 | 171 | ||
@@ -605,8 +605,8 @@ repeat: | |||
605 | current->state = TASK_INTERRUPTIBLE; | 605 | current->state = TASK_INTERRUPTIBLE; |
606 | read_lock(&tasklist_lock); | 606 | read_lock(&tasklist_lock); |
607 | tsk = current; | 607 | tsk = current; |
608 | list_for_each(_p,&tsk->children) { | 608 | list_for_each(_p, &tsk->children) { |
609 | p = list_entry(_p,struct task_struct,sibling); | 609 | p = list_entry(_p, struct task_struct, sibling); |
610 | if ((type == IRIX_P_PID) && p->pid != pid) | 610 | if ((type == IRIX_P_PID) && p->pid != pid) |
611 | continue; | 611 | continue; |
612 | if ((type == IRIX_P_PGID) && process_group(p) != pid) | 612 | if ((type == IRIX_P_PGID) && process_group(p) != pid) |
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index a990aad2f049..d06e9c9af790 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c | |||
@@ -93,7 +93,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
93 | if (i == 0) { | 93 | if (i == 0) { |
94 | seq_printf(p, " "); | 94 | seq_printf(p, " "); |
95 | for_each_online_cpu(j) | 95 | for_each_online_cpu(j) |
96 | seq_printf(p, "CPU%d ",j); | 96 | seq_printf(p, "CPU%d ", j); |
97 | seq_putc(p, '\n'); | 97 | seq_putc(p, '\n'); |
98 | } | 98 | } |
99 | 99 | ||
@@ -102,7 +102,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
102 | action = irq_desc[i].action; | 102 | action = irq_desc[i].action; |
103 | if (!action) | 103 | if (!action) |
104 | goto skip; | 104 | goto skip; |
105 | seq_printf(p, "%3d: ",i); | 105 | seq_printf(p, "%3d: ", i); |
106 | #ifndef CONFIG_SMP | 106 | #ifndef CONFIG_SMP |
107 | seq_printf(p, "%10u ", kstat_irqs(i)); | 107 | seq_printf(p, "%10u ", kstat_irqs(i)); |
108 | #else | 108 | #else |
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c index 1ed176606548..d2c2e00e5864 100644 --- a/arch/mips/kernel/kspd.c +++ b/arch/mips/kernel/kspd.c | |||
@@ -239,7 +239,7 @@ void sp_work_handle_request(void) | |||
239 | case MTSP_SYSCALL_GETTOD: | 239 | case MTSP_SYSCALL_GETTOD: |
240 | memset(&tz, 0, sizeof(tz)); | 240 | memset(&tz, 0, sizeof(tz)); |
241 | if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv, | 241 | if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv, |
242 | (int)&tz, 0,0)) == 0) | 242 | (int)&tz, 0, 0)) == 0) |
243 | ret.retval = tv.tv_sec; | 243 | ret.retval = tv.tv_sec; |
244 | break; | 244 | break; |
245 | 245 | ||
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index a6de17081cad..d6e01215fb2b 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
@@ -58,10 +58,10 @@ | |||
58 | #define AA(__x) ((unsigned long)((int)__x)) | 58 | #define AA(__x) ((unsigned long)((int)__x)) |
59 | 59 | ||
60 | #ifdef __MIPSEB__ | 60 | #ifdef __MIPSEB__ |
61 | #define merge_64(r1,r2) ((((r1) & 0xffffffffUL) << 32) + ((r2) & 0xffffffffUL)) | 61 | #define merge_64(r1, r2) ((((r1) & 0xffffffffUL) << 32) + ((r2) & 0xffffffffUL)) |
62 | #endif | 62 | #endif |
63 | #ifdef __MIPSEL__ | 63 | #ifdef __MIPSEL__ |
64 | #define merge_64(r1,r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL)) | 64 | #define merge_64(r1, r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL)) |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | /* | 67 | /* |
@@ -96,7 +96,7 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf) | |||
96 | #endif | 96 | #endif |
97 | tmp.st_blocks = stat->blocks; | 97 | tmp.st_blocks = stat->blocks; |
98 | tmp.st_blksize = stat->blksize; | 98 | tmp.st_blksize = stat->blksize; |
99 | return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0; | 99 | return copy_to_user(statbuf, &tmp, sizeof(tmp)) ? -EFAULT : 0; |
100 | } | 100 | } |
101 | 101 | ||
102 | asmlinkage unsigned long | 102 | asmlinkage unsigned long |
@@ -510,11 +510,11 @@ asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32) | |||
510 | if (err) | 510 | if (err) |
511 | goto out; | 511 | goto out; |
512 | 512 | ||
513 | memset(&tmp32,0,sizeof(struct ustat32)); | 513 | memset(&tmp32, 0, sizeof(struct ustat32)); |
514 | tmp32.f_tfree = tmp.f_tfree; | 514 | tmp32.f_tfree = tmp.f_tfree; |
515 | tmp32.f_tinode = tmp.f_tinode; | 515 | tmp32.f_tinode = tmp.f_tinode; |
516 | 516 | ||
517 | err = copy_to_user(ubuf32,&tmp32,sizeof(struct ustat32)) ? -EFAULT : 0; | 517 | err = copy_to_user(ubuf32, &tmp32, sizeof(struct ustat32)) ? -EFAULT : 0; |
518 | 518 | ||
519 | out: | 519 | out: |
520 | return err; | 520 | return err; |
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index 2a08ce41bf2b..a4e106c56ab5 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c | |||
@@ -613,9 +613,9 @@ static int handle_signal(unsigned long sig, siginfo_t *info, | |||
613 | ret = current->thread.abi->setup_frame(ka, regs, sig, oldset); | 613 | ret = current->thread.abi->setup_frame(ka, regs, sig, oldset); |
614 | 614 | ||
615 | spin_lock_irq(¤t->sighand->siglock); | 615 | spin_lock_irq(¤t->sighand->siglock); |
616 | sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); | 616 | sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); |
617 | if (!(ka->sa.sa_flags & SA_NODEFER)) | 617 | if (!(ka->sa.sa_flags & SA_NODEFER)) |
618 | sigaddset(¤t->blocked,sig); | 618 | sigaddset(¤t->blocked, sig); |
619 | recalc_sigpending(); | 619 | recalc_sigpending(); |
620 | spin_unlock_irq(¤t->sighand->siglock); | 620 | spin_unlock_irq(¤t->sighand->siglock); |
621 | 621 | ||
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 770182887c5b..4d91e2f455c0 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
@@ -180,7 +180,7 @@ void __init sanitize_tlb_entries(void) | |||
180 | 180 | ||
181 | static void smtc_configure_tlb(void) | 181 | static void smtc_configure_tlb(void) |
182 | { | 182 | { |
183 | int i,tlbsiz,vpes; | 183 | int i, tlbsiz, vpes; |
184 | unsigned long mvpconf0; | 184 | unsigned long mvpconf0; |
185 | unsigned long config1val; | 185 | unsigned long config1val; |
186 | 186 | ||
@@ -423,7 +423,7 @@ void mipsmt_prepare_cpus(void) | |||
423 | * code. Leave it alone! | 423 | * code. Leave it alone! |
424 | */ | 424 | */ |
425 | if (tc != 0) { | 425 | if (tc != 0) { |
426 | smtc_tc_setup(vpe,tc, cpu); | 426 | smtc_tc_setup(vpe, tc, cpu); |
427 | cpu++; | 427 | cpu++; |
428 | } | 428 | } |
429 | printk(" %d", tc); | 429 | printk(" %d", tc); |
@@ -431,7 +431,7 @@ void mipsmt_prepare_cpus(void) | |||
431 | } | 431 | } |
432 | if (slop) { | 432 | if (slop) { |
433 | if (tc != 0) { | 433 | if (tc != 0) { |
434 | smtc_tc_setup(vpe,tc, cpu); | 434 | smtc_tc_setup(vpe, tc, cpu); |
435 | cpu++; | 435 | cpu++; |
436 | } | 436 | } |
437 | printk(" %d", tc); | 437 | printk(" %d", tc); |
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index ef2c6360d052..17c4374d2209 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c | |||
@@ -245,7 +245,7 @@ asmlinkage int sys_olduname(struct oldold_utsname __user * name) | |||
245 | 245 | ||
246 | if (!name) | 246 | if (!name) |
247 | return -EFAULT; | 247 | return -EFAULT; |
248 | if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname))) | 248 | if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname))) |
249 | return -EFAULT; | 249 | return -EFAULT; |
250 | 250 | ||
251 | error = __copy_to_user(&name->sysname, &utsname()->sysname, | 251 | error = __copy_to_user(&name->sysname, &utsname()->sysname, |
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c index b50239574c95..ee7790d9debe 100644 --- a/arch/mips/kernel/sysirix.c +++ b/arch/mips/kernel/sysirix.c | |||
@@ -778,7 +778,7 @@ asmlinkage int irix_times(struct tms __user *tbuf) | |||
778 | int err = 0; | 778 | int err = 0; |
779 | 779 | ||
780 | if (tbuf) { | 780 | if (tbuf) { |
781 | if (!access_ok(VERIFY_WRITE,tbuf,sizeof *tbuf)) | 781 | if (!access_ok(VERIFY_WRITE, tbuf, sizeof *tbuf)) |
782 | return -EFAULT; | 782 | return -EFAULT; |
783 | 783 | ||
784 | err = __put_user(current->utime, &tbuf->tms_utime); | 784 | err = __put_user(current->utime, &tbuf->tms_utime); |
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 3c09b9785f4c..45077c4b2e22 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
@@ -1044,7 +1044,7 @@ static int getcwd(char *buff, int size) | |||
1044 | old_fs = get_fs(); | 1044 | old_fs = get_fs(); |
1045 | set_fs(KERNEL_DS); | 1045 | set_fs(KERNEL_DS); |
1046 | 1046 | ||
1047 | ret = sys_getcwd(buff,size); | 1047 | ret = sys_getcwd(buff, size); |
1048 | 1048 | ||
1049 | set_fs(old_fs); | 1049 | set_fs(old_fs); |
1050 | 1050 | ||