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 993f7ec70f3..da41eac195c 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)  }  #undef ELF_CORE_COPY_REGS -#define ELF_CORE_COPY_REGS(_dest,_regs) elf32_core_copy_regs(_dest,_regs); +#define ELF_CORE_COPY_REGS(_dest, _regs) elf32_core_copy_regs(_dest, _regs);  void elf32_core_copy_regs(elf_gregset_t grp, struct pt_regs *regs)  { diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c index 989d06c3827..c33f6f22d86 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)  			hex2mem(ptr, (char *)®s->frame_ptr, 2*sizeof(long), 0, 0);  			ptr += 2*(2*sizeof(long));  			hex2mem(ptr, (char *)®s->cp0_index, 16*sizeof(long), 0, 0); -			strcpy(output_buffer,"OK"); +			strcpy(output_buffer, "OK");  		 }  		break; @@ -919,7 +919,7 @@ void handle_exception(struct gdb_regs *regs)  					break;  				strcpy(output_buffer, "E03");  			} else -				strcpy(output_buffer,"E01"); +				strcpy(output_buffer, "E01");  			break;  		/* @@ -996,7 +996,7 @@ void handle_exception(struct gdb_regs *regs)  			ptr = &input_buffer[1];  			if (!hexToInt(&ptr, &baudrate))  			{ -				strcpy(output_buffer,"B01"); +				strcpy(output_buffer, "B01");  				break;  			} @@ -1015,7 +1015,7 @@ void handle_exception(struct gdb_regs *regs)  					break;  				default:  					baudrate = 0; -					strcpy(output_buffer,"B02"); +					strcpy(output_buffer, "B02");  					goto x1;  			} diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c index a860b21e63e..47101357710 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)  	int irqmask = 1 << irq;  	if (irq < 8) { -		outb(0x0B,PIC_MASTER_CMD);	/* ISR register */ +		outb(0x0B, PIC_MASTER_CMD);	/* ISR register */  		value = inb(PIC_MASTER_CMD) & irqmask; -		outb(0x0A,PIC_MASTER_CMD);	/* back to the IRR register */ +		outb(0x0A, PIC_MASTER_CMD);	/* back to the IRR register */  		return value;  	} -	outb(0x0B,PIC_SLAVE_CMD);	/* ISR register */ +	outb(0x0B, PIC_SLAVE_CMD);	/* ISR register */  	value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); -	outb(0x0A,PIC_SLAVE_CMD);	/* back to the IRR register */ +	outb(0x0A, PIC_SLAVE_CMD);	/* back to the IRR register */  	return value;  } @@ -175,12 +175,12 @@ handle_real_irq:  	if (irq & 8) {  		inb(PIC_SLAVE_IMR);	/* DUMMY - (do we need this?) */  		outb(cached_slave_mask, PIC_SLAVE_IMR); -		outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ -		outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */ +		outb(0x60+(irq&7), PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ +		outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */  	} else {  		inb(PIC_MASTER_IMR);	/* DUMMY - (do we need this?) */  		outb(cached_master_mask, PIC_MASTER_IMR); -		outb(0x60+irq,PIC_MASTER_CMD);	/* 'Specific EOI to master */ +		outb(0x60+irq, PIC_MASTER_CMD);	/* 'Specific EOI to master */  	}  	smtc_im_ack_irq(irq);  	spin_unlock_irqrestore(&i8259A_lock, flags); diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c index e3b4b547a82..8ef5cf4cc42 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,  	sp -= argc+1;  	argv = sp; -	__put_user((elf_addr_t)argc,--sp); +	__put_user((elf_addr_t)argc, --sp);  	current->mm->arg_start = (unsigned long) p;  	while (argc-->0) { -		__put_user((unsigned long)p,argv++); +		__put_user((unsigned long)p, argv++);  		p += strlen_user(p);  	}  	__put_user((unsigned long) NULL, argv);  	current->mm->arg_end = current->mm->env_start = (unsigned long) p;  	while (envc-->0) { -		__put_user((unsigned long)p,envp++); +		__put_user((unsigned long)p, envp++);  		p += strlen_user(p);  	}  	__put_user((unsigned long) NULL, envp); @@ -831,7 +831,7 @@ static int load_irix_library(struct file *file)  	int retval;  	unsigned int bss;  	int error; -	int i,j, k; +	int i, j, k;  	error = kernel_read(file, 0, (char *) &elf_ex, sizeof(elf_ex));  	if (error != sizeof(elf_ex)) diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index 28b2a8f0091..85c2e389edd 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,  		ret = setup_irix_frame(ka, regs, sig, oldset);  	spin_lock_irq(¤t->sighand->siglock); -	sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); +	sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask);  	if (!(ka->sa.sa_flags & SA_NODEFER)) -		sigaddset(¤t->blocked,sig); +		sigaddset(¤t->blocked, sig);  	recalc_sigpending();  	spin_unlock_irq(¤t->sighand->siglock); @@ -605,8 +605,8 @@ repeat:  	current->state = TASK_INTERRUPTIBLE;  	read_lock(&tasklist_lock);  	tsk = current; -	list_for_each(_p,&tsk->children) { -		p = list_entry(_p,struct task_struct,sibling); +	list_for_each(_p, &tsk->children) { +		p = list_entry(_p, struct task_struct, sibling);  		if ((type == IRIX_P_PID) && p->pid != pid)  			continue;  		if ((type == IRIX_P_PGID) && process_group(p) != pid) diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index a990aad2f04..d06e9c9af79 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)  	if (i == 0) {  		seq_printf(p, "           ");  		for_each_online_cpu(j) -			seq_printf(p, "CPU%d       ",j); +			seq_printf(p, "CPU%d       ", j);  		seq_putc(p, '\n');  	} @@ -102,7 +102,7 @@ int show_interrupts(struct seq_file *p, void *v)  		action = irq_desc[i].action;  		if (!action)  			goto skip; -		seq_printf(p, "%3d: ",i); +		seq_printf(p, "%3d: ", i);  #ifndef CONFIG_SMP  		seq_printf(p, "%10u ", kstat_irqs(i));  #else diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c index 1ed17660654..d2c2e00e586 100644 --- a/arch/mips/kernel/kspd.c +++ b/arch/mips/kernel/kspd.c @@ -239,7 +239,7 @@ void sp_work_handle_request(void)   	case MTSP_SYSCALL_GETTOD:   		memset(&tz, 0, sizeof(tz));   		if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv, - 		                             (int)&tz, 0,0)) == 0) +					     (int)&tz, 0, 0)) == 0)  		ret.retval = tv.tv_sec;  		break; diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index a6de17081ca..d6e01215fb2 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c @@ -58,10 +58,10 @@  #define AA(__x) ((unsigned long)((int)__x))  #ifdef __MIPSEB__ -#define merge_64(r1,r2)	((((r1) & 0xffffffffUL) << 32) + ((r2) & 0xffffffffUL)) +#define merge_64(r1, r2) ((((r1) & 0xffffffffUL) << 32) + ((r2) & 0xffffffffUL))  #endif  #ifdef __MIPSEL__ -#define merge_64(r1,r2)	((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL)) +#define merge_64(r1, r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL))  #endif  /* @@ -96,7 +96,7 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)  #endif  	tmp.st_blocks = stat->blocks;  	tmp.st_blksize = stat->blksize; -	return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0; +	return copy_to_user(statbuf, &tmp, sizeof(tmp)) ? -EFAULT : 0;  }  asmlinkage unsigned long @@ -510,11 +510,11 @@ asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32)  	if (err)  		goto out; -	memset(&tmp32,0,sizeof(struct ustat32)); +	memset(&tmp32, 0, sizeof(struct ustat32));  	tmp32.f_tfree = tmp.f_tfree;  	tmp32.f_tinode = tmp.f_tinode; -	err = copy_to_user(ubuf32,&tmp32,sizeof(struct ustat32)) ? -EFAULT : 0; +	err = copy_to_user(ubuf32, &tmp32, sizeof(struct ustat32)) ? -EFAULT : 0;  out:  	return err; diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index 2a08ce41bf2..a4e106c56ab 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,  		ret = current->thread.abi->setup_frame(ka, regs, sig, oldset);  	spin_lock_irq(¤t->sighand->siglock); -	sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); +	sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask);  	if (!(ka->sa.sa_flags & SA_NODEFER)) -		sigaddset(¤t->blocked,sig); +		sigaddset(¤t->blocked, sig);  	recalc_sigpending();  	spin_unlock_irq(¤t->sighand->siglock); diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 770182887c5..4d91e2f455c 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c @@ -180,7 +180,7 @@ void __init sanitize_tlb_entries(void)  static void smtc_configure_tlb(void)  { -	int i,tlbsiz,vpes; +	int i, tlbsiz, vpes;  	unsigned long mvpconf0;  	unsigned long config1val; @@ -423,7 +423,7 @@ void mipsmt_prepare_cpus(void)  			 * code.  Leave it alone!  			 */  			if (tc != 0) { -				smtc_tc_setup(vpe,tc, cpu); +				smtc_tc_setup(vpe, tc, cpu);  				cpu++;  			}  			printk(" %d", tc); @@ -431,7 +431,7 @@ void mipsmt_prepare_cpus(void)  		}  		if (slop) {  			if (tc != 0) { -				smtc_tc_setup(vpe,tc, cpu); +				smtc_tc_setup(vpe, tc, cpu);  				cpu++;  			}  			printk(" %d", tc); diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index ef2c6360d05..17c4374d220 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)  	if (!name)  		return -EFAULT; -	if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname))) +	if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname)))  		return -EFAULT;  	error = __copy_to_user(&name->sysname, &utsname()->sysname, diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c index b50239574c9..ee7790d9deb 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)  	int err = 0;  	if (tbuf) { -		if (!access_ok(VERIFY_WRITE,tbuf,sizeof *tbuf)) +		if (!access_ok(VERIFY_WRITE, tbuf, sizeof *tbuf))  			return -EFAULT;  		err = __put_user(current->utime, &tbuf->tms_utime); diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 3c09b9785f4..45077c4b2e2 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c @@ -1044,7 +1044,7 @@ static int getcwd(char *buff, int size)  	old_fs = get_fs();  	set_fs(KERNEL_DS); -	ret = sys_getcwd(buff,size); +	ret = sys_getcwd(buff, size);  	set_fs(old_fs);  |