aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Buchbinder <adam.buchbinder@gmail.com>2016-02-25 03:44:58 -0500
committerRalf Baechle <ralf@linux-mips.org>2016-04-03 06:32:09 -0400
commit92a76f6d8545efc67f03278009e9a828bdad3419 (patch)
tree96929a7a5499d56640eaae43407db216cac69c1b
parent091bc3a4049cb0cb28b8e3e71d8738387b91a007 (diff)
MIPS: Fix misspellings in comments.
Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com> Cc: linux-mips@linux-mips.org Cc: trivial@kernel.org Patchwork: https://patchwork.linux-mips.org/patch/12617/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/alchemy/common/dbdma.c4
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c14
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-pko.c2
-rw-r--r--arch/mips/cavium-octeon/smp.c2
-rw-r--r--arch/mips/dec/int-handler.S2
-rw-r--r--arch/mips/fw/arc/memory.c2
-rw-r--r--arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h2
-rw-r--r--arch/mips/include/asm/mach-generic/kernel-entry-init.h2
-rw-r--r--arch/mips/include/asm/mach-ip27/irq.h2
-rw-r--r--arch/mips/include/asm/mach-ip27/kernel-entry-init.h2
-rw-r--r--arch/mips/include/asm/mach-jz4740/gpio.h2
-rw-r--r--arch/mips/include/asm/mips-cm.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-config.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx.h2
-rw-r--r--arch/mips/include/asm/pci/bridge.h18
-rw-r--r--arch/mips/include/asm/sgi/hpc3.h2
-rw-r--r--arch/mips/include/asm/sgiarcs.h4
-rw-r--r--arch/mips/include/asm/sn/ioc3.h2
-rw-r--r--arch/mips/include/asm/sn/sn0/hubio.h2
-rw-r--r--arch/mips/include/asm/uaccess.h2
-rw-r--r--arch/mips/kernel/mips-cm.c2
-rw-r--r--arch/mips/kernel/perf_event_mipsxx.c2
-rw-r--r--arch/mips/kernel/pm-cps.c2
-rw-r--r--arch/mips/kernel/process.c2
-rw-r--r--arch/mips/kernel/traps.c2
-rw-r--r--arch/mips/kvm/tlb.c2
-rw-r--r--arch/mips/kvm/trap_emul.c2
-rw-r--r--arch/mips/math-emu/ieee754dp.c6
-rw-r--r--arch/mips/math-emu/ieee754sp.c6
-rw-r--r--arch/mips/mm/sc-ip22.c2
-rw-r--r--arch/mips/mm/tlbex.c2
-rw-r--r--arch/mips/sgi-ip27/ip27-memory.c2
32 files changed, 52 insertions, 52 deletions
diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c
index 745695db5ba0..f2f264b5aafe 100644
--- a/arch/mips/alchemy/common/dbdma.c
+++ b/arch/mips/alchemy/common/dbdma.c
@@ -261,7 +261,7 @@ u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
261 au1x_dma_chan_t *cp; 261 au1x_dma_chan_t *cp;
262 262
263 /* 263 /*
264 * We do the intialization on the first channel allocation. 264 * We do the initialization on the first channel allocation.
265 * We have to wait because of the interrupt handler initialization 265 * We have to wait because of the interrupt handler initialization
266 * which can't be done successfully during board set up. 266 * which can't be done successfully during board set up.
267 */ 267 */
@@ -964,7 +964,7 @@ u32 au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr)
964 dp->dscr_source1 = dscr->dscr_source1; 964 dp->dscr_source1 = dscr->dscr_source1;
965 dp->dscr_cmd1 = dscr->dscr_cmd1; 965 dp->dscr_cmd1 = dscr->dscr_cmd1;
966 nbytes = dscr->dscr_cmd1; 966 nbytes = dscr->dscr_cmd1;
967 /* Allow the caller to specifiy if an interrupt is generated */ 967 /* Allow the caller to specify if an interrupt is generated */
968 dp->dscr_cmd0 &= ~DSCR_CMD0_IE; 968 dp->dscr_cmd0 &= ~DSCR_CMD0_IE;
969 dp->dscr_cmd0 |= dscr->dscr_cmd0 | DSCR_CMD0_V; 969 dp->dscr_cmd0 |= dscr->dscr_cmd0 | DSCR_CMD0_V;
970 ctp->chan_ptr->ddma_dbell = 0; 970 ctp->chan_ptr->ddma_dbell = 0;
diff --git a/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c b/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
index e59d1b79f24c..2f415d9d0f3c 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
@@ -68,7 +68,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
68 gmx_rx_int_en.s.pause_drp = 1; 68 gmx_rx_int_en.s.pause_drp = 1;
69 /* Skipping gmx_rx_int_en.s.reserved_16_18 */ 69 /* Skipping gmx_rx_int_en.s.reserved_16_18 */
70 /*gmx_rx_int_en.s.ifgerr = 1; */ 70 /*gmx_rx_int_en.s.ifgerr = 1; */
71 /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */ 71 /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
72 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */ 72 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
73 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */ 73 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
74 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */ 74 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -89,7 +89,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
89 /*gmx_rx_int_en.s.phy_spd = 1; */ 89 /*gmx_rx_int_en.s.phy_spd = 1; */
90 /*gmx_rx_int_en.s.phy_link = 1; */ 90 /*gmx_rx_int_en.s.phy_link = 1; */
91 /*gmx_rx_int_en.s.ifgerr = 1; */ 91 /*gmx_rx_int_en.s.ifgerr = 1; */
92 /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */ 92 /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
93 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */ 93 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
94 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */ 94 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
95 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */ 95 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -112,7 +112,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
112 /*gmx_rx_int_en.s.phy_spd = 1; */ 112 /*gmx_rx_int_en.s.phy_spd = 1; */
113 /*gmx_rx_int_en.s.phy_link = 1; */ 113 /*gmx_rx_int_en.s.phy_link = 1; */
114 /*gmx_rx_int_en.s.ifgerr = 1; */ 114 /*gmx_rx_int_en.s.ifgerr = 1; */
115 /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */ 115 /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
116 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */ 116 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
117 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */ 117 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
118 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */ 118 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -134,7 +134,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
134 /*gmx_rx_int_en.s.phy_spd = 1; */ 134 /*gmx_rx_int_en.s.phy_spd = 1; */
135 /*gmx_rx_int_en.s.phy_link = 1; */ 135 /*gmx_rx_int_en.s.phy_link = 1; */
136 /*gmx_rx_int_en.s.ifgerr = 1; */ 136 /*gmx_rx_int_en.s.ifgerr = 1; */
137 /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */ 137 /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
138 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */ 138 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
139 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */ 139 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
140 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */ 140 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -156,7 +156,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
156 /*gmx_rx_int_en.s.phy_spd = 1; */ 156 /*gmx_rx_int_en.s.phy_spd = 1; */
157 /*gmx_rx_int_en.s.phy_link = 1; */ 157 /*gmx_rx_int_en.s.phy_link = 1; */
158 /*gmx_rx_int_en.s.ifgerr = 1; */ 158 /*gmx_rx_int_en.s.ifgerr = 1; */
159 /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */ 159 /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
160 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */ 160 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
161 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */ 161 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
162 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */ 162 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -179,7 +179,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
179 /*gmx_rx_int_en.s.phy_spd = 1; */ 179 /*gmx_rx_int_en.s.phy_spd = 1; */
180 /*gmx_rx_int_en.s.phy_link = 1; */ 180 /*gmx_rx_int_en.s.phy_link = 1; */
181 /*gmx_rx_int_en.s.ifgerr = 1; */ 181 /*gmx_rx_int_en.s.ifgerr = 1; */
182 /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */ 182 /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
183 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */ 183 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
184 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */ 184 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
185 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */ 185 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
@@ -209,7 +209,7 @@ void __cvmx_interrupt_gmxx_rxx_int_en_enable(int index, int block)
209 gmx_rx_int_en.s.pause_drp = 1; 209 gmx_rx_int_en.s.pause_drp = 1;
210 /* Skipping gmx_rx_int_en.s.reserved_16_18 */ 210 /* Skipping gmx_rx_int_en.s.reserved_16_18 */
211 /*gmx_rx_int_en.s.ifgerr = 1; */ 211 /*gmx_rx_int_en.s.ifgerr = 1; */
212 /*gmx_rx_int_en.s.coldet = 1; // Collsion detect */ 212 /*gmx_rx_int_en.s.coldet = 1; // Collision detect */
213 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */ 213 /*gmx_rx_int_en.s.falerr = 1; // False carrier error or extend error after slottime */
214 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */ 214 /*gmx_rx_int_en.s.rsverr = 1; // RGMII reserved opcodes */
215 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */ 215 /*gmx_rx_int_en.s.pcterr = 1; // Bad Preamble / Protocol */
diff --git a/arch/mips/cavium-octeon/executive/cvmx-pko.c b/arch/mips/cavium-octeon/executive/cvmx-pko.c
index 87be167a7a6a..676fab50dd2b 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-pko.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-pko.c
@@ -189,7 +189,7 @@ void cvmx_pko_initialize_global(void)
189 /* 189 /*
190 * Set the size of the PKO command buffers to an odd number of 190 * Set the size of the PKO command buffers to an odd number of
191 * 64bit words. This allows the normal two word send to stay 191 * 64bit words. This allows the normal two word send to stay
192 * aligned and never span a comamnd word buffer. 192 * aligned and never span a command word buffer.
193 */ 193 */
194 config.u64 = 0; 194 config.u64 = 0;
195 config.s.pool = CVMX_FPA_OUTPUT_BUFFER_POOL; 195 config.s.pool = CVMX_FPA_OUTPUT_BUFFER_POOL;
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index b7fa9ae28c36..42412ba0f3bf 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -331,7 +331,7 @@ static int octeon_update_boot_vector(unsigned int cpu)
331 } 331 }
332 332
333 if (!(avail_coremask & (1 << coreid))) { 333 if (!(avail_coremask & (1 << coreid))) {
334 /* core not available, assume, that catched by simple-executive */ 334 /* core not available, assume, that caught by simple-executive */
335 cvmx_write_csr(CVMX_CIU_PP_RST, 1 << coreid); 335 cvmx_write_csr(CVMX_CIU_PP_RST, 1 << coreid);
336 cvmx_write_csr(CVMX_CIU_PP_RST, 0); 336 cvmx_write_csr(CVMX_CIU_PP_RST, 0);
337 } 337 }
diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index 8c6f508e59de..d7b99180c6e1 100644
--- a/arch/mips/dec/int-handler.S
+++ b/arch/mips/dec/int-handler.S
@@ -5,7 +5,7 @@
5 * Written by Ralf Baechle and Andreas Busse, modified for DECstation 5 * Written by Ralf Baechle and Andreas Busse, modified for DECstation
6 * support by Paul Antoine and Harald Koerfgen. 6 * support by Paul Antoine and Harald Koerfgen.
7 * 7 *
8 * completly rewritten: 8 * completely rewritten:
9 * Copyright (C) 1998 Harald Koerfgen 9 * Copyright (C) 1998 Harald Koerfgen
10 * 10 *
11 * Rewritten extensively for controller-driven IRQ support 11 * Rewritten extensively for controller-driven IRQ support
diff --git a/arch/mips/fw/arc/memory.c b/arch/mips/fw/arc/memory.c
index 5537b94572b2..0d75b5a0bad4 100644
--- a/arch/mips/fw/arc/memory.c
+++ b/arch/mips/fw/arc/memory.c
@@ -9,7 +9,7 @@
9 * PROM library functions for acquiring/using memory descriptors given to us 9 * PROM library functions for acquiring/using memory descriptors given to us
10 * from the ARCS firmware. This is only used when CONFIG_ARC_MEMORY is set 10 * from the ARCS firmware. This is only used when CONFIG_ARC_MEMORY is set
11 * because on some machines like SGI IP27 the ARC memory configuration data 11 * because on some machines like SGI IP27 the ARC memory configuration data
12 * completly bogus and alternate easier to use mechanisms are available. 12 * completely bogus and alternate easier to use mechanisms are available.
13 */ 13 */
14#include <linux/init.h> 14#include <linux/init.h>
15#include <linux/kernel.h> 15#include <linux/kernel.h>
diff --git a/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h b/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
index cf92fe733995..c4873e8594ef 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
@@ -141,7 +141,7 @@ octeon_main_processor:
141.endm 141.endm
142 142
143/* 143/*
144 * Do SMP slave processor setup necessary before we can savely execute C code. 144 * Do SMP slave processor setup necessary before we can safely execute C code.
145 */ 145 */
146 .macro smp_slave_setup 146 .macro smp_slave_setup
147 .endm 147 .endm
diff --git a/arch/mips/include/asm/mach-generic/kernel-entry-init.h b/arch/mips/include/asm/mach-generic/kernel-entry-init.h
index 13b0751b010a..a229297c880b 100644
--- a/arch/mips/include/asm/mach-generic/kernel-entry-init.h
+++ b/arch/mips/include/asm/mach-generic/kernel-entry-init.h
@@ -16,7 +16,7 @@
16 .endm 16 .endm
17 17
18/* 18/*
19 * Do SMP slave processor setup necessary before we can savely execute C code. 19 * Do SMP slave processor setup necessary before we can safely execute C code.
20 */ 20 */
21 .macro smp_slave_setup 21 .macro smp_slave_setup
22 .endm 22 .endm
diff --git a/arch/mips/include/asm/mach-ip27/irq.h b/arch/mips/include/asm/mach-ip27/irq.h
index cf4384bfa846..b0b7261ff3ad 100644
--- a/arch/mips/include/asm/mach-ip27/irq.h
+++ b/arch/mips/include/asm/mach-ip27/irq.h
@@ -11,7 +11,7 @@
11#define __ASM_MACH_IP27_IRQ_H 11#define __ASM_MACH_IP27_IRQ_H
12 12
13/* 13/*
14 * A hardwired interrupt number is completly stupid for this system - a 14 * A hardwired interrupt number is completely stupid for this system - a
15 * large configuration might have thousands if not tenthousands of 15 * large configuration might have thousands if not tenthousands of
16 * interrupts. 16 * interrupts.
17 */ 17 */
diff --git a/arch/mips/include/asm/mach-ip27/kernel-entry-init.h b/arch/mips/include/asm/mach-ip27/kernel-entry-init.h
index b087cb83da3a..f992c1db876b 100644
--- a/arch/mips/include/asm/mach-ip27/kernel-entry-init.h
+++ b/arch/mips/include/asm/mach-ip27/kernel-entry-init.h
@@ -81,7 +81,7 @@
81 .endm 81 .endm
82 82
83/* 83/*
84 * Do SMP slave processor setup necessary before we can savely execute C code. 84 * Do SMP slave processor setup necessary before we can safely execute C code.
85 */ 85 */
86 .macro smp_slave_setup 86 .macro smp_slave_setup
87 GET_NASID_ASM t1 87 GET_NASID_ASM t1
diff --git a/arch/mips/include/asm/mach-jz4740/gpio.h b/arch/mips/include/asm/mach-jz4740/gpio.h
index bf8c3e1860e7..7c7708a23baa 100644
--- a/arch/mips/include/asm/mach-jz4740/gpio.h
+++ b/arch/mips/include/asm/mach-jz4740/gpio.h
@@ -27,7 +27,7 @@ enum jz_gpio_function {
27 27
28/* 28/*
29 Usually a driver for a SoC component has to request several gpio pins and 29 Usually a driver for a SoC component has to request several gpio pins and
30 configure them as funcion pins. 30 configure them as function pins.
31 jz_gpio_bulk_request can be used to ease this process. 31 jz_gpio_bulk_request can be used to ease this process.
32 Usually one would do something like: 32 Usually one would do something like:
33 33
diff --git a/arch/mips/include/asm/mips-cm.h b/arch/mips/include/asm/mips-cm.h
index b196825a1de9..d4635391c36a 100644
--- a/arch/mips/include/asm/mips-cm.h
+++ b/arch/mips/include/asm/mips-cm.h
@@ -28,7 +28,7 @@ extern void __iomem *mips_cm_l2sync_base;
28 * This function returns the physical base address of the Coherence Manager 28 * This function returns the physical base address of the Coherence Manager
29 * global control block, or 0 if no Coherence Manager is present. It provides 29 * global control block, or 0 if no Coherence Manager is present. It provides
30 * a default implementation which reads the CMGCRBase register where available, 30 * a default implementation which reads the CMGCRBase register where available,
31 * and may be overriden by platforms which determine this address in a 31 * and may be overridden by platforms which determine this address in a
32 * different way by defining a function with the same prototype except for the 32 * different way by defining a function with the same prototype except for the
33 * name mips_cm_phys_base (without underscores). 33 * name mips_cm_phys_base (without underscores).
34 */ 34 */
diff --git a/arch/mips/include/asm/octeon/cvmx-config.h b/arch/mips/include/asm/octeon/cvmx-config.h
index f7dd17d0dc22..f4f1996e0fac 100644
--- a/arch/mips/include/asm/octeon/cvmx-config.h
+++ b/arch/mips/include/asm/octeon/cvmx-config.h
@@ -33,7 +33,7 @@
33/* Packet buffers */ 33/* Packet buffers */
34#define CVMX_FPA_PACKET_POOL (0) 34#define CVMX_FPA_PACKET_POOL (0)
35#define CVMX_FPA_PACKET_POOL_SIZE CVMX_FPA_POOL_0_SIZE 35#define CVMX_FPA_PACKET_POOL_SIZE CVMX_FPA_POOL_0_SIZE
36/* Work queue entrys */ 36/* Work queue entries */
37#define CVMX_FPA_WQE_POOL (1) 37#define CVMX_FPA_WQE_POOL (1)
38#define CVMX_FPA_WQE_POOL_SIZE CVMX_FPA_POOL_1_SIZE 38#define CVMX_FPA_WQE_POOL_SIZE CVMX_FPA_POOL_1_SIZE
39/* PKO queue command buffers */ 39/* PKO queue command buffers */
diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h
index 19e139c9f337..3e982e0c397e 100644
--- a/arch/mips/include/asm/octeon/cvmx.h
+++ b/arch/mips/include/asm/octeon/cvmx.h
@@ -189,7 +189,7 @@ static inline uint64_t cvmx_ptr_to_phys(void *ptr)
189static inline void *cvmx_phys_to_ptr(uint64_t physical_address) 189static inline void *cvmx_phys_to_ptr(uint64_t physical_address)
190{ 190{
191 if (sizeof(void *) == 8) { 191 if (sizeof(void *) == 8) {
192 /* Just set the top bit, avoiding any TLB uglyness */ 192 /* Just set the top bit, avoiding any TLB ugliness */
193 return CASTPTR(void, 193 return CASTPTR(void,
194 CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS, 194 CVMX_ADD_SEG(CVMX_MIPS_SPACE_XKPHYS,
195 physical_address)); 195 physical_address));
diff --git a/arch/mips/include/asm/pci/bridge.h b/arch/mips/include/asm/pci/bridge.h
index 8d7a63b52ac7..3206245d1ed6 100644
--- a/arch/mips/include/asm/pci/bridge.h
+++ b/arch/mips/include/asm/pci/bridge.h
@@ -269,16 +269,16 @@ typedef struct bridge_err_cmdword_s {
269 union { 269 union {
270 u32 cmd_word; 270 u32 cmd_word;
271 struct { 271 struct {
272 u32 didn:4, /* Destination ID */ 272 u32 didn:4, /* Destination ID */
273 sidn:4, /* Source ID */ 273 sidn:4, /* Source ID */
274 pactyp:4, /* Packet type */ 274 pactyp:4, /* Packet type */
275 tnum:5, /* Trans Number */ 275 tnum:5, /* Trans Number */
276 coh:1, /* Coh Transacti */ 276 coh:1, /* Coh Transaction */
277 ds:2, /* Data size */ 277 ds:2, /* Data size */
278 gbr:1, /* GBR enable */ 278 gbr:1, /* GBR enable */
279 vbpm:1, /* VBPM message */ 279 vbpm:1, /* VBPM message */
280 error:1, /* Error occurred */ 280 error:1, /* Error occurred */
281 barr:1, /* Barrier op */ 281 barr:1, /* Barrier op */
282 rsvd:8; 282 rsvd:8;
283 } berr_st; 283 } berr_st;
284 } berr_un; 284 } berr_un;
diff --git a/arch/mips/include/asm/sgi/hpc3.h b/arch/mips/include/asm/sgi/hpc3.h
index 59920b345942..4a9c99050c13 100644
--- a/arch/mips/include/asm/sgi/hpc3.h
+++ b/arch/mips/include/asm/sgi/hpc3.h
@@ -147,7 +147,7 @@ struct hpc3_ethregs {
147#define HPC3_EPCFG_P1 0x000f /* Cycles to spend in P1 state for PIO */ 147#define HPC3_EPCFG_P1 0x000f /* Cycles to spend in P1 state for PIO */
148#define HPC3_EPCFG_P2 0x00f0 /* Cycles to spend in P2 state for PIO */ 148#define HPC3_EPCFG_P2 0x00f0 /* Cycles to spend in P2 state for PIO */
149#define HPC3_EPCFG_P3 0x0f00 /* Cycles to spend in P3 state for PIO */ 149#define HPC3_EPCFG_P3 0x0f00 /* Cycles to spend in P3 state for PIO */
150#define HPC3_EPCFG_TST 0x1000 /* Diagnistic ram test feature bit */ 150#define HPC3_EPCFG_TST 0x1000 /* Diagnostic ram test feature bit */
151 151
152 u32 _unused2[0x1000/4 - 8]; /* padding */ 152 u32 _unused2[0x1000/4 - 8]; /* padding */
153 153
diff --git a/arch/mips/include/asm/sgiarcs.h b/arch/mips/include/asm/sgiarcs.h
index 26ddfff28c8e..105a9479ac5f 100644
--- a/arch/mips/include/asm/sgiarcs.h
+++ b/arch/mips/include/asm/sgiarcs.h
@@ -144,7 +144,7 @@ struct linux_tinfo {
144struct linux_vdirent { 144struct linux_vdirent {
145 ULONG namelen; 145 ULONG namelen;
146 unsigned char attr; 146 unsigned char attr;
147 char fname[32]; /* XXX imperical, should be a define */ 147 char fname[32]; /* XXX empirical, should be a define */
148}; 148};
149 149
150/* Other stuff for files. */ 150/* Other stuff for files. */
@@ -179,7 +179,7 @@ struct linux_finfo {
179 enum linux_devtypes dtype; 179 enum linux_devtypes dtype;
180 unsigned long namelen; 180 unsigned long namelen;
181 unsigned char attr; 181 unsigned char attr;
182 char name[32]; /* XXX imperical, should be define */ 182 char name[32]; /* XXX empirical, should be define */
183}; 183};
184 184
185/* This describes the vector containing function pointers to the ARC 185/* This describes the vector containing function pointers to the ARC
diff --git a/arch/mips/include/asm/sn/ioc3.h b/arch/mips/include/asm/sn/ioc3.h
index e33f0363235b..feb385180f87 100644
--- a/arch/mips/include/asm/sn/ioc3.h
+++ b/arch/mips/include/asm/sn/ioc3.h
@@ -355,7 +355,7 @@ struct ioc3_etxd {
355#define SSCR_PAUSE_STATE 0x40000000 /* sets when PAUSE takes effect */ 355#define SSCR_PAUSE_STATE 0x40000000 /* sets when PAUSE takes effect */
356#define SSCR_RESET 0x80000000 /* reset DMA channels */ 356#define SSCR_RESET 0x80000000 /* reset DMA channels */
357 357
358/* all producer/comsumer pointers are the same bitfield */ 358/* all producer/consumer pointers are the same bitfield */
359#define PROD_CONS_PTR_4K 0x00000ff8 /* for 4K buffers */ 359#define PROD_CONS_PTR_4K 0x00000ff8 /* for 4K buffers */
360#define PROD_CONS_PTR_1K 0x000003f8 /* for 1K buffers */ 360#define PROD_CONS_PTR_1K 0x000003f8 /* for 1K buffers */
361#define PROD_CONS_PTR_OFF 3 361#define PROD_CONS_PTR_OFF 3
diff --git a/arch/mips/include/asm/sn/sn0/hubio.h b/arch/mips/include/asm/sn/sn0/hubio.h
index 5998b13e9764..57ece90f8cf1 100644
--- a/arch/mips/include/asm/sn/sn0/hubio.h
+++ b/arch/mips/include/asm/sn/sn0/hubio.h
@@ -628,7 +628,7 @@ typedef union h1_icrbb_u {
628/* 628/*
629 * Values for field imsgtype 629 * Values for field imsgtype
630 */ 630 */
631#define IIO_ICRB_IMSGT_XTALK 0 /* Incoming Meessage from Xtalk */ 631#define IIO_ICRB_IMSGT_XTALK 0 /* Incoming Message from Xtalk */
632#define IIO_ICRB_IMSGT_BTE 1 /* Incoming message from BTE */ 632#define IIO_ICRB_IMSGT_BTE 1 /* Incoming message from BTE */
633#define IIO_ICRB_IMSGT_SN0NET 2 /* Incoming message from SN0 net */ 633#define IIO_ICRB_IMSGT_SN0NET 2 /* Incoming message from SN0 net */
634#define IIO_ICRB_IMSGT_CRB 3 /* Incoming message from CRB ??? */ 634#define IIO_ICRB_IMSGT_CRB 3 /* Incoming message from CRB ??? */
diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
index 095ecafe6bd3..7f109d4f64a4 100644
--- a/arch/mips/include/asm/uaccess.h
+++ b/arch/mips/include/asm/uaccess.h
@@ -95,7 +95,7 @@ static inline bool eva_kernel_access(void)
95} 95}
96 96
97/* 97/*
98 * Is a address valid? This does a straighforward calculation rather 98 * Is a address valid? This does a straightforward calculation rather
99 * than tests. 99 * than tests.
100 * 100 *
101 * Address valid if: 101 * Address valid if:
diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c
index 1448c1f43d4e..760217bbb2fa 100644
--- a/arch/mips/kernel/mips-cm.c
+++ b/arch/mips/kernel/mips-cm.c
@@ -24,7 +24,7 @@ static char *cm2_tr[8] = {
24 "0x04", "cpc", "0x06", "0x07" 24 "0x04", "cpc", "0x06", "0x07"
25}; 25};
26 26
27/* CM3 Tag ECC transation type */ 27/* CM3 Tag ECC transaction type */
28static char *cm3_tr[16] = { 28static char *cm3_tr[16] = {
29 [0x0] = "ReqNoData", 29 [0x0] = "ReqNoData",
30 [0x1] = "0x1", 30 [0x1] = "0x1",
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index d7b8dd43147a..9bc1191b1ab0 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -530,7 +530,7 @@ static void mipspmu_enable(struct pmu *pmu)
530 530
531/* 531/*
532 * MIPS performance counters can be per-TC. The control registers can 532 * MIPS performance counters can be per-TC. The control registers can
533 * not be directly accessed accross CPUs. Hence if we want to do global 533 * not be directly accessed across CPUs. Hence if we want to do global
534 * control, we need cross CPU calls. on_each_cpu() can help us, but we 534 * control, we need cross CPU calls. on_each_cpu() can help us, but we
535 * can not make sure this function is called with interrupts enabled. So 535 * can not make sure this function is called with interrupts enabled. So
536 * here we pause local counters and then grab a rwlock and leave the 536 * here we pause local counters and then grab a rwlock and leave the
diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
index f63a289977cc..fa3f9ebad8f4 100644
--- a/arch/mips/kernel/pm-cps.c
+++ b/arch/mips/kernel/pm-cps.c
@@ -472,7 +472,7 @@ static void * __init cps_gen_entry_code(unsigned cpu, enum cps_pm_state state)
472 /* 472 /*
473 * Disable all but self interventions. The load from COHCTL is defined 473 * Disable all but self interventions. The load from COHCTL is defined
474 * by the interAptiv & proAptiv SUMs as ensuring that the operation 474 * by the interAptiv & proAptiv SUMs as ensuring that the operation
475 * resulting from the preceeding store is complete. 475 * resulting from the preceding store is complete.
476 */ 476 */
477 uasm_i_addiu(&p, t0, zero, 1 << cpu_data[cpu].core); 477 uasm_i_addiu(&p, t0, zero, 1 << cpu_data[cpu].core);
478 uasm_i_sw(&p, t0, 0, r_pcohctl); 478 uasm_i_sw(&p, t0, 0, r_pcohctl);
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index eddd5fd6fdfa..92880cee449e 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -615,7 +615,7 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value)
615 * allows us to only worry about whether an FP mode switch is in 615 * allows us to only worry about whether an FP mode switch is in
616 * progress when FP is first used in a tasks time slice. Pretty much all 616 * progress when FP is first used in a tasks time slice. Pretty much all
617 * of the mode switch overhead can thus be confined to cases where mode 617 * of the mode switch overhead can thus be confined to cases where mode
618 * switches are actually occuring. That is, to here. However for the 618 * switches are actually occurring. That is, to here. However for the
619 * thread performing the mode switch it may take a while... 619 * thread performing the mode switch it may take a while...
620 */ 620 */
621 if (num_online_cpus() > 1) { 621 if (num_online_cpus() > 1) {
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index bf14da9f3e33..e701eb0aa99c 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -2214,7 +2214,7 @@ void __init trap_init(void)
2214 2214
2215 /* 2215 /*
2216 * Copy the generic exception handlers to their final destination. 2216 * Copy the generic exception handlers to their final destination.
2217 * This will be overriden later as suitable for a particular 2217 * This will be overridden later as suitable for a particular
2218 * configuration. 2218 * configuration.
2219 */ 2219 */
2220 set_handler(0x180, &except_vec3_generic, 0x80); 2220 set_handler(0x180, &except_vec3_generic, 0x80);
diff --git a/arch/mips/kvm/tlb.c b/arch/mips/kvm/tlb.c
index a08c43946247..e0e1d0a611fc 100644
--- a/arch/mips/kvm/tlb.c
+++ b/arch/mips/kvm/tlb.c
@@ -632,7 +632,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
632 632
633 kvm_debug("%s: vcpu %p, cpu: %d\n", __func__, vcpu, cpu); 633 kvm_debug("%s: vcpu %p, cpu: %d\n", __func__, vcpu, cpu);
634 634
635 /* Alocate new kernel and user ASIDs if needed */ 635 /* Allocate new kernel and user ASIDs if needed */
636 636
637 local_irq_save(flags); 637 local_irq_save(flags);
638 638
diff --git a/arch/mips/kvm/trap_emul.c b/arch/mips/kvm/trap_emul.c
index ad988000563f..c4038d2a724c 100644
--- a/arch/mips/kvm/trap_emul.c
+++ b/arch/mips/kvm/trap_emul.c
@@ -500,7 +500,7 @@ static int kvm_trap_emul_vcpu_setup(struct kvm_vcpu *vcpu)
500 kvm_write_c0_guest_config7(cop0, (MIPS_CONF7_WII) | (1 << 10)); 500 kvm_write_c0_guest_config7(cop0, (MIPS_CONF7_WII) | (1 << 10));
501 501
502 /* 502 /*
503 * Setup IntCtl defaults, compatibilty mode for timer interrupts (HW5) 503 * Setup IntCtl defaults, compatibility mode for timer interrupts (HW5)
504 */ 504 */
505 kvm_write_c0_guest_intctl(cop0, 0xFC000000); 505 kvm_write_c0_guest_intctl(cop0, 0xFC000000);
506 506
diff --git a/arch/mips/math-emu/ieee754dp.c b/arch/mips/math-emu/ieee754dp.c
index ad3c73436777..47d26c805eac 100644
--- a/arch/mips/math-emu/ieee754dp.c
+++ b/arch/mips/math-emu/ieee754dp.c
@@ -97,7 +97,7 @@ union ieee754dp ieee754dp_format(int sn, int xe, u64 xm)
97{ 97{
98 assert(xm); /* we don't gen exact zeros (probably should) */ 98 assert(xm); /* we don't gen exact zeros (probably should) */
99 99
100 assert((xm >> (DP_FBITS + 1 + 3)) == 0); /* no execess */ 100 assert((xm >> (DP_FBITS + 1 + 3)) == 0); /* no excess */
101 assert(xm & (DP_HIDDEN_BIT << 3)); 101 assert(xm & (DP_HIDDEN_BIT << 3));
102 102
103 if (xe < DP_EMIN) { 103 if (xe < DP_EMIN) {
@@ -165,7 +165,7 @@ union ieee754dp ieee754dp_format(int sn, int xe, u64 xm)
165 /* strip grs bits */ 165 /* strip grs bits */
166 xm >>= 3; 166 xm >>= 3;
167 167
168 assert((xm >> (DP_FBITS + 1)) == 0); /* no execess */ 168 assert((xm >> (DP_FBITS + 1)) == 0); /* no excess */
169 assert(xe >= DP_EMIN); 169 assert(xe >= DP_EMIN);
170 170
171 if (xe > DP_EMAX) { 171 if (xe > DP_EMAX) {
@@ -198,7 +198,7 @@ union ieee754dp ieee754dp_format(int sn, int xe, u64 xm)
198 ieee754_setcx(IEEE754_UNDERFLOW); 198 ieee754_setcx(IEEE754_UNDERFLOW);
199 return builddp(sn, DP_EMIN - 1 + DP_EBIAS, xm); 199 return builddp(sn, DP_EMIN - 1 + DP_EBIAS, xm);
200 } else { 200 } else {
201 assert((xm >> (DP_FBITS + 1)) == 0); /* no execess */ 201 assert((xm >> (DP_FBITS + 1)) == 0); /* no excess */
202 assert(xm & DP_HIDDEN_BIT); 202 assert(xm & DP_HIDDEN_BIT);
203 203
204 return builddp(sn, xe + DP_EBIAS, xm & ~DP_HIDDEN_BIT); 204 return builddp(sn, xe + DP_EBIAS, xm & ~DP_HIDDEN_BIT);
diff --git a/arch/mips/math-emu/ieee754sp.c b/arch/mips/math-emu/ieee754sp.c
index def00ffc50fc..e0b2c450b963 100644
--- a/arch/mips/math-emu/ieee754sp.c
+++ b/arch/mips/math-emu/ieee754sp.c
@@ -97,7 +97,7 @@ union ieee754sp ieee754sp_format(int sn, int xe, unsigned xm)
97{ 97{
98 assert(xm); /* we don't gen exact zeros (probably should) */ 98 assert(xm); /* we don't gen exact zeros (probably should) */
99 99
100 assert((xm >> (SP_FBITS + 1 + 3)) == 0); /* no execess */ 100 assert((xm >> (SP_FBITS + 1 + 3)) == 0); /* no excess */
101 assert(xm & (SP_HIDDEN_BIT << 3)); 101 assert(xm & (SP_HIDDEN_BIT << 3));
102 102
103 if (xe < SP_EMIN) { 103 if (xe < SP_EMIN) {
@@ -163,7 +163,7 @@ union ieee754sp ieee754sp_format(int sn, int xe, unsigned xm)
163 /* strip grs bits */ 163 /* strip grs bits */
164 xm >>= 3; 164 xm >>= 3;
165 165
166 assert((xm >> (SP_FBITS + 1)) == 0); /* no execess */ 166 assert((xm >> (SP_FBITS + 1)) == 0); /* no excess */
167 assert(xe >= SP_EMIN); 167 assert(xe >= SP_EMIN);
168 168
169 if (xe > SP_EMAX) { 169 if (xe > SP_EMAX) {
@@ -196,7 +196,7 @@ union ieee754sp ieee754sp_format(int sn, int xe, unsigned xm)
196 ieee754_setcx(IEEE754_UNDERFLOW); 196 ieee754_setcx(IEEE754_UNDERFLOW);
197 return buildsp(sn, SP_EMIN - 1 + SP_EBIAS, xm); 197 return buildsp(sn, SP_EMIN - 1 + SP_EBIAS, xm);
198 } else { 198 } else {
199 assert((xm >> (SP_FBITS + 1)) == 0); /* no execess */ 199 assert((xm >> (SP_FBITS + 1)) == 0); /* no excess */
200 assert(xm & SP_HIDDEN_BIT); 200 assert(xm & SP_HIDDEN_BIT);
201 201
202 return buildsp(sn, xe + SP_EBIAS, xm & ~SP_HIDDEN_BIT); 202 return buildsp(sn, xe + SP_EBIAS, xm & ~SP_HIDDEN_BIT);
diff --git a/arch/mips/mm/sc-ip22.c b/arch/mips/mm/sc-ip22.c
index dc7c5a5214a9..026cb59a914d 100644
--- a/arch/mips/mm/sc-ip22.c
+++ b/arch/mips/mm/sc-ip22.c
@@ -158,7 +158,7 @@ static inline int __init indy_sc_probe(void)
158 return 1; 158 return 1;
159} 159}
160 160
161/* XXX Check with wje if the Indy caches can differenciate between 161/* XXX Check with wje if the Indy caches can differentiate between
162 writeback + invalidate and just invalidate. */ 162 writeback + invalidate and just invalidate. */
163static struct bcache_ops indy_sc_ops = { 163static struct bcache_ops indy_sc_ops = {
164 .bc_enable = indy_sc_enable, 164 .bc_enable = indy_sc_enable,
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 5a04b6f5c6fb..84c6e3fda84a 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -12,7 +12,7 @@
12 * Copyright (C) 2011 MIPS Technologies, Inc. 12 * Copyright (C) 2011 MIPS Technologies, Inc.
13 * 13 *
14 * ... and the days got worse and worse and now you see 14 * ... and the days got worse and worse and now you see
15 * I've gone completly out of my mind. 15 * I've gone completely out of my mind.
16 * 16 *
17 * They're coming to take me a away haha 17 * They're coming to take me a away haha
18 * they're coming to take me a away hoho hihi haha 18 * they're coming to take me a away hoho hihi haha
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 8d0eb2643248..f1f88291451e 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -7,7 +7,7 @@
7 * Copyright (C) 2000 by Silicon Graphics, Inc. 7 * Copyright (C) 2000 by Silicon Graphics, Inc.
8 * Copyright (C) 2004 by Christoph Hellwig 8 * Copyright (C) 2004 by Christoph Hellwig
9 * 9 *
10 * On SGI IP27 the ARC memory configuration data is completly bogus but 10 * On SGI IP27 the ARC memory configuration data is completely bogus but
11 * alternate easier to use mechanisms are available. 11 * alternate easier to use mechanisms are available.
12 */ 12 */
13#include <linux/init.h> 13#include <linux/init.h>