aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc64/kernel')
-rw-r--r--arch/sparc64/kernel/devices.c2
-rw-r--r--arch/sparc64/kernel/of_device.c4
-rw-r--r--arch/sparc64/kernel/pci_iommu.c2
-rw-r--r--arch/sparc64/kernel/pci_sun4v.c2
-rw-r--r--arch/sparc64/kernel/process.c2
-rw-r--r--arch/sparc64/kernel/prom.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/arch/sparc64/kernel/devices.c b/arch/sparc64/kernel/devices.c
index ec10f7edcf86..0e03c8e218cd 100644
--- a/arch/sparc64/kernel/devices.c
+++ b/arch/sparc64/kernel/devices.c
@@ -21,7 +21,7 @@
21#include <asm/timer.h> 21#include <asm/timer.h>
22#include <asm/cpudata.h> 22#include <asm/cpudata.h>
23 23
24/* Used to synchronize acceses to NatSemi SUPER I/O chip configure 24/* Used to synchronize accesses to NatSemi SUPER I/O chip configure
25 * operations in asm/ns87303.h 25 * operations in asm/ns87303.h
26 */ 26 */
27DEFINE_SPINLOCK(ns87303_lock); 27DEFINE_SPINLOCK(ns87303_lock);
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 9ac9a307999a..7455f5d05519 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -596,7 +596,7 @@ static void __init build_device_resources(struct of_device *op,
596 /* Convert to num-entries. */ 596 /* Convert to num-entries. */
597 num_reg /= na + ns; 597 num_reg /= na + ns;
598 598
599 /* Prevent overruning the op->resources[] array. */ 599 /* Prevent overrunning the op->resources[] array. */
600 if (num_reg > PROMREG_MAX) { 600 if (num_reg > PROMREG_MAX) {
601 printk(KERN_WARNING "%s: Too many regs (%d), " 601 printk(KERN_WARNING "%s: Too many regs (%d), "
602 "limiting to %d.\n", 602 "limiting to %d.\n",
@@ -904,7 +904,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
904 op->num_irqs = 0; 904 op->num_irqs = 0;
905 } 905 }
906 906
907 /* Prevent overruning the op->irqs[] array. */ 907 /* Prevent overrunning the op->irqs[] array. */
908 if (op->num_irqs > PROMINTR_MAX) { 908 if (op->num_irqs > PROMINTR_MAX) {
909 printk(KERN_WARNING "%s: Too many irqs (%d), " 909 printk(KERN_WARNING "%s: Too many irqs (%d), "
910 "limiting to %d.\n", 910 "limiting to %d.\n",
diff --git a/arch/sparc64/kernel/pci_iommu.c b/arch/sparc64/kernel/pci_iommu.c
index dfd6f9f4790b..70d2364fdfe0 100644
--- a/arch/sparc64/kernel/pci_iommu.c
+++ b/arch/sparc64/kernel/pci_iommu.c
@@ -542,7 +542,7 @@ static inline void fill_sg(iopte_t *iopte, struct scatterlist *sg,
542/* Map a set of buffers described by SGLIST with NELEMS array 542/* Map a set of buffers described by SGLIST with NELEMS array
543 * elements in streaming mode for PCI DMA. 543 * elements in streaming mode for PCI DMA.
544 * When making changes here, inspect the assembly output. I was having 544 * When making changes here, inspect the assembly output. I was having
545 * hard time to kepp this routine out of using stack slots for holding variables. 545 * hard time to keep this routine out of using stack slots for holding variables.
546 */ 546 */
547static int pci_4u_map_sg(struct pci_dev *pdev, struct scatterlist *sglist, int nelems, int direction) 547static int pci_4u_map_sg(struct pci_dev *pdev, struct scatterlist *sglist, int nelems, int direction)
548{ 548{
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 34df4047587a..044e8ec4c0f5 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -731,7 +731,7 @@ struct pci_sun4v_msiq_entry {
731 731
732 u64 msi_address; 732 u64 msi_address;
733 733
734 /* The format of this value is message type dependant. 734 /* The format of this value is message type dependent.
735 * For MSI bits 15:0 are the data from the MSI packet. 735 * For MSI bits 15:0 are the data from the MSI packet.
736 * For MSI-X bits 31:0 are the data from the MSI packet. 736 * For MSI-X bits 31:0 are the data from the MSI packet.
737 * For MSG, the message code and message routing code where: 737 * For MSG, the message code and message routing code where:
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 8e3c6e435110..952762bfb4c0 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -677,7 +677,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
677 * NOTE! Only a kernel-only process(ie the swapper or direct descendants 677 * NOTE! Only a kernel-only process(ie the swapper or direct descendants
678 * who haven't done an "execve()") should use this: it will work within 678 * who haven't done an "execve()") should use this: it will work within
679 * a system call from a "real" process, but the process memory space will 679 * a system call from a "real" process, but the process memory space will
680 * not be free'd until both the parent and the child have exited. 680 * not be freed until both the parent and the child have exited.
681 */ 681 */
682pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) 682pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
683{ 683{
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index b7976b14d0ba..02830e4671f5 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -899,7 +899,7 @@ static unsigned int fire_irq_build(struct device_node *dp,
899 /* The interrupt map registers do not have an INO field 899 /* The interrupt map registers do not have an INO field
900 * like other chips do. They return zero in the INO 900 * like other chips do. They return zero in the INO
901 * field, and the interrupt controller number is controlled 901 * field, and the interrupt controller number is controlled
902 * in bits 6 thru 9. So in order for build_irq() to get 902 * in bits 6 to 9. So in order for build_irq() to get
903 * the INO right we pass it in as part of the fixup 903 * the INO right we pass it in as part of the fixup
904 * which will get added to the map register zero value 904 * which will get added to the map register zero value
905 * read by build_irq(). 905 * read by build_irq().