aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sparc/kernel/auxio.c2
-rw-r--r--arch/sparc/kernel/ioport.c2
-rw-r--r--arch/sparc/kernel/irq.c8
-rw-r--r--arch/sparc/kernel/pcic.c4
-rw-r--r--arch/sparc/kernel/process.c2
-rw-r--r--arch/sparc/kernel/sun4d_irq.c2
-rw-r--r--arch/sparc/kernel/sun4m_irq.c2
-rw-r--r--arch/sparc/prom/printf.c2
8 files changed, 12 insertions, 12 deletions
diff --git a/arch/sparc/kernel/auxio.c b/arch/sparc/kernel/auxio.c
index 118f3eca373e..baf4ed3fb0f3 100644
--- a/arch/sparc/kernel/auxio.c
+++ b/arch/sparc/kernel/auxio.c
@@ -88,7 +88,7 @@ void set_auxio(unsigned char bits_on, unsigned char bits_off)
88 break; 88 break;
89 case sun4m: 89 case sun4m:
90 if(!auxio_register) 90 if(!auxio_register)
91 break; /* VME chassic sun4m, no auxio. */ 91 break; /* VME chassis sun4m, no auxio. */
92 regval = sbus_readb(auxio_register); 92 regval = sbus_readb(auxio_register);
93 sbus_writeb(((regval | bits_on) & ~bits_off) | AUXIO_ORMEIN4M, 93 sbus_writeb(((regval | bits_on) & ~bits_off) | AUXIO_ORMEIN4M,
94 auxio_register); 94 auxio_register);
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 987ec6782f99..62182d2d7b0d 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -617,7 +617,7 @@ void *pci_alloc_consistent(struct pci_dev *pdev, size_t len, dma_addr_t *pba)
617 * size must be the same as what as passed into pci_alloc_consistent, 617 * size must be the same as what as passed into pci_alloc_consistent,
618 * and likewise dma_addr must be the same as what *dma_addrp was set to. 618 * and likewise dma_addr must be the same as what *dma_addrp was set to.
619 * 619 *
620 * References to the memory and mappings assosciated with cpu_addr/dma_addr 620 * References to the memory and mappings associated with cpu_addr/dma_addr
621 * past this call are illegal. 621 * past this call are illegal.
622 */ 622 */
623void pci_free_consistent(struct pci_dev *pdev, size_t n, void *p, dma_addr_t ba) 623void pci_free_consistent(struct pci_dev *pdev, size_t n, void *p, dma_addr_t ba)
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index bdbefa8a9742..f257a67bcf93 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -1,6 +1,6 @@
1/* $Id: irq.c,v 1.114 2001/12/11 04:55:51 davem Exp $ 1/* $Id: irq.c,v 1.114 2001/12/11 04:55:51 davem Exp $
2 * arch/sparc/kernel/irq.c: Interrupt request handling routines. On the 2 * arch/sparc/kernel/irq.c: Interrupt request handling routines. On the
3 * Sparc the IRQ's are basically 'cast in stone' 3 * Sparc the IRQs are basically 'cast in stone'
4 * and you are supposed to probe the prom's device 4 * and you are supposed to probe the prom's device
5 * node trees to find out who's got which IRQ. 5 * node trees to find out who's got which IRQ.
6 * 6 *
@@ -330,7 +330,7 @@ void handler_irq(int irq, struct pt_regs * regs)
330 irq_enter(); 330 irq_enter();
331 disable_pil_irq(irq); 331 disable_pil_irq(irq);
332#ifdef CONFIG_SMP 332#ifdef CONFIG_SMP
333 /* Only rotate on lower priority IRQ's (scsi, ethernet, etc.). */ 333 /* Only rotate on lower priority IRQs (scsi, ethernet, etc.). */
334 if((sparc_cpu_model==sun4m) && (irq < 10)) 334 if((sparc_cpu_model==sun4m) && (irq < 10))
335 smp4m_irq_rotate(cpu); 335 smp4m_irq_rotate(cpu);
336#endif 336#endif
@@ -371,7 +371,7 @@ void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
371} 371}
372#endif 372#endif
373 373
374/* Fast IRQ's on the Sparc can only have one routine attached to them, 374/* Fast IRQs on the Sparc can only have one routine attached to them,
375 * thus no sharing possible. 375 * thus no sharing possible.
376 */ 376 */
377int request_fast_irq(unsigned int irq, 377int request_fast_irq(unsigned int irq,
@@ -608,7 +608,7 @@ void __init init_IRQ(void)
608 break; 608 break;
609 609
610 default: 610 default:
611 prom_printf("Cannot initialize IRQ's on this Sun machine..."); 611 prom_printf("Cannot initialize IRQs on this Sun machine...");
612 break; 612 break;
613 } 613 }
614 btfixup(); 614 btfixup();
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 5ca7e8f42bd9..791771196905 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -755,7 +755,7 @@ void __init pci_time_init(void)
755static __inline__ unsigned long do_gettimeoffset(void) 755static __inline__ unsigned long do_gettimeoffset(void)
756{ 756{
757 /* 757 /*
758 * We devide all to 100 758 * We divide all by 100
759 * to have microsecond resolution and to avoid overflow 759 * to have microsecond resolution and to avoid overflow
760 */ 760 */
761 unsigned long count = 761 unsigned long count =
@@ -956,7 +956,7 @@ EXPORT_SYMBOL(pci_device_to_OF_node);
956 * Also, think for a moment about likes of floppy.c that 956 * Also, think for a moment about likes of floppy.c that
957 * include architecture specific parts. They may want to redefine ins/outs. 957 * include architecture specific parts. They may want to redefine ins/outs.
958 * 958 *
959 * We do not use horroble macroses here because we want to 959 * We do not use horrible macros here because we want to
960 * advance pointer by sizeof(size). 960 * advance pointer by sizeof(size).
961 */ 961 */
962void outsb(unsigned long addr, const void *src, unsigned long count) 962void outsb(unsigned long addr, const void *src, unsigned long count)
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c
index 2940d2c1a778..8c37f8f5adb7 100644
--- a/arch/sparc/kernel/process.c
+++ b/arch/sparc/kernel/process.c
@@ -683,7 +683,7 @@ out:
683 * NOTE! Only a kernel-only process(ie the swapper or direct descendants 683 * NOTE! Only a kernel-only process(ie the swapper or direct descendants
684 * who haven't done an "execve()") should use this: it will work within 684 * who haven't done an "execve()") should use this: it will work within
685 * a system call from a "real" process, but the process memory space will 685 * a system call from a "real" process, but the process memory space will
686 * not be free'd until both the parent and the child have exited. 686 * not be freed until both the parent and the child have exited.
687 */ 687 */
688pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) 688pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
689{ 689{
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index 116d6a241ca2..396797e20c39 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -521,7 +521,7 @@ static void __init sun4d_init_timers(irq_handler_t counter_fn)
521 lvl14_save[2] += smp4d_ticker - real_irq_entry; 521 lvl14_save[2] += smp4d_ticker - real_irq_entry;
522 522
523 /* For SMP we use the level 14 ticker, however the bootup code 523 /* For SMP we use the level 14 ticker, however the bootup code
524 * has copied the firmwares level 14 vector into boot cpu's 524 * has copied the firmware's level 14 vector into the boot cpu's
525 * trap table, we must fix this now or we get squashed. 525 * trap table, we must fix this now or we get squashed.
526 */ 526 */
527 local_irq_save(flags); 527 local_irq_save(flags);
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c
index a654c16f4027..91a803ea88be 100644
--- a/arch/sparc/kernel/sun4m_irq.c
+++ b/arch/sparc/kernel/sun4m_irq.c
@@ -299,7 +299,7 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn)
299 struct tt_entry *trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (14 - 1)]; 299 struct tt_entry *trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (14 - 1)];
300 300
301 /* For SMP we use the level 14 ticker, however the bootup code 301 /* For SMP we use the level 14 ticker, however the bootup code
302 * has copied the firmwares level 14 vector into boot cpu's 302 * has copied the firmware's level 14 vector into the boot cpu's
303 * trap table, we must fix this now or we get squashed. 303 * trap table, we must fix this now or we get squashed.
304 */ 304 */
305 local_irq_save(flags); 305 local_irq_save(flags);
diff --git a/arch/sparc/prom/printf.c b/arch/sparc/prom/printf.c
index dc8b598bedbb..27fdac99f790 100644
--- a/arch/sparc/prom/printf.c
+++ b/arch/sparc/prom/printf.c
@@ -5,7 +5,7 @@
5 * Copyright (c) 2002 Pete Zaitcev (zaitcev@yahoo.com) 5 * Copyright (c) 2002 Pete Zaitcev (zaitcev@yahoo.com)
6 * 6 *
7 * We used to warn all over the code: DO NOT USE prom_printf(), 7 * We used to warn all over the code: DO NOT USE prom_printf(),
8 * and yet people do. Anton's banking code was outputing banks 8 * and yet people do. Anton's banking code was outputting banks
9 * with prom_printf for most of the 2.4 lifetime. Since an effective 9 * with prom_printf for most of the 2.4 lifetime. Since an effective
10 * stick is not available, we deployed a carrot: an early printk 10 * stick is not available, we deployed a carrot: an early printk
11 * through PROM by means of -p boot option. This ought to fix it. 11 * through PROM by means of -p boot option. This ought to fix it.