Commit 21a151d8 authored by Ralf Baechle's avatar Ralf Baechle

[MIPS] checkfiles: Fix "need space after that ','" errors.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 49a89efb
...@@ -213,7 +213,7 @@ au1xxx_ddma_add_device(dbdev_tab_t *dev) ...@@ -213,7 +213,7 @@ au1xxx_ddma_add_device(dbdev_tab_t *dev)
if ( NULL != p ) if ( NULL != p )
{ {
memcpy(p, dev, sizeof(dbdev_tab_t)); memcpy(p, dev, sizeof(dbdev_tab_t));
p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id); p->dev_id = DSCR_DEV2CUSTOM_ID(new_id, dev->dev_id);
ret = p->dev_id; ret = p->dev_id;
new_id++; new_id++;
#if 0 #if 0
...@@ -671,7 +671,7 @@ _au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags) ...@@ -671,7 +671,7 @@ _au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags)
* parts. If it is fixedin the future, these dma_cache_inv will just * parts. If it is fixedin the future, these dma_cache_inv will just
* be nothing more than empty macros. See io.h. * be nothing more than empty macros. See io.h.
* */ * */
dma_cache_inv((unsigned long)buf,nbytes); dma_cache_inv((unsigned long)buf, nbytes);
dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */
au_sync(); au_sync();
dma_cache_wback_inv((unsigned long)dp, sizeof(dp)); dma_cache_wback_inv((unsigned long)dp, sizeof(dp));
......
...@@ -53,7 +53,7 @@ typedef unsigned int uint32; ...@@ -53,7 +53,7 @@ typedef unsigned int uint32;
/* memory-mapped read/write of the port */ /* memory-mapped read/write of the port */
#define UART16550_READ(y) (au_readl(DEBUG_BASE + y) & 0xff) #define UART16550_READ(y) (au_readl(DEBUG_BASE + y) & 0xff)
#define UART16550_WRITE(y,z) (au_writel(z&0xff, DEBUG_BASE + y)) #define UART16550_WRITE(y, z) (au_writel(z&0xff, DEBUG_BASE + y))
extern unsigned long get_au1x00_uart_baud_base(void); extern unsigned long get_au1x00_uart_baud_base(void);
extern unsigned long cal_r4koff(void); extern unsigned long cal_r4koff(void);
......
...@@ -211,7 +211,7 @@ int au_sleep(void) ...@@ -211,7 +211,7 @@ int au_sleep(void)
unsigned long wakeup, flags; unsigned long wakeup, flags;
extern void save_and_sleep(void); extern void save_and_sleep(void);
spin_lock_irqsave(&pm_lock,flags); spin_lock_irqsave(&pm_lock, flags);
save_core_regs(); save_core_regs();
......
...@@ -132,7 +132,7 @@ static void pb1200_shutdown_irq( unsigned int irq_nr ) ...@@ -132,7 +132,7 @@ static void pb1200_shutdown_irq( unsigned int irq_nr )
pb1200_disable_irq(irq_nr); pb1200_disable_irq(irq_nr);
if (--pb1200_cascade_en == 0) if (--pb1200_cascade_en == 0)
{ {
free_irq(AU1000_GPIO_7,&pb1200_cascade_handler ); free_irq(AU1000_GPIO_7, &pb1200_cascade_handler );
} }
return; return;
} }
......
...@@ -40,7 +40,7 @@ void die(char *s) ...@@ -40,7 +40,7 @@ void die(char *s)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int fd_vmlinux,fd_initrd,fd_outfile; int fd_vmlinux, fd_initrd, fd_outfile;
FILHDR efile; FILHDR efile;
AOUTHDR eaout; AOUTHDR eaout;
SCNHDR esecs[3]; SCNHDR esecs[3];
...@@ -48,15 +48,15 @@ int main(int argc, char *argv[]) ...@@ -48,15 +48,15 @@ int main(int argc, char *argv[])
char buf[1024]; char buf[1024];
unsigned long loadaddr; unsigned long loadaddr;
unsigned long initrd_header[2]; unsigned long initrd_header[2];
int i,cnt; int i, cnt;
int swab = 0; int swab = 0;
if (argc != 4) { if (argc != 4) {
printf("Usage: %s <vmlinux> <initrd> <outfile>\n",argv[0]); printf("Usage: %s <vmlinux> <initrd> <outfile>\n", argv[0]);
exit(1); exit(1);
} }
if ((fd_vmlinux = open (argv[1],O_RDONLY)) < 0) if ((fd_vmlinux = open (argv[1], O_RDONLY)) < 0)
die("open vmlinux"); die("open vmlinux");
if (read (fd_vmlinux, &efile, sizeof efile) != sizeof efile) if (read (fd_vmlinux, &efile, sizeof efile) != sizeof efile)
die("read file header"); die("read file header");
...@@ -98,7 +98,7 @@ int main(int argc, char *argv[]) ...@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
eaout.dsize = esecs[1].s_size = initrd_header[1] = SWAB(st.st_size+8); eaout.dsize = esecs[1].s_size = initrd_header[1] = SWAB(st.st_size+8);
eaout.data_start = esecs[1].s_vaddr = esecs[1].s_paddr = SWAB(loadaddr); eaout.data_start = esecs[1].s_vaddr = esecs[1].s_paddr = SWAB(loadaddr);
if ((fd_outfile = open (argv[3], O_RDWR|O_CREAT|O_TRUNC,0666)) < 0) if ((fd_outfile = open (argv[3], O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0)
die("open outfile"); die("open outfile");
if (write (fd_outfile, &efile, sizeof efile) != sizeof efile) if (write (fd_outfile, &efile, sizeof efile) != sizeof efile)
die("write file header"); die("write file header");
......
...@@ -467,7 +467,7 @@ int main(int argc, char *argv[]) ...@@ -467,7 +467,7 @@ int main(int argc, char *argv[])
esecs[0].s_scnptr = N_TXTOFF(efh, eah); esecs[0].s_scnptr = N_TXTOFF(efh, eah);
esecs[1].s_scnptr = N_DATOFF(efh, eah); esecs[1].s_scnptr = N_DATOFF(efh, eah);
#define ECOFF_SEGMENT_ALIGNMENT(a) 0x10 #define ECOFF_SEGMENT_ALIGNMENT(a) 0x10
#define ECOFF_ROUND(s,a) (((s)+(a)-1)&~((a)-1)) #define ECOFF_ROUND(s, a) (((s)+(a)-1)&~((a)-1))
esecs[2].s_scnptr = esecs[1].s_scnptr + esecs[2].s_scnptr = esecs[1].s_scnptr +
ECOFF_ROUND(esecs[1].s_size, ECOFF_SEGMENT_ALIGNMENT(&eah)); ECOFF_ROUND(esecs[1].s_size, ECOFF_SEGMENT_ALIGNMENT(&eah));
if (addflag) { if (addflag) {
......
...@@ -110,7 +110,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) ...@@ -110,7 +110,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
} }
#undef ELF_CORE_COPY_REGS #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) void elf32_core_copy_regs(elf_gregset_t grp, struct pt_regs *regs)
{ {
......
...@@ -902,7 +902,7 @@ void handle_exception(struct gdb_regs *regs) ...@@ -902,7 +902,7 @@ void handle_exception(struct gdb_regs *regs)
hex2mem(ptr, (char *)&regs->frame_ptr, 2*sizeof(long), 0, 0); hex2mem(ptr, (char *)&regs->frame_ptr, 2*sizeof(long), 0, 0);
ptr += 2*(2*sizeof(long)); ptr += 2*(2*sizeof(long));
hex2mem(ptr, (char *)&regs->cp0_index, 16*sizeof(long), 0, 0); hex2mem(ptr, (char *)&regs->cp0_index, 16*sizeof(long), 0, 0);
strcpy(output_buffer,"OK"); strcpy(output_buffer, "OK");
} }
break; break;
...@@ -919,7 +919,7 @@ void handle_exception(struct gdb_regs *regs) ...@@ -919,7 +919,7 @@ void handle_exception(struct gdb_regs *regs)
break; break;
strcpy(output_buffer, "E03"); strcpy(output_buffer, "E03");
} else } else
strcpy(output_buffer,"E01"); strcpy(output_buffer, "E01");
break; break;
/* /*
...@@ -996,7 +996,7 @@ void handle_exception(struct gdb_regs *regs) ...@@ -996,7 +996,7 @@ void handle_exception(struct gdb_regs *regs)
ptr = &input_buffer[1]; ptr = &input_buffer[1];
if (!hexToInt(&ptr, &baudrate)) if (!hexToInt(&ptr, &baudrate))
{ {
strcpy(output_buffer,"B01"); strcpy(output_buffer, "B01");
break; break;
} }
...@@ -1015,7 +1015,7 @@ void handle_exception(struct gdb_regs *regs) ...@@ -1015,7 +1015,7 @@ void handle_exception(struct gdb_regs *regs)
break; break;
default: default:
baudrate = 0; baudrate = 0;
strcpy(output_buffer,"B02"); strcpy(output_buffer, "B02");
goto x1; goto x1;
} }
......
...@@ -127,14 +127,14 @@ static inline int i8259A_irq_real(unsigned int irq) ...@@ -127,14 +127,14 @@ static inline int i8259A_irq_real(unsigned int irq)
int irqmask = 1 << irq; int irqmask = 1 << irq;
if (irq < 8) { if (irq < 8) {
outb(0x0B,PIC_MASTER_CMD); /* ISR register */ outb(0x0B, PIC_MASTER_CMD); /* ISR register */
value = inb(PIC_MASTER_CMD) & irqmask; 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; return value;
} }
outb(0x0B,PIC_SLAVE_CMD); /* ISR register */ outb(0x0B, PIC_SLAVE_CMD); /* ISR register */
value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); 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; return value;
} }
...@@ -175,12 +175,12 @@ static void mask_and_ack_8259A(unsigned int irq) ...@@ -175,12 +175,12 @@ static void mask_and_ack_8259A(unsigned int irq)
if (irq & 8) { if (irq & 8) {
inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */
outb(cached_slave_mask, PIC_SLAVE_IMR); outb(cached_slave_mask, PIC_SLAVE_IMR);
outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ 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+PIC_CASCADE_IR, PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */
} else { } else {
inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */
outb(cached_master_mask, PIC_MASTER_IMR); 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); smtc_im_ack_irq(irq);
spin_unlock_irqrestore(&i8259A_lock, flags); spin_unlock_irqrestore(&i8259A_lock, flags);
......
...@@ -231,16 +231,16 @@ static unsigned long * create_irix_tables(char * p, int argc, int envc, ...@@ -231,16 +231,16 @@ static unsigned long * create_irix_tables(char * p, int argc, int envc,
sp -= argc+1; sp -= argc+1;
argv = sp; argv = sp;
__put_user((elf_addr_t)argc,--sp); __put_user((elf_addr_t)argc, --sp);
current->mm->arg_start = (unsigned long) p; current->mm->arg_start = (unsigned long) p;
while (argc-->0) { while (argc-->0) {
__put_user((unsigned long)p,argv++); __put_user((unsigned long)p, argv++);
p += strlen_user(p); p += strlen_user(p);
} }
__put_user((unsigned long) NULL, argv); __put_user((unsigned long) NULL, argv);
current->mm->arg_end = current->mm->env_start = (unsigned long) p; current->mm->arg_end = current->mm->env_start = (unsigned long) p;
while (envc-->0) { while (envc-->0) {
__put_user((unsigned long)p,envp++); __put_user((unsigned long)p, envp++);
p += strlen_user(p); p += strlen_user(p);
} }
__put_user((unsigned long) NULL, envp); __put_user((unsigned long) NULL, envp);
...@@ -831,7 +831,7 @@ static int load_irix_library(struct file *file) ...@@ -831,7 +831,7 @@ static int load_irix_library(struct file *file)
int retval; int retval;
unsigned int bss; unsigned int bss;
int error; int error;
int i,j, k; int i, j, k;
error = kernel_read(file, 0, (char *) &elf_ex, sizeof(elf_ex)); error = kernel_read(file, 0, (char *) &elf_ex, sizeof(elf_ex));
if (error != sizeof(elf_ex)) if (error != sizeof(elf_ex))
......
...@@ -163,9 +163,9 @@ static inline int handle_signal(unsigned long sig, siginfo_t *info, ...@@ -163,9 +163,9 @@ static inline int handle_signal(unsigned long sig, siginfo_t *info,
ret = setup_irix_frame(ka, regs, sig, oldset); ret = setup_irix_frame(ka, regs, sig, oldset);
spin_lock_irq(&current->sighand->siglock); spin_lock_irq(&current->sighand->siglock);
sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask); sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
if (!(ka->sa.sa_flags & SA_NODEFER)) if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(&current->blocked,sig); sigaddset(&current->blocked, sig);
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock); spin_unlock_irq(&current->sighand->siglock);
...@@ -605,8 +605,8 @@ asmlinkage int irix_waitsys(int type, int pid, ...@@ -605,8 +605,8 @@ asmlinkage int irix_waitsys(int type, int pid,
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
read_lock(&tasklist_lock); read_lock(&tasklist_lock);
tsk = current; tsk = current;
list_for_each(_p,&tsk->children) { list_for_each(_p, &tsk->children) {
p = list_entry(_p,struct task_struct,sibling); p = list_entry(_p, struct task_struct, sibling);
if ((type == IRIX_P_PID) && p->pid != pid) if ((type == IRIX_P_PID) && p->pid != pid)
continue; continue;
if ((type == IRIX_P_PGID) && process_group(p) != pid) if ((type == IRIX_P_PGID) && process_group(p) != pid)
......
...@@ -93,7 +93,7 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -93,7 +93,7 @@ int show_interrupts(struct seq_file *p, void *v)
if (i == 0) { if (i == 0) {
seq_printf(p, " "); seq_printf(p, " ");
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "CPU%d ",j); seq_printf(p, "CPU%d ", j);
seq_putc(p, '\n'); seq_putc(p, '\n');
} }
...@@ -102,7 +102,7 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -102,7 +102,7 @@ int show_interrupts(struct seq_file *p, void *v)
action = irq_desc[i].action; action = irq_desc[i].action;
if (!action) if (!action)
goto skip; goto skip;
seq_printf(p, "%3d: ",i); seq_printf(p, "%3d: ", i);
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
seq_printf(p, "%10u ", kstat_irqs(i)); seq_printf(p, "%10u ", kstat_irqs(i));
#else #else
......
...@@ -239,7 +239,7 @@ void sp_work_handle_request(void) ...@@ -239,7 +239,7 @@ void sp_work_handle_request(void)
case MTSP_SYSCALL_GETTOD: case MTSP_SYSCALL_GETTOD:
memset(&tz, 0, sizeof(tz)); memset(&tz, 0, sizeof(tz));
if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv, if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv,
(int)&tz, 0,0)) == 0) (int)&tz, 0, 0)) == 0)
ret.retval = tv.tv_sec; ret.retval = tv.tv_sec;
break; break;
......
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
#define AA(__x) ((unsigned long)((int)__x)) #define AA(__x) ((unsigned long)((int)__x))
#ifdef __MIPSEB__ #ifdef __MIPSEB__
#define merge_64(r1,r2) ((((r1) & 0xffffffffUL) << 32) + ((r2) & 0xffffffffUL)) #define merge_64(r1, r2) ((((r1) & 0xffffffffUL) << 32) + ((r2) & 0xffffffffUL))
#endif #endif
#ifdef __MIPSEL__ #ifdef __MIPSEL__
#define merge_64(r1,r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL)) #define merge_64(r1, r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL))
#endif #endif
/* /*
...@@ -96,7 +96,7 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf) ...@@ -96,7 +96,7 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
#endif #endif
tmp.st_blocks = stat->blocks; tmp.st_blocks = stat->blocks;
tmp.st_blksize = stat->blksize; 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 asmlinkage unsigned long
...@@ -510,11 +510,11 @@ asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32) ...@@ -510,11 +510,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;
......
...@@ -613,9 +613,9 @@ static int handle_signal(unsigned long sig, siginfo_t *info, ...@@ -613,9 +613,9 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
ret = current->thread.abi->setup_frame(ka, regs, sig, oldset); ret = current->thread.abi->setup_frame(ka, regs, sig, oldset);
spin_lock_irq(&current->sighand->siglock); spin_lock_irq(&current->sighand->siglock);
sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask); sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
if (!(ka->sa.sa_flags & SA_NODEFER)) if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(&current->blocked,sig); sigaddset(&current->blocked, sig);
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock); spin_unlock_irq(&current->sighand->siglock);
......
...@@ -180,7 +180,7 @@ void __init sanitize_tlb_entries(void) ...@@ -180,7 +180,7 @@ void __init sanitize_tlb_entries(void)
static void smtc_configure_tlb(void) static void smtc_configure_tlb(void)
{ {
int i,tlbsiz,vpes; int i, tlbsiz, vpes;
unsigned long mvpconf0; unsigned long mvpconf0;
unsigned long config1val; unsigned long config1val;
...@@ -423,7 +423,7 @@ void mipsmt_prepare_cpus(void) ...@@ -423,7 +423,7 @@ void mipsmt_prepare_cpus(void)
* code. Leave it alone! * code. Leave it alone!
*/ */
if (tc != 0) { if (tc != 0) {
smtc_tc_setup(vpe,tc, cpu); smtc_tc_setup(vpe, tc, cpu);
cpu++; cpu++;
} }
printk(" %d", tc); printk(" %d", tc);
...@@ -431,7 +431,7 @@ void mipsmt_prepare_cpus(void) ...@@ -431,7 +431,7 @@ void mipsmt_prepare_cpus(void)
} }
if (slop) { if (slop) {
if (tc != 0) { if (tc != 0) {
smtc_tc_setup(vpe,tc, cpu); smtc_tc_setup(vpe, tc, cpu);
cpu++; cpu++;
} }
printk(" %d", tc); printk(" %d", tc);
......
...@@ -245,7 +245,7 @@ asmlinkage int sys_olduname(struct oldold_utsname __user * name) ...@@ -245,7 +245,7 @@ asmlinkage int sys_olduname(struct oldold_utsname __user * name)
if (!name) if (!name)
return -EFAULT; return -EFAULT;
if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname))) if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname)))
return -EFAULT; return -EFAULT;
error = __copy_to_user(&name->sysname, &utsname()->sysname, error = __copy_to_user(&name->sysname, &utsname()->sysname,
......
...@@ -778,7 +778,7 @@ asmlinkage int irix_times(struct tms __user *tbuf) ...@@ -778,7 +778,7 @@ asmlinkage int irix_times(struct tms __user *tbuf)
int err = 0; int err = 0;
if (tbuf) { if (tbuf) {
if (!access_ok(VERIFY_WRITE,tbuf,sizeof *tbuf)) if (!access_ok(VERIFY_WRITE, tbuf, sizeof *tbuf))
return -EFAULT; return -EFAULT;
err = __put_user(current->utime, &tbuf->tms_utime); err = __put_user(current->utime, &tbuf->tms_utime);
......
...@@ -1044,7 +1044,7 @@ static int getcwd(char *buff, int size) ...@@ -1044,7 +1044,7 @@ static int getcwd(char *buff, int size)
old_fs = get_fs(); old_fs = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
ret = sys_getcwd(buff,size); ret = sys_getcwd(buff, size);
set_fs(old_fs); set_fs(old_fs);
......
...@@ -178,24 +178,24 @@ static int isBranchInstr(mips_instruction * i) ...@@ -178,24 +178,24 @@ static int isBranchInstr(mips_instruction * i)
#define FR_BIT 0 #define FR_BIT 0
#endif #endif
#define SIFROMREG(si,x) ((si) = \ #define SIFROMREG(si, x) ((si) = \
(xcp->cp0_status & FR_BIT) || !(x & 1) ? \ (xcp->cp0_status & FR_BIT) || !(x & 1) ? \
(int)ctx->fpr[x] : \ (int)ctx->fpr[x] : \
(int)(ctx->fpr[x & ~1] >> 32 )) (int)(ctx->fpr[x & ~1] >> 32 ))
#define SITOREG(si,x) (ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)] = \ #define SITOREG(si, x) (ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)] = \
(xcp->cp0_status & FR_BIT) || !(x & 1) ? \ (xcp->cp0_status & FR_BIT) || !(x & 1) ? \
ctx->fpr[x & ~1] >> 32 << 32 | (u32)(si) : \ ctx->fpr[x & ~1] >> 32 << 32 | (u32)(si) : \
ctx->fpr[x & ~1] << 32 >> 32 | (u64)(si) << 32) ctx->fpr[x & ~1] << 32 >> 32 | (u64)(si) << 32)
#define DIFROMREG(di,x) ((di) = \ #define DIFROMREG(di, x) ((di) = \
ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)]) ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)])
#define DITOREG(di,x) (ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)] \ #define DITOREG(di, x) (ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)] \
= (di)) = (di))
#define SPFROMREG(sp,x) SIFROMREG((sp).bits,x) #define SPFROMREG(sp, x) SIFROMREG((sp).bits, x)
#define SPTOREG(sp,x) SITOREG((sp).bits,x) #define SPTOREG(sp, x) SITOREG((sp).bits, x)
#define DPFROMREG(dp,x) DIFROMREG((dp).bits,x) #define DPFROMREG(dp, x) DIFROMREG((dp).bits, x)
#define DPTOREG(dp,x) DITOREG((dp).bits,x) #define DPTOREG(dp, x) DITOREG((dp).bits, x)
/* /*
* Emulate the single floating point instruction pointed at by EPC. * Emulate the single floating point instruction pointed at by EPC.
...@@ -584,12 +584,12 @@ static ieee754sp fpemu_sp_rsqrt(ieee754sp s) ...@@ -584,12 +584,12 @@ static ieee754sp fpemu_sp_rsqrt(ieee754sp s)
return ieee754sp_div(ieee754sp_one(0), ieee754sp_sqrt(s)); return ieee754sp_div(ieee754sp_one(0), ieee754sp_sqrt(s));
} }
DEF3OP(madd, sp, ieee754sp_mul, ieee754sp_add,); DEF3OP(madd, sp, ieee754sp_mul, ieee754sp_add, );
DEF3OP(msub, sp, ieee754sp_mul, ieee754sp_sub,); DEF3OP(msub, sp, ieee754sp_mul, ieee754sp_sub, );
DEF3OP(nmadd, sp, ieee754sp_mul, ieee754sp_add, ieee754sp_neg); DEF3OP(nmadd, sp, ieee754sp_mul, ieee754sp_add, ieee754sp_neg);
DEF3OP(nmsub, sp, ieee754sp_mul, ieee754sp_sub, ieee754sp_neg); DEF3OP(nmsub, sp, ieee754sp_mul, ieee754sp_sub, ieee754sp_neg);
DEF3OP(madd, dp, ieee754dp_mul, ieee754dp_add,); DEF3OP(madd, dp, ieee754dp_mul, ieee754dp_add, );
DEF3OP(msub, dp, ieee754dp_mul, ieee754dp_sub,); DEF3OP(msub, dp, ieee754dp_mul, ieee754dp_sub, );
DEF3OP(nmadd, dp, ieee754dp_mul, ieee754dp_add, ieee754dp_neg); DEF3OP(nmadd, dp, ieee754dp_mul, ieee754dp_add, ieee754dp_neg);
DEF3OP(nmsub, dp, ieee754dp_mul, ieee754dp_sub, ieee754dp_neg); DEF3OP(nmsub, dp, ieee754dp_mul, ieee754dp_sub, ieee754dp_neg);
......
...@@ -121,7 +121,7 @@ ieee754dp ieee754dp_mul(ieee754dp x, ieee754dp y) ...@@ -121,7 +121,7 @@ ieee754dp ieee754dp_mul(ieee754dp x, ieee754dp y)
*/ */
/* 32 * 32 => 64 */ /* 32 * 32 => 64 */
#define DPXMULT(x,y) ((u64)(x) * (u64)y) #define DPXMULT(x, y) ((u64)(x) * (u64)y)
{ {
unsigned lxm = xm; unsigned lxm = xm;
......
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
#if (defined(BYTE_ORDER) && BYTE_ORDER == LITTLE_ENDIAN) || defined(__MIPSEL__) #if (defined(BYTE_ORDER) && BYTE_ORDER == LITTLE_ENDIAN) || defined(__MIPSEL__)
#define SPSTR(s,b,m) {m,b,s} #define SPSTR(s, b, m) {m, b, s}
#define DPSTR(s,b,mh,ml) {ml,mh,b,s} #define DPSTR(s, b, mh, ml) {ml, mh, b, s}
#endif #endif
#ifdef __MIPSEB__ #ifdef __MIPSEB__
#define SPSTR(s,b,m) {s,b,m} #define SPSTR(s, b, m) {s, b, m}
#define DPSTR(s,b,mh,ml) {s,b,mh,ml} #define DPSTR(s, b, mh, ml) {s, b, mh, ml}
#endif #endif
const struct ieee754dp_konst __ieee754dp_spcvals[] = { const struct ieee754dp_konst __ieee754dp_spcvals[] = {
...@@ -65,7 +65,7 @@ const struct ieee754dp_konst __ieee754dp_spcvals[] = { ...@@ -65,7 +65,7 @@ const struct ieee754dp_konst __ieee754dp_spcvals[] = {
DPSTR(1, 3 + DP_EBIAS, 0x40000, 0), /* - 10.0 */ DPSTR(1, 3 + DP_EBIAS, 0x40000, 0), /* - 10.0 */
DPSTR(0, DP_EMAX + 1 + DP_EBIAS, 0, 0), /* + infinity */ DPSTR(0, DP_EMAX + 1 + DP_EBIAS, 0, 0), /* + infinity */
DPSTR(1, DP_EMAX + 1 + DP_EBIAS, 0, 0), /* - infinity */ DPSTR(1, DP_EMAX + 1 + DP_EBIAS, 0, 0), /* - infinity */
DPSTR(0,DP_EMAX+1+DP_EBIAS,0x7FFFF,0xFFFFFFFF), /* + indef quiet Nan */ DPSTR(0, DP_EMAX+1+DP_EBIAS, 0x7FFFF, 0xFFFFFFFF), /* + indef quiet Nan */
DPSTR(0, DP_EMAX + DP_EBIAS, 0xFFFFF, 0xFFFFFFFF), /* + max */ DPSTR(0, DP_EMAX + DP_EBIAS, 0xFFFFF, 0xFFFFFFFF), /* + max */
DPSTR(1, DP_EMAX + DP_EBIAS, 0xFFFFF, 0xFFFFFFFF), /* - max */ DPSTR(1, DP_EMAX + DP_EBIAS, 0xFFFFF, 0xFFFFFFFF), /* - max */
DPSTR(0, DP_EMIN + DP_EBIAS, 0, 0), /* + min normal */ DPSTR(0, DP_EMIN + DP_EBIAS, 0, 0), /* + min normal */
...@@ -85,7 +85,7 @@ const struct ieee754sp_konst __ieee754sp_spcvals[] = { ...@@ -85,7 +85,7 @@ const struct ieee754sp_konst __ieee754sp_spcvals[] = {
SPSTR(1, 3 + SP_EBIAS, 0x200000), /* - 10.0 */ SPSTR(1, 3 + SP_EBIAS, 0x200000), /* - 10.0 */
SPSTR(0, SP_EMAX + 1 + SP_EBIAS, 0), /* + infinity */ SPSTR(0, SP_EMAX + 1 + SP_EBIAS, 0), /* + infinity */
SPSTR(1, SP_EMAX + 1 + SP_EBIAS, 0), /* - infinity */ SPSTR(1, SP_EMAX + 1 + SP_EBIAS, 0), /* - infinity */
SPSTR(0,SP_EMAX+1+SP_EBIAS,0x3FFFFF), /* + indef quiet Nan */ SPSTR(0, SP_EMAX+1+SP_EBIAS, 0x3FFFFF), /* + indef quiet Nan */
SPSTR(0, SP_EMAX + SP_EBIAS, 0x7FFFFF), /* + max normal */ SPSTR(0, SP_EMAX + SP_EBIAS, 0x7FFFFF), /* + max normal */
SPSTR(1, SP_EMAX + SP_EBIAS, 0x7FFFFF), /* - max normal */ SPSTR(1, SP_EMAX + SP_EBIAS, 0x7FFFFF), /* - max normal */
SPSTR(0, SP_EMIN + SP_EBIAS, 0), /* + min normal */ SPSTR(0, SP_EMIN + SP_EBIAS, 0), /* + min normal */
......
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
/* convert denormal to normalized with extended exponent */ /* convert denormal to normalized with extended exponent */
#define DPDNORMx(m,e) \ #define DPDNORMx(m,e) \
while( (m >> DP_MBITS) == 0) { m <<= 1; e--; } while( (m >> DP_MBITS) == 0) { m <<= 1; e--; }
#define DPDNORMX DPDNORMx(xm,xe) #define DPDNORMX DPDNORMx(xm, xe)
#define DPDNORMY DPDNORMx(ym,ye) #define DPDNORMY DPDNORMx(ym, ye)
static __inline ieee754dp builddp(int s, int bx, u64 m) static __inline ieee754dp builddp(int s, int bx, u64 m)
{ {
...@@ -71,13 +71,13 @@ extern ieee754dp ieee754dp_bestnan(ieee754dp, ieee754dp); ...@@ -71,13 +71,13 @@ extern ieee754dp ieee754dp_bestnan(ieee754dp, ieee754dp);
extern ieee754dp ieee754dp_format(int, int, u64); extern ieee754dp ieee754dp_format(int, int, u64);
#define DPNORMRET2(s,e,m,name,a0,a1) \ #define DPNORMRET2(s, e, m, name, a0, a1) \
{ \ { \
ieee754dp V = ieee754dp_format(s,e,m); \ ieee754dp V = ieee754dp_format(s, e, m); \
if(TSTX()) \ if(TSTX()) \
return ieee754dp_xcpt(V,name,a0,a1); \ return ieee754dp_xcpt(V, name, a0, a1); \
else \ else \
return V; \ return V; \
} }
#define DPNORMRET1(s,e,m,name,a0) DPNORMRET2(s,e,m,name,a0,a0) #define DPNORMRET1(s, e, m, name, a0) DPNORMRET2(s, e, m, name, a0, a0)
...@@ -55,16 +55,16 @@ ...@@ -55,16 +55,16 @@
#define DPBEXP(dp) (dp.parts.bexp) #define DPBEXP(dp) (dp.parts.bexp)
#define DPMANT(dp) (dp.parts.mant) #define DPMANT(dp) (dp.parts.mant)
#define CLPAIR(x,y) ((x)*6+(y)) #define CLPAIR(x, y) ((x)*6+(y))
#define CLEARCX \ #define CLEARCX \
(ieee754_csr.cx = 0) (ieee754_csr.cx = 0)
#define SETCX(x) \ #define SETCX(x) \
(ieee754_csr.cx |= (x),ieee754_csr.sx |= (x)) (ieee754_csr.cx |= (x), ieee754_csr.sx |= (x))
#define SETANDTESTCX(x) \ #define SETANDTESTCX(x) \
(SETCX(x),ieee754_csr.mx & (x)) (SETCX(x), ieee754_csr.mx & (x))
#define TSTX() \ #define TSTX() \
(ieee754_csr.cx & ieee754_csr.mx) (ieee754_csr.cx & ieee754_csr.mx)
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
#define COMPYSP \ #define COMPYSP \
unsigned ym; int ye; int ys; int yc unsigned ym; int ye; int ys; int yc
#define EXPLODESP(v,vc,vs,ve,vm) \ #define EXPLODESP(v, vc, vs, ve, vm) \
{\ {\
vs = SPSIGN(v);\ vs = SPSIGN(v);\
ve = SPBEXP(v);\ ve = SPBEXP(v);\
...@@ -100,8 +100,8 @@ ...@@ -100,8 +100,8 @@
vc = IEEE754_CLASS_NORM;\ vc = IEEE754_CLASS_NORM;\
}\ }\
} }
#define EXPLODEXSP EXPLODESP(x,xc,xs,xe,xm) #define EXPLODEXSP EXPLODESP(x, xc, xs, xe, xm)
#define EXPLODEYSP EXPLODESP(y,yc,ys,ye,ym) #define EXPLODEYSP EXPLODESP(y, yc, ys, ye, ym)
#define COMPXDP \ #define COMPXDP \
...@@ -110,7 +110,7 @@ u64 xm; int xe; int xs; int xc ...@@ -110,7 +110,7 @@ u64 xm; int xe; int xs; int xc
#define COMPYDP \ #define COMPYDP \
u64 ym; int ye; int ys; int yc u64 ym; int ye; int ys; int yc
#define EXPLODEDP(v,vc,vs,ve,vm) \ #define EXPLODEDP(v, vc, vs, ve, vm) \
{\ {\
vm = DPMANT(v);\ vm = DPMANT(v);\
vs = DPSIGN(v);\ vs = DPSIGN(v);\
...@@ -134,10 +134,10 @@ u64 ym; int ye; int ys; int yc ...@@ -134,10 +134,10 @@ u64 ym; int ye; int ys; int yc
vc = IEEE754_CLASS_NORM;\ vc = IEEE754_CLASS_NORM;\
}\ }\
} }
#define EXPLODEXDP EXPLODEDP(x,xc,xs,xe,xm) #define EXPLODEXDP EXPLODEDP(x, xc, xs, xe, xm)
#define EXPLODEYDP EXPLODEDP(y,yc,ys,ye,ym) #define EXPLODEYDP EXPLODEDP(y, yc, ys, ye, ym)
#define FLUSHDP(v,vc,vs,ve,vm) \ #define FLUSHDP(v, vc, vs, ve, vm) \
if(vc==IEEE754_CLASS_DNORM) {\ if(vc==IEEE754_CLASS_DNORM) {\
if(ieee754_csr.nod) {\ if(ieee754_csr.nod) {\
SETCX(IEEE754_INEXACT);\ SETCX(IEEE754_INEXACT);\
...@@ -148,7 +148,7 @@ u64 ym; int ye; int ys; int yc ...@@ -148,7 +148,7 @@ u64 ym; int ye; int ys; int yc
}\ }\
} }
#define FLUSHSP(v,vc,vs,ve,vm) \ #define FLUSHSP(v, vc, vs, ve, vm) \
if(vc==IEEE754_CLASS_DNORM) {\ if(vc==IEEE754_CLASS_DNORM) {\
if(ieee754_csr.nod) {\ if(ieee754_csr.nod) {\
SETCX(IEEE754_INEXACT);\ SETCX(IEEE754_INEXACT);\
...@@ -159,7 +159,7 @@ u64 ym; int ye; int ys; int yc ...@@ -159,7 +159,7 @@ u64 ym; int ye; int ys; int yc
}\ }\
} }
#define FLUSHXDP FLUSHDP(x,xc,xs,xe,xm) #define FLUSHXDP FLUSHDP(x, xc, xs, xe, xm)
#define FLUSHYDP FLUSHDP(y,yc,ys,ye,ym) #define FLUSHYDP FLUSHDP(y, yc, ys, ye, ym)
#define FLUSHXSP FLUSHSP(x,xc,xs,xe,xm) #define FLUSHXSP FLUSHSP(x, xc, xs, xe, xm)
#define FLUSHYSP FLUSHSP(y,yc,ys,ye,ym) #define FLUSHYSP FLUSHSP(y, yc, ys, ye, ym)
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
/* convert denormal to normalized with extended exponent */ /* convert denormal to normalized with extended exponent */
#define SPDNORMx(m,e) \ #define SPDNORMx(m,e) \
while( (m >> SP_MBITS) == 0) { m <<= 1; e--; } while( (m >> SP_MBITS) == 0) { m <<= 1; e--; }
#define SPDNORMX SPDNORMx(xm,xe) #define SPDNORMX SPDNORMx(xm, xe)
#define SPDNORMY SPDNORMx(ym,ye) #define SPDNORMY SPDNORMx(ym, ye)
static __inline ieee754sp buildsp(int s, int bx, unsigned m) static __inline ieee754sp buildsp(int s, int bx, unsigned m)
{ {
...@@ -77,13 +77,13 @@ extern ieee754sp ieee754sp_bestnan(ieee754sp, ieee754sp); ...@@ -77,13 +77,13 @@ extern ieee754sp ieee754sp_bestnan(ieee754sp, ieee754sp);
extern ieee754sp ieee754sp_format(int, int, unsigned); extern ieee754sp ieee754sp_format(int, int, unsigned);
#define SPNORMRET2(s,e,m,name,a0,a1) \ #define SPNORMRET2(s, e, m, name, a0, a1) \
{ \ { \
ieee754sp V = ieee754sp_format(s,e,m); \ ieee754sp V = ieee754sp_format(s, e, m); \
if(TSTX()) \ if(TSTX()) \
return ieee754sp_xcpt(V,name,a0,a1); \ return ieee754sp_xcpt(V, name, a0, a1); \
else \ else \
return V; \ return V; \
} }
#define SPNORMRET1(s,e,m,name,a0) SPNORMRET2(s,e,m,name,a0,a0) #define SPNORMRET1(s, e, m, name, a0) SPNORMRET2(s, e, m, name, a0, a0)
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/mips-boards/saa9730_uart.h> #include <asm/mips-boards/saa9730_uart.h>
#define INB(a) inb((unsigned long)a) #define INB(a) inb((unsigned long)a)
#define OUTB(x,a) outb(x,(unsigned long)a) #define OUTB(x, a) outb(x, (unsigned long)a)
/* /*
* This is the interface to the remote debugger stub * This is the interface to the remote debugger stub
......
...@@ -124,7 +124,7 @@ static void corehi_irqdispatch(void) ...@@ -124,7 +124,7 @@ static void corehi_irqdispatch(void)
{ {
unsigned int intedge, intsteer, pcicmd, pcibadaddr; unsigned int intedge, intsteer, pcicmd, pcibadaddr;
unsigned int pcimstat, intisr, inten, intpol; unsigned int pcimstat, intisr, inten, intpol;
unsigned int intrcause,datalo,datahi; unsigned int intrcause, datalo, datahi;
struct pt_regs *regs = get_irq_regs(); struct pt_regs *regs = get_irq_regs();
printk("CoreHI interrupt, shouldn't happen, so we die here!!!\n"); printk("CoreHI interrupt, shouldn't happen, so we die here!!!\n");
......
...@@ -176,7 +176,7 @@ void __init plat_mem_setup(void) ...@@ -176,7 +176,7 @@ void __init plat_mem_setup(void)
0, /* orig-video-page */ 0, /* orig-video-page */
0, /* orig-video-mode */ 0, /* orig-video-mode */
80, /* orig-video-cols */ 80, /* orig-video-cols */
0,0,0, /* ega_ax, ega_bx, ega_cx */ 0, 0, 0, /* ega_ax, ega_bx, ega_cx */
25, /* orig-video-lines */ 25, /* orig-video-lines */
VIDEO_TYPE_VGAC, /* orig-video-isVGA */ VIDEO_TYPE_VGAC, /* orig-video-isVGA */
16 /* orig-video-points */ 16 /* orig-video-points */
......
...@@ -164,12 +164,12 @@ static inline void tx49_blast_icache32(void) ...@@ -164,12 +164,12 @@ static inline void tx49_blast_icache32(void)
/* I'm in even chunk. blast odd chunks */ /* I'm in even chunk. blast odd chunks */
for (ws = 0; ws < ws_end; ws += ws_inc) for (ws = 0; ws < ws_end; ws += ws_inc)
for (addr = start + 0x400; addr < end; addr += 0x400 * 2) for (addr = start + 0x400; addr < end; addr += 0x400 * 2)
cache32_unroll32(addr|ws,Index_Invalidate_I); cache32_unroll32(addr|ws, Index_Invalidate_I);
CACHE32_UNROLL32_ALIGN; CACHE32_UNROLL32_ALIGN;
/* I'm in odd chunk. blast even chunks */ /* I'm in odd chunk. blast even chunks */
for (ws = 0; ws < ws_end; ws += ws_inc) for (ws = 0; ws < ws_end; ws += ws_inc)
for (addr = start; addr < end; addr += 0x400 * 2) for (addr = start; addr < end; addr += 0x400 * 2)
cache32_unroll32(addr|ws,Index_Invalidate_I); cache32_unroll32(addr|ws, Index_Invalidate_I);
} }
static inline void blast_icache32_r4600_v1_page_indexed(unsigned long page) static inline void blast_icache32_r4600_v1_page_indexed(unsigned long page)
...@@ -195,12 +195,12 @@ static inline void tx49_blast_icache32_page_indexed(unsigned long page) ...@@ -195,12 +195,12 @@ static inline void tx49_blast_icache32_page_indexed(unsigned long page)
/* I'm in even chunk. blast odd chunks */ /* I'm in even chunk. blast odd chunks */
for (ws = 0; ws < ws_end; ws += ws_inc) for (ws = 0; ws < ws_end; ws += ws_inc)
for (addr = start + 0x400; addr < end; addr += 0x400 * 2) for (addr = start + 0x400; addr < end; addr += 0x400 * 2)
cache32_unroll32(addr|ws,Index_Invalidate_I); cache32_unroll32(addr|ws, Index_Invalidate_I);
CACHE32_UNROLL32_ALIGN; CACHE32_UNROLL32_ALIGN;
/* I'm in odd chunk. blast even chunks */ /* I'm in odd chunk. blast even chunks */
for (ws = 0; ws < ws_end; ws += ws_inc) for (ws = 0; ws < ws_end; ws += ws_inc)
for (addr = start; addr < end; addr += 0x400 * 2) for (addr = start; addr < end; addr += 0x400 * 2)
cache32_unroll32(addr|ws,Index_Invalidate_I); cache32_unroll32(addr|ws, Index_Invalidate_I);
} }
static void (* r4k_blast_icache_page)(unsigned long addr); static void (* r4k_blast_icache_page)(unsigned long addr);
......
...@@ -271,14 +271,22 @@ asmlinkage void sb1_cache_error(void) ...@@ -271,14 +271,22 @@ asmlinkage void sb1_cache_error(void)
/* Parity lookup table. */ /* Parity lookup table. */
static const uint8_t parity[256] = { static const uint8_t parity[256] = {
0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0
}; };
/* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */ /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
......
...@@ -188,9 +188,9 @@ static inline void copy_page_cpu(void *to, void *from) ...@@ -188,9 +188,9 @@ static inline void copy_page_cpu(void *to, void *from)
: "+r" (src), "+r" (dst) : "+r" (src), "+r" (dst)
: "r" (end) : "r" (end)
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
: "$8","$9","$10","$11","memory"); : "$8", "$9", "$10", "$11", "memory");
#else #else
: "$2","$3","$6","$7","$8","$9","$10","$11","memory"); : "$2", "$3", "$6", "$7", "$8", "$9", "$10", "$11", "memory");
#endif #endif
} }
......
...@@ -29,9 +29,9 @@ void show_mem(void) ...@@ -29,9 +29,9 @@ void show_mem(void)
shared += page_count(page) - 1; shared += page_count(page) - 1;
} }
printk("%d pages of RAM\n", total); printk("%d pages of RAM\n", total);
printk("%d pages of HIGHMEM\n",highmem); printk("%d pages of HIGHMEM\n", highmem);
printk("%d reserved pages\n",reserved); printk("%d reserved pages\n", reserved);
printk("%d pages shared\n",shared); printk("%d pages shared\n", shared);
printk("%d pages swap cached\n",cached); printk("%d pages swap cached\n", cached);
#endif #endif
} }
...@@ -56,7 +56,7 @@ void local_flush_tlb_mm(struct mm_struct *mm) ...@@ -56,7 +56,7 @@ void local_flush_tlb_mm(struct mm_struct *mm)
int cpu = smp_processor_id(); int cpu = smp_processor_id();
if (cpu_context(cpu, mm) != 0) if (cpu_context(cpu, mm) != 0)
drop_mmu_context(mm,cpu); drop_mmu_context(mm, cpu);
} }
void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
......
...@@ -141,53 +141,53 @@ struct insn { ...@@ -141,53 +141,53 @@ struct insn {
| (f) << FUNC_SH) | (f) << FUNC_SH)
static __initdata struct insn insn_table[] = { static __initdata struct insn insn_table[] = {
{ insn_addiu, M(addiu_op,0,0,0,0,0), RS | RT | SIMM }, { insn_addiu, M(addiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_addu, M(spec_op,0,0,0,0,addu_op), RS | RT | RD }, { insn_addu, M(spec_op, 0, 0, 0, 0, addu_op), RS | RT | RD },
{ insn_and, M(spec_op,0,0,0,0,and_op), RS | RT | RD }, { insn_and, M(spec_op, 0, 0, 0, 0, and_op), RS | RT | RD },
{ insn_andi, M(andi_op,0,0,0,0,0), RS | RT | UIMM }, { insn_andi, M(andi_op, 0, 0, 0, 0, 0), RS | RT | UIMM },
{ insn_beq, M(beq_op,0,0,0,0,0), RS | RT | BIMM }, { insn_beq, M(beq_op, 0, 0, 0, 0, 0), RS | RT | BIMM },
{ insn_beql, M(beql_op,0,0,0,0,0), RS | RT | BIMM }, { insn_beql, M(beql_op, 0, 0, 0, 0, 0), RS | RT | BIMM },
{ insn_bgez, M(bcond_op,0,bgez_op,0,0,0), RS | BIMM }, { insn_bgez, M(bcond_op, 0, bgez_op, 0, 0, 0), RS | BIMM },
{ insn_bgezl, M(bcond_op,0,bgezl_op,0,0,0), RS | BIMM }, { insn_bgezl, M(bcond_op, 0, bgezl_op, 0, 0, 0), RS | BIMM },
{ insn_bltz, M(bcond_op,0,bltz_op,0,0,0), RS | BIMM }, { insn_bltz, M(bcond_op, 0, bltz_op, 0, 0, 0), RS | BIMM },
{ insn_bltzl, M(bcond_op,0,bltzl_op,0,0,0), RS | BIMM }, { insn_bltzl, M(bcond_op, 0, bltzl_op, 0, 0, 0), RS | BIMM },
{ insn_bne, M(bne_op,0,0,0,0,0), RS | RT | BIMM }, { insn_bne, M(bne_op, 0, 0, 0, 0, 0), RS | RT | BIMM },
{ insn_daddiu, M(daddiu_op,0,0,0,0,0), RS | RT | SIMM }, { insn_daddiu, M(daddiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_daddu, M(spec_op,0,0,0,0,daddu_op), RS | RT | RD }, { insn_daddu, M(spec_op, 0, 0, 0, 0, daddu_op), RS | RT | RD },
{ insn_dmfc0, M(cop0_op,dmfc_op,0,0,0,0), RT | RD | SET}, { insn_dmfc0, M(cop0_op, dmfc_op, 0, 0, 0, 0), RT | RD | SET},
{ insn_dmtc0, M(cop0_op,dmtc_op,0,0,0,0), RT | RD | SET}, { insn_dmtc0, M(cop0_op, dmtc_op, 0, 0, 0, 0), RT | RD | SET},
{ insn_dsll, M(spec_op,0,0,0,0,dsll_op), RT | RD | RE }, { insn_dsll, M(spec_op, 0, 0, 0, 0, dsll_op), RT | RD | RE },
{ insn_dsll32, M(spec_op,0,0,0,0,dsll32_op), RT | RD | RE }, { insn_dsll32, M(spec_op, 0, 0, 0, 0, dsll32_op), RT | RD | RE },
{ insn_dsra, M(spec_op,0,0,0,0,dsra_op), RT | RD | RE }, { insn_dsra, M(spec_op, 0, 0, 0, 0, dsra_op), RT | RD | RE },
{ insn_dsrl, M(spec_op,0,0,0,0,dsrl_op), RT | RD | RE }, { insn_dsrl, M(spec_op, 0, 0, 0, 0, dsrl_op), RT | RD | RE },
{ insn_dsrl32, M(spec_op,0,0,0,0,dsrl32_op), RT | RD | RE }, { insn_dsrl32, M(spec_op, 0, 0, 0, 0, dsrl32_op), RT | RD | RE },
{ insn_dsubu, M(spec_op,0,0,0,0,dsubu_op), RS | RT | RD }, { insn_dsubu, M(spec_op, 0, 0, 0, 0, dsubu_op), RS | RT | RD },
{ insn_eret, M(cop0_op,cop_op,0,0,0,eret_op), 0 }, { insn_eret, M(cop0_op, cop_op, 0, 0, 0, eret_op), 0 },
{ insn_j, M(j_op,0,0,0,0,0), JIMM }, { insn_j, M(j_op, 0, 0, 0, 0, 0), JIMM },
{ insn_jal, M(jal_op,0,0,0,0,0), JIMM }, { insn_jal, M(jal_op, 0, 0, 0, 0, 0), JIMM },
{ insn_jr, M(spec_op,0,0,0,0,jr_op), RS }, { insn_jr, M(spec_op, 0, 0, 0, 0, jr_op), RS },
{ insn_ld, M(ld_op,0,0,0,0,0), RS | RT | SIMM }, { insn_ld, M(ld_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_ll, M(ll_op,0,0,0,0,0), RS | RT | SIMM }, { insn_ll, M(ll_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_lld, M(lld_op,0,0,0,0,0), RS | RT | SIMM }, { insn_lld, M(lld_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_lui, M(lui_op,0,0,0,0,0), RT | SIMM }, { insn_lui, M(lui_op, 0, 0, 0, 0, 0), RT | SIMM },
{ insn_lw, M(lw_op,0,0,0,0,0), RS | RT | SIMM }, { insn_lw, M(lw_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_mfc0, M(cop0_op,mfc_op,0,0,0,0), RT | RD | SET}, { insn_mfc0, M(cop0_op, mfc_op, 0, 0, 0, 0), RT | RD | SET},
{ insn_mtc0, M(cop0_op,mtc_op,0,0,0,0), RT | RD | SET}, { insn_mtc0, M(cop0_op, mtc_op, 0, 0, 0, 0), RT | RD | SET},
{ insn_ori, M(ori_op,0,0,0,0,0), RS | RT | UIMM }, { insn_ori, M(ori_op, 0, 0, 0, 0, 0), RS | RT | UIMM },
{ insn_rfe, M(cop0_op,cop_op,0,0,0,rfe_op), 0 }, { insn_rfe, M(cop0_op, cop_op, 0, 0, 0, rfe_op), 0 },
{ insn_sc, M(sc_op,0,0,0,0,0), RS | RT | SIMM }, { insn_sc, M(sc_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_scd, M(scd_op,0,0,0,0,0), RS | RT | SIMM }, { insn_scd, M(scd_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_sd, M(sd_op,0,0,0,0,0), RS | RT | SIMM }, { insn_sd, M(sd_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_sll, M(spec_op,0,0,0,0,sll_op), RT | RD | RE }, { insn_sll, M(spec_op, 0, 0, 0, 0, sll_op), RT | RD | RE },
{ insn_sra, M(spec_op,0,0,0,0,sra_op), RT | RD | RE }, { insn_sra, M(spec_op, 0, 0, 0, 0, sra_op), RT | RD | RE },
{ insn_srl, M(spec_op,0,0,0,0,srl_op), RT | RD | RE }, { insn_srl, M(spec_op, 0, 0, 0, 0, srl_op), RT | RD | RE },
{ insn_subu, M(spec_op,0,0,0,0,subu_op), RS | RT | RD }, { insn_subu, M(spec_op, 0, 0, 0, 0, subu_op), RS | RT | RD },
{ insn_sw, M(sw_op,0,0,0,0,0), RS | RT | SIMM }, { insn_sw, M(sw_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_tlbp, M(cop0_op,cop_op,0,0,0,tlbp_op), 0 }, { insn_tlbp, M(cop0_op, cop_op, 0, 0, 0, tlbp_op), 0 },
{ insn_tlbwi, M(cop0_op,cop_op,0,0,0,tlbwi_op), 0 }, { insn_tlbwi, M(cop0_op, cop_op, 0, 0, 0, tlbwi_op), 0 },
{ insn_tlbwr, M(cop0_op,cop_op,0,0,0,tlbwr_op), 0 }, { insn_tlbwr, M(cop0_op, cop_op, 0, 0, 0, tlbwr_op), 0 },
{ insn_xor, M(spec_op,0,0,0,0,xor_op), RS | RT | RD }, { insn_xor, M(spec_op, 0, 0, 0, 0, xor_op), RS | RT | RD },
{ insn_xori, M(xori_op,0,0,0,0,0), RS | RT | UIMM }, { insn_xori, M(xori_op, 0, 0, 0, 0, 0), RS | RT | UIMM },
{ insn_invalid, 0, 0 } { insn_invalid, 0, 0 }
}; };
......
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
* Macros for calculating offsets into config space given a device * Macros for calculating offsets into config space given a device
* structure or dev/fun/reg * structure or dev/fun/reg
*/ */
#define CFGOFFSET(bus,devfn,where) (((bus)<<16)+((devfn)<<8)+(where)) #define CFGOFFSET(bus, devfn, where) (((bus)<<16)+((devfn)<<8)+(where))
#define CFGADDR(bus,devfn,where) CFGOFFSET((bus)->number,(devfn),where) #define CFGADDR(bus, devfn, where) CFGOFFSET((bus)->number, (devfn), where)
static void *cfg_space; static void *cfg_space;
...@@ -255,7 +255,7 @@ static int __init bcm1480_pcibios_init(void) ...@@ -255,7 +255,7 @@ static int __init bcm1480_pcibios_init(void)
register_pci_controller(&bcm1480_controller); register_pci_controller(&bcm1480_controller);
#ifdef CONFIG_VGA_CONSOLE #ifdef CONFIG_VGA_CONSOLE
take_over_console(&vga_con,0,MAX_NR_CONSOLES-1,1); take_over_console(&vga_con, 0, MAX_NR_CONSOLES-1, 1);
#endif #endif
return 0; return 0;
} }
......
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
* Macros for calculating offsets into config space given a device * Macros for calculating offsets into config space given a device
* structure or dev/fun/reg * structure or dev/fun/reg
*/ */
#define CFGOFFSET(bus,devfn,where) (((bus)<<16)+((devfn)<<8)+(where)) #define CFGOFFSET(bus, devfn, where) (((bus)<<16)+((devfn)<<8)+(where))
#define CFGADDR(bus,devfn,where) CFGOFFSET((bus)->number,(devfn),where) #define CFGADDR(bus, devfn, where) CFGOFFSET((bus)->number, (devfn), where)
static void *ht_cfg_space; static void *ht_cfg_space;
......
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
* Macros for calculating offsets into config space given a device * Macros for calculating offsets into config space given a device
* structure or dev/fun/reg * structure or dev/fun/reg
*/ */
#define CFGOFFSET(bus,devfn,where) (((bus)<<16) + ((devfn)<<8) + (where)) #define CFGOFFSET(bus, devfn, where) (((bus)<<16) + ((devfn)<<8) + (where))
#define CFGADDR(bus,devfn,where) CFGOFFSET((bus)->number,(devfn),where) #define CFGADDR(bus, devfn, where) CFGOFFSET((bus)->number, (devfn), where)
static void *cfg_space; static void *cfg_space;
......
...@@ -33,14 +33,14 @@ static int pnx8550_timers_read(char* page, char** start, off_t offset, int count ...@@ -33,14 +33,14 @@ static int pnx8550_timers_read(char* page, char** start, off_t offset, int count
int configPR = read_c0_config7(); int configPR = read_c0_config7();
if (offset==0) { if (offset==0) {
len += sprintf(&page[len],"Timer: count, compare, tc, status\n"); len += sprintf(&page[len], "Timer: count, compare, tc, status\n");
len += sprintf(&page[len]," 1: %11i, %8i, %1i, %s\n", len += sprintf(&page[len], " 1: %11i, %8i, %1i, %s\n",
read_c0_count(), read_c0_compare(), read_c0_count(), read_c0_compare(),
(configPR>>6)&0x1, ((configPR>>3)&0x1)? "off":"on"); (configPR>>6)&0x1, ((configPR>>3)&0x1)? "off":"on");
len += sprintf(&page[len]," 2: %11i, %8i, %1i, %s\n", len += sprintf(&page[len], " 2: %11i, %8i, %1i, %s\n",
read_c0_count2(), read_c0_compare2(), read_c0_count2(), read_c0_compare2(),
(configPR>>7)&0x1, ((configPR>>4)&0x1)? "off":"on"); (configPR>>7)&0x1, ((configPR>>4)&0x1)? "off":"on");
len += sprintf(&page[len]," 3: %11i, %8i, %1i, %s\n", len += sprintf(&page[len], " 3: %11i, %8i, %1i, %s\n",
read_c0_count3(), read_c0_compare3(), read_c0_count3(), read_c0_compare3(),
(configPR>>8)&0x1, ((configPR>>5)&0x1)? "off":"on"); (configPR>>8)&0x1, ((configPR>>5)&0x1)? "off":"on");
} }
...@@ -53,18 +53,18 @@ static int pnx8550_registers_read(char* page, char** start, off_t offset, int co ...@@ -53,18 +53,18 @@ static int pnx8550_registers_read(char* page, char** start, off_t offset, int co
int len = 0; int len = 0;
if (offset==0) { if (offset==0) {
len += sprintf(&page[len],"config1: %#10.8x\n",read_c0_config1()); len += sprintf(&page[len], "config1: %#10.8x\n", read_c0_config1());
len += sprintf(&page[len],"config2: %#10.8x\n",read_c0_config2()); len += sprintf(&page[len], "config2: %#10.8x\n", read_c0_config2());
len += sprintf(&page[len],"config3: %#10.8x\n",read_c0_config3()); len += sprintf(&page[len], "config3: %#10.8x\n", read_c0_config3());
len += sprintf(&page[len],"configPR: %#10.8x\n",read_c0_config7()); len += sprintf(&page[len], "configPR: %#10.8x\n", read_c0_config7());
len += sprintf(&page[len],"status: %#10.8x\n",read_c0_status()); len += sprintf(&page[len], "status: %#10.8x\n", read_c0_status());
len += sprintf(&page[len],"cause: %#10.8x\n",read_c0_cause()); len += sprintf(&page[len], "cause: %#10.8x\n", read_c0_cause());
len += sprintf(&page[len],"count: %#10.8x\n",read_c0_count()); len += sprintf(&page[len], "count: %#10.8x\n", read_c0_count());
len += sprintf(&page[len],"count_2: %#10.8x\n",read_c0_count2()); len += sprintf(&page[len], "count_2: %#10.8x\n", read_c0_count2());
len += sprintf(&page[len],"count_3: %#10.8x\n",read_c0_count3()); len += sprintf(&page[len], "count_3: %#10.8x\n", read_c0_count3());
len += sprintf(&page[len],"compare: %#10.8x\n",read_c0_compare()); len += sprintf(&page[len], "compare: %#10.8x\n", read_c0_compare());
len += sprintf(&page[len],"compare_2: %#10.8x\n",read_c0_compare2()); len += sprintf(&page[len], "compare_2: %#10.8x\n", read_c0_compare2());
len += sprintf(&page[len],"compare_3: %#10.8x\n",read_c0_compare3()); len += sprintf(&page[len], "compare_3: %#10.8x\n", read_c0_compare3());
} }
return len; return len;
......
...@@ -117,7 +117,7 @@ void __init msp_serial_setup(void) ...@@ -117,7 +117,7 @@ void __init msp_serial_setup(void)
/* Initialize first serial port */ /* Initialize first serial port */
up.mapbase = MSP_UART0_BASE; up.mapbase = MSP_UART0_BASE;
up.membase = ioremap_nocache(up.mapbase,MSP_UART_REG_LEN); up.membase = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
up.irq = MSP_INT_UART0; up.irq = MSP_INT_UART0;
up.uartclk = uartclk; up.uartclk = uartclk;
up.regshift = 2; up.regshift = 2;
...@@ -145,9 +145,9 @@ void __init msp_serial_setup(void) ...@@ -145,9 +145,9 @@ void __init msp_serial_setup(void)
if( DEBUG_PORT_BASE == KSEG1ADDR(MSP_UART1_BASE) ) { if( DEBUG_PORT_BASE == KSEG1ADDR(MSP_UART1_BASE) ) {
if( mips_machtype == MACH_MSP4200_FPGA if( mips_machtype == MACH_MSP4200_FPGA
|| mips_machtype == MACH_MSP7120_FPGA ) || mips_machtype == MACH_MSP7120_FPGA )
initDebugPort(uartclk,19200); initDebugPort(uartclk, 19200);
else else
initDebugPort(uartclk,57600); initDebugPort(uartclk, 57600);
} }
#endif #endif
break; break;
...@@ -157,7 +157,7 @@ void __init msp_serial_setup(void) ...@@ -157,7 +157,7 @@ void __init msp_serial_setup(void)
} }
up.mapbase = MSP_UART1_BASE; up.mapbase = MSP_UART1_BASE;
up.membase = ioremap_nocache(up.mapbase,MSP_UART_REG_LEN); up.membase = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
up.irq = MSP_INT_UART1; up.irq = MSP_INT_UART1;
up.line = 1; up.line = 1;
up.private_data = (void*)UART1_STATUS_REG; up.private_data = (void*)UART1_STATUS_REG;
......
...@@ -115,7 +115,7 @@ static int titan_ht_config_read_word(struct pci_dev *device, ...@@ -115,7 +115,7 @@ static int titan_ht_config_read_word(struct pci_dev *device,
u32 longswap(unsigned long l) u32 longswap(unsigned long l)
{ {
unsigned char b1,b2,b3,b4; unsigned char b1, b2, b3, b4;
b1 = l&255; b1 = l&255;
b2 = (l>>8)&255; b2 = (l>>8)&255;
......
...@@ -176,7 +176,7 @@ void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle) ...@@ -176,7 +176,7 @@ void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
unsigned long gp = (unsigned long)task_thread_info(idle); unsigned long gp = (unsigned long)task_thread_info(idle);
unsigned long sp = __KSTK_TOS(idle); unsigned long sp = __KSTK_TOS(idle);
LAUNCH_SLAVE(cputonasid(cpu),cputoslice(cpu), LAUNCH_SLAVE(cputonasid(cpu), cputoslice(cpu),
(launch_proc_t)MAPPED_KERN_RW_TO_K0(smp_bootstrap), (launch_proc_t)MAPPED_KERN_RW_TO_K0(smp_bootstrap),
0, (void *) sp, (void *) gp); 0, (void *) sp, (void *) gp);
} }
......
...@@ -289,7 +289,7 @@ int bcm1480_steal_irq(int irq) ...@@ -289,7 +289,7 @@ int bcm1480_steal_irq(int irq)
if (irq >= BCM1480_NR_IRQS) if (irq >= BCM1480_NR_IRQS)
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&desc->lock,flags); spin_lock_irqsave(&desc->lock, flags);
/* Don't allow sharing at all for these */ /* Don't allow sharing at all for these */
if (desc->action != NULL) if (desc->action != NULL)
retval = -EBUSY; retval = -EBUSY;
...@@ -297,7 +297,7 @@ int bcm1480_steal_irq(int irq) ...@@ -297,7 +297,7 @@ int bcm1480_steal_irq(int irq)
desc->action = &bcm1480_dummy_action; desc->action = &bcm1480_dummy_action;
desc->depth = 0; desc->depth = 0;
} }
spin_unlock_irqrestore(&desc->lock,flags); spin_unlock_irqrestore(&desc->lock, flags);
return 0; return 0;
} }
...@@ -431,8 +431,8 @@ void __init arch_init_irq(void) ...@@ -431,8 +431,8 @@ void __init arch_init_irq(void)
#include <linux/delay.h> #include <linux/delay.h>
#define duart_out(reg, val) csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port,reg))) #define duart_out(reg, val) csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
#define duart_in(reg) csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port,reg))) #define duart_in(reg) csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
static void bcm1480_kgdb_interrupt(void) static void bcm1480_kgdb_interrupt(void)
{ {
......
...@@ -14,7 +14,7 @@ static void cfe_console_write(struct console *cons, const char *str, ...@@ -14,7 +14,7 @@ static void cfe_console_write(struct console *cons, const char *str,
{ {
int i, last, written; int i, last, written;
for (i=0,last=0; i<count; i++) { for (i=0, last=0; i<count; i++) {
if (!str[i]) if (!str[i])
/* XXXKW can/should this ever happen? */ /* XXXKW can/should this ever happen? */
return; return;
......
...@@ -309,7 +309,7 @@ void __init prom_init(void) ...@@ -309,7 +309,7 @@ void __init prom_init(void)
} }
#ifdef CONFIG_KGDB #ifdef CONFIG_KGDB
if ((arg = strstr(arcs_cmdline,"kgdb=duart")) != NULL) if ((arg = strstr(arcs_cmdline, "kgdb=duart")) != NULL)
kgdb_port = (arg[10] == '0') ? 0 : 1; kgdb_port = (arg[10] == '0') ? 0 : 1;
else else
kgdb_port = 1; kgdb_port = 1;
......
...@@ -259,7 +259,7 @@ int sb1250_steal_irq(int irq) ...@@ -259,7 +259,7 @@ int sb1250_steal_irq(int irq)
if (irq >= SB1250_NR_IRQS) if (irq >= SB1250_NR_IRQS)
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&desc->lock,flags); spin_lock_irqsave(&desc->lock, flags);
/* Don't allow sharing at all for these */ /* Don't allow sharing at all for these */
if (desc->action != NULL) if (desc->action != NULL)
retval = -EBUSY; retval = -EBUSY;
...@@ -267,7 +267,7 @@ int sb1250_steal_irq(int irq) ...@@ -267,7 +267,7 @@ int sb1250_steal_irq(int irq)
desc->action = &sb1250_dummy_action; desc->action = &sb1250_dummy_action;
desc->depth = 0; desc->depth = 0;
} }
spin_unlock_irqrestore(&desc->lock,flags); spin_unlock_irqrestore(&desc->lock, flags);
return 0; return 0;
} }
...@@ -381,8 +381,8 @@ void __init arch_init_irq(void) ...@@ -381,8 +381,8 @@ void __init arch_init_irq(void)
#include <linux/delay.h> #include <linux/delay.h>
#define duart_out(reg, val) csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port,reg))) #define duart_out(reg, val) csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
#define duart_in(reg) csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port,reg))) #define duart_in(reg) csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
static void sb1250_kgdb_interrupt(void) static void sb1250_kgdb_interrupt(void)
{ {
......
...@@ -66,7 +66,7 @@ static void prom_linux_exit(void) ...@@ -66,7 +66,7 @@ static void prom_linux_exit(void)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
if (smp_processor_id()) { if (smp_processor_id()) {
smp_call_function(prom_cpu0_exit,NULL,1,1); smp_call_function(prom_cpu0_exit, NULL, 1, 1);
} }
#endif #endif
while(1); while(1);
......
...@@ -37,8 +37,8 @@ static int duart_initialized = 0; /* 0: need to be init'ed by kgdb */ ...@@ -37,8 +37,8 @@ static int duart_initialized = 0; /* 0: need to be init'ed by kgdb */
/* -------------------- END OF CONFIG --------------------- */ /* -------------------- END OF CONFIG --------------------- */
extern int kgdb_port; extern int kgdb_port;
#define duart_out(reg, val) csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port,reg))) #define duart_out(reg, val) csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
#define duart_in(reg) csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port,reg))) #define duart_in(reg) csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
void putDebugChar(unsigned char c); void putDebugChar(unsigned char c);
unsigned char getDebugChar(void); unsigned char getDebugChar(void);
......
...@@ -35,7 +35,7 @@ void sni_machine_restart(char *command) ...@@ -35,7 +35,7 @@ void sni_machine_restart(char *command)
kb_wait(); kb_wait();
for (j = 0; j < 100000 ; j++) for (j = 0; j < 100000 ; j++)
/* nothing */; /* nothing */;
outb_p(0xfe,0x64); /* pulse reset low */ outb_p(0xfe, 0x64); /* pulse reset low */
} }
} }
} }
......
...@@ -233,7 +233,7 @@ void __init prom_init(void) ...@@ -233,7 +233,7 @@ void __init prom_init(void)
systype = "RM300-Exx"; systype = "RM300-Exx";
break; break;
} }
pr_debug("Found SNI brdtype %02x name %s\n", sni_brd_type,systype); pr_debug("Found SNI brdtype %02x name %s\n", sni_brd_type, systype);
#ifdef DEBUG #ifdef DEBUG
sni_idprom_dump(); sni_idprom_dump();
......
...@@ -176,7 +176,7 @@ static const u32 toshiba_rbtx4927_irq_debug_flag = ...@@ -176,7 +176,7 @@ static const u32 toshiba_rbtx4927_irq_debug_flag =
printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \ printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \
} }
#else #else
#define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag,str...) #define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag, str...)
#endif #endif
......
...@@ -122,7 +122,7 @@ static const u32 toshiba_rbtx4927_setup_debug_flag = ...@@ -122,7 +122,7 @@ static const u32 toshiba_rbtx4927_setup_debug_flag =
printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \ printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \
} }
#else #else
#define TOSHIBA_RBTX4927_SETUP_DPRINTK(flag,str...) #define TOSHIBA_RBTX4927_SETUP_DPRINTK(flag, str...)
#endif #endif
/* These functions are used for rebooting or halting the machine*/ /* These functions are used for rebooting or halting the machine*/
...@@ -497,7 +497,7 @@ void __init tx4927_pci_setup(void) ...@@ -497,7 +497,7 @@ void __init tx4927_pci_setup(void)
"Internal"); "Internal");
called = 1; called = 1;
} }
printk("%s PCIC --%s PCICLK:",toshiba_name, printk("%s PCIC --%s PCICLK:", toshiba_name,
(tx4927_ccfgptr->ccfg & TX4927_CCFG_PCI66) ? " PCI66" : ""); (tx4927_ccfgptr->ccfg & TX4927_CCFG_PCI66) ? " PCI66" : "");
if (tx4927_ccfgptr->pcfg & TX4927_PCFG_PCICLKEN_ALL) { if (tx4927_ccfgptr->pcfg & TX4927_PCFG_PCICLKEN_ALL) {
int pciclk = 0; int pciclk = 0;
......
...@@ -457,9 +457,9 @@ extern struct pci_controller tx4938_pci_controller[]; ...@@ -457,9 +457,9 @@ extern struct pci_controller tx4938_pci_controller[];
static int __init tx4938_pcibios_init(void) static int __init tx4938_pcibios_init(void)
{ {
unsigned long mem_base[2]; unsigned long mem_base[2];
unsigned long mem_size[2] = {TX4938_PCIMEM_SIZE_0,TX4938_PCIMEM_SIZE_1}; /* MAX 128M,64K */ unsigned long mem_size[2] = {TX4938_PCIMEM_SIZE_0, TX4938_PCIMEM_SIZE_1}; /* MAX 128M,64K */
unsigned long io_base[2]; unsigned long io_base[2];
unsigned long io_size[2] = {TX4938_PCIIO_SIZE_0,TX4938_PCIIO_SIZE_1}; /* MAX 16M,64K */ unsigned long io_size[2] = {TX4938_PCIIO_SIZE_0, TX4938_PCIIO_SIZE_1}; /* MAX 16M,64K */
/* TX4938 PCIC1: 64K MEM/IO is enough for ETH0,ETH1 */ /* TX4938 PCIC1: 64K MEM/IO is enough for ETH0,ETH1 */
int extarb = !(tx4938_ccfgptr->ccfg & TX4938_CCFG_PCIXARB); int extarb = !(tx4938_ccfgptr->ccfg & TX4938_CCFG_PCIXARB);
......
...@@ -36,7 +36,7 @@ void disable_pcnet(void) ...@@ -36,7 +36,7 @@ void disable_pcnet(void)
*/ */
writel((2 << 16) | writel((2 << 16) |
(PCI_DEVFN(1,0) << 8) | (PCI_DEVFN(1, 0) << 8) |
(0 & 0xfc) | (0 & 0xfc) |
1UL, 1UL,
PCICONFAREG); PCICONFAREG);
...@@ -44,7 +44,7 @@ void disable_pcnet(void) ...@@ -44,7 +44,7 @@ void disable_pcnet(void)
data = readl(PCICONFDREG); data = readl(PCICONFDREG);
writel((2 << 16) | writel((2 << 16) |
(PCI_DEVFN(1,0) << 8) | (PCI_DEVFN(1, 0) << 8) |
(4 & 0xfc) | (4 & 0xfc) |
1UL, 1UL,
PCICONFAREG); PCICONFAREG);
...@@ -52,7 +52,7 @@ void disable_pcnet(void) ...@@ -52,7 +52,7 @@ void disable_pcnet(void)
data = readl(PCICONFDREG); data = readl(PCICONFDREG);
writel((2 << 16) | writel((2 << 16) |
(PCI_DEVFN(1,0) << 8) | (PCI_DEVFN(1, 0) << 8) |
(4 & 0xfc) | (4 & 0xfc) |
1UL, 1UL,
PCICONFAREG); PCICONFAREG);
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
outb_p((dev_no), DATA_PORT(port)); \ outb_p((dev_no), DATA_PORT(port)); \
} while(0) } while(0)
#define WRITE_CONFIG_DATA(port,index,data) \ #define WRITE_CONFIG_DATA(port, index, data) \
do { \ do { \
outb_p((index), INDEX_PORT(port)); \ outb_p((index), INDEX_PORT(port)); \
outb_p((data), DATA_PORT(port)); \ outb_p((data), DATA_PORT(port)); \
...@@ -206,8 +206,8 @@ static inline u16 ali_config_readw(u8 reg, int devfn) ...@@ -206,8 +206,8 @@ static inline u16 ali_config_readw(u8 reg, int devfn)
int vr4133_rockhopper = 0; int vr4133_rockhopper = 0;
void __init ali_m5229_preinit(void) void __init ali_m5229_preinit(void)
{ {
if (ali_config_readw(PCI_VENDOR_ID,16) == PCI_VENDOR_ID_AL && if (ali_config_readw(PCI_VENDOR_ID, 16) == PCI_VENDOR_ID_AL &&
ali_config_readw(PCI_DEVICE_ID,16) == PCI_DEVICE_ID_AL_M1533) { ali_config_readw(PCI_DEVICE_ID, 16) == PCI_DEVICE_ID_AL_M1533) {
printk(KERN_INFO "Found an NEC Rockhopper \n"); printk(KERN_INFO "Found an NEC Rockhopper \n");
vr4133_rockhopper = 1; vr4133_rockhopper = 1;
/* /*
......
...@@ -123,10 +123,10 @@ ...@@ -123,10 +123,10 @@
/* /*
* 64-bit address conversions * 64-bit address conversions
*/ */
#define PHYS_TO_XKSEG_UNCACHED(p) PHYS_TO_XKPHYS(K_CALG_UNCACHED,(p)) #define PHYS_TO_XKSEG_UNCACHED(p) PHYS_TO_XKPHYS(K_CALG_UNCACHED, (p))
#define PHYS_TO_XKSEG_CACHED(p) PHYS_TO_XKPHYS(K_CALG_COH_SHAREABLE,(p)) #define PHYS_TO_XKSEG_CACHED(p) PHYS_TO_XKPHYS(K_CALG_COH_SHAREABLE, (p))
#define XKPHYS_TO_PHYS(p) ((p) & TO_PHYS_MASK) #define XKPHYS_TO_PHYS(p) ((p) & TO_PHYS_MASK)
#define PHYS_TO_XKPHYS(cm,a) (_CONST64_(0x8000000000000000) | \ #define PHYS_TO_XKPHYS(cm, a) (_CONST64_(0x8000000000000000) | \
((cm)<<59) | (a)) ((cm)<<59) | (a))
/* /*
......
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#ifndef CAT #ifndef CAT
#ifdef __STDC__ #ifdef __STDC__
#define __CAT(str1,str2) str1##str2 #define __CAT(str1, str2) str1##str2
#else #else
#define __CAT(str1,str2) str1/**/str2 #define __CAT(str1, str2) str1/**/str2
#endif #endif
#define CAT(str1,str2) __CAT(str1,str2) #define CAT(str1, str2) __CAT(str1, str2)
#endif #endif
/* /*
...@@ -51,9 +51,9 @@ ...@@ -51,9 +51,9 @@
#define LEAF(symbol) \ #define LEAF(symbol) \
.globl symbol; \ .globl symbol; \
.align 2; \ .align 2; \
.type symbol,@function; \ .type symbol, @function; \
.ent symbol,0; \ .ent symbol, 0; \
symbol: .frame sp,0,ra symbol: .frame sp, 0, ra
/* /*
* NESTED - declare nested routine entry point * NESTED - declare nested routine entry point
...@@ -61,8 +61,8 @@ symbol: .frame sp,0,ra ...@@ -61,8 +61,8 @@ symbol: .frame sp,0,ra
#define NESTED(symbol, framesize, rpc) \ #define NESTED(symbol, framesize, rpc) \
.globl symbol; \ .globl symbol; \
.align 2; \ .align 2; \
.type symbol,@function; \ .type symbol, @function; \
.ent symbol,0; \ .ent symbol, 0; \
symbol: .frame sp, framesize, rpc symbol: .frame sp, framesize, rpc
/* /*
...@@ -70,7 +70,7 @@ symbol: .frame sp, framesize, rpc ...@@ -70,7 +70,7 @@ symbol: .frame sp, framesize, rpc
*/ */
#define END(function) \ #define END(function) \
.end function; \ .end function; \
.size function,.-function .size function, .-function
/* /*
* EXPORT - export definition of symbol * EXPORT - export definition of symbol
...@@ -84,7 +84,7 @@ symbol: .frame sp, framesize, rpc ...@@ -84,7 +84,7 @@ symbol: .frame sp, framesize, rpc
*/ */
#define FEXPORT(symbol) \ #define FEXPORT(symbol) \
.globl symbol; \ .globl symbol; \
.type symbol,@function; \ .type symbol, @function; \
symbol: symbol:
/* /*
...@@ -97,7 +97,7 @@ symbol = value ...@@ -97,7 +97,7 @@ symbol = value
#define PANIC(msg) \ #define PANIC(msg) \
.set push; \ .set push; \
.set reorder; \ .set reorder; \
PTR_LA a0,8f; \ PTR_LA a0, 8f; \
jal panic; \ jal panic; \
9: b 9b; \ 9: b 9b; \
.set pop; \ .set pop; \
...@@ -110,7 +110,7 @@ symbol = value ...@@ -110,7 +110,7 @@ symbol = value
#define PRINT(string) \ #define PRINT(string) \
.set push; \ .set push; \
.set reorder; \ .set reorder; \
PTR_LA a0,8f; \ PTR_LA a0, 8f; \
jal printk; \ jal printk; \
.set pop; \ .set pop; \
TEXT(string) TEXT(string)
...@@ -146,19 +146,19 @@ symbol = value ...@@ -146,19 +146,19 @@ symbol = value
#define PREF(hint,addr) \ #define PREF(hint,addr) \
.set push; \ .set push; \
.set mips4; \ .set mips4; \
pref hint,addr; \ pref hint, addr; \
.set pop .set pop
#define PREFX(hint,addr) \ #define PREFX(hint,addr) \
.set push; \ .set push; \
.set mips4; \ .set mips4; \
prefx hint,addr; \ prefx hint, addr; \
.set pop .set pop
#else /* !CONFIG_CPU_HAS_PREFETCH */ #else /* !CONFIG_CPU_HAS_PREFETCH */
#define PREF(hint,addr) #define PREF(hint, addr)
#define PREFX(hint,addr) #define PREFX(hint, addr)
#endif /* !CONFIG_CPU_HAS_PREFETCH */ #endif /* !CONFIG_CPU_HAS_PREFETCH */
...@@ -166,43 +166,43 @@ symbol = value ...@@ -166,43 +166,43 @@ symbol = value
* MIPS ISA IV/V movn/movz instructions and equivalents for older CPUs. * MIPS ISA IV/V movn/movz instructions and equivalents for older CPUs.
*/ */
#if (_MIPS_ISA == _MIPS_ISA_MIPS1) #if (_MIPS_ISA == _MIPS_ISA_MIPS1)
#define MOVN(rd,rs,rt) \ #define MOVN(rd, rs, rt) \
.set push; \ .set push; \
.set reorder; \ .set reorder; \
beqz rt,9f; \ beqz rt, 9f; \
move rd,rs; \ move rd, rs; \
.set pop; \ .set pop; \
9: 9:
#define MOVZ(rd,rs,rt) \ #define MOVZ(rd, rs, rt) \
.set push; \ .set push; \
.set reorder; \ .set reorder; \
bnez rt,9f; \ bnez rt, 9f; \
move rd,rs; \ move rd, rs; \
.set pop; \ .set pop; \
9: 9:
#endif /* _MIPS_ISA == _MIPS_ISA_MIPS1 */ #endif /* _MIPS_ISA == _MIPS_ISA_MIPS1 */
#if (_MIPS_ISA == _MIPS_ISA_MIPS2) || (_MIPS_ISA == _MIPS_ISA_MIPS3) #if (_MIPS_ISA == _MIPS_ISA_MIPS2) || (_MIPS_ISA == _MIPS_ISA_MIPS3)
#define MOVN(rd,rs,rt) \ #define MOVN(rd, rs, rt) \
.set push; \ .set push; \
.set noreorder; \ .set noreorder; \
bnezl rt,9f; \ bnezl rt, 9f; \
move rd,rs; \ move rd, rs; \
.set pop; \ .set pop; \
9: 9:
#define MOVZ(rd,rs,rt) \ #define MOVZ(rd, rs, rt) \
.set push; \ .set push; \
.set noreorder; \ .set noreorder; \
beqzl rt,9f; \ beqzl rt, 9f; \
move rd,rs; \ move rd, rs; \
.set pop; \ .set pop; \
9: 9:
#endif /* (_MIPS_ISA == _MIPS_ISA_MIPS2) || (_MIPS_ISA == _MIPS_ISA_MIPS3) */ #endif /* (_MIPS_ISA == _MIPS_ISA_MIPS2) || (_MIPS_ISA == _MIPS_ISA_MIPS3) */
#if (_MIPS_ISA == _MIPS_ISA_MIPS4 ) || (_MIPS_ISA == _MIPS_ISA_MIPS5) || \ #if (_MIPS_ISA == _MIPS_ISA_MIPS4 ) || (_MIPS_ISA == _MIPS_ISA_MIPS5) || \
(_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64) (_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
#define MOVN(rd,rs,rt) \ #define MOVN(rd, rs, rt) \
movn rd,rs,rt movn rd, rs, rt
#define MOVZ(rd,rs,rt) \ #define MOVZ(rd, rs, rt) \
movz rd,rs,rt movz rd, rs, rt
#endif /* MIPS IV, MIPS V, MIPS32 or MIPS64 */ #endif /* MIPS IV, MIPS V, MIPS32 or MIPS64 */
/* /*
...@@ -396,6 +396,6 @@ symbol = value ...@@ -396,6 +396,6 @@ symbol = value
#define MTC0 dmtc0 #define MTC0 dmtc0
#endif #endif
#define SSNOP sll zero,zero,1 #define SSNOP sll zero, zero, 1
#endif /* __ASM_ASM_H */ #endif /* __ASM_ASM_H */
...@@ -39,7 +39,7 @@ typedef struct { volatile int counter; } atomic_t; ...@@ -39,7 +39,7 @@ typedef struct { volatile int counter; } atomic_t;
* *
* Atomically sets the value of @v to @i. * Atomically sets the value of @v to @i.
*/ */
#define atomic_set(v,i) ((v)->counter = (i)) #define atomic_set(v, i) ((v)->counter = (i))
/* /*
* atomic_add - add integer to atomic variable * atomic_add - add integer to atomic variable
...@@ -335,8 +335,8 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -335,8 +335,8 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
#define atomic_dec_return(v) atomic_sub_return(1,(v)) #define atomic_dec_return(v) atomic_sub_return(1, (v))
#define atomic_inc_return(v) atomic_add_return(1,(v)) #define atomic_inc_return(v) atomic_add_return(1, (v))
/* /*
* atomic_sub_and_test - subtract value from variable and test result * atomic_sub_and_test - subtract value from variable and test result
...@@ -347,7 +347,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -347,7 +347,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
* true if the result is zero, or false for all * true if the result is zero, or false for all
* other cases. * other cases.
*/ */
#define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0) #define atomic_sub_and_test(i, v) (atomic_sub_return((i), (v)) == 0)
/* /*
* atomic_inc_and_test - increment and test * atomic_inc_and_test - increment and test
...@@ -381,7 +381,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -381,7 +381,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
* *
* Atomically increments @v by 1. * Atomically increments @v by 1.
*/ */
#define atomic_inc(v) atomic_add(1,(v)) #define atomic_inc(v) atomic_add(1, (v))
/* /*
* atomic_dec - decrement and test * atomic_dec - decrement and test
...@@ -389,7 +389,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -389,7 +389,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
* *
* Atomically decrements @v by 1. * Atomically decrements @v by 1.
*/ */
#define atomic_dec(v) atomic_sub(1,(v)) #define atomic_dec(v) atomic_sub(1, (v))
/* /*
* atomic_add_negative - add and test if negative * atomic_add_negative - add and test if negative
...@@ -400,7 +400,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) ...@@ -400,7 +400,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
* if the result is negative, or false when * if the result is negative, or false when
* result is greater than or equal to zero. * result is greater than or equal to zero.
*/ */
#define atomic_add_negative(i,v) (atomic_add_return(i, (v)) < 0) #define atomic_add_negative(i, v) (atomic_add_return(i, (v)) < 0)
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
...@@ -420,7 +420,7 @@ typedef struct { volatile long counter; } atomic64_t; ...@@ -420,7 +420,7 @@ typedef struct { volatile long counter; } atomic64_t;
* @v: pointer of type atomic64_t * @v: pointer of type atomic64_t
* @i: required value * @i: required value
*/ */
#define atomic64_set(v,i) ((v)->counter = (i)) #define atomic64_set(v, i) ((v)->counter = (i))
/* /*
* atomic64_add - add integer to atomic variable * atomic64_add - add integer to atomic variable
...@@ -718,8 +718,8 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) ...@@ -718,8 +718,8 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
#define atomic64_dec_return(v) atomic64_sub_return(1,(v)) #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
#define atomic64_inc_return(v) atomic64_add_return(1,(v)) #define atomic64_inc_return(v) atomic64_add_return(1, (v))
/* /*
* atomic64_sub_and_test - subtract value from variable and test result * atomic64_sub_and_test - subtract value from variable and test result
...@@ -730,7 +730,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) ...@@ -730,7 +730,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
* true if the result is zero, or false for all * true if the result is zero, or false for all
* other cases. * other cases.
*/ */
#define atomic64_sub_and_test(i,v) (atomic64_sub_return((i), (v)) == 0) #define atomic64_sub_and_test(i, v) (atomic64_sub_return((i), (v)) == 0)
/* /*
* atomic64_inc_and_test - increment and test * atomic64_inc_and_test - increment and test
...@@ -764,7 +764,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) ...@@ -764,7 +764,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
* *
* Atomically increments @v by 1. * Atomically increments @v by 1.
*/ */
#define atomic64_inc(v) atomic64_add(1,(v)) #define atomic64_inc(v) atomic64_add(1, (v))
/* /*
* atomic64_dec - decrement and test * atomic64_dec - decrement and test
...@@ -772,7 +772,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) ...@@ -772,7 +772,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
* *
* Atomically decrements @v by 1. * Atomically decrements @v by 1.
*/ */
#define atomic64_dec(v) atomic64_sub(1,(v)) #define atomic64_dec(v) atomic64_sub(1, (v))
/* /*
* atomic64_add_negative - add and test if negative * atomic64_add_negative - add and test if negative
...@@ -783,7 +783,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) ...@@ -783,7 +783,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
* if the result is negative, or false when * if the result is negative, or false when
* result is greater than or equal to zero. * result is greater than or equal to zero.
*/ */
#define atomic64_add_negative(i,v) (atomic64_add_return(i, (v)) < 0) #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
#endif /* CONFIG_64BIT */ #endif /* CONFIG_64BIT */
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
*/ */
extern void __cmpxchg_called_with_bad_pointer(void); extern void __cmpxchg_called_with_bad_pointer(void);
#define __cmpxchg(ptr,old,new,barrier) \ #define __cmpxchg(ptr, old, new, barrier) \
({ \ ({ \
__typeof__(ptr) __ptr = (ptr); \ __typeof__(ptr) __ptr = (ptr); \
__typeof__(*(ptr)) __old = (old); \ __typeof__(*(ptr)) __old = (old); \
...@@ -102,6 +102,6 @@ extern void __cmpxchg_called_with_bad_pointer(void); ...@@ -102,6 +102,6 @@ extern void __cmpxchg_called_with_bad_pointer(void);
}) })
#define cmpxchg(ptr, old, new) __cmpxchg(ptr, old, new, smp_llsc_mb()) #define cmpxchg(ptr, old, new) __cmpxchg(ptr, old, new, smp_llsc_mb())
#define cmpxchg_local(ptr, old, new) __cmpxchg(ptr, old, new,) #define cmpxchg_local(ptr, old, new) __cmpxchg(ptr, old, new, )
#endif /* __ASM_CMPXCHG_H */ #endif /* __ASM_CMPXCHG_H */
...@@ -81,7 +81,7 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj) ...@@ -81,7 +81,7 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj)
#define __udelay_val cpu_data[raw_smp_processor_id()].udelay_val #define __udelay_val cpu_data[raw_smp_processor_id()].udelay_val
#define udelay(usecs) __udelay((usecs),__udelay_val) #define udelay(usecs) __udelay((usecs), __udelay_val)
/* make sure "usecs *= ..." in udelay do not overflow. */ /* make sure "usecs *= ..." in udelay do not overflow. */
#if HZ >= 1000 #if HZ >= 1000
......
...@@ -49,7 +49,7 @@ static inline void fd_cacheflush(char * addr, long size) ...@@ -49,7 +49,7 @@ static inline void fd_cacheflush(char * addr, long size)
* Actually this needs to be a bit more complicated since the so much different * Actually this needs to be a bit more complicated since the so much different
* hardware available with MIPS CPUs ... * hardware available with MIPS CPUs ...
*/ */
#define CROSS_64KB(a,s) ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64) #define CROSS_64KB(a, s) ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64)
#define EXTRA_FLOPPY_PARAMS #define EXTRA_FLOPPY_PARAMS
......
...@@ -136,25 +136,25 @@ int64_t cfe_getticks(void); ...@@ -136,25 +136,25 @@ int64_t cfe_getticks(void);
*/ */
#ifdef CFE_API_IMPL_NAMESPACE #ifdef CFE_API_IMPL_NAMESPACE
#define cfe_close(a) __cfe_close(a) #define cfe_close(a) __cfe_close(a)
#define cfe_cpu_start(a,b,c,d,e) __cfe_cpu_start(a,b,c,d,e) #define cfe_cpu_start(a, b, c, d, e) __cfe_cpu_start(a, b, c, d, e)
#define cfe_cpu_stop(a) __cfe_cpu_stop(a) #define cfe_cpu_stop(a) __cfe_cpu_stop(a)
#define cfe_enumenv(a,b,d,e,f) __cfe_enumenv(a,b,d,e,f) #define cfe_enumenv(a, b, d, e, f) __cfe_enumenv(a, b, d, e, f)
#define cfe_enummem(a,b,c,d,e) __cfe_enummem(a,b,c,d,e) #define cfe_enummem(a, b, c, d, e) __cfe_enummem(a, b, c, d, e)
#define cfe_exit(a,b) __cfe_exit(a,b) #define cfe_exit(a, b) __cfe_exit(a, b)
#define cfe_flushcache(a) __cfe_cacheflush(a) #define cfe_flushcache(a) __cfe_cacheflush(a)
#define cfe_getdevinfo(a) __cfe_getdevinfo(a) #define cfe_getdevinfo(a) __cfe_getdevinfo(a)
#define cfe_getenv(a,b,c) __cfe_getenv(a,b,c) #define cfe_getenv(a, b, c) __cfe_getenv(a, b, c)
#define cfe_getfwinfo(a) __cfe_getfwinfo(a) #define cfe_getfwinfo(a) __cfe_getfwinfo(a)
#define cfe_getstdhandle(a) __cfe_getstdhandle(a) #define cfe_getstdhandle(a) __cfe_getstdhandle(a)
#define cfe_init(a,b) __cfe_init(a,b) #define cfe_init(a, b) __cfe_init(a, b)
#define cfe_inpstat(a) __cfe_inpstat(a) #define cfe_inpstat(a) __cfe_inpstat(a)
#define cfe_ioctl(a,b,c,d,e,f) __cfe_ioctl(a,b,c,d,e,f) #define cfe_ioctl(a, b, c, d, e, f) __cfe_ioctl(a, b, c, d, e, f)
#define cfe_open(a) __cfe_open(a) #define cfe_open(a) __cfe_open(a)
#define cfe_read(a,b,c) __cfe_read(a,b,c) #define cfe_read(a, b, c) __cfe_read(a, b, c)
#define cfe_readblk(a,b,c,d) __cfe_readblk(a,b,c,d) #define cfe_readblk(a, b, c, d) __cfe_readblk(a, b, c, d)
#define cfe_setenv(a,b) __cfe_setenv(a,b) #define cfe_setenv(a, b) __cfe_setenv(a, b)
#define cfe_write(a,b,c) __cfe_write(a,b,c) #define cfe_write(a, b, c) __cfe_write(a, b, c)
#define cfe_writeblk(a,b,c,d) __cfe_writeblk(a,b,c,d) #define cfe_writeblk(a, b, c, d __cfe_writeblk(a, b, c, d)
#endif /* CFE_API_IMPL_NAMESPACE */ #endif /* CFE_API_IMPL_NAMESPACE */
int cfe_close(int handle); int cfe_close(int handle);
......
...@@ -193,7 +193,7 @@ ASMMACRO(enable_fpu_hazard, ...@@ -193,7 +193,7 @@ ASMMACRO(enable_fpu_hazard,
.set mips64; .set mips64;
.set noreorder; .set noreorder;
_ssnop; _ssnop;
bnezl $0,.+4; bnezl $0, .+4;
_ssnop; _ssnop;
.set pop .set pop
) )
......
...@@ -40,11 +40,11 @@ ...@@ -40,11 +40,11 @@
* hardware. An example use would be for flash memory that's used for * hardware. An example use would be for flash memory that's used for
* execute in place. * execute in place.
*/ */
# define __raw_ioswabb(a,x) (x) # define __raw_ioswabb(a, x) (x)
# define __raw_ioswabw(a,x) (x) # define __raw_ioswabw(a, x) (x)
# define __raw_ioswabl(a,x) (x) # define __raw_ioswabl(a, x) (x)
# define __raw_ioswabq(a,x) (x) # define __raw_ioswabq(a, x) (x)
# define ____raw_ioswabq(a,x) (x) # define ____raw_ioswabq(a, x) (x)
/* ioswab[bwlq], __mem_ioswab[bwlq] are defined in mangle-port.h */ /* ioswab[bwlq], __mem_ioswab[bwlq] are defined in mangle-port.h */
...@@ -561,9 +561,9 @@ extern void (*_dma_cache_wback_inv)(unsigned long start, unsigned long size); ...@@ -561,9 +561,9 @@ extern void (*_dma_cache_wback_inv)(unsigned long start, unsigned long size);
extern void (*_dma_cache_wback)(unsigned long start, unsigned long size); extern void (*_dma_cache_wback)(unsigned long start, unsigned long size);
extern void (*_dma_cache_inv)(unsigned long start, unsigned long size); extern void (*_dma_cache_inv)(unsigned long start, unsigned long size);
#define dma_cache_wback_inv(start, size) _dma_cache_wback_inv(start,size) #define dma_cache_wback_inv(start, size) _dma_cache_wback_inv(start, size)
#define dma_cache_wback(start, size) _dma_cache_wback(start,size) #define dma_cache_wback(start, size) _dma_cache_wback(start, size)
#define dma_cache_inv(start, size) _dma_cache_inv(start,size) #define dma_cache_inv(start, size) _dma_cache_inv(start, size)
#else /* Sane hardware */ #else /* Sane hardware */
...@@ -587,7 +587,7 @@ extern void (*_dma_cache_inv)(unsigned long start, unsigned long size); ...@@ -587,7 +587,7 @@ extern void (*_dma_cache_inv)(unsigned long start, unsigned long size);
#define __CSR_32_ADJUST 0 #define __CSR_32_ADJUST 0
#endif #endif
#define csr_out32(v,a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v)) #define csr_out32(v, a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v))
#define csr_in32(a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST)) #define csr_in32(a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST))
/* /*
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#define _IOC_IN 0x80000000 #define _IOC_IN 0x80000000
#define _IOC_INOUT (IOC_IN|IOC_OUT) #define _IOC_INOUT (IOC_IN|IOC_OUT)
#define _IOC(dir,type,nr,size) \ #define _IOC(dir, type, nr, size) \
(((dir) << _IOC_DIRSHIFT) | \ (((dir) << _IOC_DIRSHIFT) | \
((type) << _IOC_TYPESHIFT) | \ ((type) << _IOC_TYPESHIFT) | \
((nr) << _IOC_NRSHIFT) | \ ((nr) << _IOC_NRSHIFT) | \
...@@ -68,13 +68,13 @@ extern unsigned int __invalid_size_argument_for_IOC; ...@@ -68,13 +68,13 @@ extern unsigned int __invalid_size_argument_for_IOC;
sizeof(t) : __invalid_size_argument_for_IOC) sizeof(t) : __invalid_size_argument_for_IOC)
/* used to create numbers */ /* used to create numbers */
#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0) #define _IO(type, nr) _IOC(_IOC_NONE, (type), (nr), 0)
#define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size))) #define _IOR(type, nr, size) _IOC(_IOC_READ, (type), (nr), (_IOC_TYPECHECK(size)))
#define _IOW(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size))) #define _IOW(type, nr, size) _IOC(_IOC_WRITE, (type), (nr), (_IOC_TYPECHECK(size)))
#define _IOWR(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size))) #define _IOWR(type, nr, size) _IOC(_IOC_READ|_IOC_WRITE, (type), (nr), (_IOC_TYPECHECK(size)))
#define _IOR_BAD(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size)) #define _IOR_BAD(type, nr, size) _IOC(_IOC_READ, (type), (nr), sizeof(size))
#define _IOW_BAD(type,nr,size) _IOC(_IOC_WRITE,(type),(nr),sizeof(size)) #define _IOW_BAD(type, nr, size) _IOC(_IOC_WRITE, (type), (nr), sizeof(size))
#define _IOWR_BAD(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size)) #define _IOWR_BAD(type, nr, size) _IOC(_IOC_READ|_IOC_WRITE, (type), (nr), sizeof(size))
/* used to decode them.. */ /* used to decode them.. */
......
...@@ -77,12 +77,12 @@ ...@@ -77,12 +77,12 @@
#define TIOCSBRK 0x5427 /* BSD compatibility */ #define TIOCSBRK 0x5427 /* BSD compatibility */
#define TIOCCBRK 0x5428 /* BSD compatibility */ #define TIOCCBRK 0x5428 /* BSD compatibility */
#define TIOCGSID 0x7416 /* Return the session ID of FD */ #define TIOCGSID 0x7416 /* Return the session ID of FD */
#define TCGETS2 _IOR('T',0x2A, struct termios2) #define TCGETS2 _IOR('T', 0x2A, struct termios2)
#define TCSETS2 _IOW('T',0x2B, struct termios2) #define TCSETS2 _IOW('T', 0x2B, struct termios2)
#define TCSETSW2 _IOW('T',0x2C, struct termios2) #define TCSETSW2 _IOW('T', 0x2C, struct termios2)
#define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TCSETSF2 _IOW('T', 0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ #define TIOCGPTN _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ #define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */
/* I hope the range from 0x5480 on is free ... */ /* I hope the range from 0x5480 on is free ... */
#define TIOCSCTTY 0x5480 /* become controlling tty */ #define TIOCSCTTY 0x5480 /* become controlling tty */
......
...@@ -53,23 +53,23 @@ struct tx3927_dma_reg { ...@@ -53,23 +53,23 @@ struct tx3927_dma_reg {
#include <asm/byteorder.h> #include <asm/byteorder.h>
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
#define endian_def_s2(e1,e2) \ #define endian_def_s2(e1, e2) \
volatile unsigned short e1,e2 volatile unsigned short e1, e2
#define endian_def_sb2(e1,e2,e3) \ #define endian_def_sb2(e1, e2, e3) \
volatile unsigned short e1;volatile unsigned char e2,e3 volatile unsigned short e1;volatile unsigned char e2, e3
#define endian_def_b2s(e1,e2,e3) \ #define endian_def_b2s(e1, e2, e3) \
volatile unsigned char e1,e2;volatile unsigned short e3 volatile unsigned char e1, e2;volatile unsigned short e3
#define endian_def_b4(e1,e2,e3,e4) \ #define endian_def_b4(e1, e2, e3, e4) \
volatile unsigned char e1,e2,e3,e4 volatile unsigned char e1, e2, e3, e4
#else #else
#define endian_def_s2(e1,e2) \ #define endian_def_s2(e1, e2) \
volatile unsigned short e2,e1 volatile unsigned short e2, e1
#define endian_def_sb2(e1,e2,e3) \ #define endian_def_sb2(e1, e2, e3) \
volatile unsigned char e3,e2;volatile unsigned short e1 volatile unsigned char e3, e2;volatile unsigned short e1
#define endian_def_b2s(e1,e2,e3) \ #define endian_def_b2s(e1, e2, e3) \
volatile unsigned short e3;volatile unsigned char e2,e1 volatile unsigned short e3;volatile unsigned char e2, e1
#define endian_def_b4(e1,e2,e3,e4) \ #define endian_def_b4(e1, e2, e3, e4) \
volatile unsigned char e4,e3,e2,e1 volatile unsigned char e4, e3, e2, e1
#endif #endif
struct tx3927_pcic_reg { struct tx3927_pcic_reg {
......
...@@ -15,10 +15,10 @@ typedef struct ...@@ -15,10 +15,10 @@ typedef struct
#define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) } #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
#define local_read(l) atomic_long_read(&(l)->a) #define local_read(l) atomic_long_read(&(l)->a)
#define local_set(l,i) atomic_long_set(&(l)->a, (i)) #define local_set(l, i) atomic_long_set(&(l)->a, (i))
#define local_add(i,l) atomic_long_add((i),(&(l)->a)) #define local_add(i, l) atomic_long_add((i), (&(l)->a))
#define local_sub(i,l) atomic_long_sub((i),(&(l)->a)) #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
#define local_inc(l) atomic_long_inc(&(l)->a) #define local_inc(l) atomic_long_inc(&(l)->a)
#define local_dec(l) atomic_long_dec(&(l)->a) #define local_dec(l) atomic_long_dec(&(l)->a)
...@@ -117,7 +117,7 @@ static __inline__ long local_sub_return(long i, local_t * l) ...@@ -117,7 +117,7 @@ static __inline__ long local_sub_return(long i, local_t * l)
#define local_cmpxchg(l, o, n) \ #define local_cmpxchg(l, o, n) \
((long)cmpxchg_local(&((l)->a.counter), (o), (n))) ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
#define local_xchg(l, n) (xchg_local(&((l)->a.counter),(n))) #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
/** /**
* local_add_unless - add unless the number is a given value * local_add_unless - add unless the number is a given value
...@@ -138,8 +138,8 @@ static __inline__ long local_sub_return(long i, local_t * l) ...@@ -138,8 +138,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
}) })
#define local_inc_not_zero(l) local_add_unless((l), 1, 0) #define local_inc_not_zero(l) local_add_unless((l), 1, 0)
#define local_dec_return(l) local_sub_return(1,(l)) #define local_dec_return(l) local_sub_return(1, (l))
#define local_inc_return(l) local_add_return(1,(l)) #define local_inc_return(l) local_add_return(1, (l))
/* /*
* local_sub_and_test - subtract value from variable and test result * local_sub_and_test - subtract value from variable and test result
...@@ -150,7 +150,7 @@ static __inline__ long local_sub_return(long i, local_t * l) ...@@ -150,7 +150,7 @@ static __inline__ long local_sub_return(long i, local_t * l)
* true if the result is zero, or false for all * true if the result is zero, or false for all
* other cases. * other cases.
*/ */
#define local_sub_and_test(i,l) (local_sub_return((i), (l)) == 0) #define local_sub_and_test(i, l) (local_sub_return((i), (l)) == 0)
/* /*
* local_inc_and_test - increment and test * local_inc_and_test - increment and test
...@@ -181,7 +181,7 @@ static __inline__ long local_sub_return(long i, local_t * l) ...@@ -181,7 +181,7 @@ static __inline__ long local_sub_return(long i, local_t * l)
* if the result is negative, or false when * if the result is negative, or false when
* result is greater than or equal to zero. * result is greater than or equal to zero.
*/ */
#define local_add_negative(i,l) (local_add_return(i, (l)) < 0) #define local_add_negative(i, l) (local_add_return(i, (l)) < 0)
/* Use these for per-cpu local_t variables: on some archs they are /* Use these for per-cpu local_t variables: on some archs they are
* much more efficient than these naive implementations. Note they take * much more efficient than these naive implementations. Note they take
...@@ -190,8 +190,8 @@ static __inline__ long local_sub_return(long i, local_t * l) ...@@ -190,8 +190,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
#define __local_inc(l) ((l)->a.counter++) #define __local_inc(l) ((l)->a.counter++)
#define __local_dec(l) ((l)->a.counter++) #define __local_dec(l) ((l)->a.counter++)
#define __local_add(i,l) ((l)->a.counter+=(i)) #define __local_add(i, l) ((l)->a.counter+=(i))
#define __local_sub(i,l) ((l)->a.counter-=(i)) #define __local_sub(i, l) ((l)->a.counter-=(i))
/* Need to disable preemption for the cpu local counters otherwise we could /* Need to disable preemption for the cpu local counters otherwise we could
still access a variable of a previous CPU in a non atomic way. */ still access a variable of a previous CPU in a non atomic way. */
......
...@@ -199,7 +199,7 @@ typedef volatile struct au1xxx_ddma_desc { ...@@ -199,7 +199,7 @@ typedef volatile struct au1xxx_ddma_desc {
#define DSCR_CMD0_ALWAYS 31 #define DSCR_CMD0_ALWAYS 31
#define DSCR_NDEV_IDS 32 #define DSCR_NDEV_IDS 32
/* THis macro is used to find/create custom device types */ /* THis macro is used to find/create custom device types */
#define DSCR_DEV2CUSTOM_ID(x,d) (((((x)&0xFFFF)<<8)|0x32000000)|((d)&0xFF)) #define DSCR_DEV2CUSTOM_ID(x, d) (((((x)&0xFFFF)<<8)|0x32000000)|((d)&0xFF))
#define DSCR_CUSTOM2DEV_ID(x) ((x)&0xFF) #define DSCR_CUSTOM2DEV_ID(x) ((x)&0xFF)
...@@ -373,14 +373,14 @@ void * au1xxx_ddma_get_nextptr_virt(au1x_ddma_desc_t *dp); ...@@ -373,14 +373,14 @@ void * au1xxx_ddma_get_nextptr_virt(au1x_ddma_desc_t *dp);
Some compatibilty macros -- Some compatibilty macros --
Needed to make changes to API without breaking existing drivers Needed to make changes to API without breaking existing drivers
*/ */
#define au1xxx_dbdma_put_source(chanid,buf,nbytes)_au1xxx_dbdma_put_source(chanid, buf, nbytes, DDMA_FLAGS_IE) #define au1xxx_dbdma_put_source(chanid, buf, nbytes)_au1xxx_dbdma_put_source(chanid, buf, nbytes, DDMA_FLAGS_IE)
#define au1xxx_dbdma_put_source_flags(chanid,buf,nbytes,flags) _au1xxx_dbdma_put_source(chanid, buf, nbytes, flags) #define au1xxx_dbdma_put_source_flags(chanid, buf, nbytes, flags) _au1xxx_dbdma_put_source(chanid, buf, nbytes, flags)
#define put_source_flags(chanid,buf,nbytes,flags) au1xxx_dbdma_put_source_flags(chanid,buf,nbytes,flags) #define put_source_flags(chanid, buf, nbytes, flags) au1xxx_dbdma_put_source_flags(chanid, buf, nbytes, flags)
#define au1xxx_dbdma_put_dest(chanid,buf,nbytes) _au1xxx_dbdma_put_dest(chanid, buf, nbytes, DDMA_FLAGS_IE) #define au1xxx_dbdma_put_dest(chanid, buf, nbytes) _au1xxx_dbdma_put_dest(chanid, buf, nbytes, DDMA_FLAGS_IE)
#define au1xxx_dbdma_put_dest_flags(chanid,buf,nbytes,flags) _au1xxx_dbdma_put_dest(chanid, buf, nbytes, flags) #define au1xxx_dbdma_put_dest_flags(chanid, buf, nbytes, flags) _au1xxx_dbdma_put_dest(chanid, buf, nbytes, flags)
#define put_dest_flags(chanid,buf,nbytes,flags) au1xxx_dbdma_put_dest_flags(chanid,buf,nbytes,flags) #define put_dest_flags(chanid, buf, nbytes, flags) au1xxx_dbdma_put_dest_flags(chanid, buf, nbytes, flags)
/* /*
* Flags for the put_source/put_dest functions. * Flags for the put_source/put_dest functions.
......
...@@ -27,25 +27,25 @@ ...@@ -27,25 +27,25 @@
*/ */
#if defined(CONFIG_SWAP_IO_SPACE) #if defined(CONFIG_SWAP_IO_SPACE)
# define ioswabb(a,x) (x) # define ioswabb(a, x) (x)
# define __mem_ioswabb(a,x) (x) # define __mem_ioswabb(a, x) (x)
# define ioswabw(a,x) le16_to_cpu(x) # define ioswabw(a, x) le16_to_cpu(x)
# define __mem_ioswabw(a,x) (x) # define __mem_ioswabw(a, x) (x)
# define ioswabl(a,x) le32_to_cpu(x) # define ioswabl(a, x) le32_to_cpu(x)
# define __mem_ioswabl(a,x) (x) # define __mem_ioswabl(a, x) (x)
# define ioswabq(a,x) le64_to_cpu(x) # define ioswabq(a, x) le64_to_cpu(x)
# define __mem_ioswabq(a,x) (x) # define __mem_ioswabq(a, x) (x)
#else #else
# define ioswabb(a,x) (x) # define ioswabb(a, x) (x)
# define __mem_ioswabb(a,x) (x) # define __mem_ioswabb(a, x) (x)
# define ioswabw(a,x) (x) # define ioswabw(a, x) (x)
# define __mem_ioswabw(a,x) cpu_to_le16(x) # define __mem_ioswabw(a, x) cpu_to_le16(x)
# define ioswabl(a,x) (x) # define ioswabl(a, x) (x)
# define __mem_ioswabl(a,x) cpu_to_le32(x) # define __mem_ioswabl(a, x) cpu_to_le32(x)
# define ioswabq(a,x) (x) # define ioswabq(a, x) (x)
# define __mem_ioswabq(a,x) cpu_to_le32(x) # define __mem_ioswabq(a, x) cpu_to_le32(x)
#endif #endif
......
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
#define __swizzle_addr_l(port) (port) #define __swizzle_addr_l(port) (port)
#define __swizzle_addr_q(port) (port) #define __swizzle_addr_q(port) (port)
# define ioswabb(a,x) (x) # define ioswabb(a, x) (x)
# define __mem_ioswabb(a,x) (x) # define __mem_ioswabb(a, x) (x)
# define ioswabw(a,x) (x) # define ioswabw(a, x) (x)
# define __mem_ioswabw(a,x) cpu_to_le16(x) # define __mem_ioswabw(a, x) cpu_to_le16(x)
# define ioswabl(a,x) (x) # define ioswabl(a, x) (x)
# define __mem_ioswabl(a,x) cpu_to_le32(x) # define __mem_ioswabl(a, x) cpu_to_le32(x)
# define ioswabq(a,x) (x) # define ioswabq(a, x) (x)
# define __mem_ioswabq(a,x) cpu_to_le32(x) # define __mem_ioswabq(a, x) cpu_to_le32(x)
#endif /* __ASM_MACH_IP27_MANGLE_PORT_H */ #endif /* __ASM_MACH_IP27_MANGLE_PORT_H */
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
#define __swizzle_addr_l(port) (port) #define __swizzle_addr_l(port) (port)
#define __swizzle_addr_q(port) (port) #define __swizzle_addr_q(port) (port)
# define ioswabb(a,x) (x) # define ioswabb(a, x) (x)
# define __mem_ioswabb(a,x) (x) # define __mem_ioswabb(a, x) (x)
# define ioswabw(a,x) (x) # define ioswabw(a, x) (x)
# define __mem_ioswabw(a,x) cpu_to_le16(x) # define __mem_ioswabw(a, x) cpu_to_le16(x)
# define ioswabl(a,x) (x) # define ioswabl(a, x) (x)
# define __mem_ioswabl(a,x) cpu_to_le32(x) # define __mem_ioswabl(a, x) cpu_to_le32(x)
# define ioswabq(a,x) (x) # define ioswabq(a, x) (x)
# define __mem_ioswabq(a,x) cpu_to_le32(x) # define __mem_ioswabq(a, x) cpu_to_le32(x)
#endif /* __ASM_MACH_IP32_MANGLE_PORT_H */ #endif /* __ASM_MACH_IP32_MANGLE_PORT_H */
...@@ -6,13 +6,13 @@ extern unsigned long __swizzle_addr_b(unsigned long port); ...@@ -6,13 +6,13 @@ extern unsigned long __swizzle_addr_b(unsigned long port);
#define __swizzle_addr_l(port) (port) #define __swizzle_addr_l(port) (port)
#define __swizzle_addr_q(port) (port) #define __swizzle_addr_q(port) (port)
#define ioswabb(a,x) (x) #define ioswabb(a, x) (x)
#define __mem_ioswabb(a,x) (x) #define __mem_ioswabb(a, x) (x)
#define ioswabw(a,x) le16_to_cpu(x) #define ioswabw(a, x) le16_to_cpu(x)
#define __mem_ioswabw(a,x) (x) #define __mem_ioswabw(a, x) (x)
#define ioswabl(a,x) le32_to_cpu(x) #define ioswabl(a, x) le32_to_cpu(x)
#define __mem_ioswabl(a,x) (x) #define __mem_ioswabl(a, x) (x)
#define ioswabq(a,x) le64_to_cpu(x) #define ioswabq(a, x) le64_to_cpu(x)
#define __mem_ioswabq(a,x) (x) #define __mem_ioswabq(a, x) (x)
#endif /* __ASM_MACH_JMR3927_MANGLE_PORT_H */ #endif /* __ASM_MACH_JMR3927_MANGLE_PORT_H */
...@@ -44,7 +44,7 @@ cache_begin: li t0, (1<<28) ...@@ -44,7 +44,7 @@ cache_begin: li t0, (1<<28)
mfc0 t0, CP0_CONFIG, 7 mfc0 t0, CP0_CONFIG, 7
HAZARD_CP0 HAZARD_CP0
and t0,~((1<<19) | (1<<20)) /* TLB/MAP cleared */ and t0, ~((1<<19) | (1<<20)) /* TLB/MAP cleared */
mtc0 t0, CP0_CONFIG, 7 mtc0 t0, CP0_CONFIG, 7
HAZARD_CP0 HAZARD_CP0
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
/* early macros needed for prom/kgdb */ /* early macros needed for prom/kgdb */
#define ip3106_lcr(base,port) *(volatile u32 *)(base+(port*0x1000) + 0x000) #define ip3106_lcr(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x000)
#define ip3106_mcr(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x004) #define ip3106_mcr(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x004)
#define ip3106_baud(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x008) #define ip3106_baud(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x008)
#define ip3106_cfg(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x00C) #define ip3106_cfg(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x00C)
......
...@@ -63,8 +63,8 @@ static inline int mc146818_set_rtc_mmss(unsigned long nowtime) ...@@ -63,8 +63,8 @@ static inline int mc146818_set_rtc_mmss(unsigned long nowtime)
BIN_TO_BCD(real_seconds); BIN_TO_BCD(real_seconds);
BIN_TO_BCD(real_minutes); BIN_TO_BCD(real_minutes);
} }
CMOS_WRITE(real_seconds,RTC_SECONDS); CMOS_WRITE(real_seconds, RTC_SECONDS);
CMOS_WRITE(real_minutes,RTC_MINUTES); CMOS_WRITE(real_minutes, RTC_MINUTES);
} else { } else {
printk(KERN_WARNING printk(KERN_WARNING
"set_rtc_mmss: can't update from %d to %d\n", "set_rtc_mmss: can't update from %d to %d\n",
......
...@@ -387,7 +387,7 @@ extern unsigned long _pcictrl_bonito_pcicfg; ...@@ -387,7 +387,7 @@ extern unsigned long _pcictrl_bonito_pcicfg;
#define BONITO_PCIMAP_PCIMAP_LO2 0x0003f000 #define BONITO_PCIMAP_PCIMAP_LO2 0x0003f000
#define BONITO_PCIMAP_PCIMAP_LO2_SHIFT 12 #define BONITO_PCIMAP_PCIMAP_LO2_SHIFT 12
#define BONITO_PCIMAP_PCIMAP_2 0x00040000 #define BONITO_PCIMAP_PCIMAP_2 0x00040000
#define BONITO_PCIMAP_WIN(WIN,ADDR) ((((ADDR)>>26) & BONITO_PCIMAP_PCIMAP_LO0) << ((WIN)*6)) #define BONITO_PCIMAP_WIN(WIN, ADDR) ((((ADDR)>>26) & BONITO_PCIMAP_PCIMAP_LO0) << ((WIN)*6))
#define BONITO_PCIMAP_WINSIZE (1<<26) #define BONITO_PCIMAP_WINSIZE (1<<26)
#define BONITO_PCIMAP_WINOFFSET(ADDR) ((ADDR) & (BONITO_PCIMAP_WINSIZE - 1)) #define BONITO_PCIMAP_WINOFFSET(ADDR) ((ADDR) & (BONITO_PCIMAP_WINSIZE - 1))
...@@ -412,19 +412,19 @@ extern unsigned long _pcictrl_bonito_pcicfg; ...@@ -412,19 +412,19 @@ extern unsigned long _pcictrl_bonito_pcicfg;
#define BONITO_PCIMEMBASECFG_ASHIFT 23 #define BONITO_PCIMEMBASECFG_ASHIFT 23
#define BONITO_PCIMEMBASECFG_AMASK 0x007fffff #define BONITO_PCIMEMBASECFG_AMASK 0x007fffff
#define BONITO_PCIMEMBASECFGSIZE(WIN,SIZE) (((~((SIZE)-1))>>(BONITO_PCIMEMBASECFG_ASHIFT-BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK_SHIFT)) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK) #define BONITO_PCIMEMBASECFGSIZE(WIN, SIZE) (((~((SIZE)-1))>>(BONITO_PCIMEMBASECFG_ASHIFT-BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK_SHIFT)) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK)
#define BONITO_PCIMEMBASECFGBASE(WIN,BASE) (((BASE)>>(BONITO_PCIMEMBASECFG_ASHIFT-BONITO_PCIMEMBASECFG_MEMBASE##WIN##_TRANS_SHIFT)) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_TRANS) #define BONITO_PCIMEMBASECFGBASE(WIN, BASE) (((BASE)>>(BONITO_PCIMEMBASECFG_ASHIFT-BONITO_PCIMEMBASECFG_MEMBASE##WIN##_TRANS_SHIFT)) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_TRANS)
#define BONITO_PCIMEMBASECFG_SIZE(WIN,CFG) (((((~(CFG)) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK)) << (BONITO_PCIMEMBASECFG_ASHIFT - BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK_SHIFT)) | BONITO_PCIMEMBASECFG_AMASK) #define BONITO_PCIMEMBASECFG_SIZE(WIN, CFG) (((((~(CFG)) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK)) << (BONITO_PCIMEMBASECFG_ASHIFT - BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK_SHIFT)) | BONITO_PCIMEMBASECFG_AMASK)
#define BONITO_PCIMEMBASECFG_ADDRMASK(WIN,CFG) ((((CFG) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK) >> BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK_SHIFT) << BONITO_PCIMEMBASECFG_ASHIFT) #define BONITO_PCIMEMBASECFG_ADDRMASK(WIN, CFG) ((((CFG) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK) >> BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK_SHIFT) << BONITO_PCIMEMBASECFG_ASHIFT)
#define BONITO_PCIMEMBASECFG_ADDRMASK(WIN,CFG) ((((CFG) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK) >> BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK_SHIFT) << BONITO_PCIMEMBASECFG_ASHIFT) #define BONITO_PCIMEMBASECFG_ADDRMASK(WIN, CFG) ((((CFG) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK) >> BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK_SHIFT) << BONITO_PCIMEMBASECFG_ASHIFT)
#define BONITO_PCIMEMBASECFG_ADDRTRANS(WIN,CFG) ((((CFG) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_TRANS) >> BONITO_PCIMEMBASECFG_MEMBASE##WIN##_TRANS_SHIFT) << BONITO_PCIMEMBASECFG_ASHIFT) #define BONITO_PCIMEMBASECFG_ADDRTRANS(WIN, CFG) ((((CFG) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_TRANS) >> BONITO_PCIMEMBASECFG_MEMBASE##WIN##_TRANS_SHIFT) << BONITO_PCIMEMBASECFG_ASHIFT)
#define BONITO_PCITOPHYS(WIN,ADDR,CFG) ( \ #define BONITO_PCITOPHYS(WIN, ADDR, CFG) ( \
(((ADDR) & (~(BONITO_PCIMEMBASECFG_MASK))) & (~(BONITO_PCIMEMBASECFG_ADDRMASK(WIN,CFG)))) | \ (((ADDR) & (~(BONITO_PCIMEMBASECFG_MASK))) & (~(BONITO_PCIMEMBASECFG_ADDRMASK(WIN, CFG)))) | \
(BONITO_PCIMEMBASECFG_ADDRTRANS(WIN,CFG)) \ (BONITO_PCIMEMBASECFG_ADDRTRANS(WIN, CFG)) \
) )
/* PCICmd */ /* PCICmd */
......
...@@ -72,7 +72,7 @@ static inline unsigned long get_msc_port_base(unsigned long reg) ...@@ -72,7 +72,7 @@ static inline unsigned long get_msc_port_base(unsigned long reg)
#define SMSC_CONFIG_ACTIVATE_ENABLE 1 #define SMSC_CONFIG_ACTIVATE_ENABLE 1
#define SMSC_WRITE(x,a) outb(x,a) #define SMSC_WRITE(x, a) outb(x, a)
#define MALTA_JMPRS_REG 0x1f000210 #define MALTA_JMPRS_REG 0x1f000210
......
...@@ -41,27 +41,27 @@ ...@@ -41,27 +41,27 @@
* Macros for use in assembly language code * Macros for use in assembly language code
*/ */
#define CP0_MVPCONTROL $0,1 #define CP0_MVPCONTROL $0, 1
#define CP0_MVPCONF0 $0,2 #define CP0_MVPCONF0 $0, 2
#define CP0_MVPCONF1 $0,3 #define CP0_MVPCONF1 $0, 3
#define CP0_VPECONTROL $1,1 #define CP0_VPECONTROL $1, 1
#define CP0_VPECONF0 $1,2 #define CP0_VPECONF0 $1, 2
#define CP0_VPECONF1 $1,3 #define CP0_VPECONF1 $1, 3
#define CP0_YQMASK $1,4 #define CP0_YQMASK $1, 4
#define CP0_VPESCHEDULE $1,5 #define CP0_VPESCHEDULE $1, 5
#define CP0_VPESCHEFBK $1,6 #define CP0_VPESCHEFBK $1, 6
#define CP0_TCSTATUS $2,1 #define CP0_TCSTATUS $2, 1
#define CP0_TCBIND $2,2 #define CP0_TCBIND $2, 2
#define CP0_TCRESTART $2,3 #define CP0_TCRESTART $2, 3
#define CP0_TCHALT $2,4 #define CP0_TCHALT $2, 4
#define CP0_TCCONTEXT $2,5 #define CP0_TCCONTEXT $2, 5
#define CP0_TCSCHEDULE $2,6 #define CP0_TCSCHEDULE $2, 6
#define CP0_TCSCHEFBK $2,7 #define CP0_TCSCHEFBK $2, 7
#define CP0_SRSCONF0 $6,1 #define CP0_SRSCONF0 $6, 1
#define CP0_SRSCONF1 $6,2 #define CP0_SRSCONF1 $6, 2
#define CP0_SRSCONF2 $6,3 #define CP0_SRSCONF2 $6, 3
#define CP0_SRSCONF3 $6,4 #define CP0_SRSCONF3 $6, 4
#define CP0_SRSCONF4 $6,5 #define CP0_SRSCONF4 $6, 5
#endif #endif
...@@ -291,7 +291,7 @@ static inline void ehb(void) ...@@ -291,7 +291,7 @@ static inline void ehb(void)
__res; \ __res; \
}) })
#define mftr(rt,u,sel) \ #define mftr(rt, u, sel) \
({ \ ({ \
unsigned long __res; \ unsigned long __res; \
\ \
...@@ -315,7 +315,7 @@ do { \ ...@@ -315,7 +315,7 @@ do { \
: : "r" (v)); \ : : "r" (v)); \
} while (0) } while (0)
#define mttc0(rd,sel,v) \ #define mttc0(rd, sel, v) \
({ \ ({ \
__asm__ __volatile__( \ __asm__ __volatile__( \
" .set push \n" \ " .set push \n" \
...@@ -330,7 +330,7 @@ do { \ ...@@ -330,7 +330,7 @@ do { \
}) })
#define mttr(rd,u,sel,v) \ #define mttr(rd, u, sel, v) \
({ \ ({ \
__asm__ __volatile__( \ __asm__ __volatile__( \
"mttr %0," #rd ", " #u ", " #sel \ "mttr %0," #rd ", " #u ", " #sel \
...@@ -362,7 +362,7 @@ do { \ ...@@ -362,7 +362,7 @@ do { \
#define write_vpe_c0_config1(val) mttc0(16, 1, val) #define write_vpe_c0_config1(val) mttc0(16, 1, val)
#define read_vpe_c0_config7() mftc0(16, 7) #define read_vpe_c0_config7() mftc0(16, 7)
#define write_vpe_c0_config7(val) mttc0(16, 7, val) #define write_vpe_c0_config7(val) mttc0(16, 7, val)
#define read_vpe_c0_ebase() mftc0(15,1) #define read_vpe_c0_ebase() mftc0(15, 1)
#define write_vpe_c0_ebase(val) mttc0(15, 1, val) #define write_vpe_c0_ebase(val) mttc0(15, 1, val)
#define write_vpe_c0_compare(val) mttc0(11, 0, val) #define write_vpe_c0_compare(val) mttc0(11, 0, val)
#define read_vpe_c0_badvaddr() mftc0(8, 0) #define read_vpe_c0_badvaddr() mftc0(8, 0)
...@@ -372,15 +372,15 @@ do { \ ...@@ -372,15 +372,15 @@ do { \
/* TC */ /* TC */
#define read_tc_c0_tcstatus() mftc0(2, 1) #define read_tc_c0_tcstatus() mftc0(2, 1)
#define write_tc_c0_tcstatus(val) mttc0(2,1,val) #define write_tc_c0_tcstatus(val) mttc0(2, 1, val)
#define read_tc_c0_tcbind() mftc0(2, 2) #define read_tc_c0_tcbind() mftc0(2, 2)
#define write_tc_c0_tcbind(val) mttc0(2,2,val) #define write_tc_c0_tcbind(val) mttc0(2, 2, val)
#define read_tc_c0_tcrestart() mftc0(2, 3) #define read_tc_c0_tcrestart() mftc0(2, 3)
#define write_tc_c0_tcrestart(val) mttc0(2,3,val) #define write_tc_c0_tcrestart(val) mttc0(2, 3, val)
#define read_tc_c0_tchalt() mftc0(2, 4) #define read_tc_c0_tchalt() mftc0(2, 4)
#define write_tc_c0_tchalt(val) mttc0(2,4,val) #define write_tc_c0_tchalt(val) mttc0(2, 4, val)
#define read_tc_c0_tccontext() mftc0(2, 5) #define read_tc_c0_tccontext() mftc0(2, 5)
#define write_tc_c0_tccontext(val) mttc0(2,5,val) #define write_tc_c0_tccontext(val) mttc0(2, 5, val)
/* GPR */ /* GPR */
#define read_tc_gpr_sp() mftgpr(29) #define read_tc_gpr_sp() mftgpr(29)
......
...@@ -981,7 +981,7 @@ do { \ ...@@ -981,7 +981,7 @@ do { \
#define write_c0_errorepc(val) __write_ulong_c0_register($30, 0, val) #define write_c0_errorepc(val) __write_ulong_c0_register($30, 0, val)
/* MIPSR2 */ /* MIPSR2 */
#define read_c0_hwrena() __read_32bit_c0_register($7,0) #define read_c0_hwrena() __read_32bit_c0_register($7, 0)
#define write_c0_hwrena(val) __write_32bit_c0_register($7, 0, val) #define write_c0_hwrena(val) __write_32bit_c0_register($7, 0, val)
#define read_c0_intctl() __read_32bit_c0_register($12, 1) #define read_c0_intctl() __read_32bit_c0_register($12, 1)
...@@ -993,7 +993,7 @@ do { \ ...@@ -993,7 +993,7 @@ do { \
#define read_c0_srsmap() __read_32bit_c0_register($12, 3) #define read_c0_srsmap() __read_32bit_c0_register($12, 3)
#define write_c0_srsmap(val) __write_32bit_c0_register($12, 3, val) #define write_c0_srsmap(val) __write_32bit_c0_register($12, 3, val)
#define read_c0_ebase() __read_32bit_c0_register($15,1) #define read_c0_ebase() __read_32bit_c0_register($15, 1)
#define write_c0_ebase(val) __write_32bit_c0_register($15, 1, val) #define write_c0_ebase(val) __write_32bit_c0_register($15, 1, val)
/* /*
......
...@@ -107,7 +107,7 @@ get_new_mmu_context(struct mm_struct *mm, unsigned long cpu) ...@@ -107,7 +107,7 @@ get_new_mmu_context(struct mm_struct *mm, unsigned long cpu)
#else /* CONFIG_MIPS_MT_SMTC */ #else /* CONFIG_MIPS_MT_SMTC */
#define get_new_mmu_context(mm,cpu) smtc_get_new_mmu_context((mm),(cpu)) #define get_new_mmu_context(mm, cpu) smtc_get_new_mmu_context((mm), (cpu))
#endif /* CONFIG_MIPS_MT_SMTC */ #endif /* CONFIG_MIPS_MT_SMTC */
...@@ -191,7 +191,7 @@ static inline void destroy_context(struct mm_struct *mm) ...@@ -191,7 +191,7 @@ static inline void destroy_context(struct mm_struct *mm)
{ {
} }
#define deactivate_mm(tsk,mm) do { } while (0) #define deactivate_mm(tsk, mm) do { } while (0)
/* /*
* After we have set current->mm to a new value, this activates * After we have set current->mm to a new value, this activates
......
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
extern asmlinkage void handle_ibe(void); extern asmlinkage void handle_ibe(void);
extern asmlinkage void handle_dbe(void); extern asmlinkage void handle_dbe(void);
#define put_dbe(x,ptr) __put_dbe((x),(ptr),sizeof(*(ptr))) #define put_dbe(x, ptr) __put_dbe((x), (ptr), sizeof(*(ptr)))
#define get_dbe(x,ptr) __get_dbe((x),(ptr),sizeof(*(ptr))) #define get_dbe(x, ptr) __get_dbe((x), (ptr), sizeof(*(ptr)))
struct __large_pstruct { unsigned long buf[100]; }; struct __large_pstruct { unsigned long buf[100]; };
#define __mp(x) (*(struct __large_pstruct *)(x)) #define __mp(x) (*(struct __large_pstruct *)(x))
#define __get_dbe(x,ptr,size) \ #define __get_dbe(x, ptr, size) \
({ \ ({ \
long __gu_err; \ long __gu_err; \
__typeof__(*(ptr)) __gu_val; \ __typeof__(*(ptr)) __gu_val; \
...@@ -70,7 +70,7 @@ struct __large_pstruct { unsigned long buf[100]; }; ...@@ -70,7 +70,7 @@ struct __large_pstruct { unsigned long buf[100]; };
extern void __get_dbe_unknown(void); extern void __get_dbe_unknown(void);
#define __put_dbe(x,ptr,size) \ #define __put_dbe(x, ptr, size) \
({ \ ({ \
long __pu_err; \ long __pu_err; \
__typeof__(*(ptr)) __pu_val; \ __typeof__(*(ptr)) __pu_val; \
......
...@@ -153,7 +153,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; ...@@ -153,7 +153,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET) ((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)
#endif #endif
#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - PHYS_OFFSET)) #define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - PHYS_OFFSET))
#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x),0)) #define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0))
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
......
...@@ -360,7 +360,7 @@ typedef struct bridge_err_cmdword_s { ...@@ -360,7 +360,7 @@ typedef struct bridge_err_cmdword_s {
#define BRIDGE_TYPE0_CFG_FUNC_OFF 0x00000100 /* Type 0 Cfg Func Offset (1..7) */ #define BRIDGE_TYPE0_CFG_FUNC_OFF 0x00000100 /* Type 0 Cfg Func Offset (1..7) */
#define BRIDGE_TYPE0_CFG_DEV(s) (BRIDGE_TYPE0_CFG_DEV0+\ #define BRIDGE_TYPE0_CFG_DEV(s) (BRIDGE_TYPE0_CFG_DEV0+\
(s)*BRIDGE_TYPE0_CFG_SLOT_OFF) (s)*BRIDGE_TYPE0_CFG_SLOT_OFF)
#define BRIDGE_TYPE0_CFG_DEVF(s,f) (BRIDGE_TYPE0_CFG_DEV0+\ #define BRIDGE_TYPE0_CFG_DEVF(s, f) (BRIDGE_TYPE0_CFG_DEV0+\
(s)*BRIDGE_TYPE0_CFG_SLOT_OFF+\ (s)*BRIDGE_TYPE0_CFG_SLOT_OFF+\
(f)*BRIDGE_TYPE0_CFG_FUNC_OFF) (f)*BRIDGE_TYPE0_CFG_FUNC_OFF)
......
...@@ -95,7 +95,7 @@ static inline void pte_free(struct page *pte) ...@@ -95,7 +95,7 @@ static inline void pte_free(struct page *pte)
__free_pages(pte, PTE_ORDER); __free_pages(pte, PTE_ORDER);
} }
#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) #define __pte_free_tlb(tlb, pte) tlb_remove_page((tlb), (pte))
#ifdef CONFIG_32BIT #ifdef CONFIG_32BIT
...@@ -104,7 +104,7 @@ static inline void pte_free(struct page *pte) ...@@ -104,7 +104,7 @@ static inline void pte_free(struct page *pte)
* inside the pgd, so has no extra memory associated with it. * inside the pgd, so has no extra memory associated with it.
*/ */
#define pmd_free(x) do { } while (0) #define pmd_free(x) do { } while (0)
#define __pmd_free_tlb(tlb,x) do { } while (0) #define __pmd_free_tlb(tlb, x) do { } while (0)
#endif #endif
...@@ -125,7 +125,7 @@ static inline void pmd_free(pmd_t *pmd) ...@@ -125,7 +125,7 @@ static inline void pmd_free(pmd_t *pmd)
free_pages((unsigned long)pmd, PMD_ORDER); free_pages((unsigned long)pmd, PMD_ORDER);
} }
#define __pmd_free_tlb(tlb,x) pmd_free(x) #define __pmd_free_tlb(tlb, x) pmd_free(x)
#endif #endif
......
...@@ -140,7 +140,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot) ...@@ -140,7 +140,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot)
#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
/* to find an entry in a page-table-directory */ /* to find an entry in a page-table-directory */
#define pgd_offset(mm,addr) ((mm)->pgd + pgd_index(addr)) #define pgd_offset(mm, addr) ((mm)->pgd + pgd_index(addr))
/* Find an entry in the third-level page table.. */ /* Find an entry in the third-level page table.. */
#define __pte_offset(address) \ #define __pte_offset(address) \
......
...@@ -193,7 +193,7 @@ static inline void pud_clear(pud_t *pudp) ...@@ -193,7 +193,7 @@ static inline void pud_clear(pud_t *pudp)
#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
/* to find an entry in a page-table-directory */ /* to find an entry in a page-table-directory */
#define pgd_offset(mm,addr) ((mm)->pgd + pgd_index(addr)) #define pgd_offset(mm, addr) ((mm)->pgd + pgd_index(addr))
static inline unsigned long pud_page_vaddr(pud_t pud) static inline unsigned long pud_page_vaddr(pud_t pud)
{ {
...@@ -237,7 +237,7 @@ static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset) ...@@ -237,7 +237,7 @@ static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
#define __swp_type(x) (((x).val >> 32) & 0xff) #define __swp_type(x) (((x).val >> 32) & 0xff)
#define __swp_offset(x) ((x).val >> 40) #define __swp_offset(x) ((x).val >> 40)
#define __swp_entry(type,offset) ((swp_entry_t) { pte_val(mk_swap_pte((type),(offset))) }) #define __swp_entry(type, offset) ((swp_entry_t) { pte_val(mk_swap_pte((type), (offset))) })
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
#define __swp_entry_to_pte(x) ((pte_t) { (x).val }) #define __swp_entry_to_pte(x) ((pte_t) { (x).val })
......
...@@ -103,7 +103,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte) ...@@ -103,7 +103,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte)
} }
} }
} }
#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) #define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)
static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{ {
...@@ -140,7 +140,7 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) ...@@ -140,7 +140,7 @@ static inline void set_pte(pte_t *ptep, pte_t pteval)
} }
#endif #endif
} }
#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) #define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval)
static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{ {
......
...@@ -354,7 +354,7 @@ static inline void blast_##pfx##cache##lsize(void) \ ...@@ -354,7 +354,7 @@ static inline void blast_##pfx##cache##lsize(void) \
\ \
for (ws = 0; ws < ws_end; ws += ws_inc) \ for (ws = 0; ws < ws_end; ws += ws_inc) \
for (addr = start; addr < end; addr += lsize * 32) \ for (addr = start; addr < end; addr += lsize * 32) \
cache##lsize##_unroll32(addr|ws,indexop); \ cache##lsize##_unroll32(addr|ws, indexop); \
\ \
__##pfx##flush_epilogue \ __##pfx##flush_epilogue \
} \ } \
...@@ -367,7 +367,7 @@ static inline void blast_##pfx##cache##lsize##_page(unsigned long page) \ ...@@ -367,7 +367,7 @@ static inline void blast_##pfx##cache##lsize##_page(unsigned long page) \
__##pfx##flush_prologue \ __##pfx##flush_prologue \
\ \
do { \ do { \
cache##lsize##_unroll32(start,hitop); \ cache##lsize##_unroll32(start, hitop); \
start += lsize * 32; \ start += lsize * 32; \
} while (start < end); \ } while (start < end); \
\ \
...@@ -388,7 +388,7 @@ static inline void blast_##pfx##cache##lsize##_page_indexed(unsigned long page) ...@@ -388,7 +388,7 @@ static inline void blast_##pfx##cache##lsize##_page_indexed(unsigned long page)
\ \
for (ws = 0; ws < ws_end; ws += ws_inc) \ for (ws = 0; ws < ws_end; ws += ws_inc) \
for (addr = start; addr < end; addr += lsize * 32) \ for (addr = start; addr < end; addr += lsize * 32) \
cache##lsize##_unroll32(addr|ws,indexop); \ cache##lsize##_unroll32(addr|ws, indexop); \
\ \
__##pfx##flush_epilogue \ __##pfx##flush_epilogue \
} }
......
...@@ -46,7 +46,7 @@ struct semaphore { ...@@ -46,7 +46,7 @@ struct semaphore {
} }
#define __DECLARE_SEMAPHORE_GENERIC(name, count) \ #define __DECLARE_SEMAPHORE_GENERIC(name, count) \
struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) struct semaphore name = __SEMAPHORE_INITIALIZER(name, count)
#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1)
#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0) #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0)
......
...@@ -369,8 +369,8 @@ struct linux_smonblock { ...@@ -369,8 +369,8 @@ struct linux_smonblock {
#if defined(CONFIG_64BIT) && defined(CONFIG_ARC32) #if defined(CONFIG_64BIT) && defined(CONFIG_ARC32)
#define __arc_clobbers \ #define __arc_clobbers \
"$2","$3" /* ... */, "$8","$9","$10","$11", \ "$2", "$3" /* ... */, "$8", "$9", "$10", "$11", \
"$12","$13","$14","$15","$16","$24","$25","$31" "$12", "$13", "$14", "$15", "$16", "$24", "$25", "$31"
#define ARC_CALL0(dest) \ #define ARC_CALL0(dest) \
({ long __res; \ ({ long __res; \
...@@ -382,11 +382,11 @@ struct linux_smonblock { ...@@ -382,11 +382,11 @@ struct linux_smonblock {
"move\t%0, $2" \ "move\t%0, $2" \
: "=r" (__res), "=r" (__vec) \ : "=r" (__res), "=r" (__vec) \
: "1" (__vec) \ : "1" (__vec) \
: __arc_clobbers, "$4","$5","$6","$7"); \ : __arc_clobbers, "$4", "$5", "$6", "$7"); \
(unsigned long) __res; \ (unsigned long) __res; \
}) })
#define ARC_CALL1(dest,a1) \ #define ARC_CALL1(dest, a1) \
({ long __res; \ ({ long __res; \
register signed int __a1 __asm__("$4") = (int) (long) (a1); \ register signed int __a1 __asm__("$4") = (int) (long) (a1); \
long __vec = (long) romvec->dest; \ long __vec = (long) romvec->dest; \
...@@ -397,11 +397,11 @@ struct linux_smonblock { ...@@ -397,11 +397,11 @@ struct linux_smonblock {
"move\t%0, $2" \ "move\t%0, $2" \
: "=r" (__res), "=r" (__vec) \ : "=r" (__res), "=r" (__vec) \
: "1" (__vec), "r" (__a1) \ : "1" (__vec), "r" (__a1) \
: __arc_clobbers, "$5","$6","$7"); \ : __arc_clobbers, "$5", "$6", "$7"); \
(unsigned long) __res; \ (unsigned long) __res; \
}) })
#define ARC_CALL2(dest,a1,a2) \ #define ARC_CALL2(dest, a1, a2) \
({ long __res; \ ({ long __res; \
register signed int __a1 __asm__("$4") = (int) (long) (a1); \ register signed int __a1 __asm__("$4") = (int) (long) (a1); \
register signed int __a2 __asm__("$5") = (int) (long) (a2); \ register signed int __a2 __asm__("$5") = (int) (long) (a2); \
...@@ -413,11 +413,11 @@ struct linux_smonblock { ...@@ -413,11 +413,11 @@ struct linux_smonblock {
"move\t%0, $2" \ "move\t%0, $2" \
: "=r" (__res), "=r" (__vec) \ : "=r" (__res), "=r" (__vec) \
: "1" (__vec), "r" (__a1), "r" (__a2) \ : "1" (__vec), "r" (__a1), "r" (__a2) \
: __arc_clobbers, "$6","$7"); \ : __arc_clobbers, "$6", "$7"); \
__res; \ __res; \
}) })
#define ARC_CALL3(dest,a1,a2,a3) \ #define ARC_CALL3(dest, a1, a2, a3) \
({ long __res; \ ({ long __res; \
register signed int __a1 __asm__("$4") = (int) (long) (a1); \ register signed int __a1 __asm__("$4") = (int) (long) (a1); \
register signed int __a2 __asm__("$5") = (int) (long) (a2); \ register signed int __a2 __asm__("$5") = (int) (long) (a2); \
...@@ -434,7 +434,7 @@ struct linux_smonblock { ...@@ -434,7 +434,7 @@ struct linux_smonblock {
__res; \ __res; \
}) })
#define ARC_CALL4(dest,a1,a2,a3,a4) \ #define ARC_CALL4(dest, a1, a2, a3, a4) \
({ long __res; \ ({ long __res; \
register signed int __a1 __asm__("$4") = (int) (long) (a1); \ register signed int __a1 __asm__("$4") = (int) (long) (a1); \
register signed int __a2 __asm__("$5") = (int) (long) (a2); \ register signed int __a2 __asm__("$5") = (int) (long) (a2); \
...@@ -453,7 +453,7 @@ struct linux_smonblock { ...@@ -453,7 +453,7 @@ struct linux_smonblock {
__res; \ __res; \
}) })
#define ARC_CALL5(dest,a1,a2,a3,a4,a5) \ #define ARC_CALL5(dest, a1, a2, a3, a4, a5) \
({ long __res; \ ({ long __res; \
register signed int __a1 __asm__("$4") = (int) (long) (a1); \ register signed int __a1 __asm__("$4") = (int) (long) (a1); \
register signed int __a2 __asm__("$5") = (int) (long) (a2); \ register signed int __a2 __asm__("$5") = (int) (long) (a2); \
...@@ -488,7 +488,7 @@ struct linux_smonblock { ...@@ -488,7 +488,7 @@ struct linux_smonblock {
__res; \ __res; \
}) })
#define ARC_CALL1(dest,a1) \ #define ARC_CALL1(dest, a1) \
({ long __res; \ ({ long __res; \
long __a1 = (long) (a1); \ long __a1 = (long) (a1); \
long (*__vec)(long) = (void *) romvec->dest; \ long (*__vec)(long) = (void *) romvec->dest; \
...@@ -497,7 +497,7 @@ struct linux_smonblock { ...@@ -497,7 +497,7 @@ struct linux_smonblock {
__res; \ __res; \
}) })
#define ARC_CALL2(dest,a1,a2) \ #define ARC_CALL2(dest, a1, a2) \
({ long __res; \ ({ long __res; \
long __a1 = (long) (a1); \ long __a1 = (long) (a1); \
long __a2 = (long) (a2); \ long __a2 = (long) (a2); \
...@@ -507,7 +507,7 @@ struct linux_smonblock { ...@@ -507,7 +507,7 @@ struct linux_smonblock {
__res; \ __res; \
}) })
#define ARC_CALL3(dest,a1,a2,a3) \ #define ARC_CALL3(dest, a1, a2, a3) \
({ long __res; \ ({ long __res; \
long __a1 = (long) (a1); \ long __a1 = (long) (a1); \
long __a2 = (long) (a2); \ long __a2 = (long) (a2); \
...@@ -518,7 +518,7 @@ struct linux_smonblock { ...@@ -518,7 +518,7 @@ struct linux_smonblock {
__res; \ __res; \
}) })
#define ARC_CALL4(dest,a1,a2,a3,a4) \ #define ARC_CALL4(dest, a1, a2, a3, a4) \
({ long __res; \ ({ long __res; \
long __a1 = (long) (a1); \ long __a1 = (long) (a1); \
long __a2 = (long) (a2); \ long __a2 = (long) (a2); \
...@@ -530,7 +530,7 @@ struct linux_smonblock { ...@@ -530,7 +530,7 @@ struct linux_smonblock {
__res; \ __res; \
}) })
#define ARC_CALL5(dest,a1,a2,a3,a4,a5) \ #define ARC_CALL5(dest, a1, a2, a3, a4, a5) \
({ long __res; \ ({ long __res; \
long __a1 = (long) (a1); \ long __a1 = (long) (a1); \
long __a2 = (long) (a2); \ long __a2 = (long) (a2); \
......
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
* Mask values for each interrupt * Mask values for each interrupt
*/ */
#define _BCM1480_INT_MASK(w,n) _SB_MAKEMASK(w,((n) & 0x3F)) #define _BCM1480_INT_MASK(w, n) _SB_MAKEMASK(w, ((n) & 0x3F))
#define _BCM1480_INT_MASK1(n) _SB_MAKEMASK1(((n) & 0x3F)) #define _BCM1480_INT_MASK1(n) _SB_MAKEMASK1(((n) & 0x3F))
#define _BCM1480_INT_OFFSET(n) (((n) & 0x40) << 6) #define _BCM1480_INT_OFFSET(n) (((n) & 0x40) << 6)
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
#define M_BCM1480_INT_PMI_HIGH _BCM1480_INT_MASK1(K_BCM1480_INT_PMI_HIGH) #define M_BCM1480_INT_PMI_HIGH _BCM1480_INT_MASK1(K_BCM1480_INT_PMI_HIGH)
#define M_BCM1480_INT_PMO_LOW _BCM1480_INT_MASK1(K_BCM1480_INT_PMO_LOW) #define M_BCM1480_INT_PMO_LOW _BCM1480_INT_MASK1(K_BCM1480_INT_PMO_LOW)
#define M_BCM1480_INT_PMO_HIGH _BCM1480_INT_MASK1(K_BCM1480_INT_PMO_HIGH) #define M_BCM1480_INT_PMO_HIGH _BCM1480_INT_MASK1(K_BCM1480_INT_PMO_HIGH)
#define M_BCM1480_INT_MBOX_ALL _BCM1480_INT_MASK(8,K_BCM1480_INT_MBOX_0_0) #define M_BCM1480_INT_MBOX_ALL _BCM1480_INT_MASK(8, K_BCM1480_INT_MBOX_0_0)
#define M_BCM1480_INT_MBOX_0_0 _BCM1480_INT_MASK1(K_BCM1480_INT_MBOX_0_0) #define M_BCM1480_INT_MBOX_0_0 _BCM1480_INT_MASK1(K_BCM1480_INT_MBOX_0_0)
#define M_BCM1480_INT_MBOX_0_1 _BCM1480_INT_MASK1(K_BCM1480_INT_MBOX_0_1) #define M_BCM1480_INT_MBOX_0_1 _BCM1480_INT_MASK1(K_BCM1480_INT_MBOX_0_1)
#define M_BCM1480_INT_MBOX_0_2 _BCM1480_INT_MASK1(K_BCM1480_INT_MBOX_0_2) #define M_BCM1480_INT_MBOX_0_2 _BCM1480_INT_MASK1(K_BCM1480_INT_MBOX_0_2)
...@@ -269,9 +269,9 @@ ...@@ -269,9 +269,9 @@
*/ */
#define S_BCM1480_INT_HT_INTMSG 0 #define S_BCM1480_INT_HT_INTMSG 0
#define M_BCM1480_INT_HT_INTMSG _SB_MAKEMASK(3,S_BCM1480_INT_HT_INTMSG) #define M_BCM1480_INT_HT_INTMSG _SB_MAKEMASK(3, S_BCM1480_INT_HT_INTMSG)
#define V_BCM1480_INT_HT_INTMSG(x) _SB_MAKEVALUE(x,S_BCM1480_INT_HT_INTMSG) #define V_BCM1480_INT_HT_INTMSG(x) _SB_MAKEVALUE(x, S_BCM1480_INT_HT_INTMSG)
#define G_BCM1480_INT_HT_INTMSG(x) _SB_GETVALUE(x,S_BCM1480_INT_HT_INTMSG,M_BCM1480_INT_HT_INTMSG) #define G_BCM1480_INT_HT_INTMSG(x) _SB_GETVALUE(x, S_BCM1480_INT_HT_INTMSG, M_BCM1480_INT_HT_INTMSG)
#define K_BCM1480_INT_HT_INTMSG_FIXED 0 #define K_BCM1480_INT_HT_INTMSG_FIXED 0
#define K_BCM1480_INT_HT_INTMSG_ARBITRATED 1 #define K_BCM1480_INT_HT_INTMSG_ARBITRATED 1
...@@ -291,14 +291,14 @@ ...@@ -291,14 +291,14 @@
#define V_BCM1480_INT_HT_LOGICALDEST M_BCM1480_INT_HT_DESTMODE #define V_BCM1480_INT_HT_LOGICALDEST M_BCM1480_INT_HT_DESTMODE
#define S_BCM1480_INT_HT_INTDEST 5 #define S_BCM1480_INT_HT_INTDEST 5
#define M_BCM1480_INT_HT_INTDEST _SB_MAKEMASK(8,S_BCM1480_INT_HT_INTDEST) #define M_BCM1480_INT_HT_INTDEST _SB_MAKEMASK(8, S_BCM1480_INT_HT_INTDEST)
#define V_BCM1480_INT_HT_INTDEST(x) _SB_MAKEVALUE(x,S_BCM1480_INT_HT_INTDEST) #define V_BCM1480_INT_HT_INTDEST(x) _SB_MAKEVALUE(x, S_BCM1480_INT_HT_INTDEST)
#define G_BCM1480_INT_HT_INTDEST(x) _SB_GETVALUE(x,S_BCM1480_INT_HT_INTDEST,M_BCM1480_INT_HT_INTDEST) #define G_BCM1480_INT_HT_INTDEST(x) _SB_GETVALUE(x, S_BCM1480_INT_HT_INTDEST, M_BCM1480_INT_HT_INTDEST)
#define S_BCM1480_INT_HT_VECTOR 13 #define S_BCM1480_INT_HT_VECTOR 13
#define M_BCM1480_INT_HT_VECTOR _SB_MAKEMASK(8,S_BCM1480_INT_HT_VECTOR) #define M_BCM1480_INT_HT_VECTOR _SB_MAKEMASK(8, S_BCM1480_INT_HT_VECTOR)
#define V_BCM1480_INT_HT_VECTOR(x) _SB_MAKEVALUE(x,S_BCM1480_INT_HT_VECTOR) #define V_BCM1480_INT_HT_VECTOR(x) _SB_MAKEVALUE(x, S_BCM1480_INT_HT_VECTOR)
#define G_BCM1480_INT_HT_VECTOR(x) _SB_GETVALUE(x,S_BCM1480_INT_HT_VECTOR,M_BCM1480_INT_HT_VECTOR) #define G_BCM1480_INT_HT_VECTOR(x) _SB_GETVALUE(x, S_BCM1480_INT_HT_VECTOR, M_BCM1480_INT_HT_VECTOR)
/* /*
* Vector prefix (Table 4-7) * Vector prefix (Table 4-7)
......
This diff is collapsed.
This diff is collapsed.
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
#define BCM1480_MC_REGISTER_SPACING 0x1000 #define BCM1480_MC_REGISTER_SPACING 0x1000
#define A_BCM1480_MC_BASE(ctlid) (A_BCM1480_MC_BASE_0+(ctlid)*BCM1480_MC_REGISTER_SPACING) #define A_BCM1480_MC_BASE(ctlid) (A_BCM1480_MC_BASE_0+(ctlid)*BCM1480_MC_REGISTER_SPACING)
#define A_BCM1480_MC_REGISTER(ctlid,reg) (A_BCM1480_MC_BASE(ctlid)+(reg)) #define A_BCM1480_MC_REGISTER(ctlid, reg) (A_BCM1480_MC_BASE(ctlid)+(reg))
#define R_BCM1480_MC_CONFIG 0x0000000100 #define R_BCM1480_MC_CONFIG 0x0000000100
#define R_BCM1480_MC_CS_START 0x0000000120 #define R_BCM1480_MC_CS_START 0x0000000120
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
#define BCM1480_SCD_NUM_WDOGS 4 #define BCM1480_SCD_NUM_WDOGS 4
#define A_BCM1480_SCD_WDOG_BASE(w) (A_BCM1480_SCD_WDOG_0+((w)&2)*0x1000 + ((w)&1)*0x100) #define A_BCM1480_SCD_WDOG_BASE(w) (A_BCM1480_SCD_WDOG_0+((w)&2)*0x1000 + ((w)&1)*0x100)
#define A_BCM1480_SCD_WDOG_REGISTER(w,r) (A_BCM1480_SCD_WDOG_BASE(w) + (r)) #define A_BCM1480_SCD_WDOG_REGISTER(w, r) (A_BCM1480_SCD_WDOG_BASE(w) + (r))
#define A_BCM1480_SCD_WDOG_INIT_2 0x0010022050 #define A_BCM1480_SCD_WDOG_INIT_2 0x0010022050
#define A_BCM1480_SCD_WDOG_CNT_2 0x0010022058 #define A_BCM1480_SCD_WDOG_CNT_2 0x0010022058
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
#define BCM1480_IMR_REGISTER_SPACING_SHIFT 13 #define BCM1480_IMR_REGISTER_SPACING_SHIFT 13
#define A_BCM1480_IMR_MAPPER(cpu) (A_BCM1480_IMR_CPU0_BASE+(cpu)*BCM1480_IMR_REGISTER_SPACING) #define A_BCM1480_IMR_MAPPER(cpu) (A_BCM1480_IMR_CPU0_BASE+(cpu)*BCM1480_IMR_REGISTER_SPACING)
#define A_BCM1480_IMR_REGISTER(cpu,reg) (A_BCM1480_IMR_MAPPER(cpu)+(reg)) #define A_BCM1480_IMR_REGISTER(cpu, reg) (A_BCM1480_IMR_MAPPER(cpu)+(reg))
/* Most IMR registers are 128 bits, implemented as non-contiguous /* Most IMR registers are 128 bits, implemented as non-contiguous
64-bit registers high (_H) and low (_L) */ 64-bit registers high (_H) and low (_L) */
...@@ -413,7 +413,7 @@ ...@@ -413,7 +413,7 @@
#define A_BCM1480_IMR_ALIAS_MAILBOX(cpu) (A_BCM1480_IMR_ALIAS_MAILBOX_CPU0_BASE + \ #define A_BCM1480_IMR_ALIAS_MAILBOX(cpu) (A_BCM1480_IMR_ALIAS_MAILBOX_CPU0_BASE + \
(cpu)*BCM1480_IMR_ALIAS_MAILBOX_SPACING) (cpu)*BCM1480_IMR_ALIAS_MAILBOX_SPACING)
#define A_BCM1480_IMR_ALIAS_MAILBOX_REGISTER(cpu,reg) (A_BCM1480_IMR_ALIAS_MAILBOX(cpu)+(reg)) #define A_BCM1480_IMR_ALIAS_MAILBOX_REGISTER(cpu, reg) (A_BCM1480_IMR_ALIAS_MAILBOX(cpu)+(reg))
#define R_BCM1480_IMR_ALIAS_MAILBOX_0 0x0000 /* 0x0x0 */ #define R_BCM1480_IMR_ALIAS_MAILBOX_0 0x0000 /* 0x0x0 */
#define R_BCM1480_IMR_ALIAS_MAILBOX_0_SET 0x0008 /* 0x0x8 */ #define R_BCM1480_IMR_ALIAS_MAILBOX_0_SET 0x0008 /* 0x0x8 */
...@@ -427,7 +427,7 @@ ...@@ -427,7 +427,7 @@
#define R_BCM1480_IMR_MAILBOX_SET 0x08 #define R_BCM1480_IMR_MAILBOX_SET 0x08
#define R_BCM1480_IMR_MAILBOX_CLR 0x10 #define R_BCM1480_IMR_MAILBOX_CLR 0x10
#define R_BCM1480_IMR_MAILBOX_NUM_SPACING 0x20 #define R_BCM1480_IMR_MAILBOX_NUM_SPACING 0x20
#define A_BCM1480_MAILBOX_REGISTER(num,reg,cpu) \ #define A_BCM1480_MAILBOX_REGISTER(num, reg, cpu) \
(A_BCM1480_IMR_CPU0_BASE + \ (A_BCM1480_IMR_CPU0_BASE + \
(num * R_BCM1480_IMR_MAILBOX_NUM_SPACING) + \ (num * R_BCM1480_IMR_MAILBOX_NUM_SPACING) + \
(cpu * BCM1480_IMR_REGISTER_SPACING) + \ (cpu * BCM1480_IMR_REGISTER_SPACING) + \
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
#define BCM1480_HR_REGISTER_SPACING 0x80000 #define BCM1480_HR_REGISTER_SPACING 0x80000
#define A_BCM1480_HR_BASE(idx) (A_BCM1480_HR_BASE_0 + ((idx)*BCM1480_HR_REGISTER_SPACING)) #define A_BCM1480_HR_BASE(idx) (A_BCM1480_HR_BASE_0 + ((idx)*BCM1480_HR_REGISTER_SPACING))
#define A_BCM1480_HR_REGISTER(idx,reg) (A_BCM1480_HR_BASE(idx) + (reg)) #define A_BCM1480_HR_REGISTER(idx, reg) (A_BCM1480_HR_BASE(idx) + (reg))
#define R_BCM1480_HR_CFG 0x0000000000 #define R_BCM1480_HR_CFG 0x0000000000
...@@ -599,9 +599,9 @@ ...@@ -599,9 +599,9 @@
#define BCM1480_PM_NUM_CHANNELS 32 #define BCM1480_PM_NUM_CHANNELS 32
#define A_BCM1480_PMI_LCL_BASE(idx) (A_BCM1480_PMI_LCL_0 + ((idx)*BCM1480_PM_LCL_REGISTER_SPACING)) #define A_BCM1480_PMI_LCL_BASE(idx) (A_BCM1480_PMI_LCL_0 + ((idx)*BCM1480_PM_LCL_REGISTER_SPACING))
#define A_BCM1480_PMI_LCL_REGISTER(idx,reg) (A_BCM1480_PMI_LCL_BASE(idx) + (reg)) #define A_BCM1480_PMI_LCL_REGISTER(idx, reg) (A_BCM1480_PMI_LCL_BASE(idx) + (reg))
#define A_BCM1480_PMO_LCL_BASE(idx) (A_BCM1480_PMO_LCL_0 + ((idx)*BCM1480_PM_LCL_REGISTER_SPACING)) #define A_BCM1480_PMO_LCL_BASE(idx) (A_BCM1480_PMO_LCL_0 + ((idx)*BCM1480_PM_LCL_REGISTER_SPACING))
#define A_BCM1480_PMO_LCL_REGISTER(idx,reg) (A_BCM1480_PMO_LCL_BASE(idx) + (reg)) #define A_BCM1480_PMO_LCL_REGISTER(idx, reg) (A_BCM1480_PMO_LCL_BASE(idx) + (reg))
#define BCM1480_PM_INT_PACKING 8 #define BCM1480_PM_INT_PACKING 8
#define BCM1480_PM_INT_FUNCTION_SPACING 0x40 #define BCM1480_PM_INT_FUNCTION_SPACING 0x40
...@@ -721,7 +721,7 @@ ...@@ -721,7 +721,7 @@
#define BCM1480_HSP_REGISTER_SPACING 0x80000 #define BCM1480_HSP_REGISTER_SPACING 0x80000
#define A_BCM1480_HSP_BASE(idx) (A_BCM1480_HSP_BASE_0 + ((idx)*BCM1480_HSP_REGISTER_SPACING)) #define A_BCM1480_HSP_BASE(idx) (A_BCM1480_HSP_BASE_0 + ((idx)*BCM1480_HSP_REGISTER_SPACING))
#define A_BCM1480_HSP_REGISTER(idx,reg) (A_BCM1480_HSP_BASE(idx) + (reg)) #define A_BCM1480_HSP_REGISTER(idx, reg) (A_BCM1480_HSP_BASE(idx) + (reg))
#define R_BCM1480_HSP_RX_SPI4_CFG_0 0x0000000000 #define R_BCM1480_HSP_RX_SPI4_CFG_0 0x0000000000
#define R_BCM1480_HSP_RX_SPI4_CFG_1 0x0000000008 #define R_BCM1480_HSP_RX_SPI4_CFG_1 0x0000000008
......
This diff is collapsed.
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
#ifdef LEDS_PHYS #ifdef LEDS_PHYS
#define setleds(t0,t1,c0,c1,c2,c3) \ #define setleds(t0, t1, c0, c1, c2, c3) \
li t0, (LEDS_PHYS|0xa0000000); \ li t0, (LEDS_PHYS|0xa0000000); \
li t1, c0; \ li t1, c0; \
sb t1, 0x18(t0); \ sb t1, 0x18(t0); \
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
li t1, c3; \ li t1, c3; \
sb t1, 0x00(t0) sb t1, 0x00(t0)
#else #else
#define setleds(t0,t1,c0,c1,c2,c3) #define setleds(t0, t1, c0, c1, c2, c3)
#endif /* LEDS_PHYS */ #endif /* LEDS_PHYS */
#else #else
......
...@@ -232,18 +232,18 @@ ...@@ -232,18 +232,18 @@
* Make a mask for 'v' bits at position 'n' * Make a mask for 'v' bits at position 'n'
*/ */
#define _SB_MAKEMASK(v,n) (_SB_MAKE64((_SB_MAKE64(1)<<(v))-1) << _SB_MAKE64(n)) #define _SB_MAKEMASK(v, n) (_SB_MAKE64((_SB_MAKE64(1)<<(v))-1) << _SB_MAKE64(n))
#define _SB_MAKEMASK_32(v,n) (_SB_MAKE32((_SB_MAKE32(1)<<(v))-1) << _SB_MAKE32(n)) #define _SB_MAKEMASK_32(v, n) (_SB_MAKE32((_SB_MAKE32(1)<<(v))-1) << _SB_MAKE32(n))
/* /*
* Make a value at 'v' at bit position 'n' * Make a value at 'v' at bit position 'n'
*/ */
#define _SB_MAKEVALUE(v,n) (_SB_MAKE64(v) << _SB_MAKE64(n)) #define _SB_MAKEVALUE(v, n) (_SB_MAKE64(v) << _SB_MAKE64(n))
#define _SB_MAKEVALUE_32(v,n) (_SB_MAKE32(v) << _SB_MAKE32(n)) #define _SB_MAKEVALUE_32(v, n) (_SB_MAKE32(v) << _SB_MAKE32(n))
#define _SB_GETVALUE(v,n,m) ((_SB_MAKE64(v) & _SB_MAKE64(m)) >> _SB_MAKE64(n)) #define _SB_GETVALUE(v, n, m) ((_SB_MAKE64(v) & _SB_MAKE64(m)) >> _SB_MAKE64(n))
#define _SB_GETVALUE_32(v,n,m) ((_SB_MAKE32(v) & _SB_MAKE32(m)) >> _SB_MAKE32(n)) #define _SB_GETVALUE_32(v, n, m) ((_SB_MAKE32(v) & _SB_MAKE32(m)) >> _SB_MAKE32(n))
/* /*
* Macros to read/write on-chip registers * Macros to read/write on-chip registers
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
#if defined(__mips64) && !defined(__ASSEMBLY__) #if defined(__mips64) && !defined(__ASSEMBLY__)
#define SBWRITECSR(csr,val) *((volatile uint64_t *) PHYS_TO_K1(csr)) = (val) #define SBWRITECSR(csr, val) *((volatile uint64_t *) PHYS_TO_K1(csr)) = (val)
#define SBREADCSR(csr) (*((volatile uint64_t *) PHYS_TO_K1(csr))) #define SBREADCSR(csr) (*((volatile uint64_t *) PHYS_TO_K1(csr)))
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
This diff is collapsed.
This diff is collapsed.
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
********************************************************************* *********************************************************************
* *
* Copyright 2000,2001,2002,2003 * Copyright 2000, 2001, 2002, 2003
* Broadcom Corporation. All rights reserved. * Broadcom Corporation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
#define M_INT_MBOX_1 _SB_MAKEMASK1(K_INT_MBOX_1) #define M_INT_MBOX_1 _SB_MAKEMASK1(K_INT_MBOX_1)
#define M_INT_MBOX_2 _SB_MAKEMASK1(K_INT_MBOX_2) #define M_INT_MBOX_2 _SB_MAKEMASK1(K_INT_MBOX_2)
#define M_INT_MBOX_3 _SB_MAKEMASK1(K_INT_MBOX_3) #define M_INT_MBOX_3 _SB_MAKEMASK1(K_INT_MBOX_3)
#define M_INT_MBOX_ALL _SB_MAKEMASK(4,K_INT_MBOX_0) #define M_INT_MBOX_ALL _SB_MAKEMASK(4, K_INT_MBOX_0)
#if SIBYTE_HDR_FEATURE(1250, PASS2) || SIBYTE_HDR_FEATURE(112x, PASS1) #if SIBYTE_HDR_FEATURE(1250, PASS2) || SIBYTE_HDR_FEATURE(112x, PASS1)
#define M_INT_CYCLE_CP0_INT _SB_MAKEMASK1(K_INT_CYCLE_CP0_INT) #define M_INT_CYCLE_CP0_INT _SB_MAKEMASK1(K_INT_CYCLE_CP0_INT)
#define M_INT_CYCLE_CP1_INT _SB_MAKEMASK1(K_INT_CYCLE_CP1_INT) #define M_INT_CYCLE_CP1_INT _SB_MAKEMASK1(K_INT_CYCLE_CP1_INT)
...@@ -208,9 +208,9 @@ ...@@ -208,9 +208,9 @@
*/ */
#define S_INT_LDT_INTMSG 0 #define S_INT_LDT_INTMSG 0
#define M_INT_LDT_INTMSG _SB_MAKEMASK(3,S_INT_LDT_INTMSG) #define M_INT_LDT_INTMSG _SB_MAKEMASK(3, S_INT_LDT_INTMSG)
#define V_INT_LDT_INTMSG(x) _SB_MAKEVALUE(x,S_INT_LDT_INTMSG) #define V_INT_LDT_INTMSG(x) _SB_MAKEVALUE(x, S_INT_LDT_INTMSG)
#define G_INT_LDT_INTMSG(x) _SB_GETVALUE(x,S_INT_LDT_INTMSG,M_INT_LDT_INTMSG) #define G_INT_LDT_INTMSG(x) _SB_GETVALUE(x, S_INT_LDT_INTMSG, M_INT_LDT_INTMSG)
#define K_INT_LDT_INTMSG_FIXED 0 #define K_INT_LDT_INTMSG_FIXED 0
#define K_INT_LDT_INTMSG_ARBITRATED 1 #define K_INT_LDT_INTMSG_ARBITRATED 1
...@@ -228,14 +228,14 @@ ...@@ -228,14 +228,14 @@
#define M_INT_LDT_LOGICALDEST _SB_MAKEMASK1(4) #define M_INT_LDT_LOGICALDEST _SB_MAKEMASK1(4)
#define S_INT_LDT_INTDEST 5 #define S_INT_LDT_INTDEST 5
#define M_INT_LDT_INTDEST _SB_MAKEMASK(10,S_INT_LDT_INTDEST) #define M_INT_LDT_INTDEST _SB_MAKEMASK(10, S_INT_LDT_INTDEST)
#define V_INT_LDT_INTDEST(x) _SB_MAKEVALUE(x,S_INT_LDT_INTDEST) #define V_INT_LDT_INTDEST(x) _SB_MAKEVALUE(x, S_INT_LDT_INTDEST)
#define G_INT_LDT_INTDEST(x) _SB_GETVALUE(x,S_INT_LDT_INTDEST,M_INT_LDT_INTDEST) #define G_INT_LDT_INTDEST(x) _SB_GETVALUE(x, S_INT_LDT_INTDEST, M_INT_LDT_INTDEST)
#define S_INT_LDT_VECTOR 13 #define S_INT_LDT_VECTOR 13
#define M_INT_LDT_VECTOR _SB_MAKEMASK(8,S_INT_LDT_VECTOR) #define M_INT_LDT_VECTOR _SB_MAKEMASK(8, S_INT_LDT_VECTOR)
#define V_INT_LDT_VECTOR(x) _SB_MAKEVALUE(x,S_INT_LDT_VECTOR) #define V_INT_LDT_VECTOR(x) _SB_MAKEVALUE(x, S_INT_LDT_VECTOR)
#define G_INT_LDT_VECTOR(x) _SB_GETVALUE(x,S_INT_LDT_VECTOR,M_INT_LDT_VECTOR) #define G_INT_LDT_VECTOR(x) _SB_GETVALUE(x, S_INT_LDT_VECTOR, M_INT_LDT_VECTOR)
/* /*
* Vector format (Table 4-6) * Vector format (Table 4-6)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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