aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-lh7a40x/arch-lpd7a40x.c2
-rw-r--r--arch/i386/Kconfig2
-rw-r--r--arch/i386/pci/fixup.c2
-rw-r--r--arch/ia64/sn/kernel/xpnet.c2
-rw-r--r--arch/m68knommu/Kconfig2
-rw-r--r--arch/mips/mm/tlbex.c2
-rw-r--r--arch/parisc/kernel/entry.S4
-rw-r--r--arch/powerpc/Kconfig4
-rw-r--r--arch/ppc/Kconfig4
-rw-r--r--arch/um/Makefile2
-rw-r--r--arch/um/drivers/line.c2
-rw-r--r--arch/um/include/sysdep-x86_64/ptrace_user.h2
-rw-r--r--arch/v850/kernel/entry.S2
-rw-r--r--arch/xtensa/lib/usercopy.S4
14 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
index a6910114b24c..a21b12f06c6b 100644
--- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@ -164,7 +164,7 @@ static void lh7a40x_ack_cpld_irq (u32 irq)
164 /* CPLD doesn't have ack capability, but some devices may */ 164 /* CPLD doesn't have ack capability, but some devices may */
165 165
166#if defined (CPLD_INTMASK_TOUCH) 166#if defined (CPLD_INTMASK_TOUCH)
167 /* The touch control *must* mask the the interrupt because the 167 /* The touch control *must* mask the interrupt because the
168 * interrupt bit is read by the driver to determine if the pen 168 * interrupt bit is read by the driver to determine if the pen
169 * is still down. */ 169 * is still down. */
170 if (irq == IRQ_TOUCH) 170 if (irq == IRQ_TOUCH)
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index af219e51734f..8ff1c6fb5aa1 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -682,7 +682,7 @@ config EFI
682 depends on ACPI 682 depends on ACPI
683 default n 683 default n
684 ---help--- 684 ---help---
685 This enables the the kernel to boot on EFI platforms using 685 This enables the kernel to boot on EFI platforms using
686 system configuration information passed to it from the firmware. 686 system configuration information passed to it from the firmware.
687 This also enables the kernel to use any EFI runtime services that are 687 This also enables the kernel to use any EFI runtime services that are
688 available (such as the EFI variable services). 688 available (such as the EFI variable services).
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index 83c3645ccc43..b60d7e8689ed 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -393,7 +393,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);
393 * We pretend to bring them out of full D3 state, and restore the proper 393 * We pretend to bring them out of full D3 state, and restore the proper
394 * IRQ, PCI cache line size, and BARs, otherwise the device won't function 394 * IRQ, PCI cache line size, and BARs, otherwise the device won't function
395 * properly. In some cases, the device will generate an interrupt on 395 * properly. In some cases, the device will generate an interrupt on
396 * the wrong IRQ line, causing any devices sharing the the line it's 396 * the wrong IRQ line, causing any devices sharing the line it's
397 * *supposed* to use to be disabled by the kernel's IRQ debug code. 397 * *supposed* to use to be disabled by the kernel's IRQ debug code.
398 */ 398 */
399static u16 toshiba_line_size; 399static u16 toshiba_line_size;
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c
index 007703c494a4..c8173db0d84f 100644
--- a/arch/ia64/sn/kernel/xpnet.c
+++ b/arch/ia64/sn/kernel/xpnet.c
@@ -225,7 +225,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
225 skb_put(skb, (msg->size - msg->leadin_ignore - msg->tailout_ignore)); 225 skb_put(skb, (msg->size - msg->leadin_ignore - msg->tailout_ignore));
226 226
227 /* 227 /*
228 * Move the data over from the the other side. 228 * Move the data over from the other side.
229 */ 229 */
230 if ((XPNET_VERSION_MINOR(msg->version) == 1) && 230 if ((XPNET_VERSION_MINOR(msg->version) == 1) &&
231 (msg->embedded_bytes != 0)) { 231 (msg->embedded_bytes != 0)) {
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index e767f2ddae72..b7c942cf7741 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -495,7 +495,7 @@ config VECTORBASE
495 hex "Address of the base of system vectors" 495 hex "Address of the base of system vectors"
496 default "0" 496 default "0"
497 help 497 help
498 Define the address of the the system vectors. Commonly this is 498 Define the address of the system vectors. Commonly this is
499 put at the start of RAM, but it doesn't have to be. On ColdFire 499 put at the start of RAM, but it doesn't have to be. On ColdFire
500 platforms this address is programmed into the VBR register, thus 500 platforms this address is programmed into the VBR register, thus
501 actually setting the address to use. 501 actually setting the address to use.
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 375e0991505d..6f8b25cfa6f0 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -1211,7 +1211,7 @@ static void __init build_r4000_tlb_refill_handler(void)
1211 * Overflow check: For the 64bit handler, we need at least one 1211 * Overflow check: For the 64bit handler, we need at least one
1212 * free instruction slot for the wrap-around branch. In worst 1212 * free instruction slot for the wrap-around branch. In worst
1213 * case, if the intended insertion point is a delay slot, we 1213 * case, if the intended insertion point is a delay slot, we
1214 * need three, with the the second nop'ed and the third being 1214 * need three, with the second nop'ed and the third being
1215 * unused. 1215 * unused.
1216 */ 1216 */
1217#ifdef CONFIG_32BIT 1217#ifdef CONFIG_32BIT
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 95c1b8ec4289..192357a3b9fe 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -941,8 +941,8 @@ syscall_exit_rfi:
941 * to "proper" values now (otherwise we'll wind up restoring 941 * to "proper" values now (otherwise we'll wind up restoring
942 * whatever was last stored in the task structure, which might 942 * whatever was last stored in the task structure, which might
943 * be inconsistent if an interrupt occured while on the gateway 943 * be inconsistent if an interrupt occured while on the gateway
944 * page) Note that we may be "trashing" values the user put in 944 * page). Note that we may be "trashing" values the user put in
945 * them, but we don't support the the user changing them. 945 * them, but we don't support the user changing them.
946 */ 946 */
947 947
948 STREG %r0,PT_SR2(%r16) 948 STREG %r0,PT_SR2(%r16)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 032e6ab5d3c4..96ef656e4669 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -1002,7 +1002,7 @@ config CONSISTENT_START_BOOL
1002 depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE 1002 depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
1003 help 1003 help
1004 This option allows you to set the base virtual address 1004 This option allows you to set the base virtual address
1005 of the the consistent memory pool. This pool of virtual 1005 of the consistent memory pool. This pool of virtual
1006 memory is used to make consistent memory allocations. 1006 memory is used to make consistent memory allocations.
1007 1007
1008config CONSISTENT_START 1008config CONSISTENT_START
@@ -1013,7 +1013,7 @@ config CONSISTENT_SIZE_BOOL
1013 bool "Set custom consistent memory pool size" 1013 bool "Set custom consistent memory pool size"
1014 depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE 1014 depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
1015 help 1015 help
1016 This option allows you to set the size of the the 1016 This option allows you to set the size of the
1017 consistent memory pool. This pool of virtual memory 1017 consistent memory pool. This pool of virtual memory
1018 is used to make consistent memory allocations. 1018 is used to make consistent memory allocations.
1019 1019
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index fdd9e7b66244..077711e63104 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1345,7 +1345,7 @@ config CONSISTENT_START_BOOL
1345 depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE 1345 depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
1346 help 1346 help
1347 This option allows you to set the base virtual address 1347 This option allows you to set the base virtual address
1348 of the the consistent memory pool. This pool of virtual 1348 of the consistent memory pool. This pool of virtual
1349 memory is used to make consistent memory allocations. 1349 memory is used to make consistent memory allocations.
1350 1350
1351config CONSISTENT_START 1351config CONSISTENT_START
@@ -1356,7 +1356,7 @@ config CONSISTENT_SIZE_BOOL
1356 bool "Set custom consistent memory pool size" 1356 bool "Set custom consistent memory pool size"
1357 depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE 1357 depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
1358 help 1358 help
1359 This option allows you to set the size of the the 1359 This option allows you to set the size of the
1360 consistent memory pool. This pool of virtual memory 1360 consistent memory pool. This pool of virtual memory
1361 is used to make consistent memory allocations. 1361 is used to make consistent memory allocations.
1362 1362
diff --git a/arch/um/Makefile b/arch/um/Makefile
index f6ad832faf13..c8016a98483b 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -102,7 +102,7 @@ linux: vmlinux
102define archhelp 102define archhelp
103 echo '* linux - Binary kernel image (./linux) - for backward' 103 echo '* linux - Binary kernel image (./linux) - for backward'
104 echo ' compatibility only, this creates a hard link to the' 104 echo ' compatibility only, this creates a hard link to the'
105 echo ' real kernel binary, the the "vmlinux" binary you' 105 echo ' real kernel binary, the "vmlinux" binary you'
106 echo ' find in the kernel root.' 106 echo ' find in the kernel root.'
107endef 107endef
108 108
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 24747a413785..cfd9f01fd464 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -497,7 +497,7 @@ void close_lines(struct line *lines, int nlines)
497} 497}
498 498
499/* Common setup code for both startup command line and mconsole initialization. 499/* Common setup code for both startup command line and mconsole initialization.
500 * @lines contains the the array (of size @num) to modify; 500 * @lines contains the array (of size @num) to modify;
501 * @init is the setup string; 501 * @init is the setup string;
502 */ 502 */
503 503
diff --git a/arch/um/include/sysdep-x86_64/ptrace_user.h b/arch/um/include/sysdep-x86_64/ptrace_user.h
index 128faf027364..4cd61a852fab 100644
--- a/arch/um/include/sysdep-x86_64/ptrace_user.h
+++ b/arch/um/include/sysdep-x86_64/ptrace_user.h
@@ -55,7 +55,7 @@
55#define PTRACE_OLDSETOPTIONS 21 55#define PTRACE_OLDSETOPTIONS 21
56#endif 56#endif
57 57
58/* These are before the system call, so the the system call number is RAX 58/* These are before the system call, so the system call number is RAX
59 * rather than ORIG_RAX, and arg4 is R10 rather than RCX 59 * rather than ORIG_RAX, and arg4 is R10 rather than RCX
60 */ 60 */
61#define REGS_SYSCALL_NR PT_INDEX(RAX) 61#define REGS_SYSCALL_NR PT_INDEX(RAX)
diff --git a/arch/v850/kernel/entry.S b/arch/v850/kernel/entry.S
index d991e4547dbb..8bc521ca081f 100644
--- a/arch/v850/kernel/entry.S
+++ b/arch/v850/kernel/entry.S
@@ -195,7 +195,7 @@
195 sst.w lp, PTO+PT_GPR(GPR_LP)[ep]; \ 195 sst.w lp, PTO+PT_GPR(GPR_LP)[ep]; \
196 type ## _STATE_SAVER 196 type ## _STATE_SAVER
197/* Pop a register state pushed by PUSH_STATE, except for the stack pointer, 197/* Pop a register state pushed by PUSH_STATE, except for the stack pointer,
198 from the the stack. */ 198 from the stack. */
199#define POP_STATE(type) \ 199#define POP_STATE(type) \
200 mov sp, ep; \ 200 mov sp, ep; \
201 type ## _STATE_RESTORER; \ 201 type ## _STATE_RESTORER; \
diff --git a/arch/xtensa/lib/usercopy.S b/arch/xtensa/lib/usercopy.S
index 265db2693cbd..4641ef510f0e 100644
--- a/arch/xtensa/lib/usercopy.S
+++ b/arch/xtensa/lib/usercopy.S
@@ -5,10 +5,10 @@
5 * 5 *
6 * DO NOT COMBINE this function with <arch/xtensa/lib/hal/memcopy.S>. 6 * DO NOT COMBINE this function with <arch/xtensa/lib/hal/memcopy.S>.
7 * It needs to remain separate and distinct. The hal files are part 7 * It needs to remain separate and distinct. The hal files are part
8 * of the the Xtensa link-time HAL, and those files may differ per 8 * of the Xtensa link-time HAL, and those files may differ per
9 * processor configuration. Patching the kernel for another 9 * processor configuration. Patching the kernel for another
10 * processor configuration includes replacing the hal files, and we 10 * processor configuration includes replacing the hal files, and we
11 * could loose the special functionality for accessing user-space 11 * could lose the special functionality for accessing user-space
12 * memory during such a patch. We sacrifice a little code space here 12 * memory during such a patch. We sacrifice a little code space here
13 * in favor to simplify code maintenance. 13 * in favor to simplify code maintenance.
14 * 14 *