diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /arch | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'arch')
127 files changed, 141 insertions, 145 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 2b36afd8e969..7e55ea66c6d4 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -534,7 +534,7 @@ config ARCH_DISCONTIGMEM_ENABLE bool "Discontiguous Memory Support (EXPERIMENTAL)" depends on EXPERIMENTAL help - Say Y to upport efficient handling of discontiguous physical memory, + Say Y to support efficient handling of discontiguous physical memory, for architectures which are either NUMA (Non-Uniform Memory Access) or have huge holes in the physical address space for other reasons. See <file:Documentation/vm/numa> for more. diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c index dbe327d32b6f..8b02420f732e 100644 --- a/arch/alpha/kernel/alpha_ksyms.c +++ b/arch/alpha/kernel/alpha_ksyms.c @@ -1,5 +1,5 @@ /* - * linux/arch/alpha/kernel/ksyms.c + * linux/arch/alpha/kernel/alpha_ksyms.c * * Export the alpha-specific functions that are needed for loadable * modules. diff --git a/arch/alpha/kernel/head.S b/arch/alpha/kernel/head.S index 1e2a62a1f75f..e27d23c74ba8 100644 --- a/arch/alpha/kernel/head.S +++ b/arch/alpha/kernel/head.S @@ -1,5 +1,5 @@ /* - * alpha/boot/head.S + * arch/alpha/kernel/head.S * * initial boot stuff.. At this point, the bootloader has already * switched into OSF/1 PAL-code, and loaded us at the correct address diff --git a/arch/alpha/kernel/machvec_impl.h b/arch/alpha/kernel/machvec_impl.h index 08b8302e64ca..0caa45aa128d 100644 --- a/arch/alpha/kernel/machvec_impl.h +++ b/arch/alpha/kernel/machvec_impl.h @@ -1,5 +1,5 @@ /* - * linux/arch/alpha/kernel/machvec.h + * linux/arch/alpha/kernel/machvec_impl.h * * Copyright (C) 1997, 1998 Richard Henderson * diff --git a/arch/alpha/lib/dbg_stackcheck.S b/arch/alpha/lib/dbg_stackcheck.S index 3c1f3e6522e5..78f6b924ad8f 100644 --- a/arch/alpha/lib/dbg_stackcheck.S +++ b/arch/alpha/lib/dbg_stackcheck.S @@ -1,5 +1,5 @@ /* - * arch/alpha/lib/stackcheck.S + * arch/alpha/lib/dbg_stackcheck.S * Contributed by Richard Henderson (rth@tamu.edu) * * Verify that we have not overflowed the stack. Oops if we have. diff --git a/arch/alpha/lib/dbg_stackkill.S b/arch/alpha/lib/dbg_stackkill.S index e9f6a9dcf2b7..c1e40a1a43d5 100644 --- a/arch/alpha/lib/dbg_stackkill.S +++ b/arch/alpha/lib/dbg_stackkill.S @@ -1,5 +1,5 @@ /* - * arch/alpha/lib/killstack.S + * arch/alpha/lib/dbg_stackkill.S * Contributed by Richard Henderson (rth@cygnus.com) * * Clobber the balance of the kernel stack, hoping to catch diff --git a/arch/alpha/lib/memset.S b/arch/alpha/lib/memset.S index 8ff6e7e1773e..311b8cfc6914 100644 --- a/arch/alpha/lib/memset.S +++ b/arch/alpha/lib/memset.S @@ -1,5 +1,5 @@ /* - * linux/arch/alpha/memset.S + * linux/arch/alpha/lib/memset.S * * This is an efficient (and small) implementation of the C library "memset()" * function for the alpha. diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f9362ee9955f..adb05de40e24 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -629,7 +629,7 @@ config ALIGNMENT_TRAP depends on CPU_CP15_MMU default y if !ARCH_EBSA110 help - ARM processors can not fetch/store information which is not + ARM processors cannot fetch/store information which is not naturally aligned on the bus, i.e., a 4 byte fetch must start at an address divisible by 4. On 32-bit ARM processors, these non-aligned fetch/store instructions will be emulated in software if you say diff --git a/arch/arm/boot/compressed/head-clps7500.S b/arch/arm/boot/compressed/head-clps7500.S index 941c5f5cbacf..4f3c78ac30a0 100644 --- a/arch/arm/boot/compressed/head-clps7500.S +++ b/arch/arm/boot/compressed/head-clps7500.S @@ -1,5 +1,5 @@ /* - * linux/arch/arm/boot/compressed/head.S + * linux/arch/arm/boot/compressed/head-clps7500.S * * Copyright (C) 1999, 2000, 2001 Nexus Electronics Ltd */ diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 29818bd3248f..30046ad41ced 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-sa1100/sa1111.c + * linux/arch/arm/common/sa1111.c * * SA1111 support * diff --git a/arch/arm/mach-imx/leds.c b/arch/arm/mach-imx/leds.c index 471c1db7c57f..cf30803e019b 100644 --- a/arch/arm/mach-imx/leds.c +++ b/arch/arm/mach-imx/leds.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-imx/leds.h + * linux/arch/arm/mach-imx/leds.c * * Copyright (C) 2004 Sascha Hauer <sascha@saschahauer.de> * diff --git a/arch/arm/mach-imx/leds.h b/arch/arm/mach-imx/leds.h index 83fa21e795a9..49dc1c1da338 100644 --- a/arch/arm/mach-imx/leds.h +++ b/arch/arm/mach-imx/leds.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-imx/leds.h + * arch/arm/mach-imx/leds.h * * Copyright (c) 2004 Sascha Hauer <sascha@saschahauer.de> * diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c index 2cebb2878895..7bc94f3def1c 100644 --- a/arch/arm/mach-ixp4xx/coyote-pci.c +++ b/arch/arm/mach-ixp4xx/coyote-pci.c @@ -1,5 +1,5 @@ /* - * arch/arch/mach-ixp4xx/coyote-pci.c + * arch/arm/mach-ixp4xx/coyote-pci.c * * PCI setup routines for ADI Engineering Coyote platform * diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c index ed5270800217..509a95a692a4 100644 --- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c +++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c @@ -1,5 +1,5 @@ /* - * arch/arch/mach-ixp4xx/ixdpg425-pci.c + * arch/arm/mach-ixp4xx/ixdpg425-pci.c * * PCI setup routines for Intel IXDPG425 Platform * 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) /* CPLD doesn't have ack capability, but some devices may */ #if defined (CPLD_INTMASK_TOUCH) - /* The touch control *must* mask the the interrupt because the + /* The touch control *must* mask the interrupt because the * interrupt bit is read by the driver to determine if the pen * is still down. */ if (irq == IRQ_TOUCH) diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index 976edfb882e2..c4b790217a5b 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap1/id.c + * linux/arch/arm/mach-omap1/serial.c * * OMAP1 CPU identification code * diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 2db6b732b084..c37b0e6d1248 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap/omap2/board-apollon.c + * linux/arch/arm/mach-omap2/board-apollon.c * * Copyright (C) 2005,2006 Samsung Electronics * Author: Kyungmin Park <kyungmin.park@samsung.com> diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index eaecbf422d8c..90938151bcf1 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap/omap2/board-generic.c + * linux/arch/arm/mach-omap2/board-generic.c * * Copyright (C) 2005 Nokia Corporation * Author: Paul Mundt <paul.mundt@nokia.com> diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 996aeda1285d..26a95a642ad7 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap/omap2/board-h4.c + * linux/arch/arm/mach-omap2/board-h4.c * * Copyright (C) 2005 Nokia Corporation * Author: Paul Mundt <paul.mundt@nokia.com> diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 1ed2fff4691a..11870093d7a1 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap/omap2/irq.c + * linux/arch/arm/mach-omap2/irq.c * * Interrupt handler for OMAP2 boards. * diff --git a/arch/arm/mach-omap2/prcm-regs.h b/arch/arm/mach-omap2/prcm-regs.h index 22ac7be4f782..5e1c4b53ee9d 100644 --- a/arch/arm/mach-omap2/prcm-regs.h +++ b/arch/arm/mach-omap2/prcm-regs.h @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap2/prcm-reg.h + * linux/arch/arm/mach-omap2/prcm-regs.h * * OMAP24XX Power Reset and Clock Management (PRCM) registers * diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 0884bc7c23b7..aaa5589e8169 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -1,5 +1,5 @@ /* - * arch/arm/mach-omap/omap2/serial.c + * arch/arm/mach-omap2/serial.c * * OMAP2 serial support. * diff --git a/arch/arm/mach-omap2/sram-fn.S b/arch/arm/mach-omap2/sram-fn.S index a5ef7f611da9..b27576690f8d 100644 --- a/arch/arm/mach-omap2/sram-fn.S +++ b/arch/arm/mach-omap2/sram-fn.S @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap2/sram.S + * linux/arch/arm/mach-omap2/sram-fn.S * * Omap2 specific functions that need to be run in internal SRAM * diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c index d7815491b752..a72476c24621 100644 --- a/arch/arm/mach-pxa/corgi_lcd.c +++ b/arch/arm/mach-pxa/corgi_lcd.c @@ -1,5 +1,5 @@ /* - * linux/drivers/video/w100fb.c + * linux/arch/arm/mach-pxa/corgi_lcd.c * * Corgi/Spitz LCD Specific Code * diff --git a/arch/arm/mach-pxa/leds.h b/arch/arm/mach-pxa/leds.h index 4f829b8c39dd..7f0dfe01345a 100644 --- a/arch/arm/mach-pxa/leds.h +++ b/arch/arm/mach-pxa/leds.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-pxa/leds.h + * arch/arm/mach-pxa/leds.h * * Copyright (c) 2001 Jeff Sutherland, Accelent Systems Inc. * diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index df37594c30f8..63965c78de8c 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig @@ -13,7 +13,7 @@ config MACH_ANUBIS bool "Simtec Electronics ANUBIS" select CPU_S3C2440 help - Say Y gere if you are using the Simtec Electronics ANUBIS + Say Y here if you are using the Simtec Electronics ANUBIS development system config MACH_OSIRIS diff --git a/arch/arm/mach-s3c2410/s3c2400-gpio.c b/arch/arm/mach-s3c2410/s3c2400-gpio.c index f2a78175a70a..1576d01d5f82 100644 --- a/arch/arm/mach-s3c2410/s3c2400-gpio.c +++ b/arch/arm/mach-s3c2410/s3c2400-gpio.c @@ -1,4 +1,4 @@ -/* linux/arch/arm/mach-s3c2410/gpio.c +/* linux/arch/arm/mach-s3c2410/s3c2400-gpio.c * * Copyright (c) 2006 Lucas Correia Villa Real <lucasvr@gobolinux.org> * diff --git a/arch/arm/mach-s3c2410/s3c2410-clock.c b/arch/arm/mach-s3c2410/s3c2410-clock.c index 99718663318e..00abe199a08e 100644 --- a/arch/arm/mach-s3c2410/s3c2410-clock.c +++ b/arch/arm/mach-s3c2410/s3c2410-clock.c @@ -1,4 +1,4 @@ -/* linux/arch/arm/mach-s3c2410/clock.c +/* linux/arch/arm/mach-s3c2410/s3c2410-clock.c * * Copyright (c) 2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/arch/arm/mach-s3c2410/s3c2410-gpio.c b/arch/arm/mach-s3c2410/s3c2410-gpio.c index 471a71490010..a2098f692d83 100644 --- a/arch/arm/mach-s3c2410/s3c2410-gpio.c +++ b/arch/arm/mach-s3c2410/s3c2410-gpio.c @@ -1,4 +1,4 @@ -/* linux/arch/arm/mach-s3c2410/gpio.c +/* linux/arch/arm/mach-s3c2410/s3c2410-gpio.c * * Copyright (c) 2004-2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/arch/arm/mach-s3c2410/s3c2442.c b/arch/arm/mach-s3c2410/s3c2442.c index debae2430557..581667efd13c 100644 --- a/arch/arm/mach-s3c2410/s3c2442.c +++ b/arch/arm/mach-s3c2410/s3c2442.c @@ -1,4 +1,4 @@ -/* linux/arch/arm/mach-s3c2410/s3c2440.c +/* linux/arch/arm/mach-s3c2410/s3c2442.c * * Copyright (c) 2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/arch/arm/mach-s3c2410/s3c244x-irq.c b/arch/arm/mach-s3c2410/s3c244x-irq.c index 0d13546c3500..ec702f88b299 100644 --- a/arch/arm/mach-s3c2410/s3c244x-irq.c +++ b/arch/arm/mach-s3c2410/s3c244x-irq.c @@ -1,4 +1,4 @@ -/* linux/arch/arm/mach-s3c2410/s3c2440-irq.c +/* linux/arch/arm/mach-s3c2410/s3c244x-irq.c * * Copyright (c) 2003,2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/arch/arm/mach-s3c2410/s3c244x.h b/arch/arm/mach-s3c2410/s3c244x.h index 3e7f5f75134d..1488c1eb37e6 100644 --- a/arch/arm/mach-s3c2410/s3c244x.h +++ b/arch/arm/mach-s3c2410/s3c244x.h @@ -1,4 +1,4 @@ -/* arch/arm/mach-s3c2410/s3c2440.h +/* arch/arm/mach-s3c2410/s3c244x.h * * Copyright (c) 2004-2005 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/arch/arm/mach-s3c2410/usb-simtec.h b/arch/arm/mach-s3c2410/usb-simtec.h index 92c0cc83aeec..d8aa6127dedb 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.h +++ b/arch/arm/mach-s3c2410/usb-simtec.h @@ -1,4 +1,4 @@ -/* linux/arch/arm/mach-s3c2410/usb-simtec.c +/* linux/arch/arm/mach-s3c2410/usb-simtec.h * * Copyright (c) 2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c index 3c6441d4bc59..2ea2a657a034 100644 --- a/arch/arm/mach-sa1100/dma.c +++ b/arch/arm/mach-sa1100/dma.c @@ -1,5 +1,5 @@ /* - * arch/arm/kernel/dma-sa1100.c + * arch/arm/mach-sa1100/dma.c * * Support functions for the SA11x0 internal DMA channels. * diff --git a/arch/arm/mach-shark/leds.c b/arch/arm/mach-shark/leds.c index 7cd86d357a3c..5386a81f796a 100644 --- a/arch/arm/mach-shark/leds.c +++ b/arch/arm/mach-shark/leds.c @@ -1,5 +1,5 @@ /* - * arch/arm/kernel/leds-shark.c + * arch/arm/mach-shark/leds.c * by Alexander Schulz * * derived from: diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/plat-omap/sram-fn.S index 85cffe2c6266..9e1813c77e05 100644 --- a/arch/arm/plat-omap/sram-fn.S +++ b/arch/arm/plat-omap/sram-fn.S @@ -1,5 +1,5 @@ /* - * linux/arch/arm/plat-omap/sram.S + * linux/arch/arm/plat-omap/sram-fn.S * * Functions that need to be run in internal SRAM * diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index 8b50e8402954..734d5f3a5304 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig @@ -550,7 +550,7 @@ config ETRAX_IDE select BLK_DEV_IDEDMA help Enable this to get support for ATA/IDE. - You can't use paralell ports or SCSI ports + You can't use parallel ports or SCSI ports at the same time. @@ -744,7 +744,7 @@ config ETRAX_PA_CHANGEABLE_BITS default "FF" help This is a bitmask with information of what bits in PA that a user - can change change the value on using ioctl's. + can change the value on using ioctl's. Bit set = changeable. You probably want 00 here. diff --git a/arch/cris/arch-v32/Kconfig b/arch/cris/arch-v32/Kconfig index 22f0ddc04c50..4f79d8ed3e1c 100644 --- a/arch/cris/arch-v32/Kconfig +++ b/arch/cris/arch-v32/Kconfig @@ -162,7 +162,7 @@ config ETRAX_SDRAM_GRP1_CONFIG depends on ETRAX_ARCH_V32 default "0" help - SDRAM configuration for group 1. The defult value is 0 + SDRAM configuration for group 1. The default value is 0 because group 1 is not used in the default configuration, described in the help for SDRAM_GRP0_CONFIG. diff --git a/arch/h8300/kernel/ints.c b/arch/h8300/kernel/ints.c index 1488b6ace18c..1bfc77e391d5 100644 --- a/arch/h8300/kernel/ints.c +++ b/arch/h8300/kernel/ints.c @@ -1,5 +1,5 @@ /* - * linux/arch/h8300/platform/h8300h/ints.c + * linux/arch/h8300/kernel/ints.c * * Yoshinori Sato <ysato@users.sourceforge.jp> * 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 depends on ACPI default n ---help--- - This enables the the kernel to boot on EFI platforms using + This enables the kernel to boot on EFI platforms using system configuration information passed to it from the firmware. This also enables the kernel to use any EFI runtime services that are available (such as the EFI variable services). diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c index b2f24d57fddd..d9f3e3c31f05 100644 --- a/arch/i386/kernel/cpu/common.c +++ b/arch/i386/kernel/cpu/common.c @@ -669,8 +669,7 @@ old_gdt: */ atomic_inc(&init_mm.mm_count); current->active_mm = &init_mm; - if (current->mm) - BUG(); + BUG_ON(current->mm); enter_lazy_tlb(&init_mm, current); load_esp0(t, thread); diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c index f9436989473c..8b40648d0ef0 100644 --- a/arch/i386/kernel/efi.c +++ b/arch/i386/kernel/efi.c @@ -498,8 +498,7 @@ void __init efi_enter_virtual_mode(void) check_range_for_systab(md); } - if (!efi.systab) - BUG(); + BUG_ON(!efi.systab); status = phys_efi_set_virtual_address_map( memmap.desc_size * memmap.nr_map, diff --git a/arch/i386/kernel/ldt.c b/arch/i386/kernel/ldt.c index 983f95707e11..445211eb2d57 100644 --- a/arch/i386/kernel/ldt.c +++ b/arch/i386/kernel/ldt.c @@ -1,5 +1,5 @@ /* - * linux/kernel/ldt.c + * linux/arch/i386/kernel/ldt.c * * Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds * Copyright (C) 1999 Ingo Molnar <mingo@redhat.com> diff --git a/arch/i386/mach-visws/visws_apic.c b/arch/i386/mach-visws/visws_apic.c index 828522541a88..5929f884d79b 100644 --- a/arch/i386/mach-visws/visws_apic.c +++ b/arch/i386/mach-visws/visws_apic.c @@ -1,5 +1,5 @@ /* - * linux/arch/i386/mach_visws/visws_apic.c + * linux/arch/i386/mach-visws/visws_apic.c * * Copyright (C) 1999 Bent Hagemark, Ingo Molnar * diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c index 51e3739dd227..455597db84df 100644 --- a/arch/i386/mm/discontig.c +++ b/arch/i386/mm/discontig.c @@ -153,8 +153,7 @@ static void __init find_max_pfn_node(int nid) */ if (node_start_pfn[nid] > max_pfn) node_start_pfn[nid] = max_pfn; - if (node_start_pfn[nid] > node_end_pfn[nid]) - BUG(); + BUG_ON(node_start_pfn[nid] > node_end_pfn[nid]); } /* diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index 90089c14c23d..167416155ee4 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -569,8 +569,7 @@ void __init mem_init(void) int bad_ppro; #ifdef CONFIG_FLATMEM - if (!mem_map) - BUG(); + BUG_ON(!mem_map); #endif bad_ppro = ppro_with_ram_bug(); 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); * We pretend to bring them out of full D3 state, and restore the proper * IRQ, PCI cache line size, and BARs, otherwise the device won't function * properly. In some cases, the device will generate an interrupt on - * the wrong IRQ line, causing any devices sharing the the line it's + * the wrong IRQ line, causing any devices sharing the line it's * *supposed* to use to be disabled by the kernel's IRQ debug code. */ static u16 toshiba_line_size; diff --git a/arch/ia64/kernel/acpi-processor.c b/arch/ia64/kernel/acpi-processor.c index e683630c8ce2..4d4993a47e55 100644 --- a/arch/ia64/kernel/acpi-processor.c +++ b/arch/ia64/kernel/acpi-processor.c @@ -1,5 +1,5 @@ /* - * arch/ia64/kernel/cpufreq/processor.c + * arch/ia64/kernel/acpi-processor.c * * Copyright (C) 2005 Intel Corporation * Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index e5b1be51b197..3390b7c5a63f 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1,5 +1,5 @@ /* - * ia64/kernel/entry.S + * arch/ia64/kernel/entry.S * * Kernel entry points. * diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c index a041367f043b..aafca18ab33b 100644 --- a/arch/ia64/kernel/irq_ia64.c +++ b/arch/ia64/kernel/irq_ia64.c @@ -1,5 +1,5 @@ /* - * linux/arch/ia64/kernel/irq.c + * linux/arch/ia64/kernel/irq_ia64.c * * Copyright (C) 1998-2001 Hewlett-Packard Co * Stephane Eranian <eranian@hpl.hp.com> 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) skb_put(skb, (msg->size - msg->leadin_ignore - msg->tailout_ignore)); /* - * Move the data over from the the other side. + * Move the data over from the other side. */ if ((XPNET_VERSION_MINOR(msg->version) == 1) && (msg->embedded_bytes != 0)) { diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 49015e32d8fc..afcccdc6ad45 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -1,5 +1,5 @@ /* - * linux/arch/m68k/motorola.c + * linux/arch/m68k/mm/motorola.c * * Routines specific to the Motorola MMU, originally from: * linux/arch/m68k/init.c diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c index 6c265222cbcd..a2bc2da7f8f0 100644 --- a/arch/m68k/sun3/sun3dvma.c +++ b/arch/m68k/sun3/sun3dvma.c @@ -1,5 +1,5 @@ /* - * linux/arch/m68k/mm/sun3dvma.c + * linux/arch/m68k/sun3/sun3dvma.c * * Copyright (C) 2000 Sam Creasey * diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index e767f2ddae72..6d920d4bdc3d 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig @@ -161,8 +161,8 @@ config CLOCK_FREQ frequency, it may or may not be the same as the external clock crystal fitted to your board. Some processors have an internal PLL and can have their frequency programmed at run time, others - use internal dividers. In gernal the kernel won't setup a PLL - if it is fitted (there are some expections). This value will be + use internal dividers. In general the kernel won't setup a PLL + if it is fitted (there are some exceptions). This value will be specific to the exact CPU that you are using. config CLOCK_DIV @@ -495,7 +495,7 @@ config VECTORBASE hex "Address of the base of system vectors" default "0" help - Define the address of the the system vectors. Commonly this is + Define the address of the system vectors. Commonly this is put at the start of RAM, but it doesn't have to be. On ColdFire platforms this address is programmed into the VBR register, thus actually setting the address to use. diff --git a/arch/m68knommu/platform/68328/head-pilot.S b/arch/m68knommu/platform/68328/head-pilot.S index 9e07faa3e81d..aecff532b343 100644 --- a/arch/m68knommu/platform/68328/head-pilot.S +++ b/arch/m68knommu/platform/68328/head-pilot.S @@ -1,5 +1,5 @@ /* - * linux/arch/m68knommu/platform/68328/head-rom.S + * linux/arch/m68knommu/platform/68328/head-pilot.S * - A startup file for the MC68328 * * Copyright (C) 1998 D. Jeff Dionne <jeff@ryeham.ee.ryerson.ca>, diff --git a/arch/mips/dec/prom/call_o32.S b/arch/mips/dec/prom/call_o32.S index 0dd56db9b3d0..e523454bda3a 100644 --- a/arch/mips/dec/prom/call_o32.S +++ b/arch/mips/dec/prom/call_o32.S @@ -1,5 +1,5 @@ /* - * arch/mips/dec/call_o32.S + * arch/mips/dec/prom/call_o32.S * * O32 interface for the 64 (or N32) ABI. * 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) * Overflow check: For the 64bit handler, we need at least one * free instruction slot for the wrap-around branch. In worst * case, if the intended insertion point is a delay slot, we - * need three, with the the second nop'ed and the third being + * need three, with the second nop'ed and the third being * unused. */ #ifdef CONFIG_32BIT diff --git a/arch/mips/pci/fixup-vr4133.c b/arch/mips/pci/fixup-vr4133.c index 8e01d0c1b76b..597b89764ba1 100644 --- a/arch/mips/pci/fixup-vr4133.c +++ b/arch/mips/pci/fixup-vr4133.c @@ -1,5 +1,5 @@ /* - * arch/mips/vr41xx/nec-cmbvr4133/pci_fixup.c + * arch/mips/pci/fixup-vr4133.c * * The NEC CMB-VR4133 Board specific PCI fixups. * diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c index dc30d66123b6..cbfb34221b59 100644 --- a/arch/mips/tx4938/common/irq.c +++ b/arch/mips/tx4938/common/irq.c @@ -1,5 +1,5 @@ /* - * linux/arch/mps/tx4938/common/irq.c + * linux/arch/mips/tx4938/common/irq.c * * Common tx4938 irq handler * Copyright (C) 2000-2001 Toshiba Corporation 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: * to "proper" values now (otherwise we'll wind up restoring * whatever was last stored in the task structure, which might * be inconsistent if an interrupt occured while on the gateway - * page) Note that we may be "trashing" values the user put in - * them, but we don't support the the user changing them. + * page). Note that we may be "trashing" values the user put in + * them, but we don't support the user changing them. */ 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 depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE help This option allows you to set the base virtual address - of the the consistent memory pool. This pool of virtual + of the consistent memory pool. This pool of virtual memory is used to make consistent memory allocations. config CONSISTENT_START @@ -1013,7 +1013,7 @@ config CONSISTENT_SIZE_BOOL bool "Set custom consistent memory pool size" depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE help - This option allows you to set the size of the the + This option allows you to set the size of the consistent memory pool. This pool of virtual memory is used to make consistent memory allocations. diff --git a/arch/powerpc/kernel/perfmon_fsl_booke.c b/arch/powerpc/kernel/perfmon_fsl_booke.c index bdc3977a7b06..e0dcf2b41fbe 100644 --- a/arch/powerpc/kernel/perfmon_fsl_booke.c +++ b/arch/powerpc/kernel/perfmon_fsl_booke.c @@ -1,4 +1,4 @@ -/* kernel/perfmon_fsl_booke.c +/* arch/powerpc/kernel/perfmon_fsl_booke.c * Freescale Book-E Performance Monitor code * * Author: Andy Fleming diff --git a/arch/powerpc/oprofile/op_model_7450.c b/arch/powerpc/oprofile/op_model_7450.c index e0491c3c71f1..d8ee3aea83f8 100644 --- a/arch/powerpc/oprofile/op_model_7450.c +++ b/arch/powerpc/oprofile/op_model_7450.c @@ -1,5 +1,5 @@ /* - * oprofile/op_model_7450.c + * arch/powerpc/oprofile/op_model_7450.c * * Freescale 745x/744x oprofile support, based on fsl_booke support * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM diff --git a/arch/powerpc/oprofile/op_model_fsl_booke.c b/arch/powerpc/oprofile/op_model_fsl_booke.c index 93d63e62662f..e29dede31423 100644 --- a/arch/powerpc/oprofile/op_model_fsl_booke.c +++ b/arch/powerpc/oprofile/op_model_fsl_booke.c @@ -1,5 +1,5 @@ /* - * oprofile/op_model_e500.c + * arch/powerpc/oprofile/op_model_fsl_booke.c * * Freescale Book-E oprofile support, based on ppc64 oprofile support * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.h b/arch/powerpc/platforms/83xx/mpc834x_sys.h index fedecb73f7ff..7d5bbef084e7 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_sys.h +++ b/arch/powerpc/platforms/83xx/mpc834x_sys.h @@ -1,5 +1,5 @@ /* - * arch/powerppc/platforms/83xx/mpc834x_sys.h + * arch/powerpc/platforms/83xx/mpc834x_sys.h * * MPC834X SYS common board definitions * diff --git a/arch/powerpc/platforms/85xx/mpc8540_ads.h b/arch/powerpc/platforms/85xx/mpc8540_ads.h index c0d56d2bb5a5..da82f4c0fdac 100644 --- a/arch/powerpc/platforms/85xx/mpc8540_ads.h +++ b/arch/powerpc/platforms/85xx/mpc8540_ads.h @@ -1,5 +1,5 @@ /* - * arch/ppc/platforms/85xx/mpc8540_ads.h + * arch/powerpc/platforms/85xx/mpc8540_ads.h * * MPC8540ADS board definitions * diff --git a/arch/powerpc/platforms/85xx/mpc85xx.h b/arch/powerpc/platforms/85xx/mpc85xx.h index b44db6268f3d..83415db33378 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx.h +++ b/arch/powerpc/platforms/85xx/mpc85xx.h @@ -1,5 +1,5 @@ /* - * arch/ppc/platforms/85xx/mpc85xx.h + * arch/powerpc/platforms/85xx/mpc85xx.h * * MPC85xx soc definitions/function decls * diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.h b/arch/powerpc/platforms/85xx/mpc85xx_cds.h index 671f54ff185a..b251c9feb3dc 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.h +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.h @@ -1,5 +1,5 @@ /* - * arch/ppc/platforms/85xx/mpc85xx_cds_common.h + * arch/powerpc/platforms/85xx/mpc85xx_cds.h * * MPC85xx CDS board definitions * diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c index 0251b7c68d0e..6ebdae8e6f69 100644 --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c @@ -1,5 +1,5 @@ /* - * include/asm-ppc/ipic.c + * arch/powerpc/sysdev/ipic.c * * IPIC routines implementations. * 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 depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE help This option allows you to set the base virtual address - of the the consistent memory pool. This pool of virtual + of the consistent memory pool. This pool of virtual memory is used to make consistent memory allocations. config CONSISTENT_START @@ -1356,7 +1356,7 @@ config CONSISTENT_SIZE_BOOL bool "Set custom consistent memory pool size" depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE help - This option allows you to set the size of the the + This option allows you to set the size of the consistent memory pool. This pool of virtual memory is used to make consistent memory allocations. diff --git a/arch/ppc/boot/include/mpsc_defs.h b/arch/ppc/boot/include/mpsc_defs.h index 2ce7bbba7277..9f37e1355b17 100644 --- a/arch/ppc/boot/include/mpsc_defs.h +++ b/arch/ppc/boot/include/mpsc_defs.h @@ -1,5 +1,5 @@ /* - * drivers/serial/mpsc/mpsc_defs.h + * arch/ppc/boot/include/mpsc_defs.h * * Register definitions for the Marvell Multi-Protocol Serial Controller (MPSC), * Serial DMA Controller (SDMA), and Baud Rate Generator (BRG). diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters.h b/arch/ppc/platforms/4xx/xparameters/xparameters.h index cd7d0e7d9863..66ec5f35f306 100644 --- a/arch/ppc/platforms/4xx/xparameters/xparameters.h +++ b/arch/ppc/platforms/4xx/xparameters/xparameters.h @@ -1,5 +1,5 @@ /* - * include/asm-ppc/xparameters.h + * arch/ppc/platforms/4xx/xparameters/xparameters.h * * This file includes the correct xparameters.h for the CONFIG'ed board plus * fixups to translate board specific XPAR values to a common set of names diff --git a/arch/ppc/platforms/85xx/Kconfig b/arch/ppc/platforms/85xx/Kconfig index 7ddd331a7145..6f2d0add7de6 100644 --- a/arch/ppc/platforms/85xx/Kconfig +++ b/arch/ppc/platforms/85xx/Kconfig @@ -24,12 +24,12 @@ config MPC8540_ADS config MPC8548_CDS bool "Freescale MPC8548 CDS" help - This option enablese support for the MPC8548 CDS evaluation board. + This option enables support for the MPC8548 CDS evaluation board. config MPC8555_CDS bool "Freescale MPC8555 CDS" help - This option enablese support for the MPC8555 CDS evaluation board. + This option enables support for the MPC8555 CDS evaluation board. config MPC8560_ADS bool "Freescale MPC8560 ADS" @@ -51,22 +51,22 @@ config STX_GP3 config TQM8540 bool "TQ Components TQM8540" help - This option enablese support for the TQ Components TQM8540 board. + This option enables support for the TQ Components TQM8540 board. config TQM8541 bool "TQ Components TQM8541" help - This option enablese support for the TQ Components TQM8541 board. + This option enables support for the TQ Components TQM8541 board. config TQM8555 bool "TQ Components TQM8555" help - This option enablese support for the TQ Components TQM8555 board. + This option enables support for the TQ Components TQM8555 board. config TQM8560 bool "TQ Components TQM8560" help - This option enablese support for the TQ Components TQM8560 board. + This option enables support for the TQ Components TQM8560 board. endchoice @@ -94,7 +94,7 @@ config MPC8560 default y config 85xx_PCI2 - bool "Supprt for 2nd PCI host controller" + bool "Support for 2nd PCI host controller" depends on MPC8555_CDS default y diff --git a/arch/ppc/platforms/lopec.h b/arch/ppc/platforms/lopec.h index 5490edb2d263..d597b6878693 100644 --- a/arch/ppc/platforms/lopec.h +++ b/arch/ppc/platforms/lopec.h @@ -1,5 +1,5 @@ /* - * include/asm-ppc/lopec_serial.h + * arch/ppc/platforms/lopec.h * * Definitions for Motorola LoPEC board. * diff --git a/arch/ppc/platforms/mpc8272ads_setup.c b/arch/ppc/platforms/mpc8272ads_setup.c index d5d36c372c8e..d7b3a6afa78f 100644 --- a/arch/ppc/platforms/mpc8272ads_setup.c +++ b/arch/ppc/platforms/mpc8272ads_setup.c @@ -1,5 +1,5 @@ /* - * arch/ppc/platforms/82xx/pq2ads_pd.c + * arch/ppc/platforms/mpc8272ads_setup.c * * MPC82xx Board-specific PlatformDevice descriptions * diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c index bf388ed04d46..02293141efb5 100644 --- a/arch/ppc/platforms/mpc885ads_setup.c +++ b/arch/ppc/platforms/mpc885ads_setup.c @@ -1,4 +1,4 @@ -/*arch/ppc/platforms/mpc885ads-setup.c +/*arch/ppc/platforms/mpc885ads_setup.c * * Platform setup for the Freescale mpc885ads board * diff --git a/arch/ppc/platforms/mvme5100.h b/arch/ppc/platforms/mvme5100.h index edd479439a4e..9e2a09e636ae 100644 --- a/arch/ppc/platforms/mvme5100.h +++ b/arch/ppc/platforms/mvme5100.h @@ -1,5 +1,5 @@ /* - * include/asm-ppc/platforms/mvme5100.h + * arch/ppc/platforms/mvme5100.h * * Definitions for Motorola MVME5100. * diff --git a/arch/ppc/platforms/powerpmc250.h b/arch/ppc/platforms/powerpmc250.h index 41a6dc881911..d33ad8dc0439 100644 --- a/arch/ppc/platforms/powerpmc250.h +++ b/arch/ppc/platforms/powerpmc250.h @@ -1,5 +1,5 @@ /* - * include/asm-ppc/platforms/powerpmc250.h + * arch/ppc/platforms/powerpmc250.h * * Definitions for Force PowerPMC-250 board support * diff --git a/arch/ppc/platforms/prpmc750.h b/arch/ppc/platforms/prpmc750.h index 015b4f52c3eb..4c7adcc9ae33 100644 --- a/arch/ppc/platforms/prpmc750.h +++ b/arch/ppc/platforms/prpmc750.h @@ -1,5 +1,5 @@ /* - * include/asm-ppc/platforms/prpmc750.h + * arch/ppc/platforms/prpmc750.h * * Definitions for Motorola PrPMC750 board support * diff --git a/arch/ppc/platforms/prpmc800.h b/arch/ppc/platforms/prpmc800.h index e53ec9b42a35..26f604e05cfa 100644 --- a/arch/ppc/platforms/prpmc800.h +++ b/arch/ppc/platforms/prpmc800.h @@ -1,5 +1,5 @@ /* - * include/asm-ppc/platforms/prpmc800.h + * arch/ppc/platforms/prpmc800.h * * Definitions for Motorola PrPMC800 board support * diff --git a/arch/ppc/platforms/spruce.h b/arch/ppc/platforms/spruce.h index a31ff7ee698f..f1f96f1de72a 100644 --- a/arch/ppc/platforms/spruce.h +++ b/arch/ppc/platforms/spruce.h @@ -1,5 +1,5 @@ /* - * include/asm-ppc/platforms/spruce.h + * arch/ppc/platforms/spruce.h * * Definitions for IBM Spruce reference board support * diff --git a/arch/sh/boards/bigsur/io.c b/arch/sh/boards/bigsur/io.c index 6835381da5fd..23071f97eec3 100644 --- a/arch/sh/boards/bigsur/io.c +++ b/arch/sh/boards/bigsur/io.c @@ -1,5 +1,5 @@ /* - * include/asm-sh/io_bigsur.c + * arch/sh/boards/bigsur/io.c * * By Dustin McIntire (dustin@sensoria.com) (c)2001 * Derived from io_hd64465.h, which bore the message: diff --git a/arch/sh/boards/bigsur/led.c b/arch/sh/boards/bigsur/led.c index 6b08c0e1c453..d221439aafcc 100644 --- a/arch/sh/boards/bigsur/led.c +++ b/arch/sh/boards/bigsur/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_bigsur.c + * linux/arch/sh/boards/bigsur/led.c * * By Dustin McIntire (dustin@sensoria.com) (c)2001 * Derived from led_se.c and led.c, which bore the message: diff --git a/arch/sh/boards/ec3104/io.c b/arch/sh/boards/ec3104/io.c index a70928c44753..2f86394b280b 100644 --- a/arch/sh/boards/ec3104/io.c +++ b/arch/sh/boards/ec3104/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/io_ec3104.c + * linux/arch/sh/boards/ec3104/io.c * EC3104 companion chip support * * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org> diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/hp6xx/setup.c index 60ab17ad6054..2d3a5b4faf58 100644 --- a/arch/sh/boards/hp6xx/setup.c +++ b/arch/sh/boards/hp6xx/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/boards/hp6xx/hp680/setup.c + * linux/arch/sh/boards/hp6xx/setup.c * * Copyright (C) 2002 Andriy Skulysh * diff --git a/arch/sh/boards/mpc1211/led.c b/arch/sh/boards/mpc1211/led.c index 1fe36927f691..8df1591823d6 100644 --- a/arch/sh/boards/mpc1211/led.c +++ b/arch/sh/boards/mpc1211/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_mpc1211.c + * linux/arch/sh/boards/mpc1211/led.c * * Copyright (C) 2001 Saito.K & Jeanne * diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c index 8eb5d4303972..01c10fa5c058 100644 --- a/arch/sh/boards/mpc1211/setup.c +++ b/arch/sh/boards/mpc1211/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/board/mpc1211/setup.c + * linux/arch/sh/boards/mpc1211/setup.c * * Copyright (C) 2002 Saito.K & Jeanne, Fujii.Y * diff --git a/arch/sh/boards/renesas/hs7751rvoip/io.c b/arch/sh/boards/renesas/hs7751rvoip/io.c index 9ea1136b219b..51f3f6574210 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/io.c +++ b/arch/sh/boards/renesas/hs7751rvoip/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/io_hs7751rvoip.c + * linux/arch/sh/boards/renesas/hs7751rvoip/io.c * * Copyright (C) 2001 Ian da Silva, Jeremy Siegel * Based largely on io_se.c. diff --git a/arch/sh/boards/renesas/hs7751rvoip/pci.c b/arch/sh/boards/renesas/hs7751rvoip/pci.c index 7e5786b58110..1c0ddee30d21 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/pci.c +++ b/arch/sh/boards/renesas/hs7751rvoip/pci.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/pci-hs7751rvoip.c + * linux/arch/sh/boards/renesas/hs7751rvoip/pci.c * * Author: Ian DaSilva (idasilva@mvista.com) * diff --git a/arch/sh/boards/renesas/rts7751r2d/led.c b/arch/sh/boards/renesas/rts7751r2d/led.c index e14a13d12d4a..a7ce66c1e4f0 100644 --- a/arch/sh/boards/renesas/rts7751r2d/led.c +++ b/arch/sh/boards/renesas/rts7751r2d/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_rts7751r2d.c + * linux/arch/sh/boards/renesas/rts7751r2d/led.c * * Copyright (C) Atom Create Engineering Co., Ltd. * diff --git a/arch/sh/boards/renesas/systemh/io.c b/arch/sh/boards/renesas/systemh/io.c index cde6e5d192c4..1b767e1a1428 100644 --- a/arch/sh/boards/renesas/systemh/io.c +++ b/arch/sh/boards/renesas/systemh/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/boards/systemh/io.c + * linux/arch/sh/boards/renesas/systemh/io.c * * Copyright (C) 2001 Ian da Silva, Jeremy Siegel * Based largely on io_se.c. diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c index 8d016dae2333..0ba2fe674c47 100644 --- a/arch/sh/boards/renesas/systemh/irq.c +++ b/arch/sh/boards/renesas/systemh/irq.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/boards/systemh/irq.c + * linux/arch/sh/boards/renesas/systemh/irq.c * * Copyright (C) 2000 Kazumoto Kojima * diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/renesas/systemh/setup.c index bab7d3cdc87b..936117659b74 100644 --- a/arch/sh/boards/renesas/systemh/setup.c +++ b/arch/sh/boards/renesas/systemh/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/boards/systemh/setup.c + * linux/arch/sh/boards/renesas/systemh/setup.c * * Copyright (C) 2000 Kazumoto Kojima * Copyright (C) 2003 Paul Mundt diff --git a/arch/sh/boards/se/770x/led.c b/arch/sh/boards/se/770x/led.c index daf7b1ee786a..d93dd831b2ad 100644 --- a/arch/sh/boards/se/770x/led.c +++ b/arch/sh/boards/se/770x/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_se.c + * linux/arch/sh/boards/se/770x/led.c * * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com> * diff --git a/arch/sh/boards/se/7751/led.c b/arch/sh/boards/se/7751/led.c index ff0355dea81b..de4194d97c88 100644 --- a/arch/sh/boards/se/7751/led.c +++ b/arch/sh/boards/se/7751/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_se.c + * linux/arch/sh/boards/se/7751/led.c * * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com> * diff --git a/arch/sh/boards/se/7751/pci.c b/arch/sh/boards/se/7751/pci.c index 3ee03014dea3..203b2923fe7f 100644 --- a/arch/sh/boards/se/7751/pci.c +++ b/arch/sh/boards/se/7751/pci.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/pci-7751se.c + * linux/arch/sh/boards/se/7751/pci.c * * Author: Ian DaSilva (idasilva@mvista.com) * diff --git a/arch/sh/boards/superh/microdev/io.c b/arch/sh/boards/superh/microdev/io.c index 4836b9422e27..83419bf4c834 100644 --- a/arch/sh/boards/superh/microdev/io.c +++ b/arch/sh/boards/superh/microdev/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/io_microdev.c + * linux/arch/sh/boards/superh/microdev/io.c * * Copyright (C) 2003 Sean McGoogan (Sean.McGoogan@superh.com) * Copyright (C) 2003, 2004 SuperH, Inc. diff --git a/arch/sh/boards/superh/microdev/led.c b/arch/sh/boards/superh/microdev/led.c index a38f5351bd16..36e54b47a752 100644 --- a/arch/sh/boards/superh/microdev/led.c +++ b/arch/sh/boards/superh/microdev/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_microdev.c + * linux/arch/sh/boards/superh/microdev/led.c * * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com> * Copyright (C) 2003 Richard Curnow (Richard.Curnow@superh.com) diff --git a/arch/sh/drivers/dma/dma-pvr2.c b/arch/sh/drivers/dma/dma-pvr2.c index 3b0b0f60bb3c..c1b6bc23c107 100644 --- a/arch/sh/drivers/dma/dma-pvr2.c +++ b/arch/sh/drivers/dma/dma-pvr2.c @@ -1,5 +1,5 @@ /* - * arch/sh/boards/dreamcast/dma-pvr2.c + * arch/sh/drivers/dma/dma-pvr2.c * * NEC PowerVR 2 (Dreamcast) DMA support * diff --git a/arch/sh/drivers/pci/dma-dreamcast.c b/arch/sh/drivers/pci/dma-dreamcast.c index 6acf02b9375b..230d6ec0d239 100644 --- a/arch/sh/drivers/pci/dma-dreamcast.c +++ b/arch/sh/drivers/pci/dma-dreamcast.c @@ -1,5 +1,5 @@ /* - * arch/sh/pci/dma-dreamcast.c + * arch/sh/drivers/pci/dma-dreamcast.c * * PCI DMA support for the Sega Dreamcast * diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c index c0af5f7ef414..6f53f8200dc3 100644 --- a/arch/sh/drivers/pci/fixups-dreamcast.c +++ b/arch/sh/drivers/pci/fixups-dreamcast.c @@ -1,5 +1,5 @@ /* - * arch/sh/pci/fixups-dreamcast.c + * arch/sh/drivers/pci/fixups-dreamcast.c * * PCI fixups for the Sega Dreamcast * diff --git a/arch/sh/drivers/pci/ops-bigsur.c b/arch/sh/drivers/pci/ops-bigsur.c index 5da501bd77b5..eb31be751524 100644 --- a/arch/sh/drivers/pci/ops-bigsur.c +++ b/arch/sh/drivers/pci/ops-bigsur.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/pci-bigsur.c + * linux/arch/sh/drivers/pci/ops-bigsur.c * * By Dustin McIntire (dustin@sensoria.com) (c)2001 * diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c index 23d52791917e..381306cf5425 100644 --- a/arch/sh/drivers/pci/ops-dreamcast.c +++ b/arch/sh/drivers/pci/ops-dreamcast.c @@ -1,5 +1,5 @@ /* - * arch/sh/pci/ops-dreamcast.c + * arch/sh/drivers/pci/ops-dreamcast.c * * PCI operations for the Sega Dreamcast * diff --git a/arch/sh/drivers/pci/ops-rts7751r2d.c b/arch/sh/drivers/pci/ops-rts7751r2d.c index 88f44e245424..b68824c8b81e 100644 --- a/arch/sh/drivers/pci/ops-rts7751r2d.c +++ b/arch/sh/drivers/pci/ops-rts7751r2d.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/pci-rts7751r2d.c + * linux/arch/sh/drivers/pci/ops-rts7751r2d.c * * Author: Ian DaSilva (idasilva@mvista.com) * diff --git a/arch/sh/kernel/cpu/ubc.S b/arch/sh/kernel/cpu/ubc.S index 0c569b20e1c1..81923079fa12 100644 --- a/arch/sh/kernel/cpu/ubc.S +++ b/arch/sh/kernel/cpu/ubc.S @@ -1,5 +1,5 @@ /* - * arch/sh/kernel/ubc.S + * arch/sh/kernel/cpu/ubc.S * * Set of management routines for the User Break Controller (UBC) * diff --git a/arch/sh64/boot/compressed/misc.c b/arch/sh64/boot/compressed/misc.c index ee7a1b6acb83..aea00c53ce29 100644 --- a/arch/sh64/boot/compressed/misc.c +++ b/arch/sh64/boot/compressed/misc.c @@ -1,5 +1,5 @@ /* - * arch/shmedia/boot/compressed/misc.c + * arch/sh64/boot/compressed/misc.c * * This is a collection of several routines from gzip-1.0.3 * adapted for Linux. diff --git a/arch/sh64/kernel/alphanum.c b/arch/sh64/kernel/alphanum.c index 9079d1e94f2b..91707c1acd70 100644 --- a/arch/sh64/kernel/alphanum.c +++ b/arch/sh64/kernel/alphanum.c @@ -1,5 +1,5 @@ /* - * arch/sh64/kernel/alpanum.c + * arch/sh64/kernel/alphanum.c * * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com> * diff --git a/arch/sh64/lib/c-checksum.c b/arch/sh64/lib/c-checksum.c index 53c1cabb3428..0e8a742abf8c 100644 --- a/arch/sh64/lib/c-checksum.c +++ b/arch/sh64/lib/c-checksum.c @@ -1,5 +1,5 @@ /* - * arch/sh/lib/csum_parial.c + * arch/sh64/lib/c-checksum.c * * This file contains network checksum routines that are better done * in an architecture-specific manner due to speed.. diff --git a/arch/sh64/mach-cayman/led.c b/arch/sh64/mach-cayman/led.c index 8b3cc4c78870..b4e122fd9502 100644 --- a/arch/sh64/mach-cayman/led.c +++ b/arch/sh64/mach-cayman/led.c @@ -1,5 +1,5 @@ /* - * arch/sh64/kernel/led_cayman.c + * arch/sh64/mach-cayman/led.c * * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com> * diff --git a/arch/sh64/oprofile/op_model_null.c b/arch/sh64/oprofile/op_model_null.c index a845b088edb4..a750ea1fee98 100644 --- a/arch/sh64/oprofile/op_model_null.c +++ b/arch/sh64/oprofile/op_model_null.c @@ -1,5 +1,5 @@ /* - * arch/sh/oprofile/op_model_null.c + * arch/sh64/oprofile/op_model_null.c * * Copyright (C) 2003 Paul Mundt * diff --git a/arch/sparc/kernel/sys_solaris.c b/arch/sparc/kernel/sys_solaris.c index c09afd96dd9c..01b07bb440f0 100644 --- a/arch/sparc/kernel/sys_solaris.c +++ b/arch/sparc/kernel/sys_solaris.c @@ -1,5 +1,5 @@ /* - * linux/arch/sparc/sys_solaris.c + * linux/arch/sparc/kernel/sys_solaris.c * * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) */ diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 76e85bbaea55..d75307589d74 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -257,7 +257,7 @@ config UML_REAL_TIME_CLOCK UML and spend long times with UML stopped at a breakpoint. In this case, when UML is restarted, it will call the timer enough times to make up for the time spent at the breakpoint. This could result in a - noticable lag. If this is a problem, then disable this option. + noticeable lag. If this is a problem, then disable this option. endmenu 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 define archhelp echo '* linux - Binary kernel image (./linux) - for backward' echo ' compatibility only, this creates a hard link to the' - echo ' real kernel binary, the the "vmlinux" binary you' + echo ' real kernel binary, the "vmlinux" binary you' echo ' find in the kernel root.' endef 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) } /* Common setup code for both startup command line and mconsole initialization. - * @lines contains the the array (of size @num) to modify; + * @lines contains the array (of size @num) to modify; * @init is the setup string; */ 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 @@ #define PTRACE_OLDSETOPTIONS 21 #endif -/* These are before the system call, so the the system call number is RAX +/* These are before the system call, so the system call number is RAX * rather than ORIG_RAX, and arg4 is R10 rather than RCX */ #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 @@ sst.w lp, PTO+PT_GPR(GPR_LP)[ep]; \ type ## _STATE_SAVER /* Pop a register state pushed by PUSH_STATE, except for the stack pointer, - from the the stack. */ + from the stack. */ #define POP_STATE(type) \ mov sp, ep; \ type ## _STATE_RESTORER; \ diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 0a5d8e659aa4..010d2265f1cf 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -310,7 +310,7 @@ config K8_NUMA help Enable K8 NUMA node topology detection. You should say Y here if you have a multi processor AMD K8 system. This uses an old - method to read the NUMA configurtion directly from the builtin + method to read the NUMA configuration directly from the builtin Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA instead, which also takes priority if both are compiled in. diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 848f173db257..c1e69a1f92a4 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -206,7 +206,7 @@ source "drivers/pci/hotplug/Kconfig" endmenu -menu "Exectuable file formats" +menu "Executable file formats" # only elf supported config KCORE_ELF @@ -241,7 +241,7 @@ menu "Xtensa initrd options" bool "Embed root filesystem ramdisk into the kernel" config EMBEDDED_RAMDISK_IMAGE - string "Filename of gziped ramdisk image" + string "Filename of gzipped ramdisk image" depends on EMBEDDED_RAMDISK default "ramdisk.gz" help diff --git a/arch/xtensa/kernel/module.c b/arch/xtensa/kernel/module.c index d1683cfa19a2..2ea1755a0858 100644 --- a/arch/xtensa/kernel/module.c +++ b/arch/xtensa/kernel/module.c @@ -1,5 +1,5 @@ /* - * arch/xtensa/kernel/platform.c + * arch/xtensa/kernel/module.c * * Module support. * diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c index 1ff82268e8ea..6648fa9d9192 100644 --- a/arch/xtensa/kernel/pci-dma.c +++ b/arch/xtensa/kernel/pci-dma.c @@ -1,5 +1,5 @@ /* - * arch/xtensa/pci-dma.c + * arch/xtensa/kernel/pci-dma.c * * DMA coherent memory allocation. * diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c index 8709f8249d02..45571ccb72d6 100644 --- a/arch/xtensa/kernel/pci.c +++ b/arch/xtensa/kernel/pci.c @@ -1,5 +1,5 @@ /* - * arch/xtensa/pcibios.c + * arch/xtensa/kernel/pci.c * * PCI bios-type initialisation for PCI machines * diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 82684d05910a..c99ab72b41b6 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -1,5 +1,5 @@ /* - * arch/xtensa/setup.c + * arch/xtensa/kernel/setup.c * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive diff --git a/arch/xtensa/kernel/syscalls.c b/arch/xtensa/kernel/syscalls.c index d9285d4d5565..f49cb239e603 100644 --- a/arch/xtensa/kernel/syscalls.c +++ b/arch/xtensa/kernel/syscalls.c @@ -1,5 +1,5 @@ /* - * arch/xtensa/kernel/syscall.c + * arch/xtensa/kernel/syscalls.c * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive diff --git a/arch/xtensa/lib/pci-auto.c b/arch/xtensa/lib/pci-auto.c index 90c790f6123b..a71733ae1193 100644 --- a/arch/xtensa/lib/pci-auto.c +++ b/arch/xtensa/lib/pci-auto.c @@ -1,5 +1,5 @@ /* - * arch/xtensa/kernel/pci-auto.c + * arch/xtensa/lib/pci-auto.c * * PCI autoconfiguration library * 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 @@ * * DO NOT COMBINE this function with <arch/xtensa/lib/hal/memcopy.S>. * It needs to remain separate and distinct. The hal files are part - * of the the Xtensa link-time HAL, and those files may differ per + * of the Xtensa link-time HAL, and those files may differ per * processor configuration. Patching the kernel for another * processor configuration includes replacing the hal files, and we - * could loose the special functionality for accessing user-space + * could lose the special functionality for accessing user-space * memory during such a patch. We sacrifice a little code space here * in favor to simplify code maintenance. * diff --git a/arch/xtensa/mm/pgtable.c b/arch/xtensa/mm/pgtable.c index 7d28914d11cb..697992738205 100644 --- a/arch/xtensa/mm/pgtable.c +++ b/arch/xtensa/mm/pgtable.c @@ -1,5 +1,5 @@ /* - * arch/xtensa/mm/fault.c + * arch/xtensa/mm/pgtable.c * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive diff --git a/arch/xtensa/mm/tlb.c b/arch/xtensa/mm/tlb.c index d3bd3bfc3b3b..0fefb8666874 100644 --- a/arch/xtensa/mm/tlb.c +++ b/arch/xtensa/mm/tlb.c @@ -1,5 +1,5 @@ /* - * arch/xtensa/mm/mmu.c + * arch/xtensa/mm/tlb.c * * Logic that manipulates the Xtensa MMU. Derived from MIPS. * |