Commit e0daad44 authored by Ralf Baechle's avatar Ralf Baechle

[MIPS] Whitespace cleanups.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 722b05a0
...@@ -565,7 +565,7 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c) ...@@ -565,7 +565,7 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)
if (config3 & MIPS_CONF3_VEIC) if (config3 & MIPS_CONF3_VEIC)
c->options |= MIPS_CPU_VEIC; c->options |= MIPS_CPU_VEIC;
if (config3 & MIPS_CONF3_MT) if (config3 & MIPS_CONF3_MT)
c->ases |= MIPS_ASE_MIPSMT; c->ases |= MIPS_ASE_MIPSMT;
return config3 & MIPS_CONF_M; return config3 & MIPS_CONF_M;
} }
......
...@@ -505,13 +505,13 @@ void show_gdbregs(struct gdb_regs * regs) ...@@ -505,13 +505,13 @@ void show_gdbregs(struct gdb_regs * regs)
*/ */
printk("$0 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", printk("$0 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
regs->reg0, regs->reg1, regs->reg2, regs->reg3, regs->reg0, regs->reg1, regs->reg2, regs->reg3,
regs->reg4, regs->reg5, regs->reg6, regs->reg7); regs->reg4, regs->reg5, regs->reg6, regs->reg7);
printk("$8 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", printk("$8 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
regs->reg8, regs->reg9, regs->reg10, regs->reg11, regs->reg8, regs->reg9, regs->reg10, regs->reg11,
regs->reg12, regs->reg13, regs->reg14, regs->reg15); regs->reg12, regs->reg13, regs->reg14, regs->reg15);
printk("$16: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", printk("$16: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
regs->reg16, regs->reg17, regs->reg18, regs->reg19, regs->reg16, regs->reg17, regs->reg18, regs->reg19,
regs->reg20, regs->reg21, regs->reg22, regs->reg23); regs->reg20, regs->reg21, regs->reg22, regs->reg23);
printk("$24: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", printk("$24: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
regs->reg24, regs->reg25, regs->reg26, regs->reg27, regs->reg24, regs->reg25, regs->reg26, regs->reg27,
regs->reg28, regs->reg29, regs->reg30, regs->reg31); regs->reg28, regs->reg29, regs->reg30, regs->reg31);
......
...@@ -177,8 +177,8 @@ void mask_and_ack_8259A(unsigned int irq) ...@@ -177,8 +177,8 @@ void mask_and_ack_8259A(unsigned int irq)
outb(0x60+irq,PIC_MASTER_CMD); /* 'Specific EOI to master */ outb(0x60+irq,PIC_MASTER_CMD); /* 'Specific EOI to master */
} }
#ifdef CONFIG_MIPS_MT_SMTC #ifdef CONFIG_MIPS_MT_SMTC
if (irq_hwmask[irq] & ST0_IM) if (irq_hwmask[irq] & ST0_IM)
set_c0_status(irq_hwmask[irq] & ST0_IM); set_c0_status(irq_hwmask[irq] & ST0_IM);
#endif /* CONFIG_MIPS_MT_SMTC */ #endif /* CONFIG_MIPS_MT_SMTC */
spin_unlock_irqrestore(&i8259A_lock, flags); spin_unlock_irqrestore(&i8259A_lock, flags);
return; return;
......
...@@ -23,13 +23,13 @@ static unsigned int irq_base; ...@@ -23,13 +23,13 @@ static unsigned int irq_base;
static inline int ls1bit32(unsigned int x) static inline int ls1bit32(unsigned int x)
{ {
int b = 31, s; int b = 31, s;
s = 16; if (x << 16 == 0) s = 0; b -= s; x <<= s; s = 16; if (x << 16 == 0) s = 0; b -= s; x <<= s;
s = 8; if (x << 8 == 0) s = 0; b -= s; x <<= s; s = 8; if (x << 8 == 0) s = 0; b -= s; x <<= s;
s = 4; if (x << 4 == 0) s = 0; b -= s; x <<= s; s = 4; if (x << 4 == 0) s = 0; b -= s; x <<= s;
s = 2; if (x << 2 == 0) s = 0; b -= s; x <<= s; s = 2; if (x << 2 == 0) s = 0; b -= s; x <<= s;
s = 1; if (x << 1 == 0) s = 0; b -= s; s = 1; if (x << 1 == 0) s = 0; b -= s;
return b; return b;
} }
......
...@@ -194,15 +194,15 @@ sysn32_waitid(int which, compat_pid_t pid, ...@@ -194,15 +194,15 @@ sysn32_waitid(int which, compat_pid_t pid,
} }
struct sysinfo32 { struct sysinfo32 {
s32 uptime; s32 uptime;
u32 loads[3]; u32 loads[3];
u32 totalram; u32 totalram;
u32 freeram; u32 freeram;
u32 sharedram; u32 sharedram;
u32 bufferram; u32 bufferram;
u32 totalswap; u32 totalswap;
u32 freeswap; u32 freeswap;
u16 procs; u16 procs;
u32 totalhigh; u32 totalhigh;
u32 freehigh; u32 freehigh;
u32 mem_unit; u32 mem_unit;
...@@ -558,7 +558,7 @@ extern asmlinkage long sys_ustat(dev_t dev, struct ustat __user * ubuf); ...@@ -558,7 +558,7 @@ extern asmlinkage long sys_ustat(dev_t dev, struct ustat __user * ubuf);
asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32) asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32)
{ {
int err; int err;
struct ustat tmp; struct ustat tmp;
struct ustat32 tmp32; struct ustat32 tmp32;
mm_segment_t old_fs = get_fs(); mm_segment_t old_fs = get_fs();
...@@ -569,11 +569,11 @@ asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32) ...@@ -569,11 +569,11 @@ asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32)
if (err) if (err)
goto out; goto out;
memset(&tmp32,0,sizeof(struct ustat32)); memset(&tmp32,0,sizeof(struct ustat32));
tmp32.f_tfree = tmp.f_tfree; tmp32.f_tfree = tmp.f_tfree;
tmp32.f_tinode = tmp.f_tinode; 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: out:
return err; return err;
......
...@@ -31,13 +31,13 @@ static const char *cpu_name[] = { ...@@ -31,13 +31,13 @@ static const char *cpu_name[] = {
[CPU_R4000PC] = "R4000PC", [CPU_R4000PC] = "R4000PC",
[CPU_R4000SC] = "R4000SC", [CPU_R4000SC] = "R4000SC",
[CPU_R4000MC] = "R4000MC", [CPU_R4000MC] = "R4000MC",
[CPU_R4200] = "R4200", [CPU_R4200] = "R4200",
[CPU_R4400PC] = "R4400PC", [CPU_R4400PC] = "R4400PC",
[CPU_R4400SC] = "R4400SC", [CPU_R4400SC] = "R4400SC",
[CPU_R4400MC] = "R4400MC", [CPU_R4400MC] = "R4400MC",
[CPU_R4600] = "R4600", [CPU_R4600] = "R4600",
[CPU_R6000] = "R6000", [CPU_R6000] = "R6000",
[CPU_R6000A] = "R6000A", [CPU_R6000A] = "R6000A",
[CPU_R8000] = "R8000", [CPU_R8000] = "R8000",
[CPU_R10000] = "R10000", [CPU_R10000] = "R10000",
[CPU_R12000] = "R12000", [CPU_R12000] = "R12000",
...@@ -46,14 +46,14 @@ static const char *cpu_name[] = { ...@@ -46,14 +46,14 @@ static const char *cpu_name[] = {
[CPU_R4650] = "R4650", [CPU_R4650] = "R4650",
[CPU_R4700] = "R4700", [CPU_R4700] = "R4700",
[CPU_R5000] = "R5000", [CPU_R5000] = "R5000",
[CPU_R5000A] = "R5000A", [CPU_R5000A] = "R5000A",
[CPU_R4640] = "R4640", [CPU_R4640] = "R4640",
[CPU_NEVADA] = "Nevada", [CPU_NEVADA] = "Nevada",
[CPU_RM7000] = "RM7000", [CPU_RM7000] = "RM7000",
[CPU_RM9000] = "RM9000", [CPU_RM9000] = "RM9000",
[CPU_R5432] = "R5432", [CPU_R5432] = "R5432",
[CPU_4KC] = "MIPS 4Kc", [CPU_4KC] = "MIPS 4Kc",
[CPU_5KC] = "MIPS 5Kc", [CPU_5KC] = "MIPS 5Kc",
[CPU_R4310] = "R4310", [CPU_R4310] = "R4310",
[CPU_SB1] = "SiByte SB1", [CPU_SB1] = "SiByte SB1",
[CPU_SB1A] = "SiByte SB1A", [CPU_SB1A] = "SiByte SB1A",
......
...@@ -529,9 +529,9 @@ void __init setup_arch(char **cmdline_p) ...@@ -529,9 +529,9 @@ void __init setup_arch(char **cmdline_p)
#if defined(CONFIG_VT) #if defined(CONFIG_VT)
#if defined(CONFIG_VGA_CONSOLE) #if defined(CONFIG_VGA_CONSOLE)
conswitchp = &vga_con; conswitchp = &vga_con;
#elif defined(CONFIG_DUMMY_CONSOLE) #elif defined(CONFIG_DUMMY_CONSOLE)
conswitchp = &dummy_con; conswitchp = &dummy_con;
#endif #endif
#endif #endif
......
...@@ -89,7 +89,7 @@ _sys_rt_sigsuspend(nabi_no_regargs struct pt_regs regs) ...@@ -89,7 +89,7 @@ _sys_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
spin_lock_irq(&current->sighand->siglock); spin_lock_irq(&current->sighand->siglock);
current->saved_sigmask = current->blocked; current->saved_sigmask = current->blocked;
current->blocked = newset; current->blocked = newset;
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock); spin_unlock_irq(&current->sighand->siglock);
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
...@@ -124,7 +124,7 @@ asmlinkage int sys_sigaction(int sig, const struct sigaction __user *act, ...@@ -124,7 +124,7 @@ asmlinkage int sys_sigaction(int sig, const struct sigaction __user *act,
if (!ret && oact) { if (!ret && oact) {
if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact))) if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)))
return -EFAULT; return -EFAULT;
err |= __put_user(old_ka.sa.sa_flags, &oact->sa_flags); err |= __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
err |= __put_user(old_ka.sa.sa_handler, &oact->sa_handler); err |= __put_user(old_ka.sa.sa_handler, &oact->sa_handler);
err |= __put_user(old_ka.sa.sa_mask.sig[0], oact->sa_mask.sig); err |= __put_user(old_ka.sa.sa_mask.sig[0], oact->sa_mask.sig);
...@@ -304,7 +304,7 @@ int setup_frame(struct k_sigaction * ka, struct pt_regs *regs, ...@@ -304,7 +304,7 @@ int setup_frame(struct k_sigaction * ka, struct pt_regs *regs,
current->comm, current->pid, current->comm, current->pid,
frame, regs->cp0_epc, frame->regs[31]); frame, regs->cp0_epc, frame->regs[31]);
#endif #endif
return 0; return 0;
give_sigsegv: give_sigsegv:
force_sigsegv(signr, current); force_sigsegv(signr, current);
......
...@@ -105,7 +105,7 @@ _sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs) ...@@ -105,7 +105,7 @@ _sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
spin_lock_irq(&current->sighand->siglock); spin_lock_irq(&current->sighand->siglock);
current->saved_sigmask = current->blocked; current->saved_sigmask = current->blocked;
current->blocked = newset; current->blocked = newset;
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock); spin_unlock_irq(&current->sighand->siglock);
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
...@@ -184,7 +184,7 @@ int setup_rt_frame_n32(struct k_sigaction * ka, ...@@ -184,7 +184,7 @@ int setup_rt_frame_n32(struct k_sigaction * ka,
/* Create the ucontext. */ /* Create the ucontext. */
err |= __put_user(0, &frame->rs_uc.uc_flags); err |= __put_user(0, &frame->rs_uc.uc_flags);
err |= __put_user(0, &frame->rs_uc.uc_link); err |= __put_user(0, &frame->rs_uc.uc_link);
sp = (int) (long) current->sas_ss_sp; sp = (int) (long) current->sas_ss_sp;
err |= __put_user(sp, err |= __put_user(sp,
&frame->rs_uc.uc_stack.ss_sp); &frame->rs_uc.uc_stack.ss_sp);
err |= __put_user(sas_ss_flags(regs->regs[29]), err |= __put_user(sas_ss_flags(regs->regs[29]),
......
...@@ -1159,7 +1159,7 @@ void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu) ...@@ -1159,7 +1159,7 @@ void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu)
* It would be nice to be able to use a spinlock here, * It would be nice to be able to use a spinlock here,
* but this is invoked from within TLB flush routines * but this is invoked from within TLB flush routines
* that protect themselves with DVPE, so if a lock is * that protect themselves with DVPE, so if a lock is
* held by another TC, it'll never be freed. * held by another TC, it'll never be freed.
* *
* DVPE/DMT must not be done with interrupts enabled, * DVPE/DMT must not be done with interrupts enabled,
* so even so most callers will already have disabled * so even so most callers will already have disabled
......
...@@ -669,7 +669,7 @@ asmlinkage int irix_mount(char __user *dev_name, char __user *dir_name, ...@@ -669,7 +669,7 @@ asmlinkage int irix_mount(char __user *dev_name, char __user *dir_name,
struct irix_statfs { struct irix_statfs {
short f_type; short f_type;
long f_bsize, f_frsize, f_blocks, f_bfree, f_files, f_ffree; long f_bsize, f_frsize, f_blocks, f_bfree, f_files, f_ffree;
char f_fname[6], f_fpack[6]; char f_fname[6], f_fpack[6];
}; };
...@@ -959,7 +959,7 @@ static inline loff_t llseek(struct file *file, loff_t offset, int origin) ...@@ -959,7 +959,7 @@ static inline loff_t llseek(struct file *file, loff_t offset, int origin)
fn = default_llseek; fn = default_llseek;
if (file->f_op && file->f_op->llseek) if (file->f_op && file->f_op->llseek)
fn = file->f_op->llseek; fn = file->f_op->llseek;
lock_kernel(); lock_kernel();
retval = fn(file, offset, origin); retval = fn(file, offset, origin);
unlock_kernel(); unlock_kernel();
......
...@@ -522,7 +522,7 @@ static int (*reloc_handlers[]) (struct module *me, uint32_t *location, ...@@ -522,7 +522,7 @@ static int (*reloc_handlers[]) (struct module *me, uint32_t *location,
}; };
static char *rstrs[] = { static char *rstrs[] = {
[R_MIPS_NONE] = "MIPS_NONE", [R_MIPS_NONE] = "MIPS_NONE",
[R_MIPS_32] = "MIPS_32", [R_MIPS_32] = "MIPS_32",
[R_MIPS_26] = "MIPS_26", [R_MIPS_26] = "MIPS_26",
[R_MIPS_HI16] = "MIPS_HI16", [R_MIPS_HI16] = "MIPS_HI16",
...@@ -713,16 +713,16 @@ static int vpe_run(struct vpe * v) ...@@ -713,16 +713,16 @@ static int vpe_run(struct vpe * v)
dvpe(); dvpe();
if (!list_empty(&v->tc)) { if (!list_empty(&v->tc)) {
if ((t = list_entry(v->tc.next, struct tc, tc)) == NULL) { if ((t = list_entry(v->tc.next, struct tc, tc)) == NULL) {
printk(KERN_WARNING "VPE loader: TC %d is already in use.\n", printk(KERN_WARNING "VPE loader: TC %d is already in use.\n",
t->index); t->index);
return -ENOEXEC; return -ENOEXEC;
} }
} else { } else {
printk(KERN_WARNING "VPE loader: No TC's associated with VPE %d\n", printk(KERN_WARNING "VPE loader: No TC's associated with VPE %d\n",
v->minor); v->minor);
return -ENOEXEC; return -ENOEXEC;
} }
/* Put MVPE's into 'configuration state' */ /* Put MVPE's into 'configuration state' */
set_c0_mvpcontrol(MVPCONTROL_VPC); set_c0_mvpcontrol(MVPCONTROL_VPC);
...@@ -775,14 +775,14 @@ static int vpe_run(struct vpe * v) ...@@ -775,14 +775,14 @@ static int vpe_run(struct vpe * v)
back_to_back_c0_hazard(); back_to_back_c0_hazard();
/* Set up the XTC bit in vpeconf0 to point at our tc */ /* Set up the XTC bit in vpeconf0 to point at our tc */
write_vpe_c0_vpeconf0( (read_vpe_c0_vpeconf0() & ~(VPECONF0_XTC)) write_vpe_c0_vpeconf0( (read_vpe_c0_vpeconf0() & ~(VPECONF0_XTC))
| (t->index << VPECONF0_XTC_SHIFT)); | (t->index << VPECONF0_XTC_SHIFT));
back_to_back_c0_hazard(); back_to_back_c0_hazard();
/* enable this VPE */ /* enable this VPE */
write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() | VPECONF0_VPA); write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() | VPECONF0_VPA);
/* clear out any left overs from a previous program */ /* clear out any left overs from a previous program */
write_vpe_c0_status(0); write_vpe_c0_status(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment