aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 19:35:11 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 19:35:11 -0400
commit708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch)
treefe7c31bc0edef84eb1075c7e195340047d6aaa17
parentf3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff)
parenta847825970e741e20a09c659978baa34016b63bc (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
-rw-r--r--CREDITS8
-rw-r--r--Documentation/DMA-mapping.txt4
-rw-r--r--Documentation/DocBook/libata.tmpl2
-rw-r--r--Documentation/DocBook/usb.tmpl5
-rw-r--r--Documentation/DocBook/writing_usb_driver.tmpl7
-rw-r--r--Documentation/IPMI.txt4
-rw-r--r--Documentation/MSI-HOWTO.txt2
-rw-r--r--Documentation/RCU/whatisRCU.txt4
-rw-r--r--Documentation/aoe/todo.txt2
-rw-r--r--Documentation/arm/SA1100/serial_UART4
-rw-r--r--Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt2
-rw-r--r--Documentation/arm/Samsung-S3C24XX/GPIO.txt2
-rw-r--r--Documentation/arm/Samsung-S3C24XX/Overview.txt2
-rw-r--r--Documentation/arm/Samsung-S3C24XX/S3C2412.txt2
-rw-r--r--Documentation/block/as-iosched.txt4
-rw-r--r--Documentation/block/barrier.txt6
-rw-r--r--Documentation/block/biodoc.txt10
-rw-r--r--Documentation/block/deadline-iosched.txt4
-rw-r--r--Documentation/cciss.txt4
-rw-r--r--Documentation/computone.txt70
-rw-r--r--Documentation/cpu-freq/cpufreq-stats.txt10
-rw-r--r--Documentation/cpu-freq/governors.txt12
-rw-r--r--Documentation/cputopology.txt2
-rw-r--r--Documentation/dell_rbu.txt22
-rw-r--r--Documentation/devices.txt8
-rw-r--r--Documentation/driver-model/class.txt2
-rw-r--r--Documentation/driver-model/driver.txt2
-rw-r--r--Documentation/driver-model/overview.txt2
-rw-r--r--Documentation/dvb/avermedia.txt4
-rw-r--r--Documentation/dvb/cards.txt2
-rw-r--r--Documentation/dvb/ci.txt4
-rw-r--r--Documentation/dvb/faq.txt6
-rw-r--r--Documentation/eisa.txt4
-rw-r--r--Documentation/exception.txt2
-rw-r--r--Documentation/fb/fbcon.txt2
-rw-r--r--Documentation/fb/sisfb.txt2
-rw-r--r--Documentation/fb/sstfb.txt42
-rw-r--r--Documentation/feature-removal-schedule.txt2
-rw-r--r--Documentation/filesystems/00-INDEX2
-rw-r--r--Documentation/filesystems/befs.txt8
-rw-r--r--Documentation/filesystems/configfs/configfs.txt8
-rw-r--r--Documentation/filesystems/directory-locking2
-rw-r--r--Documentation/filesystems/dlmfs.txt2
-rw-r--r--Documentation/filesystems/ext2.txt2
-rw-r--r--Documentation/filesystems/files.txt2
-rw-r--r--Documentation/filesystems/ntfs.txt10
-rw-r--r--Documentation/filesystems/proc.txt10
-rw-r--r--Documentation/filesystems/spufs.txt6
-rw-r--r--Documentation/filesystems/sysfs.txt2
-rw-r--r--Documentation/filesystems/tmpfs.txt4
-rw-r--r--Documentation/filesystems/vfat.txt2
-rw-r--r--Documentation/filesystems/vfs.txt2
-rw-r--r--Documentation/fujitsu/frv/mmu-layout.txt2
-rw-r--r--Documentation/highuid.txt2
-rw-r--r--Documentation/hrtimers.txt12
-rw-r--r--Documentation/ia64/efirtc.txt2
-rw-r--r--Documentation/ia64/fsys.txt2
-rw-r--r--Documentation/ia64/mca.txt4
-rw-r--r--Documentation/ibm-acpi.txt2
-rw-r--r--Documentation/ide.txt2
-rw-r--r--Documentation/input/amijoy.txt4
-rw-r--r--Documentation/input/atarikbd.txt10
-rw-r--r--Documentation/input/cs461x.txt2
-rw-r--r--Documentation/input/ff.txt2
-rw-r--r--Documentation/input/gameport-programming.txt4
-rw-r--r--Documentation/input/input.txt31
-rw-r--r--Documentation/input/joystick-parport.txt8
-rw-r--r--Documentation/input/joystick.txt2
-rw-r--r--Documentation/input/yealink.txt4
-rw-r--r--Documentation/ioctl/hdio.txt2
-rw-r--r--Documentation/isdn/INTERFACE.fax2
-rw-r--r--Documentation/isdn/README.hysdn2
-rw-r--r--Documentation/java.txt2
-rw-r--r--Documentation/kbuild/kconfig-language.txt4
-rw-r--r--Documentation/kdump/kdump.txt2
-rw-r--r--Documentation/kernel-docs.txt11
-rw-r--r--Documentation/kernel-parameters.txt10
-rw-r--r--Documentation/keys.txt6
-rw-r--r--Documentation/kobject.txt2
-rw-r--r--Documentation/laptop-mode.txt2
-rw-r--r--Documentation/lockdep-design.txt8
-rw-r--r--Documentation/m68k/kernel-options.txt2
-rw-r--r--Documentation/mca.txt2
-rw-r--r--Documentation/md.txt16
-rw-r--r--Documentation/memory-barriers.txt4
-rw-r--r--Documentation/mono.txt2
-rw-r--r--Documentation/networking/3c509.txt2
-rw-r--r--Documentation/networking/NAPI_HOWTO.txt2
-rw-r--r--Documentation/networking/arcnet-hardware.txt2
-rw-r--r--Documentation/networking/bonding.txt2
-rw-r--r--Documentation/networking/cs89x0.txt6
-rw-r--r--Documentation/networking/cxgb.txt4
-rw-r--r--Documentation/networking/decnet.txt2
-rw-r--r--Documentation/networking/dl2k.txt4
-rw-r--r--Documentation/networking/dmfe.txt2
-rw-r--r--Documentation/networking/driver.txt2
-rw-r--r--Documentation/networking/e1000.txt2
-rw-r--r--Documentation/networking/fib_trie.txt2
-rw-r--r--Documentation/networking/gen_stats.txt8
-rw-r--r--Documentation/networking/ip-sysctl.txt4
-rw-r--r--Documentation/networking/netconsole.txt2
-rw-r--r--Documentation/networking/netif-msg.txt2
-rw-r--r--Documentation/networking/operstates.txt2
-rw-r--r--Documentation/networking/packet_mmap.txt24
-rw-r--r--Documentation/networking/pktgen.txt8
-rw-r--r--Documentation/networking/s2io.txt2
-rw-r--r--Documentation/networking/sk98lin.txt16
-rw-r--r--Documentation/networking/skfp.txt4
-rw-r--r--Documentation/networking/slicecom.txt8
-rw-r--r--Documentation/networking/smctr.txt2
-rw-r--r--Documentation/networking/tcp.txt2
-rw-r--r--Documentation/networking/tms380tr.txt2
-rw-r--r--Documentation/networking/vortex.txt4
-rw-r--r--Documentation/networking/wan-router.txt16
-rw-r--r--Documentation/nfsroot.txt2
-rw-r--r--Documentation/pci-error-recovery.txt2
-rw-r--r--Documentation/pi-futex.txt2
-rw-r--r--Documentation/pm.txt6
-rw-r--r--Documentation/pnp.txt2
-rw-r--r--Documentation/power/pci.txt2
-rw-r--r--Documentation/power/swsusp.txt8
-rw-r--r--Documentation/power/tricks.txt2
-rw-r--r--Documentation/power/userland-swsusp.txt2
-rw-r--r--Documentation/power/video.txt2
-rw-r--r--Documentation/powerpc/booting-without-of.txt43
-rw-r--r--Documentation/powerpc/eeh-pci-error-recovery.txt4
-rw-r--r--Documentation/powerpc/hvcs.txt2
-rw-r--r--Documentation/prio_tree.txt2
-rw-r--r--Documentation/rocket.txt6
-rw-r--r--Documentation/rpc-cache.txt4
-rw-r--r--Documentation/s390/3270.txt4
-rw-r--r--Documentation/s390/Debugging390.txt93
-rw-r--r--Documentation/s390/cds.txt14
-rw-r--r--Documentation/s390/crypto/crypto-API.txt4
-rw-r--r--Documentation/s390/driver-model.txt4
-rw-r--r--Documentation/s390/monreader.txt2
-rw-r--r--Documentation/s390/s390dbf.txt12
-rw-r--r--Documentation/sched-coding.txt2
-rw-r--r--Documentation/sched-design.txt4
-rw-r--r--Documentation/scsi/ChangeLog.1992-19972
-rw-r--r--Documentation/scsi/NinjaSCSI.txt18
-rw-r--r--Documentation/scsi/aacraid.txt2
-rw-r--r--Documentation/scsi/aic79xx.txt4
-rw-r--r--Documentation/scsi/aic7xxx.txt2
-rw-r--r--Documentation/scsi/aic7xxx_old.txt6
-rw-r--r--Documentation/scsi/dc395x.txt2
-rw-r--r--Documentation/scsi/dpti.txt2
-rw-r--r--Documentation/scsi/ibmmca.txt36
-rw-r--r--Documentation/scsi/megaraid.txt4
-rw-r--r--Documentation/scsi/ncr53c8xx.txt20
-rw-r--r--Documentation/scsi/osst.txt3
-rw-r--r--Documentation/scsi/ppa.txt2
-rw-r--r--Documentation/scsi/scsi-changer.txt2
-rw-r--r--Documentation/scsi/scsi_eh.txt4
-rw-r--r--Documentation/scsi/st.txt4
-rw-r--r--Documentation/scsi/sym53c8xx_2.txt4
-rw-r--r--Documentation/scsi/tmscsim.txt4
-rw-r--r--Documentation/sh/kgdb.txt2
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt26
-rw-r--r--Documentation/sound/alsa/Audiophile-Usb.txt2
-rw-r--r--Documentation/sound/alsa/CMIPCI.txt6
-rw-r--r--Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl2
-rw-r--r--Documentation/sound/alsa/MIXART.txt6
-rw-r--r--Documentation/sound/alsa/Procfile.txt10
-rw-r--r--Documentation/sound/oss/AWE322
-rw-r--r--Documentation/sound/oss/solo12
-rw-r--r--Documentation/sound/oss/ultrasound2
-rw-r--r--Documentation/sound/oss/vwsnd2
-rw-r--r--Documentation/sparc/sbus_drivers.txt6
-rw-r--r--Documentation/spi/pxa2xx6
-rw-r--r--Documentation/spi/spi-summary4
-rw-r--r--Documentation/stable_kernel_rules.txt4
-rw-r--r--Documentation/uml/UserModeLinux-HOWTO.txt66
-rw-r--r--Documentation/unshare.txt2
-rw-r--r--Documentation/usb/URB.txt2
-rw-r--r--Documentation/usb/acm.txt14
-rw-r--r--Documentation/usb/error-codes.txt4
-rw-r--r--Documentation/usb/hiddev.txt2
-rw-r--r--Documentation/usb/mtouchusb.txt6
-rw-r--r--Documentation/usb/usb-serial.txt11
-rw-r--r--Documentation/video4linux/README.pvrusb22
-rw-r--r--Documentation/video4linux/Zoran2
-rw-r--r--Documentation/video4linux/cx2341x/fw-decoder-api.txt2
-rw-r--r--Documentation/video4linux/cx2341x/fw-encoder-api.txt2
-rw-r--r--Documentation/video4linux/cx2341x/fw-osd-api.txt2
-rw-r--r--Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt2
-rw-r--r--Documentation/video4linux/et61x251.txt4
-rw-r--r--Documentation/video4linux/hauppauge-wintv-cx88-ir.txt2
-rw-r--r--Documentation/video4linux/meye.txt2
-rw-r--r--Documentation/video4linux/sn9c102.txt4
-rw-r--r--Documentation/video4linux/w9968cf.txt2
-rw-r--r--Documentation/video4linux/zr36120.txt4
-rw-r--r--Documentation/vm/numa2
-rw-r--r--Documentation/watchdog/watchdog-api.txt8
-rw-r--r--Documentation/x86_64/boot-options.txt2
-rw-r--r--arch/alpha/Kconfig2
-rw-r--r--arch/alpha/kernel/alpha_ksyms.c2
-rw-r--r--arch/alpha/kernel/head.S2
-rw-r--r--arch/alpha/kernel/machvec_impl.h2
-rw-r--r--arch/alpha/lib/dbg_stackcheck.S2
-rw-r--r--arch/alpha/lib/dbg_stackkill.S2
-rw-r--r--arch/alpha/lib/memset.S2
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/boot/compressed/head-clps7500.S2
-rw-r--r--arch/arm/common/sa1111.c2
-rw-r--r--arch/arm/mach-imx/leds.c2
-rw-r--r--arch/arm/mach-imx/leds.h2
-rw-r--r--arch/arm/mach-ixp4xx/coyote-pci.c2
-rw-r--r--arch/arm/mach-ixp4xx/ixdpg425-pci.c2
-rw-r--r--arch/arm/mach-lh7a40x/arch-lpd7a40x.c2
-rw-r--r--arch/arm/mach-omap1/serial.c2
-rw-r--r--arch/arm/mach-omap2/board-apollon.c2
-rw-r--r--arch/arm/mach-omap2/board-generic.c2
-rw-r--r--arch/arm/mach-omap2/board-h4.c2
-rw-r--r--arch/arm/mach-omap2/irq.c2
-rw-r--r--arch/arm/mach-omap2/prcm-regs.h2
-rw-r--r--arch/arm/mach-omap2/serial.c2
-rw-r--r--arch/arm/mach-omap2/sram-fn.S2
-rw-r--r--arch/arm/mach-pxa/corgi_lcd.c2
-rw-r--r--arch/arm/mach-pxa/leds.h2
-rw-r--r--arch/arm/mach-s3c2410/Kconfig2
-rw-r--r--arch/arm/mach-s3c2410/s3c2400-gpio.c2
-rw-r--r--arch/arm/mach-s3c2410/s3c2410-clock.c2
-rw-r--r--arch/arm/mach-s3c2410/s3c2410-gpio.c2
-rw-r--r--arch/arm/mach-s3c2410/s3c2442.c2
-rw-r--r--arch/arm/mach-s3c2410/s3c244x-irq.c2
-rw-r--r--arch/arm/mach-s3c2410/s3c244x.h2
-rw-r--r--arch/arm/mach-s3c2410/usb-simtec.h2
-rw-r--r--arch/arm/mach-sa1100/dma.c2
-rw-r--r--arch/arm/mach-shark/leds.c2
-rw-r--r--arch/arm/plat-omap/sram-fn.S2
-rw-r--r--arch/cris/arch-v10/drivers/Kconfig4
-rw-r--r--arch/cris/arch-v32/Kconfig2
-rw-r--r--arch/h8300/kernel/ints.c2
-rw-r--r--arch/i386/Kconfig2
-rw-r--r--arch/i386/kernel/cpu/common.c3
-rw-r--r--arch/i386/kernel/efi.c3
-rw-r--r--arch/i386/kernel/ldt.c2
-rw-r--r--arch/i386/mach-visws/visws_apic.c2
-rw-r--r--arch/i386/mm/discontig.c3
-rw-r--r--arch/i386/mm/init.c3
-rw-r--r--arch/i386/pci/fixup.c2
-rw-r--r--arch/ia64/kernel/acpi-processor.c2
-rw-r--r--arch/ia64/kernel/entry.S2
-rw-r--r--arch/ia64/kernel/irq_ia64.c2
-rw-r--r--arch/ia64/sn/kernel/xpnet.c2
-rw-r--r--arch/m68k/mm/motorola.c2
-rw-r--r--arch/m68k/sun3/sun3dvma.c2
-rw-r--r--arch/m68knommu/Kconfig6
-rw-r--r--arch/m68knommu/platform/68328/head-pilot.S2
-rw-r--r--arch/mips/dec/prom/call_o32.S2
-rw-r--r--arch/mips/mm/tlbex.c2
-rw-r--r--arch/mips/pci/fixup-vr4133.c2
-rw-r--r--arch/mips/tx4938/common/irq.c2
-rw-r--r--arch/parisc/kernel/entry.S4
-rw-r--r--arch/powerpc/Kconfig4
-rw-r--r--arch/powerpc/kernel/perfmon_fsl_booke.c2
-rw-r--r--arch/powerpc/oprofile/op_model_7450.c2
-rw-r--r--arch/powerpc/oprofile/op_model_fsl_booke.c2
-rw-r--r--arch/powerpc/platforms/83xx/mpc834x_sys.h2
-rw-r--r--arch/powerpc/platforms/85xx/mpc8540_ads.h2
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx.h2
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_cds.h2
-rw-r--r--arch/powerpc/sysdev/ipic.c2
-rw-r--r--arch/ppc/Kconfig4
-rw-r--r--arch/ppc/boot/include/mpsc_defs.h2
-rw-r--r--arch/ppc/platforms/4xx/xparameters/xparameters.h2
-rw-r--r--arch/ppc/platforms/85xx/Kconfig14
-rw-r--r--arch/ppc/platforms/lopec.h2
-rw-r--r--arch/ppc/platforms/mpc8272ads_setup.c2
-rw-r--r--arch/ppc/platforms/mpc885ads_setup.c2
-rw-r--r--arch/ppc/platforms/mvme5100.h2
-rw-r--r--arch/ppc/platforms/powerpmc250.h2
-rw-r--r--arch/ppc/platforms/prpmc750.h2
-rw-r--r--arch/ppc/platforms/prpmc800.h2
-rw-r--r--arch/ppc/platforms/spruce.h2
-rw-r--r--arch/sh/boards/bigsur/io.c2
-rw-r--r--arch/sh/boards/bigsur/led.c2
-rw-r--r--arch/sh/boards/ec3104/io.c2
-rw-r--r--arch/sh/boards/hp6xx/setup.c2
-rw-r--r--arch/sh/boards/mpc1211/led.c2
-rw-r--r--arch/sh/boards/mpc1211/setup.c2
-rw-r--r--arch/sh/boards/renesas/hs7751rvoip/io.c2
-rw-r--r--arch/sh/boards/renesas/hs7751rvoip/pci.c2
-rw-r--r--arch/sh/boards/renesas/rts7751r2d/led.c2
-rw-r--r--arch/sh/boards/renesas/systemh/io.c2
-rw-r--r--arch/sh/boards/renesas/systemh/irq.c2
-rw-r--r--arch/sh/boards/renesas/systemh/setup.c2
-rw-r--r--arch/sh/boards/se/770x/led.c2
-rw-r--r--arch/sh/boards/se/7751/led.c2
-rw-r--r--arch/sh/boards/se/7751/pci.c2
-rw-r--r--arch/sh/boards/superh/microdev/io.c2
-rw-r--r--arch/sh/boards/superh/microdev/led.c2
-rw-r--r--arch/sh/drivers/dma/dma-pvr2.c2
-rw-r--r--arch/sh/drivers/pci/dma-dreamcast.c2
-rw-r--r--arch/sh/drivers/pci/fixups-dreamcast.c2
-rw-r--r--arch/sh/drivers/pci/ops-bigsur.c2
-rw-r--r--arch/sh/drivers/pci/ops-dreamcast.c2
-rw-r--r--arch/sh/drivers/pci/ops-rts7751r2d.c2
-rw-r--r--arch/sh/kernel/cpu/ubc.S2
-rw-r--r--arch/sh64/boot/compressed/misc.c2
-rw-r--r--arch/sh64/kernel/alphanum.c2
-rw-r--r--arch/sh64/lib/c-checksum.c2
-rw-r--r--arch/sh64/mach-cayman/led.c2
-rw-r--r--arch/sh64/oprofile/op_model_null.c2
-rw-r--r--arch/sparc/kernel/sys_solaris.c2
-rw-r--r--arch/um/Kconfig2
-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/x86_64/Kconfig2
-rw-r--r--arch/xtensa/Kconfig4
-rw-r--r--arch/xtensa/kernel/module.c2
-rw-r--r--arch/xtensa/kernel/pci-dma.c2
-rw-r--r--arch/xtensa/kernel/pci.c2
-rw-r--r--arch/xtensa/kernel/setup.c2
-rw-r--r--arch/xtensa/kernel/syscalls.c2
-rw-r--r--arch/xtensa/lib/pci-auto.c2
-rw-r--r--arch/xtensa/lib/usercopy.S4
-rw-r--r--arch/xtensa/mm/pgtable.c2
-rw-r--r--arch/xtensa/mm/tlb.c2
-rw-r--r--drivers/acorn/block/mfmhd.c2
-rw-r--r--drivers/acpi/Kconfig6
-rw-r--r--drivers/block/Kconfig5
-rw-r--r--drivers/cdrom/cdrom.c2
-rw-r--r--drivers/char/hw_random/ixp4xx-rng.c2
-rw-r--r--drivers/char/hw_random/omap-rng.c2
-rw-r--r--drivers/char/mwave/README5
-rw-r--r--drivers/char/watchdog/ixp2000_wdt.c2
-rw-r--r--drivers/char/watchdog/ixp4xx_wdt.c2
-rw-r--r--drivers/firmware/Kconfig2
-rw-r--r--drivers/firmware/edd.c2
-rw-r--r--drivers/i2c/busses/Kconfig4
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c2
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.h2
-rw-r--r--drivers/i2c/busses/i2c-ixp4xx.c2
-rw-r--r--drivers/i2c/busses/scx200_i2c.c2
-rw-r--r--drivers/ide/h8300/ide-h8300.c2
-rw-r--r--drivers/ide/ppc/pmac.c2
-rw-r--r--drivers/ieee1394/Kconfig2
-rw-r--r--drivers/infiniband/ulp/ipoib/Kconfig2
-rw-r--r--drivers/input/joystick/Kconfig2
-rw-r--r--drivers/input/keyboard/Kconfig2
-rw-r--r--drivers/input/serio/Kconfig4
-rw-r--r--drivers/isdn/hardware/eicon/Kconfig2
-rw-r--r--drivers/isdn/hisax/Kconfig2
-rw-r--r--drivers/isdn/hisax/amd7930_fn.h2
-rw-r--r--drivers/leds/led-class.c2
-rw-r--r--drivers/leds/leds-locomo.c2
-rw-r--r--drivers/macintosh/Kconfig2
-rw-r--r--drivers/macintosh/adbhid.c2
-rw-r--r--drivers/md/md.c3
-rw-r--r--drivers/md/raid5.c2
-rw-r--r--drivers/media/dvb/cinergyT2/Kconfig2
-rw-r--r--drivers/media/radio/Kconfig3
-rw-r--r--drivers/media/video/Kconfig2
-rw-r--r--drivers/media/video/cx88/Kconfig2
-rw-r--r--drivers/media/video/pwc/philips.txt4
-rw-r--r--drivers/mtd/chips/Kconfig2
-rw-r--r--drivers/mtd/maps/bast-flash.c2
-rw-r--r--drivers/mtd/maps/dmv182.c2
-rw-r--r--drivers/mtd/nand/Kconfig2
-rw-r--r--drivers/mtd/onenand/Kconfig2
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/arm/am79c961a.h2
-rw-r--r--drivers/net/ibm_emac/ibm_emac_debug.h2
-rw-r--r--drivers/net/ibm_emac/ibm_emac_rgmii.h2
-rw-r--r--drivers/net/tokenring/tmspci.c3
-rw-r--r--drivers/net/wireless/Kconfig2
-rw-r--r--drivers/parisc/power.c2
-rw-r--r--drivers/parport/daisy.c212
-rw-r--r--drivers/pci/hotplug/Kconfig2
-rw-r--r--drivers/rapidio/Kconfig2
-rw-r--r--drivers/rtc/rtc-max6902.c2
-rw-r--r--drivers/sbus/char/cpwatchdog.c2
-rw-r--r--drivers/scsi/Kconfig6
-rw-r--r--drivers/scsi/aic7xxx/Kconfig.aic79xx4
-rw-r--r--drivers/scsi/aic7xxx/Kconfig.aic7xxx4
-rw-r--r--drivers/scsi/arm/arxescsi.c2
-rw-r--r--drivers/serial/21285.c2
-rw-r--r--drivers/serial/Kconfig6
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_cpm1.h2
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_cpm2.h2
-rw-r--r--drivers/usb/atm/Kconfig2
-rw-r--r--drivers/usb/core/file.c2
-rw-r--r--drivers/usb/core/usb.c2
-rw-r--r--drivers/usb/gadget/Kconfig2
-rw-r--r--drivers/usb/storage/Kconfig2
-rw-r--r--drivers/video/Kconfig10
-rw-r--r--drivers/video/s3c2410fb.h2
-rw-r--r--drivers/w1/Kconfig2
-rw-r--r--fs/Kconfig18
-rw-r--r--fs/befs/befs_fs_types.h2
-rw-r--r--fs/cifs/README6
-rw-r--r--fs/debugfs/inode.c2
-rw-r--r--fs/hfsplus/part_tbl.c2
-rw-r--r--fs/jbd/commit.c2
-rw-r--r--fs/jbd/journal.c2
-rw-r--r--fs/nfsd/nfs2acl.c2
-rw-r--r--fs/nfsd/nfs4xdr.c3
-rw-r--r--fs/nfsd/nfsxdr.c2
-rw-r--r--fs/nls/nls_ascii.c2
-rw-r--r--fs/nls/nls_base.c2
-rw-r--r--fs/nls/nls_cp1250.c2
-rw-r--r--fs/nls/nls_cp1251.c2
-rw-r--r--fs/nls/nls_cp1255.c2
-rw-r--r--fs/nls/nls_cp437.c2
-rw-r--r--fs/nls/nls_cp737.c2
-rw-r--r--fs/nls/nls_cp775.c2
-rw-r--r--fs/nls/nls_cp850.c2
-rw-r--r--fs/nls/nls_cp852.c2
-rw-r--r--fs/nls/nls_cp855.c2
-rw-r--r--fs/nls/nls_cp857.c2
-rw-r--r--fs/nls/nls_cp860.c2
-rw-r--r--fs/nls/nls_cp861.c2
-rw-r--r--fs/nls/nls_cp862.c2
-rw-r--r--fs/nls/nls_cp863.c2
-rw-r--r--fs/nls/nls_cp864.c2
-rw-r--r--fs/nls/nls_cp865.c2
-rw-r--r--fs/nls/nls_cp866.c2
-rw-r--r--fs/nls/nls_cp869.c2
-rw-r--r--fs/nls/nls_cp874.c2
-rw-r--r--fs/nls/nls_cp932.c2
-rw-r--r--fs/nls/nls_cp936.c2
-rw-r--r--fs/nls/nls_cp949.c2
-rw-r--r--fs/nls/nls_cp950.c2
-rw-r--r--fs/nls/nls_euc-jp.c2
-rw-r--r--fs/nls/nls_iso8859-1.c2
-rw-r--r--fs/nls/nls_iso8859-13.c2
-rw-r--r--fs/nls/nls_iso8859-14.c2
-rw-r--r--fs/nls/nls_iso8859-15.c2
-rw-r--r--fs/nls/nls_iso8859-2.c2
-rw-r--r--fs/nls/nls_iso8859-3.c2
-rw-r--r--fs/nls/nls_iso8859-4.c2
-rw-r--r--fs/nls/nls_iso8859-5.c2
-rw-r--r--fs/nls/nls_iso8859-6.c2
-rw-r--r--fs/nls/nls_iso8859-7.c2
-rw-r--r--fs/nls/nls_iso8859-9.c2
-rw-r--r--fs/nls/nls_koi8-r.c2
-rw-r--r--fs/nls/nls_koi8-ru.c2
-rw-r--r--fs/nls/nls_koi8-u.c2
-rw-r--r--fs/reiserfs/file.c6
-rw-r--r--fs/reiserfs/item_ops.c12
-rw-r--r--fs/reiserfs/journal.c49
-rw-r--r--fs/reiserfs/namei.c9
-rw-r--r--fs/reiserfs/stree.c4
-rw-r--r--fs/xfs/support/debug.c6
-rw-r--r--include/asm-arm/arch-clps711x/entry-macro.S2
-rw-r--r--include/asm-arm/arch-ebsa285/entry-macro.S2
-rw-r--r--include/asm-arm/arch-h720x/system.h2
-rw-r--r--include/asm-arm/arch-ixp4xx/system.h2
-rw-r--r--include/asm-arm/arch-omap/dmtimer.h2
-rw-r--r--include/asm-arm/arch-omap/mcbsp.h2
-rw-r--r--include/asm-arm/arch-omap/pm.h2
-rw-r--r--include/asm-arm/arch-pnx4008/platform.h2
-rw-r--r--include/asm-arm/arch-s3c2410/fb.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-adc.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-clock.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-dsc.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-gpio.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-gpioj.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-iis.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-irq.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-lcd.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-rtc.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-sdi.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-timer.h2
-rw-r--r--include/asm-arm/arch-s3c2410/regs-udc.h2
-rw-r--r--include/asm-arm/arch-s3c2410/spi-gpio.h2
-rw-r--r--include/asm-arm/arch-sa1100/neponset.h2
-rw-r--r--include/asm-arm/arch-sa1100/uncompress.h2
-rw-r--r--include/asm-arm/arch-shark/vmalloc.h2
-rw-r--r--include/asm-arm/hardware/debug-8250.S2
-rw-r--r--include/asm-arm/hardware/debug-pl01x.S2
-rw-r--r--include/asm-arm/hardware/entry-macro-iomd.S2
-rw-r--r--include/asm-arm/hardware/sa1111.h2
-rw-r--r--include/asm-arm26/assembler.h2
-rw-r--r--include/asm-arm26/namei.h2
-rw-r--r--include/asm-arm26/semaphore.h2
-rw-r--r--include/asm-frv/namei.h2
-rw-r--r--include/asm-generic/mutex-dec.h2
-rw-r--r--include/asm-generic/mutex-null.h2
-rw-r--r--include/asm-generic/mutex-xchg.h2
-rw-r--r--include/asm-generic/rtc.h2
-rw-r--r--include/asm-generic/tlb.h2
-rw-r--r--include/asm-m32r/m32104ut/m32104ut_pld.h2
-rw-r--r--include/asm-m32r/m32700ut/m32700ut_lan.h2
-rw-r--r--include/asm-m32r/m32700ut/m32700ut_lcd.h2
-rw-r--r--include/asm-m32r/m32700ut/m32700ut_pld.h2
-rw-r--r--include/asm-m32r/mappi2/mappi2_pld.h2
-rw-r--r--include/asm-m32r/mappi3/mappi3_pld.h2
-rw-r--r--include/asm-m32r/opsput/opsput_lan.h2
-rw-r--r--include/asm-m32r/opsput/opsput_lcd.h2
-rw-r--r--include/asm-m32r/opsput/opsput_pld.h2
-rw-r--r--include/asm-m68k/rtc.h2
-rw-r--r--include/asm-m68knommu/processor.h2
-rw-r--r--include/asm-mips/tx4938/tx4938_mips.h2
-rw-r--r--include/asm-parisc/rtc.h2
-rw-r--r--include/asm-powerpc/ipic.h2
-rw-r--r--include/asm-ppc/mv64x60_defs.h2
-rw-r--r--include/asm-ppc/rheap.h2
-rw-r--r--include/asm-ppc/rtc.h2
-rw-r--r--include/asm-s390/qdio.h2
-rw-r--r--include/asm-sh/bigsur/io.h2
-rw-r--r--include/asm-sh/bigsur/serial.h2
-rw-r--r--include/asm-sh/dreamcast/sysasic.h2
-rw-r--r--include/asm-sh/hd64465/io.h2
-rw-r--r--include/asm-sh/mpc1211/io.h2
-rw-r--r--include/asm-sh64/serial.h2
-rw-r--r--include/asm-sparc/reg.h2
-rw-r--r--include/asm-x86_64/cache.h2
-rw-r--r--include/asm-xtensa/a.out.h2
-rw-r--r--include/asm-xtensa/cache.h2
-rw-r--r--include/asm-xtensa/coprocessor.h2
-rw-r--r--include/asm-xtensa/dma-mapping.h2
-rw-r--r--include/asm-xtensa/ioctls.h2
-rw-r--r--include/asm-xtensa/pgtable.h2
-rw-r--r--include/asm-xtensa/siginfo.h2
-rw-r--r--include/linux/aio_abi.h2
-rw-r--r--include/linux/awe_voice.h2
-rw-r--r--include/linux/harrier_defs.h2
-rw-r--r--include/linux/lockd/xdr4.h2
-rw-r--r--include/linux/mtd/plat-ram.h2
-rw-r--r--include/linux/nfsd/stats.h2
-rw-r--r--include/linux/nfsd/xdr.h2
-rw-r--r--include/linux/ppdev.h2
-rw-r--r--include/linux/slab.h2
-rw-r--r--include/linux/sunrpc/auth_gss.h2
-rw-r--r--include/linux/sunrpc/gss_api.h2
-rw-r--r--include/linux/sunrpc/msg_prot.h2
-rw-r--r--include/linux/sunrpc/svcauth_gss.h2
-rw-r--r--include/linux/writeback.h2
-rw-r--r--include/video/s1d13xxxfb.h2
-rw-r--r--ipc/mqueue.c2
-rw-r--r--ipc/msgutil.c2
-rw-r--r--kernel/posix-timers.c2
-rw-r--r--kernel/rcutorture.c2
-rw-r--r--kernel/workqueue.c2
-rw-r--r--lib/reed_solomon/reed_solomon.c2
-rw-r--r--mm/Kconfig4
-rw-r--r--mm/nommu.c2
-rw-r--r--mm/page-writeback.c2
-rw-r--r--mm/vmalloc.c6
-rw-r--r--net/ipv4/Kconfig6
-rw-r--r--net/ipv4/arp.c2
-rw-r--r--net/ipv4/ipvs/Kconfig4
-rw-r--r--net/ipv4/netfilter/Kconfig2
-rw-r--r--net/sunrpc/auth_gss/auth_gss.c2
-rwxr-xr-xscripts/kernel-doc4
-rw-r--r--security/selinux/Kconfig4
-rw-r--r--sound/oss/Kconfig2
-rw-r--r--sound/oss/ad1848.c2
-rw-r--r--sound/oss/ad1848_mixer.h2
-rw-r--r--sound/oss/adlib_card.c2
-rw-r--r--sound/oss/audio.c2
-rw-r--r--sound/oss/awe_hw.h2
-rw-r--r--sound/oss/awe_wave.c2
-rw-r--r--sound/oss/awe_wave.h2
-rw-r--r--sound/oss/dev_table.c2
-rw-r--r--sound/oss/dmabuf.c2
-rw-r--r--sound/oss/gus_card.c2
-rw-r--r--sound/oss/gus_midi.c2
-rw-r--r--sound/oss/gus_wave.c2
-rw-r--r--sound/oss/harmony.c2
-rw-r--r--sound/oss/ics2101.c2
-rw-r--r--sound/oss/iwmem.h2
-rw-r--r--sound/oss/maui.c2
-rw-r--r--sound/oss/midi_synth.c2
-rw-r--r--sound/oss/midibuf.c2
-rw-r--r--sound/oss/mpu401.c2
-rw-r--r--sound/oss/opl3.c2
-rw-r--r--sound/oss/opl3sa.c2
-rw-r--r--sound/oss/opl3sa2.c2
-rw-r--r--sound/oss/pas2_card.c2
-rw-r--r--sound/oss/pas2_midi.c2
-rw-r--r--sound/oss/pas2_mixer.c2
-rw-r--r--sound/oss/pss.c2
-rw-r--r--sound/oss/sb_audio.c2
-rw-r--r--sound/oss/sb_common.c2
-rw-r--r--sound/oss/sb_midi.c2
-rw-r--r--sound/oss/sb_mixer.c2
-rw-r--r--sound/oss/sb_mixer.h2
-rw-r--r--sound/oss/sequencer.c2
-rw-r--r--sound/oss/sgalaxy.c2
-rw-r--r--sound/oss/sound_timer.c2
-rw-r--r--sound/oss/soundcard.c2
-rw-r--r--sound/oss/sscape.c2
-rw-r--r--sound/oss/sys_timer.c2
-rw-r--r--sound/oss/trix.c2
-rw-r--r--sound/oss/uart401.c2
-rw-r--r--sound/oss/uart6850.c2
-rw-r--r--sound/oss/v_midi.c2
-rw-r--r--sound/oss/waveartist.c2
-rw-r--r--sound/oss/waveartist.h2
-rw-r--r--sound/oss/wf_midi.c2
596 files changed, 1095 insertions, 1333 deletions
diff --git a/CREDITS b/CREDITS
index 6c06ded9882b..dba3e6334691 100644
--- a/CREDITS
+++ b/CREDITS
@@ -34,6 +34,7 @@ E: magrawal@nortelnetworks.com
34D: Basic Interphase 5575 driver with UBR and ABR support. 34D: Basic Interphase 5575 driver with UBR and ABR support.
35S: 75 Donald St, Apt 42 35S: 75 Donald St, Apt 42
36S: Weymouth, MA 02188 36S: Weymouth, MA 02188
37S: USA
37 38
38N: Dave Airlie 39N: Dave Airlie
39E: airlied@linux.ie 40E: airlied@linux.ie
@@ -202,6 +203,7 @@ S: MS42
202S: Hewlett-Packard 203S: Hewlett-Packard
203S: 3404 E Harmony Rd 204S: 3404 E Harmony Rd
204S: Fort Collins, CO 80525 205S: Fort Collins, CO 80525
206S: USA
205 207
206N: Arindam Banerji 208N: Arindam Banerji
207E: axb@cse.nd.edu 209E: axb@cse.nd.edu
@@ -444,6 +446,7 @@ E: rbradetich@uswest.net
444D: Linux/PA-RISC hacker 446D: Linux/PA-RISC hacker
445S: 1200 Goldenrod Dr. 447S: 1200 Goldenrod Dr.
446S: Nampa, Idaho 83686 448S: Nampa, Idaho 83686
449S: USA
447 450
448N: Derrick J. Brashear 451N: Derrick J. Brashear
449E: shadow@dementia.org 452E: shadow@dementia.org
@@ -633,6 +636,7 @@ E: scole@lanl.gov
633E: elenstev@mesatop.com 636E: elenstev@mesatop.com
634D: Various build fixes and kernel documentation. 637D: Various build fixes and kernel documentation.
635S: Los Alamos, New Mexico 638S: Los Alamos, New Mexico
639S: USA
636 640
637N: Hamish Coleman 641N: Hamish Coleman
638E: hamish@zot.apana.org.au 642E: hamish@zot.apana.org.au
@@ -2009,6 +2013,7 @@ W: http://www.mathematik.uni-stuttgart.de/~floeff
2009D: Busmaster driver for HP 10/100 Mbit Network Adapters 2013D: Busmaster driver for HP 10/100 Mbit Network Adapters
2010S: University of Stuttgart, Germany and 2014S: University of Stuttgart, Germany and
2011S: Ecole Nationale Superieure des Telecommunications, Paris 2015S: Ecole Nationale Superieure des Telecommunications, Paris
2016S: France
2012 2017
2013N: Jamie Lokier 2018N: Jamie Lokier
2014E: jamie@shareable.org 2019E: jamie@shareable.org
@@ -2178,6 +2183,7 @@ S: Hewlett Packard
2178S: MS 42 2183S: MS 42
2179S: 3404 E. Harmony Road 2184S: 3404 E. Harmony Road
2180S: Fort Collins, CO 80528 2185S: Fort Collins, CO 80528
2186S: USA
2181 2187
2182N: Torben Mathiasen 2188N: Torben Mathiasen
2183E: torben.mathiasen@compaq.com 2189E: torben.mathiasen@compaq.com
@@ -3658,7 +3664,7 @@ S: Portland, OR
3658S: USA 3664S: USA
3659 3665
3660N: Michal Wronski 3666N: Michal Wronski
3661E: Michal.Wronski@motorola.com 3667E: michal.wronski@gmail.com
3662D: POSIX message queues fs (with K. Benedyczak) 3668D: POSIX message queues fs (with K. Benedyczak)
3663S: Krakow 3669S: Krakow
3664S: Poland 3670S: Poland
diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt
index 63392c9132b4..028614cdd062 100644
--- a/Documentation/DMA-mapping.txt
+++ b/Documentation/DMA-mapping.txt
@@ -107,7 +107,7 @@ The query is performed via a call to pci_set_dma_mask():
107 107
108 int pci_set_dma_mask(struct pci_dev *pdev, u64 device_mask); 108 int pci_set_dma_mask(struct pci_dev *pdev, u64 device_mask);
109 109
110The query for consistent allocations is performed via a a call to 110The query for consistent allocations is performed via a call to
111pci_set_consistent_dma_mask(): 111pci_set_consistent_dma_mask():
112 112
113 int pci_set_consistent_dma_mask(struct pci_dev *pdev, u64 device_mask); 113 int pci_set_consistent_dma_mask(struct pci_dev *pdev, u64 device_mask);
@@ -117,7 +117,7 @@ device_mask is a bit mask describing which bits of a PCI address your
117device supports. It returns zero if your card can perform DMA 117device supports. It returns zero if your card can perform DMA
118properly on the machine given the address mask you provided. 118properly on the machine given the address mask you provided.
119 119
120If it returns non-zero, your device can not perform DMA properly on 120If it returns non-zero, your device cannot perform DMA properly on
121this platform, and attempting to do so will result in undefined 121this platform, and attempting to do so will result in undefined
122behavior. You must either use a different mask, or not use DMA. 122behavior. You must either use a different mask, or not use DMA.
123 123
diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl
index 065e8dc23e3a..c684abf0d3b2 100644
--- a/Documentation/DocBook/libata.tmpl
+++ b/Documentation/DocBook/libata.tmpl
@@ -1400,7 +1400,7 @@ and other resources, etc.
1400 <listitem> 1400 <listitem>
1401 <para> 1401 <para>
1402 When it's known that HBA is in ready state but ATA/ATAPI 1402 When it's known that HBA is in ready state but ATA/ATAPI
1403 device in in unknown state, reset only device. 1403 device is in unknown state, reset only device.
1404 </para> 1404 </para>
1405 </listitem> 1405 </listitem>
1406 1406
diff --git a/Documentation/DocBook/usb.tmpl b/Documentation/DocBook/usb.tmpl
index 3608472d7b74..143e5ff7deb8 100644
--- a/Documentation/DocBook/usb.tmpl
+++ b/Documentation/DocBook/usb.tmpl
@@ -314,8 +314,7 @@
314 <emphasis>usbdevfs</emphasis> although it wasn't solving what 314 <emphasis>usbdevfs</emphasis> although it wasn't solving what
315 <emphasis>devfs</emphasis> was. 315 <emphasis>devfs</emphasis> was.
316 Every USB device will appear in usbfs, regardless of whether or 316 Every USB device will appear in usbfs, regardless of whether or
317 not it has a kernel driver; but only devices with kernel drivers 317 not it has a kernel driver.
318 show up in devfs.
319 </para> 318 </para>
320 319
321 <sect1> 320 <sect1>
@@ -741,7 +740,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param)
741 <title>Synchronous I/O Support</title> 740 <title>Synchronous I/O Support</title>
742 741
743 <para>Synchronous requests involve the kernel blocking 742 <para>Synchronous requests involve the kernel blocking
744 until until the user mode request completes, either by 743 until the user mode request completes, either by
745 finishing successfully or by reporting an error. 744 finishing successfully or by reporting an error.
746 In most cases this is the simplest way to use usbfs, 745 In most cases this is the simplest way to use usbfs,
747 although as noted above it does prevent performing I/O 746 although as noted above it does prevent performing I/O
diff --git a/Documentation/DocBook/writing_usb_driver.tmpl b/Documentation/DocBook/writing_usb_driver.tmpl
index 008a341234d0..07cd34c1940b 100644
--- a/Documentation/DocBook/writing_usb_driver.tmpl
+++ b/Documentation/DocBook/writing_usb_driver.tmpl
@@ -224,13 +224,8 @@ static int skel_probe(struct usb_interface *interface,
224 Conversely, when the device is removed from the USB bus, the disconnect 224 Conversely, when the device is removed from the USB bus, the disconnect
225 function is called with the device pointer. The driver needs to clean any 225 function is called with the device pointer. The driver needs to clean any
226 private data that has been allocated at this time and to shut down any 226 private data that has been allocated at this time and to shut down any
227 pending urbs that are in the USB system. The driver also unregisters 227 pending urbs that are in the USB system.
228 itself from the devfs subsystem with the call:
229 </para> 228 </para>
230 <programlisting>
231/* remove our devfs node */
232devfs_unregister(skel->devfs);
233 </programlisting>
234 <para> 229 <para>
235 Now that the device is plugged into the system and the driver is bound to 230 Now that the device is plugged into the system and the driver is bound to
236 the device, any of the functions in the file_operations structure that 231 the device, any of the functions in the file_operations structure that
diff --git a/Documentation/IPMI.txt b/Documentation/IPMI.txt
index 9f08d73d90bf..0e3924ecd76b 100644
--- a/Documentation/IPMI.txt
+++ b/Documentation/IPMI.txt
@@ -468,12 +468,12 @@ BMCs specified on the smb_addr line will be detected.
468Setting smb_dbg_probe to 1 will enable debugging of the probing and 468Setting smb_dbg_probe to 1 will enable debugging of the probing and
469detection process for BMCs on the SMBusses. 469detection process for BMCs on the SMBusses.
470 470
471Discovering the IPMI compilant BMC on the SMBus can cause devices 471Discovering the IPMI compliant BMC on the SMBus can cause devices
472on the I2C bus to fail. The SMBus driver writes a "Get Device ID" IPMI 472on the I2C bus to fail. The SMBus driver writes a "Get Device ID" IPMI
473message as a block write to the I2C bus and waits for a response. 473message as a block write to the I2C bus and waits for a response.
474This action can be detrimental to some I2C devices. It is highly recommended 474This action can be detrimental to some I2C devices. It is highly recommended
475that the known I2c address be given to the SMBus driver in the smb_addr 475that the known I2c address be given to the SMBus driver in the smb_addr
476parameter. The default adrress range will not be used when a smb_addr 476parameter. The default address range will not be used when a smb_addr
477parameter is provided. 477parameter is provided.
478 478
479When compiled into the kernel, the addresses can be specified on the 479When compiled into the kernel, the addresses can be specified on the
diff --git a/Documentation/MSI-HOWTO.txt b/Documentation/MSI-HOWTO.txt
index 3ec6c720b016..c70306abb7b2 100644
--- a/Documentation/MSI-HOWTO.txt
+++ b/Documentation/MSI-HOWTO.txt
@@ -267,7 +267,7 @@ y = The number of MSI capable devices populated in the system.
267 vector reserved to avoid the case where some MSI-X capable 267 vector reserved to avoid the case where some MSI-X capable
268 drivers may attempt to claim all available vector resources. 268 drivers may attempt to claim all available vector resources.
269 269
270z = The number of MSI-X capable devices pupulated in the system. 270z = The number of MSI-X capable devices populated in the system.
271 This policy ensures that maximum (x - y) is distributed 271 This policy ensures that maximum (x - y) is distributed
272 evenly among MSI-X capable devices. 272 evenly among MSI-X capable devices.
273 273
diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt
index 318df44259b3..820fee236967 100644
--- a/Documentation/RCU/whatisRCU.txt
+++ b/Documentation/RCU/whatisRCU.txt
@@ -582,7 +582,7 @@ The rcu_read_lock() and rcu_read_unlock() primitive read-acquire
582and release a global reader-writer lock. The synchronize_rcu() 582and release a global reader-writer lock. The synchronize_rcu()
583primitive write-acquires this same lock, then immediately releases 583primitive write-acquires this same lock, then immediately releases
584it. This means that once synchronize_rcu() exits, all RCU read-side 584it. This means that once synchronize_rcu() exits, all RCU read-side
585critical sections that were in progress before synchonize_rcu() was 585critical sections that were in progress before synchronize_rcu() was
586called are guaranteed to have completed -- there is no way that 586called are guaranteed to have completed -- there is no way that
587synchronize_rcu() would have been able to write-acquire the lock 587synchronize_rcu() would have been able to write-acquire the lock
588otherwise. 588otherwise.
@@ -750,7 +750,7 @@ Or, for those who prefer a side-by-side listing:
750 750
751Either way, the differences are quite small. Read-side locking moves 751Either way, the differences are quite small. Read-side locking moves
752to rcu_read_lock() and rcu_read_unlock, update-side locking moves from 752to rcu_read_lock() and rcu_read_unlock, update-side locking moves from
753from a reader-writer lock to a simple spinlock, and a synchronize_rcu() 753a reader-writer lock to a simple spinlock, and a synchronize_rcu()
754precedes the kfree(). 754precedes the kfree().
755 755
756However, there is one potential catch: the read-side and update-side 756However, there is one potential catch: the read-side and update-side
diff --git a/Documentation/aoe/todo.txt b/Documentation/aoe/todo.txt
index 7fee1e1165bc..c09dfad4aed8 100644
--- a/Documentation/aoe/todo.txt
+++ b/Documentation/aoe/todo.txt
@@ -7,7 +7,7 @@ not been observed, but it would be nice to eliminate any potential for
7deadlock under memory pressure. 7deadlock under memory pressure.
8 8
9Because ATA over Ethernet is not fragmented by the kernel's IP code, 9Because ATA over Ethernet is not fragmented by the kernel's IP code,
10the destructore member of the struct sk_buff is available to the aoe 10the destructor member of the struct sk_buff is available to the aoe
11driver. By using a mempool for allocating all but the first few 11driver. By using a mempool for allocating all but the first few
12sk_buffs, and by registering a destructor, we should be able to 12sk_buffs, and by registering a destructor, we should be able to
13efficiently allocate sk_buffs without introducing any potential for 13efficiently allocate sk_buffs without introducing any potential for
diff --git a/Documentation/arm/SA1100/serial_UART b/Documentation/arm/SA1100/serial_UART
index aea2e91ca0ef..a63966f1d083 100644
--- a/Documentation/arm/SA1100/serial_UART
+++ b/Documentation/arm/SA1100/serial_UART
@@ -24,8 +24,8 @@ The SA1100 serial port had its major/minor numbers officially assigned:
24> 7 = /dev/cusa2 Callout device for ttySA2 24> 7 = /dev/cusa2 Callout device for ttySA2
25> 25>
26 26
27If you're not using devfs, you must create those inodes in /dev 27You must create those inodes in /dev on the root filesystem used
28on the root filesystem used by your SA1100-based device: 28by your SA1100-based device:
29 29
30 mknod ttySA0 c 204 5 30 mknod ttySA0 c 204 5
31 mknod ttySA1 c 204 6 31 mknod ttySA1 c 204 6
diff --git a/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt b/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt
index 000e3d7a78b2..26422f0f9080 100644
--- a/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt
+++ b/Documentation/arm/Samsung-S3C24XX/EB2410ITX.txt
@@ -38,7 +38,7 @@ MTD
38--- 38---
39 39
40 The NAND and NOR support has been merged from the linux-mtd project. 40 The NAND and NOR support has been merged from the linux-mtd project.
41 Any prolbems, see http://www.linux-mtd.infradead.org/ for more 41 Any problems, see http://www.linux-mtd.infradead.org/ for more
42 information or up-to-date versions of linux-mtd. 42 information or up-to-date versions of linux-mtd.
43 43
44 44
diff --git a/Documentation/arm/Samsung-S3C24XX/GPIO.txt b/Documentation/arm/Samsung-S3C24XX/GPIO.txt
index 0822764ec270..8caea8c237ee 100644
--- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt
+++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt
@@ -24,7 +24,7 @@ Headers
24 header include/asm-arm/arch-s3c2410/hardware.h which can be 24 header include/asm-arm/arch-s3c2410/hardware.h which can be
25 included by #include <asm/arch/hardware.h> 25 included by #include <asm/arch/hardware.h>
26 26
27 A useful ammount of documentation can be found in the hardware 27 A useful amount of documentation can be found in the hardware
28 header on how the GPIO functions (and others) work. 28 header on how the GPIO functions (and others) work.
29 29
30 Whilst a number of these functions do make some checks on what 30 Whilst a number of these functions do make some checks on what
diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt
index 3e46d2a31158..dda7ecdde87b 100644
--- a/Documentation/arm/Samsung-S3C24XX/Overview.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt
@@ -80,7 +80,7 @@ Machines
80Adding New Machines 80Adding New Machines
81------------------- 81-------------------
82 82
83 The archicture has been designed to support as many machines as can 83 The architecture has been designed to support as many machines as can
84 be configured for it in one kernel build, and any future additions 84 be configured for it in one kernel build, and any future additions
85 should keep this in mind before altering items outside of their own 85 should keep this in mind before altering items outside of their own
86 machine files. 86 machine files.
diff --git a/Documentation/arm/Samsung-S3C24XX/S3C2412.txt b/Documentation/arm/Samsung-S3C24XX/S3C2412.txt
index cb82a7fc7901..295d971a15ed 100644
--- a/Documentation/arm/Samsung-S3C24XX/S3C2412.txt
+++ b/Documentation/arm/Samsung-S3C24XX/S3C2412.txt
@@ -80,7 +80,7 @@ RTC
80Watchdog 80Watchdog
81-------- 81--------
82 82
83 The watchdog harware is the same as the S3C2410, and is supported by 83 The watchdog hardware is the same as the S3C2410, and is supported by
84 the s3c2410_wdt driver. 84 the s3c2410_wdt driver.
85 85
86 86
diff --git a/Documentation/block/as-iosched.txt b/Documentation/block/as-iosched.txt
index 6f47332c883d..e2a66f8143c5 100644
--- a/Documentation/block/as-iosched.txt
+++ b/Documentation/block/as-iosched.txt
@@ -99,8 +99,8 @@ contrast, many write requests may be dispatched to the disk controller
99at a time during a write batch. It is this characteristic that can make 99at a time during a write batch. It is this characteristic that can make
100the anticipatory scheduler perform anomalously with controllers supporting 100the anticipatory scheduler perform anomalously with controllers supporting
101TCQ, or with hardware striped RAID devices. Setting the antic_expire 101TCQ, or with hardware striped RAID devices. Setting the antic_expire
102queue paramter (see below) to zero disables this behavior, and the anticipatory 102queue parameter (see below) to zero disables this behavior, and the
103scheduler behaves essentially like the deadline scheduler. 103anticipatory scheduler behaves essentially like the deadline scheduler.
104 104
105When read anticipation is enabled (antic_expire is not zero), reads 105When read anticipation is enabled (antic_expire is not zero), reads
106are dispatched to the disk controller one at a time. 106are dispatched to the disk controller one at a time.
diff --git a/Documentation/block/barrier.txt b/Documentation/block/barrier.txt
index 03971518b222..a272c3db8094 100644
--- a/Documentation/block/barrier.txt
+++ b/Documentation/block/barrier.txt
@@ -25,7 +25,7 @@ of the following three ways.
25i. For devices which have queue depth greater than 1 (TCQ devices) and 25i. For devices which have queue depth greater than 1 (TCQ devices) and
26support ordered tags, block layer can just issue the barrier as an 26support ordered tags, block layer can just issue the barrier as an
27ordered request and the lower level driver, controller and drive 27ordered request and the lower level driver, controller and drive
28itself are responsible for making sure that the ordering contraint is 28itself are responsible for making sure that the ordering constraint is
29met. Most modern SCSI controllers/drives should support this. 29met. Most modern SCSI controllers/drives should support this.
30 30
31NOTE: SCSI ordered tag isn't currently used due to limitation in the 31NOTE: SCSI ordered tag isn't currently used due to limitation in the
@@ -42,7 +42,7 @@ iii. Devices which have queue depth of 1. This is a degenerate case
42of ii. Just keeping issue order suffices. Ancient SCSI 42of ii. Just keeping issue order suffices. Ancient SCSI
43controllers/drives and IDE drives are in this category. 43controllers/drives and IDE drives are in this category.
44 44
452. Forced flushing to physcial medium 452. Forced flushing to physical medium
46 46
47Again, if you're not gonna do synchronization with disk drives (dang, 47Again, if you're not gonna do synchronization with disk drives (dang,
48it sounds even more appealing now!), the reason you use I/O barriers 48it sounds even more appealing now!), the reason you use I/O barriers
@@ -56,7 +56,7 @@ There are four cases,
56i. No write-back cache. Keeping requests ordered is enough. 56i. No write-back cache. Keeping requests ordered is enough.
57 57
58ii. Write-back cache but no flush operation. There's no way to 58ii. Write-back cache but no flush operation. There's no way to
59gurantee physical-medium commit order. This kind of devices can't to 59guarantee physical-medium commit order. This kind of devices can't to
60I/O barriers. 60I/O barriers.
61 61
62iii. Write-back cache and flush operation but no FUA (forced unit 62iii. Write-back cache and flush operation but no FUA (forced unit
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index f989a9e839b4..34bf8f60d8f8 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -135,7 +135,7 @@ Some new queue property settings:
135 Sets two variables that limit the size of the request. 135 Sets two variables that limit the size of the request.
136 136
137 - The request queue's max_sectors, which is a soft size in 137 - The request queue's max_sectors, which is a soft size in
138 in units of 512 byte sectors, and could be dynamically varied 138 units of 512 byte sectors, and could be dynamically varied
139 by the core kernel. 139 by the core kernel.
140 140
141 - The request queue's max_hw_sectors, which is a hard limit 141 - The request queue's max_hw_sectors, which is a hard limit
@@ -783,7 +783,7 @@ all the outstanding requests. There's a third helper to do that:
783 783
784 blk_queue_invalidate_tags(request_queue_t *q) 784 blk_queue_invalidate_tags(request_queue_t *q)
785 785
786 Clear the internal block tag queue and readd all the pending requests 786 Clear the internal block tag queue and re-add all the pending requests
787 to the request queue. The driver will receive them again on the 787 to the request queue. The driver will receive them again on the
788 next request_fn run, just like it did the first time it encountered 788 next request_fn run, just like it did the first time it encountered
789 them. 789 them.
@@ -890,7 +890,7 @@ Aside:
890 890
891 Kvec i/o: 891 Kvec i/o:
892 892
893 Ben LaHaise's aio code uses a slighly different structure instead 893 Ben LaHaise's aio code uses a slightly different structure instead
894 of kiobufs, called a kvec_cb. This contains an array of <page, offset, len> 894 of kiobufs, called a kvec_cb. This contains an array of <page, offset, len>
895 tuples (very much like the networking code), together with a callback function 895 tuples (very much like the networking code), together with a callback function
896 and data pointer. This is embedded into a brw_cb structure when passed 896 and data pointer. This is embedded into a brw_cb structure when passed
@@ -988,7 +988,7 @@ elevator_exit_fn Allocate and free any elevator specific storage
988 for a queue. 988 for a queue.
989 989
9904.2 Request flows seen by I/O schedulers 9904.2 Request flows seen by I/O schedulers
991All requests seens by I/O schedulers strictly follow one of the following three 991All requests seen by I/O schedulers strictly follow one of the following three
992flows. 992flows.
993 993
994 set_req_fn -> 994 set_req_fn ->
@@ -1203,6 +1203,6 @@ temporarily map a bio into the virtual address space.
1203and Linus' comments - Jan 2001) 1203and Linus' comments - Jan 2001)
12049.2 Discussions about kiobuf and bh design on lkml between sct, linus, alan 12049.2 Discussions about kiobuf and bh design on lkml between sct, linus, alan
1205et al - Feb-March 2001 (many of the initial thoughts that led to bio were 1205et al - Feb-March 2001 (many of the initial thoughts that led to bio were
1206brought up in this discusion thread) 1206brought up in this discussion thread)
12079.3 Discussions on mempool on lkml - Dec 2001. 12079.3 Discussions on mempool on lkml - Dec 2001.
1208 1208
diff --git a/Documentation/block/deadline-iosched.txt b/Documentation/block/deadline-iosched.txt
index c918b3a6022d..be08ffd1e9b8 100644
--- a/Documentation/block/deadline-iosched.txt
+++ b/Documentation/block/deadline-iosched.txt
@@ -23,11 +23,11 @@ you can do so by typing:
23read_expire (in ms) 23read_expire (in ms)
24----------- 24-----------
25 25
26The goal of the deadline io scheduler is to attempt to guarentee a start 26The goal of the deadline io scheduler is to attempt to guarantee a start
27service time for a request. As we focus mainly on read latencies, this is 27service time for a request. As we focus mainly on read latencies, this is
28tunable. When a read request first enters the io scheduler, it is assigned 28tunable. When a read request first enters the io scheduler, it is assigned
29a deadline that is the current time + the read_expire value in units of 29a deadline that is the current time + the read_expire value in units of
30miliseconds. 30milliseconds.
31 31
32 32
33write_expire (in ms) 33write_expire (in ms)
diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt
index 9c629ffa0e58..f74affe5c829 100644
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
@@ -80,7 +80,7 @@ the /proc filesystem entry which the "block" side of the driver creates as
80the SCSI core may not yet be initialized (because the driver is a block 80the SCSI core may not yet be initialized (because the driver is a block
81driver) and attempting to register it with the SCSI core in such a case 81driver) and attempting to register it with the SCSI core in such a case
82would cause a hang. This is best done via an initialization script 82would cause a hang. This is best done via an initialization script
83(typically in /etc/init.d, but could vary depending on distibution). 83(typically in /etc/init.d, but could vary depending on distribution).
84For example: 84For example:
85 85
86 for x in /proc/driver/cciss/cciss[0-9]* 86 for x in /proc/driver/cciss/cciss[0-9]*
@@ -152,7 +152,7 @@ side during the SCSI error recovery process, the cciss driver only
152implements the first two of these actions, aborting the command, and 152implements the first two of these actions, aborting the command, and
153resetting the device. Additionally, most tape drives will not oblige 153resetting the device. Additionally, most tape drives will not oblige
154in aborting commands, and sometimes it appears they will not even 154in aborting commands, and sometimes it appears they will not even
155obey a reset coommand, though in most circumstances they will. In 155obey a reset command, though in most circumstances they will. In
156the case that the command cannot be aborted and the device cannot be 156the case that the command cannot be aborted and the device cannot be
157reset, the device will be set offline. 157reset, the device will be set offline.
158 158
diff --git a/Documentation/computone.txt b/Documentation/computone.txt
index b1cf59b84d97..5e2a0c76bfa0 100644
--- a/Documentation/computone.txt
+++ b/Documentation/computone.txt
@@ -199,30 +199,6 @@ boxes this will leave gaps in the sequence of device names. ip2mkdev uses
199Linux tty naming conventions: ttyF0 - ttyF255 for normal devices, and 199Linux tty naming conventions: ttyF0 - ttyF255 for normal devices, and
200cuf0 - cuf255 for callout devices. 200cuf0 - cuf255 for callout devices.
201 201
202If you are using devfs, existing devices are automatically created within
203the devfs name space. Normal devices will be tts/F0 - tts/F255 and callout
204devices will be cua/F0 - cua/F255. With devfs installed, ip2mkdev will
205create symbolic links in /dev from the old conventional names to the newer
206devfs names as follows:
207
208 /dev/ip2ipl[n] -> /dev/ip2/ipl[n] n = 0 - 3
209 /dev/ip2stat[n] -> /dev/ip2/stat[n] n = 0 - 3
210 /dev/ttyF[n] -> /dev/tts/F[n] n = 0 - 255
211 /dev/cuf[n] -> /dev/cua/F[n] n = 0 - 255
212
213Only devices for existing ports and boards will be created.
214
215IMPORTANT NOTE: The naming convention used for devfs by this driver
216was changed from 1.2.12 to 1.2.13. The old naming convention was to
217use ttf/%d for the tty device and cuf/%d for the cua device. That
218has been changed to conform to an agreed-upon standard of placing
219all the tty devices under tts. The device names are now tts/F%d for
220the tty device and cua/F%d for the cua devices. If you were using
221the older devfs names, you must update for the newer convention.
222
223You do not need to run ip2mkdev if you are using devfs and only want to
224use the devfs native device names.
225
226 202
2274. USING THE DRIVERS 2034. USING THE DRIVERS
228 204
@@ -256,57 +232,15 @@ cut out and run as "ip2mkdev" to create the necessary device files. To
256use the ip2mkdev script, you must have procfs enabled and the proc file 232use the ip2mkdev script, you must have procfs enabled and the proc file
257system mounted on /proc. 233system mounted on /proc.
258 234
259You do not need to run ip2mkdev if you are using devfs and only want to
260use the devfs native device names.
261
262
2636. DEVFS
264
265DEVFS is the DEVice File System available as an add on package for the
2662.2.x kernels and available as a configuration option in 2.3.46 and higher.
267Devfs allows for the automatic creation and management of device names
268under control of the device drivers themselves. The Devfs namespace is
269hierarchical and reduces the clutter present in the normal flat /dev
270namespace. Devfs names and conventional device names may be intermixed.
271A userspace daemon, devfsd, exists to allow for automatic creation and
272management of symbolic links from the devfs name space to the conventional
273names. More details on devfs can be found on the DEVFS home site at
274<http://www.atnf.csiro.au/~rgooch/linux/> or in the file kernel
275documentation files, .../linux/Documentation/filesystems/devfs/README.
276
277If you are using devfs, existing devices are automatically created within
278the devfs name space. Normal devices will be tts/F0 - tts/F255 and callout
279devices will be cua/F0 - cua/F255. With devfs installed, ip2mkdev will
280create symbolic links in /dev from the old conventional names to the newer
281devfs names as follows:
282
283 /dev/ip2ipl[n] -> /dev/ip2/ipl[n] n = 0 - 3
284 /dev/ip2stat[n] -> /dev/ip2/stat[n] n = 0 - 3
285 /dev/ttyF[n] -> /dev/tts/F[n] n = 0 - 255
286 /dev/cuf[n] -> /dev/cua/F[n] n = 0 - 255
287
288Only devices for existing ports and boards will be created.
289
290IMPORTANT NOTE: The naming convention used for devfs by this driver
291was changed from 1.2.12 to 1.2.13. The old naming convention was to
292use ttf/%d for the tty device and cuf/%d for the cua device. That
293has been changed to conform to an agreed-upon standard of placing
294all the tty devices under tts. The device names are now tts/F%d for
295the tty device and cua/F%d for the cua devices. If you were using
296the older devfs names, you must update for the newer convention.
297
298You do not need to run ip2mkdev if you are using devfs and only want to
299use the devfs native device names.
300
301 235
3027. NOTES 2366. NOTES
303 237
304This is a release version of the driver, but it is impossible to test it 238This is a release version of the driver, but it is impossible to test it
305in all configurations of Linux. If there is any anomalous behaviour that 239in all configurations of Linux. If there is any anomalous behaviour that
306does not match the standard serial port's behaviour please let us know. 240does not match the standard serial port's behaviour please let us know.
307 241
308 242
3098. ip2mkdev shell script 2437. ip2mkdev shell script
310 244
311Previously, this script was simply attached here. It is now attached as a 245Previously, this script was simply attached here. It is now attached as a
312shar archive to make it easier to extract the script from the documentation. 246shar archive to make it easier to extract the script from the documentation.
diff --git a/Documentation/cpu-freq/cpufreq-stats.txt b/Documentation/cpu-freq/cpufreq-stats.txt
index 6a82948ff4bd..53d62c1e1c94 100644
--- a/Documentation/cpu-freq/cpufreq-stats.txt
+++ b/Documentation/cpu-freq/cpufreq-stats.txt
@@ -1,5 +1,5 @@
1 1
2 CPU frequency and voltage scaling statictics in the Linux(TM) kernel 2 CPU frequency and voltage scaling statistics in the Linux(TM) kernel
3 3
4 4
5 L i n u x c p u f r e q - s t a t s d r i v e r 5 L i n u x c p u f r e q - s t a t s d r i v e r
@@ -18,8 +18,8 @@ Contents
181. Introduction 181. Introduction
19 19
20cpufreq-stats is a driver that provices CPU frequency statistics for each CPU. 20cpufreq-stats is a driver that provices CPU frequency statistics for each CPU.
21This statistics is provided in /sysfs as a bunch of read_only interfaces. This 21These statistics are provided in /sysfs as a bunch of read_only interfaces. This
22interface (when configured) will appear in a seperate directory under cpufreq 22interface (when configured) will appear in a separate directory under cpufreq
23in /sysfs (<sysfs root>/devices/system/cpu/cpuX/cpufreq/stats/) for each CPU. 23in /sysfs (<sysfs root>/devices/system/cpu/cpuX/cpufreq/stats/) for each CPU.
24Various statistics will form read_only files under this directory. 24Various statistics will form read_only files under this directory.
25 25
@@ -53,7 +53,7 @@ drwxr-xr-x 3 root root 0 May 14 15:58 ..
53This gives the amount of time spent in each of the frequencies supported by 53This gives the amount of time spent in each of the frequencies supported by
54this CPU. The cat output will have "<frequency> <time>" pair in each line, which 54this CPU. The cat output will have "<frequency> <time>" pair in each line, which
55will mean this CPU spent <time> usertime units of time at <frequency>. Output 55will mean this CPU spent <time> usertime units of time at <frequency>. Output
56will have one line for each of the supported freuencies. usertime units here 56will have one line for each of the supported frequencies. usertime units here
57is 10mS (similar to other time exported in /proc). 57is 10mS (similar to other time exported in /proc).
58 58
59-------------------------------------------------------------------------------- 59--------------------------------------------------------------------------------
@@ -115,7 +115,7 @@ basic statistics which includes time_in_state and total_trans.
115 115
116"CPU frequency translation statistics details" (CONFIG_CPU_FREQ_STAT_DETAILS) 116"CPU frequency translation statistics details" (CONFIG_CPU_FREQ_STAT_DETAILS)
117provides fine grained cpufreq stats by trans_table. The reason for having a 117provides fine grained cpufreq stats by trans_table. The reason for having a
118seperate config option for trans_table is: 118separate config option for trans_table is:
119- trans_table goes against the traditional /sysfs rule of one value per 119- trans_table goes against the traditional /sysfs rule of one value per
120 interface. It provides a whole bunch of value in a 2 dimensional matrix 120 interface. It provides a whole bunch of value in a 2 dimensional matrix
121 form. 121 form.
diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt
index f4b8dc4237e6..6a9c55bd556b 100644
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
@@ -57,7 +57,7 @@ selected for each specific use.
57 57
58Basically, it's the following flow graph: 58Basically, it's the following flow graph:
59 59
60CPU can be set to switch independetly | CPU can only be set 60CPU can be set to switch independently | CPU can only be set
61 within specific "limits" | to specific frequencies 61 within specific "limits" | to specific frequencies
62 62
63 "CPUfreq policy" 63 "CPUfreq policy"
@@ -109,7 +109,7 @@ directory.
1092.4 Ondemand 1092.4 Ondemand
110------------ 110------------
111 111
112The CPUfreq govenor "ondemand" sets the CPU depending on the 112The CPUfreq governor "ondemand" sets the CPU depending on the
113current usage. To do this the CPU must have the capability to 113current usage. To do this the CPU must have the capability to
114switch the frequency very quickly. There are a number of sysfs file 114switch the frequency very quickly. There are a number of sysfs file
115accessible parameters: 115accessible parameters:
@@ -137,11 +137,11 @@ have to be made in a row before the CPU frequency is actually lower.
137If set to '1' then the frequency decreases as quickly as it increases, 137If set to '1' then the frequency decreases as quickly as it increases,
138if set to '2' it decreases at half the rate of the increase. 138if set to '2' it decreases at half the rate of the increase.
139 139
140ignore_nice_load: this parameter takes a value of '0' or '1', when set 140ignore_nice_load: this parameter takes a value of '0' or '1'. When
141to '0' (its default) then all processes are counted towards towards the 141set to '0' (its default), all processes are counted towards the
142'cpu utilisation' value. When set to '1' then processes that are 142'cpu utilisation' value. When set to '1', the processes that are
143run with a 'nice' value will not count (and thus be ignored) in the 143run with a 'nice' value will not count (and thus be ignored) in the
144overal usage calculation. This is useful if you are running a CPU 144overall usage calculation. This is useful if you are running a CPU
145intensive calculation on your laptop that you do not care how long it 145intensive calculation on your laptop that you do not care how long it
146takes to complete as you can 'nice' it and prevent it from taking part 146takes to complete as you can 'nice' it and prevent it from taking part
147in the deciding process of whether to increase your CPU frequency. 147in the deciding process of whether to increase your CPU frequency.
diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt
index 2b28e9ec4e3a..b61cb9564023 100644
--- a/Documentation/cputopology.txt
+++ b/Documentation/cputopology.txt
@@ -26,7 +26,7 @@ The type of **_id is int.
26The type of siblings is cpumask_t. 26The type of siblings is cpumask_t.
27 27
28To be consistent on all architectures, the 4 attributes should have 28To be consistent on all architectures, the 4 attributes should have
29deafult values if their values are unavailable. Below is the rule. 29default values if their values are unavailable. Below is the rule.
301) physical_package_id: If cpu has no physical package id, -1 is the 301) physical_package_id: If cpu has no physical package id, -1 is the
31default value. 31default value.
322) core_id: If cpu doesn't support multi-core, its core id is 0. 322) core_id: If cpu doesn't support multi-core, its core id is 0.
diff --git a/Documentation/dell_rbu.txt b/Documentation/dell_rbu.txt
index 941343a7a265..2c0d631de0cf 100644
--- a/Documentation/dell_rbu.txt
+++ b/Documentation/dell_rbu.txt
@@ -4,7 +4,7 @@ for updating BIOS images on Dell servers and desktops.
4 4
5Scope: 5Scope:
6This document discusses the functionality of the rbu driver only. 6This document discusses the functionality of the rbu driver only.
7It does not cover the support needed from aplications to enable the BIOS to 7It does not cover the support needed from applications to enable the BIOS to
8update itself with the image downloaded in to the memory. 8update itself with the image downloaded in to the memory.
9 9
10Overview: 10Overview:
@@ -16,8 +16,8 @@ OpenManage and Dell Update packages (DUP).
16Libsmbios can also be used to update BIOS on Dell systems go to 16Libsmbios can also be used to update BIOS on Dell systems go to
17http://linux.dell.com/libsmbios/ for details. 17http://linux.dell.com/libsmbios/ for details.
18 18
19Dell_RBU driver supports BIOS update using the monilothic image and packetized 19Dell_RBU driver supports BIOS update using the monolithic image and packetized
20image methods. In case of moniolithic the driver allocates a contiguous chunk 20image methods. In case of monolithic the driver allocates a contiguous chunk
21of physical pages having the BIOS image. In case of packetized the app 21of physical pages having the BIOS image. In case of packetized the app
22using the driver breaks the image in to packets of fixed sizes and the driver 22using the driver breaks the image in to packets of fixed sizes and the driver
23would place each packet in contiguous physical memory. The driver also 23would place each packet in contiguous physical memory. The driver also
@@ -41,7 +41,7 @@ The driver supports two types of update mechanism; monolithic and packetized.
41These update mechanism depends upon the BIOS currently running on the system. 41These update mechanism depends upon the BIOS currently running on the system.
42Most of the Dell systems support a monolithic update where the BIOS image is 42Most of the Dell systems support a monolithic update where the BIOS image is
43copied to a single contiguous block of physical memory. 43copied to a single contiguous block of physical memory.
44In case of packet mechanism the single memory can be broken in smaller chuks 44In case of packet mechanism the single memory can be broken in smaller chunks
45of contiguous memory and the BIOS image is scattered in these packets. 45of contiguous memory and the BIOS image is scattered in these packets.
46 46
47By default the driver uses monolithic memory for the update type. This can be 47By default the driver uses monolithic memory for the update type. This can be
@@ -52,11 +52,11 @@ echo packet > /sys/devices/platform/dell_rbu/image_type
52In packet update mode the packet size has to be given before any packets can 52In packet update mode the packet size has to be given before any packets can
53be downloaded. It is done as below 53be downloaded. It is done as below
54echo XXXX > /sys/devices/platform/dell_rbu/packet_size 54echo XXXX > /sys/devices/platform/dell_rbu/packet_size
55In the packet update mechanism, the user neesd to create a new file having 55In the packet update mechanism, the user needs to create a new file having
56packets of data arranged back to back. It can be done as follows 56packets of data arranged back to back. It can be done as follows
57The user creates packets header, gets the chunk of the BIOS image and 57The user creates packets header, gets the chunk of the BIOS image and
58placs it next to the packetheader; now, the packetheader + BIOS image chunk 58places it next to the packetheader; now, the packetheader + BIOS image chunk
59added to geather should match the specified packet_size. This makes one 59added together should match the specified packet_size. This makes one
60packet, the user needs to create more such packets out of the entire BIOS 60packet, the user needs to create more such packets out of the entire BIOS
61image file and then arrange all these packets back to back in to one single 61image file and then arrange all these packets back to back in to one single
62file. 62file.
@@ -93,8 +93,8 @@ read back the image downloaded.
93NOTE: 93NOTE:
94This driver requires a patch for firmware_class.c which has the modified 94This driver requires a patch for firmware_class.c which has the modified
95request_firmware_nowait function. 95request_firmware_nowait function.
96Also after updating the BIOS image an user mdoe application neeeds to execute 96Also after updating the BIOS image a user mode application needs to execute
97code which message the BIOS update request to the BIOS. So on the next reboot 97code which sends the BIOS update request to the BIOS. So on the next reboot
98the BIOS knows about the new image downloaded and it updates it self. 98the BIOS knows about the new image downloaded and it updates itself.
99Also don't unload the rbu drive if the image has to be updated. 99Also don't unload the rbu driver if the image has to be updated.
100 100
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index addc67b1d770..28c4f79662c2 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -2005,7 +2005,7 @@ Your cooperation is appreciated.
2005116 char Advanced Linux Sound Driver (ALSA) 2005116 char Advanced Linux Sound Driver (ALSA)
2006 2006
2007116 block MicroMemory battery backed RAM adapter (NVRAM) 2007116 block MicroMemory battery backed RAM adapter (NVRAM)
2008 Supports 16 boards, 15 paritions each. 2008 Supports 16 boards, 15 partitions each.
2009 Requested by neilb at cse.unsw.edu.au. 2009 Requested by neilb at cse.unsw.edu.au.
2010 2010
2011 0 = /dev/umem/d0 Whole of first board 2011 0 = /dev/umem/d0 Whole of first board
@@ -3094,7 +3094,7 @@ Your cooperation is appreciated.
3094 This major is reserved to assist the expansion to a 3094 This major is reserved to assist the expansion to a
3095 larger number space. No device nodes with this major 3095 larger number space. No device nodes with this major
3096 should ever be created on the filesystem. 3096 should ever be created on the filesystem.
3097 (This is probaly not true anymore, but I'll leave it 3097 (This is probably not true anymore, but I'll leave it
3098 for now /Torben) 3098 for now /Torben)
3099 3099
3100---LARGE MAJORS!!!!!--- 3100---LARGE MAJORS!!!!!---
@@ -3205,7 +3205,7 @@ for a session; this includes virtual consoles, serial ports, and
3205pseudoterminals (PTYs). 3205pseudoterminals (PTYs).
3206 3206
3207All terminal devices share a common set of capabilities known as line 3207All terminal devices share a common set of capabilities known as line
3208diciplines; these include the common terminal line dicipline as well 3208disciplines; these include the common terminal line discipline as well
3209as SLIP and PPP modes. 3209as SLIP and PPP modes.
3210 3210
3211All terminal devices are named similarly; this section explains the 3211All terminal devices are named similarly; this section explains the
@@ -3285,7 +3285,7 @@ port TTY, for which no alternate device would exist.
3285 Pseudoterminals (PTYs) 3285 Pseudoterminals (PTYs)
3286 3286
3287Pseudoterminals, or PTYs, are used to create login sessions or provide 3287Pseudoterminals, or PTYs, are used to create login sessions or provide
3288other capabilities requiring a TTY line dicipline (including SLIP or 3288other capabilities requiring a TTY line discipline (including SLIP or
3289PPP capability) to arbitrary data-generation processes. Each PTY has 3289PPP capability) to arbitrary data-generation processes. Each PTY has
3290a master side, named /dev/pty[p-za-e][0-9a-f], and a slave side, named 3290a master side, named /dev/pty[p-za-e][0-9a-f], and a slave side, named
3291/dev/tty[p-za-e][0-9a-f]. The kernel arbitrates the use of PTYs by 3291/dev/tty[p-za-e][0-9a-f]. The kernel arbitrates the use of PTYs by
diff --git a/Documentation/driver-model/class.txt b/Documentation/driver-model/class.txt
index 2d1d893a5e5d..548505f14aa4 100644
--- a/Documentation/driver-model/class.txt
+++ b/Documentation/driver-model/class.txt
@@ -12,7 +12,7 @@ device. The following device classes have been identified:
12 12
13Each device class defines a set of semantics and a programming interface 13Each device class defines a set of semantics and a programming interface
14that devices of that class adhere to. Device drivers are the 14that devices of that class adhere to. Device drivers are the
15implemention of that programming interface for a particular device on 15implementation of that programming interface for a particular device on
16a particular bus. 16a particular bus.
17 17
18Device classes are agnostic with respect to what bus a device resides 18Device classes are agnostic with respect to what bus a device resides
diff --git a/Documentation/driver-model/driver.txt b/Documentation/driver-model/driver.txt
index 59806c9761f7..82132169d47a 100644
--- a/Documentation/driver-model/driver.txt
+++ b/Documentation/driver-model/driver.txt
@@ -178,7 +178,7 @@ the driver to that device.
178 178
179A driver's probe() may return a negative errno value to indicate that 179A driver's probe() may return a negative errno value to indicate that
180the driver did not bind to this device, in which case it should have 180the driver did not bind to this device, in which case it should have
181released all reasources it allocated. 181released all resources it allocated.
182 182
183 int (*remove) (struct device * dev); 183 int (*remove) (struct device * dev);
184 184
diff --git a/Documentation/driver-model/overview.txt b/Documentation/driver-model/overview.txt
index 2050c9ffc629..07236ed968da 100644
--- a/Documentation/driver-model/overview.txt
+++ b/Documentation/driver-model/overview.txt
@@ -57,7 +57,7 @@ the two.
57 57
58The PCI bus layer freely accesses the fields of struct device. It knows about 58The PCI bus layer freely accesses the fields of struct device. It knows about
59the structure of struct pci_dev, and it should know the structure of struct 59the structure of struct pci_dev, and it should know the structure of struct
60device. Individual PCI device drivers that have been converted the the current 60device. Individual PCI device drivers that have been converted to the current
61driver model generally do not and should not touch the fields of struct device, 61driver model generally do not and should not touch the fields of struct device,
62unless there is a strong compelling reason to do so. 62unless there is a strong compelling reason to do so.
63 63
diff --git a/Documentation/dvb/avermedia.txt b/Documentation/dvb/avermedia.txt
index 8bab8461a4af..e44c009ac6c5 100644
--- a/Documentation/dvb/avermedia.txt
+++ b/Documentation/dvb/avermedia.txt
@@ -45,9 +45,9 @@ Assumptions and Introduction
45 by circuitry on the card and is often presented uncompressed. 45 by circuitry on the card and is often presented uncompressed.
46 For a PAL TV signal encoded at a resolution of 768x576 24-bit 46 For a PAL TV signal encoded at a resolution of 768x576 24-bit
47 color pixels over 25 frames per second - a fair amount of data 47 color pixels over 25 frames per second - a fair amount of data
48 is generated and must be proceesed by the PC before it can be 48 is generated and must be processed by the PC before it can be
49 displayed on the video monitor screen. Some Analogue TV cards 49 displayed on the video monitor screen. Some Analogue TV cards
50 for PC's have onboard MPEG2 encoders which permit the raw 50 for PCs have onboard MPEG2 encoders which permit the raw
51 digital data stream to be presented to the PC in an encoded 51 digital data stream to be presented to the PC in an encoded
52 and compressed form - similar to the form that is used in 52 and compressed form - similar to the form that is used in
53 Digital TV. 53 Digital TV.
diff --git a/Documentation/dvb/cards.txt b/Documentation/dvb/cards.txt
index 9e10092440e1..ca58e339d85f 100644
--- a/Documentation/dvb/cards.txt
+++ b/Documentation/dvb/cards.txt
@@ -5,7 +5,7 @@ Hardware supported by the linuxtv.org DVB drivers
5 frontends (i.e. tuner / demodulator units) used, usually without 5 frontends (i.e. tuner / demodulator units) used, usually without
6 changing the product name, revision number or specs. Some cards 6 changing the product name, revision number or specs. Some cards
7 are also available in versions with different frontends for 7 are also available in versions with different frontends for
8 DVB-S/DVB-C/DVB-T. Thus the frontend drivers are listed seperately. 8 DVB-S/DVB-C/DVB-T. Thus the frontend drivers are listed separately.
9 9
10 Note 1: There is no guarantee that every frontend driver works 10 Note 1: There is no guarantee that every frontend driver works
11 out of the box with every card, because of different wiring. 11 out of the box with every card, because of different wiring.
diff --git a/Documentation/dvb/ci.txt b/Documentation/dvb/ci.txt
index 95f0e73b2135..531239b29082 100644
--- a/Documentation/dvb/ci.txt
+++ b/Documentation/dvb/ci.txt
@@ -32,7 +32,7 @@ This application requires the following to function properly as of now.
32 descrambler to function, 32 descrambler to function,
33 eg: $ ca_zap channels.conf "TMC" 33 eg: $ ca_zap channels.conf "TMC"
34 34
35 (d) Hopeflly Enjoy your favourite subscribed channel as you do with 35 (d) Hopefully enjoy your favourite subscribed channel as you do with
36 a FTA card. 36 a FTA card.
37 37
38(3) Currently ca_zap, and dst_test, both are meant for demonstration 38(3) Currently ca_zap, and dst_test, both are meant for demonstration
@@ -65,7 +65,7 @@ Modules that have been tested by this driver at present are
65~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 65~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
66With the High Level CI approach any new card with almost any random 66With the High Level CI approach any new card with almost any random
67architecture can be implemented with this style, the definitions 67architecture can be implemented with this style, the definitions
68insidethe switch statement can be easily adapted for any card, thereby 68inside the switch statement can be easily adapted for any card, thereby
69eliminating the need for any additional ioctls. 69eliminating the need for any additional ioctls.
70 70
71The disadvantage is that the driver/hardware has to manage the rest. For 71The disadvantage is that the driver/hardware has to manage the rest. For
diff --git a/Documentation/dvb/faq.txt b/Documentation/dvb/faq.txt
index a42132d60dc8..dbcedf5833ee 100644
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
@@ -5,7 +5,7 @@ Some very frequently asked questions about linuxtv-dvb
5 It's not a bug, it's a feature. Because the frontends have 5 It's not a bug, it's a feature. Because the frontends have
6 significant power requirements (and hence get very hot), they 6 significant power requirements (and hence get very hot), they
7 are powered down if they are unused (i.e. if the frontend device 7 are powered down if they are unused (i.e. if the frontend device
8 is closed). The dvb-core.o module paramter "dvb_shutdown_timeout" 8 is closed). The dvb-core.o module parameter "dvb_shutdown_timeout"
9 allow you to change the timeout (default 5 seconds). Setting the 9 allow you to change the timeout (default 5 seconds). Setting the
10 timeout to 0 disables the timeout feature. 10 timeout to 0 disables the timeout feature.
11 11
@@ -138,7 +138,7 @@ Some very frequently asked questions about linuxtv-dvb
138 138
139 - v4l2-common: common functions for Video4Linux-2 drivers 139 - v4l2-common: common functions for Video4Linux-2 drivers
140 140
141 - v4l1-compat: backward compatiblity layer for Video4Linux-1 legacy 141 - v4l1-compat: backward compatibility layer for Video4Linux-1 legacy
142 applications 142 applications
143 143
144 - dvb-core: DVB core module. This provides you with the 144 - dvb-core: DVB core module. This provides you with the
@@ -153,7 +153,7 @@ Some very frequently asked questions about linuxtv-dvb
153 - video-buf: capture helper module for the saa7146_vv driver. This 153 - video-buf: capture helper module for the saa7146_vv driver. This
154 one is responsible to handle capture buffers. 154 one is responsible to handle capture buffers.
155 155
156 - dvb-ttpci: The main driver for AV7110 based, full-featued 156 - dvb-ttpci: The main driver for AV7110 based, full-featured
157 DVB-S/C/T cards 157 DVB-S/C/T cards
158 158
159eof 159eof
diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt
index 8c8388da868a..6a099edadd62 100644
--- a/Documentation/eisa.txt
+++ b/Documentation/eisa.txt
@@ -18,7 +18,7 @@ The EISA infrastructure is made up of three parts :
18 18
19 - The bus code implements most of the generic code. It is shared 19 - The bus code implements most of the generic code. It is shared
20 among all the architectures that the EISA code runs on. It 20 among all the architectures that the EISA code runs on. It
21 implements bus probing (detecting EISA cards avaible on the bus), 21 implements bus probing (detecting EISA cards available on the bus),
22 allocates I/O resources, allows fancy naming through sysfs, and 22 allocates I/O resources, allows fancy naming through sysfs, and
23 offers interfaces for driver to register. 23 offers interfaces for driver to register.
24 24
@@ -84,7 +84,7 @@ struct eisa_driver {
84 84
85id_table : an array of NULL terminated EISA id strings, 85id_table : an array of NULL terminated EISA id strings,
86 followed by an empty string. Each string can 86 followed by an empty string. Each string can
87 optionnaly be paired with a driver-dependant value 87 optionally be paired with a driver-dependant value
88 (driver_data). 88 (driver_data).
89 89
90driver : a generic driver, such as described in 90driver : a generic driver, such as described in
diff --git a/Documentation/exception.txt b/Documentation/exception.txt
index 3cb39ade290e..2d5aded64247 100644
--- a/Documentation/exception.txt
+++ b/Documentation/exception.txt
@@ -10,7 +10,7 @@ int verify_area(int type, const void * addr, unsigned long size)
10function (which has since been replaced by access_ok()). 10function (which has since been replaced by access_ok()).
11 11
12This function verified that the memory area starting at address 12This function verified that the memory area starting at address
13addr and of size size was accessible for the operation specified 13'addr' and of size 'size' was accessible for the operation specified
14in type (read or write). To do this, verify_read had to look up the 14in type (read or write). To do this, verify_read had to look up the
15virtual memory area (vma) that contained the address addr. In the 15virtual memory area (vma) that contained the address addr. In the
16normal case (correctly working program), this test was successful. 16normal case (correctly working program), this test was successful.
diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt
index f373df12ed4c..99ea58e65eff 100644
--- a/Documentation/fb/fbcon.txt
+++ b/Documentation/fb/fbcon.txt
@@ -163,7 +163,7 @@ from the console layer before unloading the driver. The VGA driver cannot be
163unloaded if it is still bound to the console layer. (See 163unloaded if it is still bound to the console layer. (See
164Documentation/console/console.txt for more information). 164Documentation/console/console.txt for more information).
165 165
166This is more complicated in the case of the the framebuffer console (fbcon), 166This is more complicated in the case of the framebuffer console (fbcon),
167because fbcon is an intermediate layer between the console and the drivers: 167because fbcon is an intermediate layer between the console and the drivers:
168 168
169console ---> fbcon ---> fbdev drivers ---> hardware 169console ---> fbcon ---> fbdev drivers ---> hardware
diff --git a/Documentation/fb/sisfb.txt b/Documentation/fb/sisfb.txt
index 3b50c517a08d..2e68e503e72f 100644
--- a/Documentation/fb/sisfb.txt
+++ b/Documentation/fb/sisfb.txt
@@ -72,7 +72,7 @@ information. Additionally, "modinfo sisfb" gives an overview over all
72supported options including some explanation. 72supported options including some explanation.
73 73
74The desired display mode can be specified using the keyword "mode" with 74The desired display mode can be specified using the keyword "mode" with
75a parameter in one of the follwing formats: 75a parameter in one of the following formats:
76 - XxYxDepth or 76 - XxYxDepth or
77 - XxY-Depth or 77 - XxY-Depth or
78 - XxY-Depth@Rate or 78 - XxY-Depth@Rate or
diff --git a/Documentation/fb/sstfb.txt b/Documentation/fb/sstfb.txt
index 628d7ffa8769..df27f5bf15db 100644
--- a/Documentation/fb/sstfb.txt
+++ b/Documentation/fb/sstfb.txt
@@ -48,12 +48,12 @@ Module Usage
48 48
49 Module insertion: 49 Module insertion:
50 # insmod sstfb.o 50 # insmod sstfb.o
51 you should see some strange output frome the board: 51 you should see some strange output from the board:
52 a big blue square, a green and a red small squares and a vertical 52 a big blue square, a green and a red small squares and a vertical
53 white rectangle. why ? the function's name is self explanatory : 53 white rectangle. why? the function's name is self-explanatory:
54 "sstfb_test()"... 54 "sstfb_test()"...
55 (if you don't have a second monitor, you'll have to plug your monitor 55 (if you don't have a second monitor, you'll have to plug your monitor
56 directely to the 2D videocard to see what you're typing) 56 directly to the 2D videocard to see what you're typing)
57 # con2fb /dev/fbx /dev/ttyx 57 # con2fb /dev/fbx /dev/ttyx
58 bind a tty to the new frame buffer. if you already have a frame 58 bind a tty to the new frame buffer. if you already have a frame
59 buffer driver, the voodoo fb will likely be /dev/fb1. if not, 59 buffer driver, the voodoo fb will likely be /dev/fb1. if not,
@@ -72,12 +72,12 @@ Module Usage
72 72
73Kernel/Modules Options 73Kernel/Modules Options
74 74
75 You can pass some otions to sstfb module, and via the kernel command 75 You can pass some options to the sstfb module, and via the kernel
76 line when the driver is compiled in : 76 command line when the driver is compiled in:
77 for module : insmod sstfb.o option1=value1 option2=value2 ... 77 for module : insmod sstfb.o option1=value1 option2=value2 ...
78 in kernel : video=sstfb:option1,option2:value2,option3 ... 78 in kernel : video=sstfb:option1,option2:value2,option3 ...
79 79
80 sstfb supports the folowing options : 80 sstfb supports the following options :
81 81
82Module Kernel Description 82Module Kernel Description
83 83
@@ -95,11 +95,11 @@ inverse=1 inverse Supposed to enable inverse console.
95 95
96clipping=1 clipping Enable or disable clipping. 96clipping=1 clipping Enable or disable clipping.
97clipping=0 noclipping With clipping enabled, all offscreen 97clipping=0 noclipping With clipping enabled, all offscreen
98 reads and writes are disgarded. 98 reads and writes are discarded.
99 Default: enable clipping. 99 Default: enable clipping.
100 100
101gfxclk=x gfxclk:x Force graphic clock frequency (in MHz). 101gfxclk=x gfxclk:x Force graphic clock frequency (in MHz).
102 Be carefull with this option, it may be 102 Be careful with this option, it may be
103 DANGEROUS. 103 DANGEROUS.
104 Default: auto 104 Default: auto
105 50Mhz for Voodoo 1, 105 50Mhz for Voodoo 1,
@@ -137,23 +137,23 @@ Bugs
137 - The driver is 16 bpp only, 24/32 won't work. 137 - The driver is 16 bpp only, 24/32 won't work.
138 - The driver is not your_favorite_toy-safe. this includes SMP... 138 - The driver is not your_favorite_toy-safe. this includes SMP...
139 [Actually from inspection it seems to be safe - Alan] 139 [Actually from inspection it seems to be safe - Alan]
140 - when using XFree86 FBdev (X over fbdev) you may see strange color 140 - When using XFree86 FBdev (X over fbdev) you may see strange color
141 patterns at the border of your windows (the pixels lose the lowest 141 patterns at the border of your windows (the pixels lose the lowest
142 byte -> basicaly the blue component nd some of the green) . I'm unable 142 byte -> basically the blue component and some of the green). I'm unable
143 to reproduce this with XFree86-3.3, but one of the testers has this 143 to reproduce this with XFree86-3.3, but one of the testers has this
144 problem with XFree86-4. apparently recent Xfree86-4.x solve this 144 problem with XFree86-4. Apparently recent Xfree86-4.x solve this
145 problem. 145 problem.
146 - I didn't really test changing the palette, so you may find some weird 146 - I didn't really test changing the palette, so you may find some weird
147 things when playing with that. 147 things when playing with that.
148 - Sometimes the driver will not recognise the DAC , and the 148 - Sometimes the driver will not recognise the DAC, and the
149 initialisation will fail. this is specificaly true for 149 initialisation will fail. This is specifically true for
150 voodoo 2 boards , but it should be solved in recent versions. please 150 voodoo 2 boards, but it should be solved in recent versions. Please
151 contact me . 151 contact me.
152 - the 24/32 is not likely to work anytime soon , knowing that the 152 - The 24/32 is not likely to work anytime soon, knowing that the
153 hardware does ... unusual thigs in 24/32 bpp 153 hardware does ... unusual things in 24/32 bpp.
154 - When used with anther video board, current limitations of linux 154 - When used with another video board, current limitations of the linux
155 console subsystem can cause some troubles, specificaly, you should 155 console subsystem can cause some troubles, specifically, you should
156 disable software scrollback , as it can oops badly ... 156 disable software scrollback, as it can oops badly ...
157 157
158Todo 158Todo
159 159
@@ -161,7 +161,7 @@ Todo
161 - Buy more coffee. 161 - Buy more coffee.
162 - test/port to other arch. 162 - test/port to other arch.
163 - try to add panning using tweeks with front and back buffer . 163 - try to add panning using tweeks with front and back buffer .
164 - try to implement accel on voodoo2 , this board can actualy do a 164 - try to implement accel on voodoo2, this board can actually do a
165 lot in 2D even if it was sold as a 3D only board ... 165 lot in 2D even if it was sold as a 3D only board ...
166 166
167ghoz. 167ghoz.
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 2e410f5aa750..42b95e0ad558 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -184,7 +184,7 @@ Who: Greg Kroah-Hartman <gregkh@suse.de>
184--------------------------- 184---------------------------
185 185
186What: USB driver API moves to EXPORT_SYMBOL_GPL 186What: USB driver API moves to EXPORT_SYMBOL_GPL
187When: Febuary 2008 187When: February 2008
188Files: include/linux/usb.h, drivers/usb/core/driver.c 188Files: include/linux/usb.h, drivers/usb/core/driver.c
189Why: The USB subsystem has changed a lot over time, and it has been 189Why: The USB subsystem has changed a lot over time, and it has been
190 possible to create userspace USB drivers using usbfs/libusb/gadgetfs 190 possible to create userspace USB drivers using usbfs/libusb/gadgetfs
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 16dec61d7671..3c384c0cf86e 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -26,8 +26,6 @@ cramfs.txt
26 - info on the cram filesystem for small storage (ROMs etc). 26 - info on the cram filesystem for small storage (ROMs etc).
27dentry-locking.txt 27dentry-locking.txt
28 - info on the RCU-based dcache locking model. 28 - info on the RCU-based dcache locking model.
29devfs/
30 - directory containing devfs documentation.
31directory-locking 29directory-locking
32 - info about the locking scheme used for directory operations. 30 - info about the locking scheme used for directory operations.
33dlmfs.txt 31dlmfs.txt
diff --git a/Documentation/filesystems/befs.txt b/Documentation/filesystems/befs.txt
index 877a7b1d46ec..67391a15949a 100644
--- a/Documentation/filesystems/befs.txt
+++ b/Documentation/filesystems/befs.txt
@@ -7,7 +7,7 @@ WARNING
7Make sure you understand that this is alpha software. This means that the 7Make sure you understand that this is alpha software. This means that the
8implementation is neither complete nor well-tested. 8implementation is neither complete nor well-tested.
9 9
10I DISCLAIM ALL RESPONSIBILTY FOR ANY POSSIBLE BAD EFFECTS OF THIS CODE! 10I DISCLAIM ALL RESPONSIBILITY FOR ANY POSSIBLE BAD EFFECTS OF THIS CODE!
11 11
12LICENSE 12LICENSE
13===== 13=====
@@ -22,7 +22,7 @@ He has been working on the code since Aug 13, 2001. See the changelog for
22details. 22details.
23 23
24Original Author: Makoto Kato <m_kato@ga2.so-net.ne.jp> 24Original Author: Makoto Kato <m_kato@ga2.so-net.ne.jp>
25His orriginal code can still be found at: 25His original code can still be found at:
26<http://hp.vector.co.jp/authors/VA008030/bfs/> 26<http://hp.vector.co.jp/authors/VA008030/bfs/>
27Does anyone know of a more current email address for Makoto? He doesn't 27Does anyone know of a more current email address for Makoto? He doesn't
28respond to the address given above... 28respond to the address given above...
@@ -39,7 +39,7 @@ Which is it, BFS or BEFS?
39================ 39================
40Be, Inc said, "BeOS Filesystem is officially called BFS, not BeFS". 40Be, Inc said, "BeOS Filesystem is officially called BFS, not BeFS".
41But Unixware Boot Filesystem is called bfs, too. And they are already in 41But Unixware Boot Filesystem is called bfs, too. And they are already in
42the kernel. Because of this nameing conflict, on Linux the BeOS 42the kernel. Because of this naming conflict, on Linux the BeOS
43filesystem is called befs. 43filesystem is called befs.
44 44
45HOW TO INSTALL 45HOW TO INSTALL
@@ -57,7 +57,7 @@ if the patching step fails (i.e. there are rejected hunks), you can try to
57figure it out yourself (it shouldn't be hard), or mail the maintainer 57figure it out yourself (it shouldn't be hard), or mail the maintainer
58(Will Dyson <will_dyson@pobox.com>) for help. 58(Will Dyson <will_dyson@pobox.com>) for help.
59 59
60step 2. Configuretion & make kernel 60step 2. Configuration & make kernel
61 61
62The linux kernel has many compile-time options. Most of them are beyond the 62The linux kernel has many compile-time options. Most of them are beyond the
63scope of this document. I suggest the Kernel-HOWTO document as a good general 63scope of this document. I suggest the Kernel-HOWTO document as a good general
diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt
index c4ff96b7c4e0..c3a7afb5eabf 100644
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
@@ -1,5 +1,5 @@
1 1
2configfs - Userspace-driven kernel object configuation. 2configfs - Userspace-driven kernel object configuration.
3 3
4Joel Becker <joel.becker@oracle.com> 4Joel Becker <joel.becker@oracle.com>
5 5
@@ -254,7 +254,7 @@ using the group _init() functions on the group.
254 254
255Finally, when userspace calls rmdir(2) on the item or group, 255Finally, when userspace calls rmdir(2) on the item or group,
256ct_group_ops->drop_item() is called. As a config_group is also a 256ct_group_ops->drop_item() is called. As a config_group is also a
257config_item, it is not necessary for a seperate drop_group() method. 257config_item, it is not necessary for a separate drop_group() method.
258The subsystem must config_item_put() the reference that was initialized 258The subsystem must config_item_put() the reference that was initialized
259upon item allocation. If a subsystem has no work to do, it may omit 259upon item allocation. If a subsystem has no work to do, it may omit
260the ct_group_ops->drop_item() method, and configfs will call 260the ct_group_ops->drop_item() method, and configfs will call
@@ -406,7 +406,7 @@ that condition is met.
406 406
407Far better would be an explicit action notifying the subsystem that the 407Far better would be an explicit action notifying the subsystem that the
408config_item is ready to go. More importantly, an explicit action allows 408config_item is ready to go. More importantly, an explicit action allows
409the subsystem to provide feedback as to whether the attibutes are 409the subsystem to provide feedback as to whether the attributes are
410initialized in a way that makes sense. configfs provides this as 410initialized in a way that makes sense. configfs provides this as
411committable items. 411committable items.
412 412
@@ -422,7 +422,7 @@ support mkdir(2) or rmdir(2) either. It only allows rename(2). The
422"pending" directory does allow mkdir(2) and rmdir(2). An item is 422"pending" directory does allow mkdir(2) and rmdir(2). An item is
423created in the "pending" directory. Its attributes can be modified at 423created in the "pending" directory. Its attributes can be modified at
424will. Userspace commits the item by renaming it into the "live" 424will. Userspace commits the item by renaming it into the "live"
425directory. At this point, the subsystem recieves the ->commit_item() 425directory. At this point, the subsystem receives the ->commit_item()
426callback. If all required attributes are filled to satisfaction, the 426callback. If all required attributes are filled to satisfaction, the
427method returns zero and the item is moved to the "live" directory. 427method returns zero and the item is moved to the "live" directory.
428 428
diff --git a/Documentation/filesystems/directory-locking b/Documentation/filesystems/directory-locking
index 34380d4fbce3..d7099a9266fb 100644
--- a/Documentation/filesystems/directory-locking
+++ b/Documentation/filesystems/directory-locking
@@ -82,7 +82,7 @@ own descendent. Moreover, there is exactly one cross-directory rename
82 82
83 Consider the object blocking the cross-directory rename. One 83 Consider the object blocking the cross-directory rename. One
84of its descendents is locked by cross-directory rename (otherwise we 84of its descendents is locked by cross-directory rename (otherwise we
85would again have an infinite set of of contended objects). But that 85would again have an infinite set of contended objects). But that
86means that cross-directory rename is taking locks out of order. Due 86means that cross-directory rename is taking locks out of order. Due
87to (2) the order hadn't changed since we had acquired filesystem lock. 87to (2) the order hadn't changed since we had acquired filesystem lock.
88But locking rules for cross-directory rename guarantee that we do not 88But locking rules for cross-directory rename guarantee that we do not
diff --git a/Documentation/filesystems/dlmfs.txt b/Documentation/filesystems/dlmfs.txt
index 9afab845a906..c50bbb2d52b4 100644
--- a/Documentation/filesystems/dlmfs.txt
+++ b/Documentation/filesystems/dlmfs.txt
@@ -68,7 +68,7 @@ request for an already acquired lock will not generate another DLM
68call. Userspace programs are assumed to handle their own local 68call. Userspace programs are assumed to handle their own local
69locking. 69locking.
70 70
71Two levels of locks are supported - Shared Read, and Exlcusive. 71Two levels of locks are supported - Shared Read, and Exclusive.
72Also supported is a Trylock operation. 72Also supported is a Trylock operation.
73 73
74For information on the libo2dlm interface, please see o2dlm.h, 74For information on the libo2dlm interface, please see o2dlm.h,
diff --git a/Documentation/filesystems/ext2.txt b/Documentation/filesystems/ext2.txt
index 3dd2872416a1..4333e836c495 100644
--- a/Documentation/filesystems/ext2.txt
+++ b/Documentation/filesystems/ext2.txt
@@ -205,7 +205,7 @@ Reserved Space
205 205
206In ext2, there is a mechanism for reserving a certain number of blocks 206In ext2, there is a mechanism for reserving a certain number of blocks
207for a particular user (normally the super-user). This is intended to 207for a particular user (normally the super-user). This is intended to
208allow for the system to continue functioning even if non-priveleged users 208allow for the system to continue functioning even if non-privileged users
209fill up all the space available to them (this is independent of filesystem 209fill up all the space available to them (this is independent of filesystem
210quotas). It also keeps the filesystem from filling up entirely which 210quotas). It also keeps the filesystem from filling up entirely which
211helps combat fragmentation. 211helps combat fragmentation.
diff --git a/Documentation/filesystems/files.txt b/Documentation/filesystems/files.txt
index 8c206f4e0250..133e213ebb72 100644
--- a/Documentation/filesystems/files.txt
+++ b/Documentation/filesystems/files.txt
@@ -55,7 +55,7 @@ the fdtable structure -
552. Reading of the fdtable as described above must be protected 552. Reading of the fdtable as described above must be protected
56 by rcu_read_lock()/rcu_read_unlock(). 56 by rcu_read_lock()/rcu_read_unlock().
57 57
583. For any update to the the fd table, files->file_lock must 583. For any update to the fd table, files->file_lock must
59 be held. 59 be held.
60 60
614. To look up the file structure given an fd, a reader 614. To look up the file structure given an fd, a reader
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt
index 638cbd3d2b00..35f105b29e3e 100644
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
@@ -13,7 +13,7 @@ Table of contents
13- Using NTFS volume and stripe sets 13- Using NTFS volume and stripe sets
14 - The Device-Mapper driver 14 - The Device-Mapper driver
15 - The Software RAID / MD driver 15 - The Software RAID / MD driver
16 - Limitiations when using the MD driver 16 - Limitations when using the MD driver
17- ChangeLog 17- ChangeLog
18 18
19 19
@@ -43,7 +43,7 @@ There is plenty of additional information on the linux-ntfs web site
43at http://linux-ntfs.sourceforge.net/ 43at http://linux-ntfs.sourceforge.net/
44 44
45The web site has a lot of additional information, such as a comprehensive 45The web site has a lot of additional information, such as a comprehensive
46FAQ, documentation on the NTFS on-disk format, informaiton on the Linux-NTFS 46FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS
47userspace utilities, etc. 47userspace utilities, etc.
48 48
49 49
@@ -383,14 +383,14 @@ Software RAID / MD driver. For which you need to set up your /etc/raidtab
383appropriately (see man 5 raidtab). 383appropriately (see man 5 raidtab).
384 384
385Linear volume sets, i.e. linear raid, as well as stripe sets, i.e. raid level 385Linear volume sets, i.e. linear raid, as well as stripe sets, i.e. raid level
3860, have been tested and work fine (though see section "Limitiations when using 3860, have been tested and work fine (though see section "Limitations when using
387the MD driver with NTFS volumes" especially if you want to use linear raid). 387the MD driver with NTFS volumes" especially if you want to use linear raid).
388Even though untested, there is no reason why mirrors, i.e. raid level 1, and 388Even though untested, there is no reason why mirrors, i.e. raid level 1, and
389stripes with parity, i.e. raid level 5, should not work, too. 389stripes with parity, i.e. raid level 5, should not work, too.
390 390
391You have to use the "persistent-superblock 0" option for each raid-disk in the 391You have to use the "persistent-superblock 0" option for each raid-disk in the
392NTFS volume/stripe you are configuring in /etc/raidtab as the persistent 392NTFS volume/stripe you are configuring in /etc/raidtab as the persistent
393superblock used by the MD driver would damange the NTFS volume. 393superblock used by the MD driver would damage the NTFS volume.
394 394
395Windows by default uses a stripe chunk size of 64k, so you probably want the 395Windows by default uses a stripe chunk size of 64k, so you probably want the
396"chunk-size 64k" option for each raid-disk, too. 396"chunk-size 64k" option for each raid-disk, too.
@@ -435,7 +435,7 @@ setup correctly to avoid the possibility of causing damage to the data on the
435ntfs volume. 435ntfs volume.
436 436
437 437
438Limitiations when using the Software RAID / MD driver 438Limitations when using the Software RAID / MD driver
439----------------------------------------------------- 439-----------------------------------------------------
440 440
441Using the md driver will not work properly if any of your NTFS partitions have 441Using the md driver will not work properly if any of your NTFS partitions have
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 7240ee7515de..3355e6920105 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -410,7 +410,7 @@ VmallocChunk: 111088 kB
410 this memory, making it slower to access than lowmem. 410 this memory, making it slower to access than lowmem.
411 LowTotal: 411 LowTotal:
412 LowFree: Lowmem is memory which can be used for everything that 412 LowFree: Lowmem is memory which can be used for everything that
413 highmem can be used for, but it is also availble for the 413 highmem can be used for, but it is also available for the
414 kernel's use for its own data structures. Among many 414 kernel's use for its own data structures. Among many
415 other things, it is where everything from the Slab is 415 other things, it is where everything from the Slab is
416 allocated. Bad things happen when you're out of lowmem. 416 allocated. Bad things happen when you're out of lowmem.
@@ -1255,7 +1255,7 @@ to allocate (but not use) more memory than is actually available.
1255 address space are refused. Used for a typical system. It 1255 address space are refused. Used for a typical system. It
1256 ensures a seriously wild allocation fails while allowing 1256 ensures a seriously wild allocation fails while allowing
1257 overcommit to reduce swap usage. root is allowed to 1257 overcommit to reduce swap usage. root is allowed to
1258 allocate slighly more memory in this mode. This is the 1258 allocate slightly more memory in this mode. This is the
1259 default. 1259 default.
1260 1260
12611 - Always overcommit. Appropriate for some scientific 12611 - Always overcommit. Appropriate for some scientific
@@ -1588,7 +1588,7 @@ Enable the strict RFC793 interpretation of the TCP urgent pointer field. The
1588default is to use the BSD compatible interpretation of the urgent pointer 1588default is to use the BSD compatible interpretation of the urgent pointer
1589pointing to the first byte after the urgent data. The RFC793 interpretation is 1589pointing to the first byte after the urgent data. The RFC793 interpretation is
1590to have it point to the last byte of urgent data. Enabling this option may 1590to have it point to the last byte of urgent data. Enabling this option may
1591lead to interoperatibility problems. Disabled by default. 1591lead to interoperability problems. Disabled by default.
1592 1592
1593tcp_syncookies 1593tcp_syncookies
1594-------------- 1594--------------
@@ -1733,7 +1733,7 @@ error_burst and error_cost
1733 1733
1734These parameters are used to limit how many ICMP destination unreachable to 1734These parameters are used to limit how many ICMP destination unreachable to
1735send from the host in question. ICMP destination unreachable messages are 1735send from the host in question. ICMP destination unreachable messages are
1736sent when we can not reach the next hop, while trying to transmit a packet. 1736sent when we cannot reach the next hop while trying to transmit a packet.
1737It will also print some error messages to kernel logs if someone is ignoring 1737It will also print some error messages to kernel logs if someone is ignoring
1738our ICMP redirects. The higher the error_cost factor is, the fewer 1738our ICMP redirects. The higher the error_cost factor is, the fewer
1739destination unreachable and error messages will be let through. Error_burst 1739destination unreachable and error messages will be let through. Error_burst
@@ -1857,7 +1857,7 @@ proxy_qlen
1857 1857
1858Maximum queue length of the delayed proxy arp timer. (see proxy_delay). 1858Maximum queue length of the delayed proxy arp timer. (see proxy_delay).
1859 1859
1860app_solcit 1860app_solicit
1861---------- 1861----------
1862 1862
1863Determines the number of requests to send to the user level ARP daemon. Use 0 1863Determines the number of requests to send to the user level ARP daemon. Use 0
diff --git a/Documentation/filesystems/spufs.txt b/Documentation/filesystems/spufs.txt
index 8edc3952eff4..982645a1981d 100644
--- a/Documentation/filesystems/spufs.txt
+++ b/Documentation/filesystems/spufs.txt
@@ -84,7 +84,7 @@ FILES
84 /ibox 84 /ibox
85 The second SPU to CPU communication mailbox. This file is similar to 85 The second SPU to CPU communication mailbox. This file is similar to
86 the first mailbox file, but can be read in blocking I/O mode, and the 86 the first mailbox file, but can be read in blocking I/O mode, and the
87 poll familiy of system calls can be used to wait for it. The possible 87 poll family of system calls can be used to wait for it. The possible
88 operations on an open ibox file are: 88 operations on an open ibox file are:
89 89
90 read(2) 90 read(2)
@@ -105,7 +105,7 @@ FILES
105 105
106 106
107 /wbox 107 /wbox
108 The CPU to SPU communation mailbox. It is write-only can can be written 108 The CPU to SPU communation mailbox. It is write-only and can be written
109 in units of 32 bits. If the mailbox is full, write() will block and 109 in units of 32 bits. If the mailbox is full, write() will block and
110 poll can be used to wait for it becoming empty again. The possible 110 poll can be used to wait for it becoming empty again. The possible
111 operations on an open wbox file are: write(2) If a count smaller than 111 operations on an open wbox file are: write(2) If a count smaller than
@@ -359,7 +359,7 @@ ERRORS
359 EFAULT npc is not a valid pointer or status is neither NULL nor a valid 359 EFAULT npc is not a valid pointer or status is neither NULL nor a valid
360 pointer. 360 pointer.
361 361
362 EINTR A signal occured while spu_run was in progress. The npc value 362 EINTR A signal occurred while spu_run was in progress. The npc value
363 has been updated to the new program counter value if necessary. 363 has been updated to the new program counter value if necessary.
364 364
365 EINVAL fd is not a file descriptor returned from spu_create(2). 365 EINVAL fd is not a file descriptor returned from spu_create(2).
diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt
index 89b1d196ca80..4b5ca26e5048 100644
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
@@ -238,7 +238,7 @@ Top Level Directory Layout
238The sysfs directory arrangement exposes the relationship of kernel 238The sysfs directory arrangement exposes the relationship of kernel
239data structures. 239data structures.
240 240
241The top level sysfs diretory looks like: 241The top level sysfs directory looks like:
242 242
243block/ 243block/
244bus/ 244bus/
diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt
index 1773106976a2..6dd050878a20 100644
--- a/Documentation/filesystems/tmpfs.txt
+++ b/Documentation/filesystems/tmpfs.txt
@@ -39,7 +39,7 @@ tmpfs has the following uses:
39 tmpfs /dev/shm tmpfs defaults 0 0 39 tmpfs /dev/shm tmpfs defaults 0 0
40 40
41 Remember to create the directory that you intend to mount tmpfs on 41 Remember to create the directory that you intend to mount tmpfs on
42 if necessary (/dev/shm is automagically created if you use devfs). 42 if necessary.
43 43
44 This mount is _not_ needed for SYSV shared memory. The internal 44 This mount is _not_ needed for SYSV shared memory. The internal
45 mount is used for that. (In the 2.3 kernel versions it was 45 mount is used for that. (In the 2.3 kernel versions it was
@@ -63,7 +63,7 @@ size: The limit of allocated bytes for this tmpfs instance. The
63nr_blocks: The same as size, but in blocks of PAGE_CACHE_SIZE. 63nr_blocks: The same as size, but in blocks of PAGE_CACHE_SIZE.
64nr_inodes: The maximum number of inodes for this instance. The default 64nr_inodes: The maximum number of inodes for this instance. The default
65 is half of the number of your physical RAM pages, or (on a 65 is half of the number of your physical RAM pages, or (on a
66 a machine with highmem) the number of lowmem RAM pages, 66 machine with highmem) the number of lowmem RAM pages,
67 whichever is the lower. 67 whichever is the lower.
68 68
69These parameters accept a suffix k, m or g for kilo, mega and giga and 69These parameters accept a suffix k, m or g for kilo, mega and giga and
diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt
index 2001abbc60e6..069cb1094300 100644
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
@@ -35,7 +35,7 @@ iocharset=name -- Character set to use for converting between the
35 you should consider the following option instead. 35 you should consider the following option instead.
36 36
37utf8=<bool> -- UTF-8 is the filesystem safe version of Unicode that 37utf8=<bool> -- UTF-8 is the filesystem safe version of Unicode that
38 is used by the console. It can be be enabled for the 38 is used by the console. It can be enabled for the
39 filesystem with this option. If 'uni_xlate' gets set, 39 filesystem with this option. If 'uni_xlate' gets set,
40 UTF-8 gets disabled. 40 UTF-8 gets disabled.
41 41
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index cd07c21b8400..7737bfd03cf8 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -410,7 +410,7 @@ otherwise noted.
410 410
411 put_link: called by the VFS to release resources allocated by 411 put_link: called by the VFS to release resources allocated by
412 follow_link(). The cookie returned by follow_link() is passed 412 follow_link(). The cookie returned by follow_link() is passed
413 to to this method as the last parameter. It is used by 413 to this method as the last parameter. It is used by
414 filesystems such as NFS where page cache is not stable 414 filesystems such as NFS where page cache is not stable
415 (i.e. page that was installed when the symbolic link walk 415 (i.e. page that was installed when the symbolic link walk
416 started might not be in the page cache at the end of the 416 started might not be in the page cache at the end of the
diff --git a/Documentation/fujitsu/frv/mmu-layout.txt b/Documentation/fujitsu/frv/mmu-layout.txt
index 11dcc5679887..db10250df6be 100644
--- a/Documentation/fujitsu/frv/mmu-layout.txt
+++ b/Documentation/fujitsu/frv/mmu-layout.txt
@@ -233,7 +233,7 @@ related kernel services:
233 (*) __debug_mmu.iamr[] 233 (*) __debug_mmu.iamr[]
234 (*) __debug_mmu.damr[] 234 (*) __debug_mmu.damr[]
235 235
236 These receive the current IAMR and DAMR contents. These can be viewed with with the _amr 236 These receive the current IAMR and DAMR contents. These can be viewed with the _amr
237 GDB macro: 237 GDB macro:
238 238
239 (gdb) _amr 239 (gdb) _amr
diff --git a/Documentation/highuid.txt b/Documentation/highuid.txt
index 2c33926b9099..76034d9dbfc0 100644
--- a/Documentation/highuid.txt
+++ b/Documentation/highuid.txt
@@ -57,7 +57,7 @@ What's left to be done for 32-bit UIDs on all Linux architectures:
57 57
58 Other filesystems have not been checked yet. 58 Other filesystems have not been checked yet.
59 59
60- The ncpfs and smpfs filesystems can not presently use 32-bit UIDs in 60- The ncpfs and smpfs filesystems cannot presently use 32-bit UIDs in
61 all ioctl()s. Some new ioctl()s have been added with 32-bit UIDs, but 61 all ioctl()s. Some new ioctl()s have been added with 32-bit UIDs, but
62 more are needed. (as well as new user<->kernel data structures) 62 more are needed. (as well as new user<->kernel data structures)
63 63
diff --git a/Documentation/hrtimers.txt b/Documentation/hrtimers.txt
index 7620ff735faf..ce31f65e12e7 100644
--- a/Documentation/hrtimers.txt
+++ b/Documentation/hrtimers.txt
@@ -10,7 +10,7 @@ back and forth trying to integrate high-resolution and high-precision
10features into the existing timer framework, and after testing various 10features into the existing timer framework, and after testing various
11such high-resolution timer implementations in practice, we came to the 11such high-resolution timer implementations in practice, we came to the
12conclusion that the timer wheel code is fundamentally not suitable for 12conclusion that the timer wheel code is fundamentally not suitable for
13such an approach. We initially didnt believe this ('there must be a way 13such an approach. We initially didn't believe this ('there must be a way
14to solve this'), and spent a considerable effort trying to integrate 14to solve this'), and spent a considerable effort trying to integrate
15things into the timer wheel, but we failed. In hindsight, there are 15things into the timer wheel, but we failed. In hindsight, there are
16several reasons why such integration is hard/impossible: 16several reasons why such integration is hard/impossible:
@@ -27,7 +27,7 @@ several reasons why such integration is hard/impossible:
27 high-res timers. 27 high-res timers.
28 28
29- the unpredictable [O(N)] overhead of cascading leads to delays which 29- the unpredictable [O(N)] overhead of cascading leads to delays which
30 necessiate a more complex handling of high resolution timers, which 30 necessitate a more complex handling of high resolution timers, which
31 in turn decreases robustness. Such a design still led to rather large 31 in turn decreases robustness. Such a design still led to rather large
32 timing inaccuracies. Cascading is a fundamental property of the timer 32 timing inaccuracies. Cascading is a fundamental property of the timer
33 wheel concept, it cannot be 'designed out' without unevitably 33 wheel concept, it cannot be 'designed out' without unevitably
@@ -58,7 +58,7 @@ several reasons why such integration is hard/impossible:
58The primary users of precision timers are user-space applications that 58The primary users of precision timers are user-space applications that
59utilize nanosleep, posix-timers and itimer interfaces. Also, in-kernel 59utilize nanosleep, posix-timers and itimer interfaces. Also, in-kernel
60users like drivers and subsystems which require precise timed events 60users like drivers and subsystems which require precise timed events
61(e.g. multimedia) can benefit from the availability of a seperate 61(e.g. multimedia) can benefit from the availability of a separate
62high-resolution timer subsystem as well. 62high-resolution timer subsystem as well.
63 63
64While this subsystem does not offer high-resolution clock sources just 64While this subsystem does not offer high-resolution clock sources just
@@ -68,7 +68,7 @@ The increasing demand for realtime and multimedia applications along
68with other potential users for precise timers gives another reason to 68with other potential users for precise timers gives another reason to
69separate the "timeout" and "precise timer" subsystems. 69separate the "timeout" and "precise timer" subsystems.
70 70
71Another potential benefit is that such a seperation allows even more 71Another potential benefit is that such a separation allows even more
72special-purpose optimization of the existing timer wheel for the low 72special-purpose optimization of the existing timer wheel for the low
73resolution and low precision use cases - once the precision-sensitive 73resolution and low precision use cases - once the precision-sensitive
74APIs are separated from the timer wheel and are migrated over to 74APIs are separated from the timer wheel and are migrated over to
@@ -96,8 +96,8 @@ file systems. The rbtree is solely used for time sorted ordering, while
96a separate list is used to give the expiry code fast access to the 96a separate list is used to give the expiry code fast access to the
97queued timers, without having to walk the rbtree. 97queued timers, without having to walk the rbtree.
98 98
99(This seperate list is also useful for later when we'll introduce 99(This separate list is also useful for later when we'll introduce
100high-resolution clocks, where we need seperate pending and expired 100high-resolution clocks, where we need separate pending and expired
101queues while keeping the time-order intact.) 101queues while keeping the time-order intact.)
102 102
103Time-ordered enqueueing is not purely for the purposes of 103Time-ordered enqueueing is not purely for the purposes of
diff --git a/Documentation/ia64/efirtc.txt b/Documentation/ia64/efirtc.txt
index ede2c1e51cd7..057e6bebda8f 100644
--- a/Documentation/ia64/efirtc.txt
+++ b/Documentation/ia64/efirtc.txt
@@ -26,7 +26,7 @@ to initialize the system view of the time during boot.
26Because we wanted to minimize the impact on existing user-level apps using 26Because we wanted to minimize the impact on existing user-level apps using
27the CMOS clock, we decided to expose an API that was very similar to the one 27the CMOS clock, we decided to expose an API that was very similar to the one
28used today with the legacy RTC driver (driver/char/rtc.c). However, because 28used today with the legacy RTC driver (driver/char/rtc.c). However, because
29EFI provides a simpler services, not all all ioctl() are available. Also 29EFI provides a simpler services, not all ioctl() are available. Also
30new ioctl()s have been introduced for things that EFI provides but not the 30new ioctl()s have been introduced for things that EFI provides but not the
31legacy. 31legacy.
32 32
diff --git a/Documentation/ia64/fsys.txt b/Documentation/ia64/fsys.txt
index 28da181f9966..59dd689d9b86 100644
--- a/Documentation/ia64/fsys.txt
+++ b/Documentation/ia64/fsys.txt
@@ -165,7 +165,7 @@ complicated cases.
165* Signal handling 165* Signal handling
166 166
167The delivery of (asynchronous) signals must be delayed until fsys-mode 167The delivery of (asynchronous) signals must be delayed until fsys-mode
168is exited. This is acomplished with the help of the lower-privilege 168is exited. This is accomplished with the help of the lower-privilege
169transfer trap: arch/ia64/kernel/process.c:do_notify_resume_user() 169transfer trap: arch/ia64/kernel/process.c:do_notify_resume_user()
170checks whether the interrupted task was in fsys-mode and, if so, sets 170checks whether the interrupted task was in fsys-mode and, if so, sets
171PSR.lp and returns immediately. When fsys-mode is exited via the 171PSR.lp and returns immediately. When fsys-mode is exited via the
diff --git a/Documentation/ia64/mca.txt b/Documentation/ia64/mca.txt
index a71cc6a67ef7..f097c60cba1b 100644
--- a/Documentation/ia64/mca.txt
+++ b/Documentation/ia64/mca.txt
@@ -12,7 +12,7 @@ by locks is indeterminate, including linked lists.
12--- 12---
13 13
14The complicated ia64 MCA process. All of this is mandated by Intel's 14The complicated ia64 MCA process. All of this is mandated by Intel's
15specification for ia64 SAL, error recovery and and unwind, it is not as 15specification for ia64 SAL, error recovery and unwind, it is not as
16if we have a choice here. 16if we have a choice here.
17 17
18* MCA occurs on one cpu, usually due to a double bit memory error. 18* MCA occurs on one cpu, usually due to a double bit memory error.
@@ -94,7 +94,7 @@ if we have a choice here.
94 94
95INIT is less complicated than MCA. Pressing the nmi button or using 95INIT is less complicated than MCA. Pressing the nmi button or using
96the equivalent command on the management console sends INIT to all 96the equivalent command on the management console sends INIT to all
97cpus. SAL picks one one of the cpus as the monarch and the rest are 97cpus. SAL picks one of the cpus as the monarch and the rest are
98slaves. All the OS INIT handlers are entered at approximately the same 98slaves. All the OS INIT handlers are entered at approximately the same
99time. The OS monarch prints the state of all tasks and returns, after 99time. The OS monarch prints the state of all tasks and returns, after
100which the slaves return and the system resumes. 100which the slaves return and the system resumes.
diff --git a/Documentation/ibm-acpi.txt b/Documentation/ibm-acpi.txt
index 8b3fd82b2ce7..71aa40345272 100644
--- a/Documentation/ibm-acpi.txt
+++ b/Documentation/ibm-acpi.txt
@@ -450,7 +450,7 @@ his laptop (the location of sensors may vary on other models):
450 450
451No commands can be written to this file. 451No commands can be written to this file.
452 452
453EXPERIMENTAL: Embedded controller reigster dump -- /proc/acpi/ibm/ecdump 453EXPERIMENTAL: Embedded controller register dump -- /proc/acpi/ibm/ecdump
454------------------------------------------------------------------------ 454------------------------------------------------------------------------
455 455
456This feature is marked EXPERIMENTAL because the implementation 456This feature is marked EXPERIMENTAL because the implementation
diff --git a/Documentation/ide.txt b/Documentation/ide.txt
index 29866fbfb229..0bf38baa2db9 100644
--- a/Documentation/ide.txt
+++ b/Documentation/ide.txt
@@ -281,7 +281,7 @@ Summary of ide driver parameters for kernel command line
281 281
282 "idex=serialize" : do not overlap operations on idex. Please note 282 "idex=serialize" : do not overlap operations on idex. Please note
283 that you will have to specify this option for 283 that you will have to specify this option for
284 both the respecitve primary and secondary channel 284 both the respective primary and secondary channel
285 to take effect. 285 to take effect.
286 286
287 "idex=four" : four drives on idex and ide(x^1) share same ports 287 "idex=four" : four drives on idex and ide(x^1) share same ports
diff --git a/Documentation/input/amijoy.txt b/Documentation/input/amijoy.txt
index 3b8b2d43a68e..4f0e89df5c51 100644
--- a/Documentation/input/amijoy.txt
+++ b/Documentation/input/amijoy.txt
@@ -79,10 +79,10 @@ JOY0DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0
79JOY1DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0 79JOY1DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0
80 80
81 0=LEFT CONTROLLER PAIR, 1=RIGHT CONTROLLER PAIR. 81 0=LEFT CONTROLLER PAIR, 1=RIGHT CONTROLLER PAIR.
82 (4 counters total).The bit usage for both left and right 82 (4 counters total). The bit usage for both left and right
83 addresses is shown below. Each 6 bit counter (Y7-Y2,X7-X2) is 83 addresses is shown below. Each 6 bit counter (Y7-Y2,X7-X2) is
84 clocked by 2 of the signals input from the mouse serial 84 clocked by 2 of the signals input from the mouse serial
85 stream. Starting with first bit recived: 85 stream. Starting with first bit received:
86 86
87 +-------------------+-----------------------------------------+ 87 +-------------------+-----------------------------------------+
88 | Serial | Bit Name | Description | 88 | Serial | Bit Name | Description |
diff --git a/Documentation/input/atarikbd.txt b/Documentation/input/atarikbd.txt
index 8fb896c74114..1e7e5853ba4c 100644
--- a/Documentation/input/atarikbd.txt
+++ b/Documentation/input/atarikbd.txt
@@ -10,7 +10,7 @@ provides a convenient connection point for a mouse and switch-type joysticks.
10The ikbd processor also maintains a time-of-day clock with one second 10The ikbd processor also maintains a time-of-day clock with one second
11resolution. 11resolution.
12The ikbd has been designed to be general enough that it can be used with a 12The ikbd has been designed to be general enough that it can be used with a
13ariety of new computer products. Product variations in a number of 13variety of new computer products. Product variations in a number of
14keyswitches, mouse resolution, etc. can be accommodated. 14keyswitches, mouse resolution, etc. can be accommodated.
15The ikbd communicates with the main processor over a high speed bi-directional 15The ikbd communicates with the main processor over a high speed bi-directional
16serial interface. It can function in a variety of modes to facilitate 16serial interface. It can function in a variety of modes to facilitate
@@ -30,7 +30,7 @@ is obtained by ORing 0x80 with the make code.
30The special codes 0xF6 through 0xFF are reserved for use as follows: 30The special codes 0xF6 through 0xFF are reserved for use as follows:
31 0xF6 status report 31 0xF6 status report
32 0xF7 absolute mouse position record 32 0xF7 absolute mouse position record
33 0xF8-0xFB relative mouse position records(lsbs determind by 33 0xF8-0xFB relative mouse position records (lsbs determined by
34 mouse button states) 34 mouse button states)
35 0xFC time-of-day 35 0xFC time-of-day
36 0xFD joystick report (both sticks) 36 0xFD joystick report (both sticks)
@@ -84,7 +84,7 @@ selected.
844.2 Absolute Position reporting 844.2 Absolute Position reporting
85 85
86The ikbd can also maintain absolute mouse position. Commands exist for 86The ikbd can also maintain absolute mouse position. Commands exist for
87reseting the mouse position, setting X/Y scaling, and interrogating the 87resetting the mouse position, setting X/Y scaling, and interrogating the
88current mouse position. 88current mouse position.
89 89
904.3 Mouse Cursor Key Mode 904.3 Mouse Cursor Key Mode
@@ -406,7 +406,7 @@ INTERROGATION MODE.
4069.18 SET JOYSTICK MONITORING 4069.18 SET JOYSTICK MONITORING
407 407
408 0x17 408 0x17
409 rate ; time between samples in hundreths of a second 409 rate ; time between samples in hundredths of a second
410 Returns: (in packets of two as long as in mode) 410 Returns: (in packets of two as long as in mode)
411 %000000xy ; where y is JOYSTICK1 Fire button 411 %000000xy ; where y is JOYSTICK1 Fire button
412 ; and x is JOYSTICK0 Fire button 412 ; and x is JOYSTICK0 Fire button
@@ -522,7 +522,7 @@ controller memory. The time between data bytes must be less than 20ms.
522 0x20 ; memory access 522 0x20 ; memory access
523 { data } ; 6 data bytes starting at ADR 523 { data } ; 6 data bytes starting at ADR
524 524
525This comand permits the host to read from the ikbd controller memory. 525This command permits the host to read from the ikbd controller memory.
526 526
5279.26 CONTROLLER EXECUTE 5279.26 CONTROLLER EXECUTE
528 528
diff --git a/Documentation/input/cs461x.txt b/Documentation/input/cs461x.txt
index 6181747a14d8..afe0d6543e09 100644
--- a/Documentation/input/cs461x.txt
+++ b/Documentation/input/cs461x.txt
@@ -27,7 +27,7 @@ This driver have the basic support for PCI devices only; there is no
27ISA or PnP ISA cards supported. AFAIK the ns558 have support for Crystal 27ISA or PnP ISA cards supported. AFAIK the ns558 have support for Crystal
28ISA and PnP ISA series. 28ISA and PnP ISA series.
29 29
30The driver works witn ALSA drivers simultaneously. For exmple, the xracer 30The driver works with ALSA drivers simultaneously. For example, the xracer
31uses joystick as input device and PCM device as sound output in one time. 31uses joystick as input device and PCM device as sound output in one time.
32There are no sound or input collisions detected. The source code have 32There are no sound or input collisions detected. The source code have
33comments about them; but I've found the joystick can be initialized 33comments about them; but I've found the joystick can be initialized
diff --git a/Documentation/input/ff.txt b/Documentation/input/ff.txt
index c53b1c11aa40..085eb15b45b7 100644
--- a/Documentation/input/ff.txt
+++ b/Documentation/input/ff.txt
@@ -38,7 +38,7 @@ joystick.txt for details.
38There is an utility called fftest that will allow you to test the driver. 38There is an utility called fftest that will allow you to test the driver.
39% fftest /dev/input/eventXX 39% fftest /dev/input/eventXX
40 40
413. Instructions to the developper 413. Instructions to the developer
42~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 42~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
43All interactions are done using the event API. That is, you can use ioctl() 43All interactions are done using the event API. That is, you can use ioctl()
44and write() on /dev/input/eventXX. 44and write() on /dev/input/eventXX.
diff --git a/Documentation/input/gameport-programming.txt b/Documentation/input/gameport-programming.txt
index 1ba3d322e0ac..14e0a8b70225 100644
--- a/Documentation/input/gameport-programming.txt
+++ b/Documentation/input/gameport-programming.txt
@@ -18,8 +18,8 @@ Make sure struct gameport is initialized to 0 in all other fields. The
18gameport generic code will take care of the rest. 18gameport generic code will take care of the rest.
19 19
20If your hardware supports more than one io address, and your driver can 20If your hardware supports more than one io address, and your driver can
21choose which one program the hardware to, starting from the more exotic 21choose which one to program the hardware to, starting from the more exotic
22addresses is preferred, because the likelyhood of clashing with the standard 22addresses is preferred, because the likelihood of clashing with the standard
230x201 address is smaller. 230x201 address is smaller.
24 24
25Eg. if your driver supports addresses 0x200, 0x208, 0x210 and 0x218, then 25Eg. if your driver supports addresses 0x200, 0x208, 0x210 and 0x218, then
diff --git a/Documentation/input/input.txt b/Documentation/input/input.txt
index 47137e75fdb8..ff8cea0225f9 100644
--- a/Documentation/input/input.txt
+++ b/Documentation/input/input.txt
@@ -68,8 +68,8 @@ will be available as a character device on major 13, minor 63:
68 68
69 crw-r--r-- 1 root root 13, 63 Mar 28 22:45 mice 69 crw-r--r-- 1 root root 13, 63 Mar 28 22:45 mice
70 70
71 This device has to be created, unless you use devfs, in which case it's 71 This device has to be created.
72created automatically. The commands to do create it by hand are: 72 The commands to create it by hand are:
73 73
74 cd /dev 74 cd /dev
75 mkdir input 75 mkdir input
@@ -154,7 +154,7 @@ about it.
154 154
1553.2 Event handlers 1553.2 Event handlers
156~~~~~~~~~~~~~~~~~~ 156~~~~~~~~~~~~~~~~~~
157 Event handlers distrubite the events from the devices to userland and 157 Event handlers distribute the events from the devices to userland and
158kernel, as needed. 158kernel, as needed.
159 159
1603.2.1 keybdev 1603.2.1 keybdev
@@ -230,7 +230,7 @@ generated in the kernel straight to the program, with timestamps. The
230API is still evolving, but should be useable now. It's described in 230API is still evolving, but should be useable now. It's described in
231section 5. 231section 5.
232 232
233 This should be the way for GPM and X to get keyboard and mouse mouse 233 This should be the way for GPM and X to get keyboard and mouse
234events. It allows for multihead in X without any specific multihead 234events. It allows for multihead in X without any specific multihead
235kernel support. The event codes are the same on all architectures and 235kernel support. The event codes are the same on all architectures and
236are hardware independent. 236are hardware independent.
@@ -279,7 +279,7 @@ struct input_event {
279}; 279};
280 280
281 'time' is the timestamp, it returns the time at which the event happened. 281 'time' is the timestamp, it returns the time at which the event happened.
282Type is for example EV_REL for relative momement, REL_KEY for a keypress or 282Type is for example EV_REL for relative moment, REL_KEY for a keypress or
283release. More types are defined in include/linux/input.h. 283release. More types are defined in include/linux/input.h.
284 284
285 'code' is event code, for example REL_X or KEY_BACKSPACE, again a complete 285 'code' is event code, for example REL_X or KEY_BACKSPACE, again a complete
@@ -289,24 +289,3 @@ list is in include/linux/input.h.
289EV_REL, absolute new value for EV_ABS (joysticks ...), or 0 for EV_KEY for 289EV_REL, absolute new value for EV_ABS (joysticks ...), or 0 for EV_KEY for
290release, 1 for keypress and 2 for autorepeat. 290release, 1 for keypress and 2 for autorepeat.
291 291
2926. Contacts
293~~~~~~~~~~~
294 This effort has its home page at:
295
296 http://www.suse.cz/development/input/
297
298You'll find both the latest HID driver and the complete Input driver
299there as well as information how to access the CVS repository for
300latest revisions of the drivers.
301
302 There is also a mailing list for this:
303
304 majordomo@atrey.karlin.mff.cuni.cz
305
306Send "subscribe linux-input" to subscribe to it.
307
308The input changes are also being worked on as part of the LinuxConsole
309project, see:
310
311 http://sourceforge.net/projects/linuxconsole/
312
diff --git a/Documentation/input/joystick-parport.txt b/Documentation/input/joystick-parport.txt
index d537c48cc6d0..ede5f33daad3 100644
--- a/Documentation/input/joystick-parport.txt
+++ b/Documentation/input/joystick-parport.txt
@@ -456,8 +456,8 @@ uses the following kernel/module command line:
456 8 | Sony PSX DDR controller 456 8 | Sony PSX DDR controller
457 9 | SNES mouse 457 9 | SNES mouse
458 458
459 The exact type of the PSX controller type is autoprobed when used so 459 The exact type of the PSX controller type is autoprobed when used, so
460hot swapping should work (but is not recomended). 460hot swapping should work (but is not recommended).
461 461
462 Should you want to use more than one of parallel ports at once, you can use 462 Should you want to use more than one of parallel ports at once, you can use
463gamecon.map2 and gamecon.map3 as additional command line parameters for two 463gamecon.map2 and gamecon.map3 as additional command line parameters for two
@@ -465,8 +465,8 @@ more parallel ports.
465 465
466 There are two options specific to PSX driver portion. gamecon.psx_delay sets 466 There are two options specific to PSX driver portion. gamecon.psx_delay sets
467the command delay when talking to the controllers. The default of 25 should 467the command delay when talking to the controllers. The default of 25 should
468work but you can try lowering it for better performace. If your pads don't 468work but you can try lowering it for better performance. If your pads don't
469respond try raising it untill they work. Setting the type to 8 allows the 469respond try raising it until they work. Setting the type to 8 allows the
470driver to be used with Dance Dance Revolution or similar games. Arrow keys are 470driver to be used with Dance Dance Revolution or similar games. Arrow keys are
471registered as key presses instead of X and Y axes. 471registered as key presses instead of X and Y axes.
472 472
diff --git a/Documentation/input/joystick.txt b/Documentation/input/joystick.txt
index 841c353297e6..389de9bd9878 100644
--- a/Documentation/input/joystick.txt
+++ b/Documentation/input/joystick.txt
@@ -60,7 +60,7 @@ and install it before going on.
60 60
612.2 Device nodes 612.2 Device nodes
62~~~~~~~~~~~~~~~~ 62~~~~~~~~~~~~~~~~
63For applications to be able to use the joysticks, in you don't use devfs, 63For applications to be able to use the joysticks,
64you'll have to manually create these nodes in /dev: 64you'll have to manually create these nodes in /dev:
65 65
66cd /dev 66cd /dev
diff --git a/Documentation/input/yealink.txt b/Documentation/input/yealink.txt
index 0962c5c948be..0a8c97e87d47 100644
--- a/Documentation/input/yealink.txt
+++ b/Documentation/input/yealink.txt
@@ -87,13 +87,13 @@ Line 3 Format : 888888888888
87 87
88 88
89Format description: 89Format description:
90 From a user space perspective the world is seperated in "digits" and "icons". 90 From a userspace perspective the world is separated into "digits" and "icons".
91 A digit can have a character set, an icon can only be ON or OFF. 91 A digit can have a character set, an icon can only be ON or OFF.
92 92
93 Format specifier 93 Format specifier
94 '8' : Generic 7 segment digit with individual addressable segments 94 '8' : Generic 7 segment digit with individual addressable segments
95 95
96 Reduced capabillity 7 segm digit, when segments are hard wired together. 96 Reduced capability 7 segm digit, when segments are hard wired together.
97 '1' : 2 segments digit only able to produce a 1. 97 '1' : 2 segments digit only able to produce a 1.
98 'e' : Most significant day of the month digit, 98 'e' : Most significant day of the month digit,
99 able to produce at least 1 2 3. 99 able to produce at least 1 2 3.
diff --git a/Documentation/ioctl/hdio.txt b/Documentation/ioctl/hdio.txt
index 11c9be49f37c..c19efdeace2c 100644
--- a/Documentation/ioctl/hdio.txt
+++ b/Documentation/ioctl/hdio.txt
@@ -203,7 +203,7 @@ HDIO_SET_MULTCOUNT change IDE blockmode
203 203
204 Source code comments read: 204 Source code comments read:
205 205
206 This is tightly woven into the driver->do_special can not 206 This is tightly woven into the driver->do_special cannot
207 touch. DON'T do it again until a total personality rewrite 207 touch. DON'T do it again until a total personality rewrite
208 is committed. 208 is committed.
209 209
diff --git a/Documentation/isdn/INTERFACE.fax b/Documentation/isdn/INTERFACE.fax
index 7e5731319e30..9c8c6d914ec7 100644
--- a/Documentation/isdn/INTERFACE.fax
+++ b/Documentation/isdn/INTERFACE.fax
@@ -26,7 +26,7 @@ Structure T30_s description:
26 If the HL-driver receives ISDN_CMD_FAXCMD, all needed information 26 If the HL-driver receives ISDN_CMD_FAXCMD, all needed information
27 is in this struct set by the LL. 27 is in this struct set by the LL.
28 To signal information to the LL, the HL-driver has to set the 28 To signal information to the LL, the HL-driver has to set the
29 the parameters and use ISDN_STAT_FAXIND. 29 parameters and use ISDN_STAT_FAXIND.
30 (Please refer to INTERFACE) 30 (Please refer to INTERFACE)
31 31
32Structure T30_s: 32Structure T30_s:
diff --git a/Documentation/isdn/README.hysdn b/Documentation/isdn/README.hysdn
index 56cc59df1fb7..eeca11f00ccd 100644
--- a/Documentation/isdn/README.hysdn
+++ b/Documentation/isdn/README.hysdn
@@ -1,6 +1,6 @@
1$Id: README.hysdn,v 1.3.6.1 2001/02/10 14:41:19 kai Exp $ 1$Id: README.hysdn,v 1.3.6.1 2001/02/10 14:41:19 kai Exp $
2The hysdn driver has been written by 2The hysdn driver has been written by
3by Werner Cornelius (werner@isdn4linux.de or werner@titro.de) 3Werner Cornelius (werner@isdn4linux.de or werner@titro.de)
4for Hypercope GmbH Aachen Germany. Hypercope agreed to publish this driver 4for Hypercope GmbH Aachen Germany. Hypercope agreed to publish this driver
5under the GNU General Public License. 5under the GNU General Public License.
6 6
diff --git a/Documentation/java.txt b/Documentation/java.txt
index e4814c213301..c768dc63b34e 100644
--- a/Documentation/java.txt
+++ b/Documentation/java.txt
@@ -22,7 +22,7 @@ other program after you have done the following:
22 the kernel (CONFIG_BINFMT_MISC) and set it up properly. 22 the kernel (CONFIG_BINFMT_MISC) and set it up properly.
23 If you choose to compile it as a module, you will have 23 If you choose to compile it as a module, you will have
24 to insert it manually with modprobe/insmod, as kmod 24 to insert it manually with modprobe/insmod, as kmod
25 can not easily be supported with binfmt_misc. 25 cannot easily be supported with binfmt_misc.
26 Read the file 'binfmt_misc.txt' in this directory to know 26 Read the file 'binfmt_misc.txt' in this directory to know
27 more about the configuration process. 27 more about the configuration process.
28 28
diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt
index 003fccc14d24..7f34778dd23b 100644
--- a/Documentation/kbuild/kconfig-language.txt
+++ b/Documentation/kbuild/kconfig-language.txt
@@ -110,7 +110,7 @@ applicable everywhere (see syntax).
110 the indentation level, this means it ends at the first line which has 110 the indentation level, this means it ends at the first line which has
111 a smaller indentation than the first line of the help text. 111 a smaller indentation than the first line of the help text.
112 "---help---" and "help" do not differ in behaviour, "---help---" is 112 "---help---" and "help" do not differ in behaviour, "---help---" is
113 used to help visually seperate configuration logic from help within 113 used to help visually separate configuration logic from help within
114 the file as an aid to developers. 114 the file as an aid to developers.
115 115
116 116
@@ -226,7 +226,7 @@ menuconfig:
226 "menuconfig" <symbol> 226 "menuconfig" <symbol>
227 <config options> 227 <config options>
228 228
229This is similiar to the simple config entry above, but it also gives a 229This is similar to the simple config entry above, but it also gives a
230hint to front ends, that all suboptions should be displayed as a 230hint to front ends, that all suboptions should be displayed as a
231separate list of options. 231separate list of options.
232 232
diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt
index 08bafa8c1caa..99f2d4d4bf7d 100644
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
@@ -249,7 +249,7 @@ If die() is called, and it happens to be a thread with pid 0 or 1, or die()
249is called inside interrupt context or die() is called and panic_on_oops is set, 249is called inside interrupt context or die() is called and panic_on_oops is set,
250the system will boot into the dump-capture kernel. 250the system will boot into the dump-capture kernel.
251 251
252On powererpc systems when a soft-reset is generated, die() is called by all cpus and the system system will boot into the dump-capture kernel. 252On powererpc systems when a soft-reset is generated, die() is called by all cpus and the system will boot into the dump-capture kernel.
253 253
254For testing purposes, you can trigger a crash by using "ALT-SysRq-c", 254For testing purposes, you can trigger a crash by using "ALT-SysRq-c",
255"echo c > /proc/sysrq-trigger or write a module to force the panic. 255"echo c > /proc/sysrq-trigger or write a module to force the panic.
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt
index 99d24f2943ee..b53bccbd9727 100644
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
@@ -290,17 +290,6 @@
290 Description: Very nice 92 pages GPL book on the topic of modules 290 Description: Very nice 92 pages GPL book on the topic of modules
291 programming. Lots of examples. 291 programming. Lots of examples.
292 292
293 * Title: "Device File System (devfs) Overview"
294 Author: Richard Gooch.
295 URL: http://www.atnf.csiro.au/people/rgooch/linux/docs/devfs.html
296 Keywords: filesystem, /dev, devfs, dynamic devices, major/minor
297 allocation, device management.
298 Description: Document describing Richard Gooch's controversial
299 devfs, which allows for dynamic devices, only shows present
300 devices in /dev, gets rid of major/minor numbers allocation
301 problems, and allows for hundreds of identical devices (which some
302 USB systems might demand soon).
303
304 * Title: "I/O Event Handling Under Linux" 293 * Title: "I/O Event Handling Under Linux"
305 Author: Richard Gooch. 294 Author: Richard Gooch.
306 URL: http://www.atnf.csiro.au/~rgooch/linux/docs/io-events.html 295 URL: http://www.atnf.csiro.au/~rgooch/linux/docs/io-events.html
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 137e993f4329..12b3b24bfd2f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -355,9 +355,9 @@ and is between 256 and 4096 characters. It is defined in the file
355 355
356 clock= [BUGS=IA-32, HW] gettimeofday clocksource override. 356 clock= [BUGS=IA-32, HW] gettimeofday clocksource override.
357 [Deprecated] 357 [Deprecated]
358 Forces specified clocksource (if avaliable) to be used 358 Forces specified clocksource (if available) to be used
359 when calculating gettimeofday(). If specified 359 when calculating gettimeofday(). If specified
360 clocksource is not avalible, it defaults to PIT. 360 clocksource is not available, it defaults to PIT.
361 Format: { pit | tsc | cyclone | pmtmr } 361 Format: { pit | tsc | cyclone | pmtmr }
362 362
363 disable_8254_timer 363 disable_8254_timer
@@ -611,8 +611,8 @@ and is between 256 and 4096 characters. It is defined in the file
611 noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing 611 noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing
612 612
613 i8042.direct [HW] Put keyboard port into non-translated mode 613 i8042.direct [HW] Put keyboard port into non-translated mode
614 i8042.dumbkbd [HW] Pretend that controlled can only read data from 614 i8042.dumbkbd [HW] Pretend that controller can only read data from
615 keyboard and can not control its state 615 keyboard and cannot control its state
616 (Don't attempt to blink the leds) 616 (Don't attempt to blink the leds)
617 i8042.noaux [HW] Don't check for auxiliary (== mouse) port 617 i8042.noaux [HW] Don't check for auxiliary (== mouse) port
618 i8042.nokbd [HW] Don't check/create keyboard port 618 i8042.nokbd [HW] Don't check/create keyboard port
@@ -1368,7 +1368,7 @@ and is between 256 and 4096 characters. It is defined in the file
1368 1368
1369 reboot= [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode 1369 reboot= [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
1370 Format: <reboot_mode>[,<reboot_mode2>[,...]] 1370 Format: <reboot_mode>[,<reboot_mode2>[,...]]
1371 See arch/*/kernel/reboot.c. 1371 See arch/*/kernel/reboot.c or arch/*/kernel/process.c
1372 1372
1373 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area 1373 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area
1374 1374
diff --git a/Documentation/keys.txt b/Documentation/keys.txt
index e373f0212843..3da586bc7859 100644
--- a/Documentation/keys.txt
+++ b/Documentation/keys.txt
@@ -671,7 +671,7 @@ The keyctl syscall functions are:
671 671
672 Note that this setting is inherited across fork/exec. 672 Note that this setting is inherited across fork/exec.
673 673
674 [1] The default default is: the thread keyring if there is one, otherwise 674 [1] The default is: the thread keyring if there is one, otherwise
675 the process keyring if there is one, otherwise the session keyring if 675 the process keyring if there is one, otherwise the session keyring if
676 there is one, otherwise the user default session keyring. 676 there is one, otherwise the user default session keyring.
677 677
@@ -708,14 +708,14 @@ The keyctl syscall functions are:
708 708
709 If the specified key is 0, then any assumed authority will be divested. 709 If the specified key is 0, then any assumed authority will be divested.
710 710
711 The assumed authorititive key is inherited across fork and exec. 711 The assumed authoritative key is inherited across fork and exec.
712 712
713 713
714=============== 714===============
715KERNEL SERVICES 715KERNEL SERVICES
716=============== 716===============
717 717
718The kernel services for key managment are fairly simple to deal with. They can 718The kernel services for key management are fairly simple to deal with. They can
719be broken down into two areas: keys and key types. 719be broken down into two areas: keys and key types.
720 720
721Dealing with keys is fairly straightforward. Firstly, the kernel service 721Dealing with keys is fairly straightforward. Firstly, the kernel service
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt
index 949f7b5a2053..e44855513b3d 100644
--- a/Documentation/kobject.txt
+++ b/Documentation/kobject.txt
@@ -51,7 +51,7 @@ more complex object types. It provides a set of basic fields that
51almost all complex data types share. kobjects are intended to be 51almost all complex data types share. kobjects are intended to be
52embedded in larger data structures and replace fields they duplicate. 52embedded in larger data structures and replace fields they duplicate.
53 53
541.2 Defintion 541.2 Definition
55 55
56struct kobject { 56struct kobject {
57 char name[KOBJ_NAME_LEN]; 57 char name[KOBJ_NAME_LEN];
diff --git a/Documentation/laptop-mode.txt b/Documentation/laptop-mode.txt
index 5696e879449b..c487186eb2b9 100644
--- a/Documentation/laptop-mode.txt
+++ b/Documentation/laptop-mode.txt
@@ -152,7 +152,7 @@ loaded on demand while the application executes) and sequentially accessed data
152DO_REMOUNTS: 152DO_REMOUNTS:
153 153
154The control script automatically remounts any mounted journaled filesystems 154The control script automatically remounts any mounted journaled filesystems
155with approriate commit interval options. When this option is set to 0, this 155with appropriate commit interval options. When this option is set to 0, this
156feature is disabled. 156feature is disabled.
157 157
158DO_REMOUNT_NOATIME: 158DO_REMOUNT_NOATIME:
diff --git a/Documentation/lockdep-design.txt b/Documentation/lockdep-design.txt
index 55a7e4fa8cc2..dab123db5a4f 100644
--- a/Documentation/lockdep-design.txt
+++ b/Documentation/lockdep-design.txt
@@ -133,7 +133,7 @@ cases there is an inherent "natural" ordering between the two objects
133(defined by the properties of the hierarchy), and the kernel grabs the 133(defined by the properties of the hierarchy), and the kernel grabs the
134locks in this fixed order on each of the objects. 134locks in this fixed order on each of the objects.
135 135
136An example of such an object hieararchy that results in "nested locking" 136An example of such an object hierarchy that results in "nested locking"
137is that of a "whole disk" block-dev object and a "partition" block-dev 137is that of a "whole disk" block-dev object and a "partition" block-dev
138object; the partition is "part of" the whole device and as long as one 138object; the partition is "part of" the whole device and as long as one
139always takes the whole disk lock as a higher lock than the partition 139always takes the whole disk lock as a higher lock than the partition
@@ -158,11 +158,11 @@ enum bdev_bd_mutex_lock_class
158In this case the locking is done on a bdev object that is known to be a 158In this case the locking is done on a bdev object that is known to be a
159partition. 159partition.
160 160
161The validator treats a lock that is taken in such a nested fasion as a 161The validator treats a lock that is taken in such a nested fashion as a
162separate (sub)class for the purposes of validation. 162separate (sub)class for the purposes of validation.
163 163
164Note: When changing code to use the _nested() primitives, be careful and 164Note: When changing code to use the _nested() primitives, be careful and
165check really thoroughly that the hiearchy is correctly mapped; otherwise 165check really thoroughly that the hierarchy is correctly mapped; otherwise
166you can get false positives or false negatives. 166you can get false positives or false negatives.
167 167
168Proof of 100% correctness: 168Proof of 100% correctness:
@@ -170,7 +170,7 @@ Proof of 100% correctness:
170 170
171The validator achieves perfect, mathematical 'closure' (proof of locking 171The validator achieves perfect, mathematical 'closure' (proof of locking
172correctness) in the sense that for every simple, standalone single-task 172correctness) in the sense that for every simple, standalone single-task
173locking sequence that occured at least once during the lifetime of the 173locking sequence that occurred at least once during the lifetime of the
174kernel, the validator proves it with a 100% certainty that no 174kernel, the validator proves it with a 100% certainty that no
175combination and timing of these locking sequences can cause any class of 175combination and timing of these locking sequences can cause any class of
176lock related deadlock. [*] 176lock related deadlock. [*]
diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt
index d5d3f064f552..1c41db21d3c1 100644
--- a/Documentation/m68k/kernel-options.txt
+++ b/Documentation/m68k/kernel-options.txt
@@ -415,7 +415,7 @@ switch to another mode once Linux has started.
415 415
416 The first 3 parameters of this sub-option should be obvious: <xres>, 416 The first 3 parameters of this sub-option should be obvious: <xres>,
417<yres> and <depth> give the dimensions of the screen and the number of 417<yres> and <depth> give the dimensions of the screen and the number of
418planes (depth). The depth is is the logarithm to base 2 of the number 418planes (depth). The depth is the logarithm to base 2 of the number
419of colors possible. (Or, the other way round: The number of colors is 419of colors possible. (Or, the other way round: The number of colors is
4202^depth). 4202^depth).
421 421
diff --git a/Documentation/mca.txt b/Documentation/mca.txt
index 60913354cb7d..aabce4ad90f9 100644
--- a/Documentation/mca.txt
+++ b/Documentation/mca.txt
@@ -177,7 +177,7 @@ Currently, there are a number of MCA-specific device drivers.
177 with clones that have a different adapter id than the original 177 with clones that have a different adapter id than the original
178 NE/2. 178 NE/2.
179 179
1806) Future Domain MCS-600/700, OEM'd IBM Fast SCSI Aapter/A and 1806) Future Domain MCS-600/700, OEM'd IBM Fast SCSI Adapter/A and
181 Reply Sound Blaster/SCSI (SCSI part) 181 Reply Sound Blaster/SCSI (SCSI part)
182 Better support for these cards than the driver for ISA. 182 Better support for these cards than the driver for ISA.
183 Supports multiple cards with IRQ sharing. 183 Supports multiple cards with IRQ sharing.
diff --git a/Documentation/md.txt b/Documentation/md.txt
index 9ae9e4078985..2202f5dc8ac2 100644
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
@@ -62,7 +62,7 @@ be reconstructed (due to no parity).
62 62
63For this reason, md will normally refuse to start such an array. This 63For this reason, md will normally refuse to start such an array. This
64requires the sysadmin to take action to explicitly start the array 64requires the sysadmin to take action to explicitly start the array
65desipite possible corruption. This is normally done with 65despite possible corruption. This is normally done with
66 mdadm --assemble --force .... 66 mdadm --assemble --force ....
67 67
68This option is not really available if the array has the root 68This option is not really available if the array has the root
@@ -175,7 +175,7 @@ All md devices contain:
175 raid levels that involve striping (1,4,5,6,10). The address space 175 raid levels that involve striping (1,4,5,6,10). The address space
176 of the array is conceptually divided into chunks and consecutive 176 of the array is conceptually divided into chunks and consecutive
177 chunks are striped onto neighbouring devices. 177 chunks are striped onto neighbouring devices.
178 The size should be atleast PAGE_SIZE (4k) and should be a power 178 The size should be at least PAGE_SIZE (4k) and should be a power
179 of 2. This can only be set while assembling an array 179 of 2. This can only be set while assembling an array
180 180
181 component_size 181 component_size
@@ -214,8 +214,8 @@ All md devices contain:
214 safe_mode_delay 214 safe_mode_delay
215 When an md array has seen no write requests for a certain period 215 When an md array has seen no write requests for a certain period
216 of time, it will be marked as 'clean'. When another write 216 of time, it will be marked as 'clean'. When another write
217 request arrive, the array is marked as 'dirty' before the write 217 request arrives, the array is marked as 'dirty' before the write
218 commenses. This is known as 'safe_mode'. 218 commences. This is known as 'safe_mode'.
219 The 'certain period' is controlled by this file which stores the 219 The 'certain period' is controlled by this file which stores the
220 period as a number of seconds. The default is 200msec (0.200). 220 period as a number of seconds. The default is 200msec (0.200).
221 Writing a value of 0 disables safemode. 221 Writing a value of 0 disables safemode.
@@ -307,8 +307,8 @@ Each directory contains:
307 This applies only to raid1 arrays. 307 This applies only to raid1 arrays.
308 spare - device is working, but not a full member. 308 spare - device is working, but not a full member.
309 This includes spares that are in the process 309 This includes spares that are in the process
310 of being recoverred to 310 of being recovered to
311 This list make grow in future. 311 This list may grow in future.
312 This can be written to. 312 This can be written to.
313 Writing "faulty" simulates a failure on the device. 313 Writing "faulty" simulates a failure on the device.
314 Writing "remove" removes the device from the array. 314 Writing "remove" removes the device from the array.
@@ -330,7 +330,7 @@ Each directory contains:
330 This gives the role that the device has in the array. It will 330 This gives the role that the device has in the array. It will
331 either be 'none' if the device is not active in the array 331 either be 'none' if the device is not active in the array
332 (i.e. is a spare or has failed) or an integer less than the 332 (i.e. is a spare or has failed) or an integer less than the
333 'raid_disks' number for the array indicating which possition 333 'raid_disks' number for the array indicating which position
334 it currently fills. This can only be set while assembling an 334 it currently fills. This can only be set while assembling an
335 array. A device for which this is set is assumed to be working. 335 array. A device for which this is set is assumed to be working.
336 336
@@ -353,7 +353,7 @@ in the array. These are named
353 353
354 rdNN 354 rdNN
355 355
356where 'NN' is the possition in the array, starting from 0. 356where 'NN' is the position in the array, starting from 0.
357So for a 3 drive array there will be rd0, rd1, rd2. 357So for a 3 drive array there will be rd0, rd1, rd2.
358These are symbolic links to the appropriate 'dev-XXX' entry. 358These are symbolic links to the appropriate 'dev-XXX' entry.
359Thus, for example, 359Thus, for example,
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt
index 46b9b389df35..994355b0cd19 100644
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
@@ -670,7 +670,7 @@ effectively random order, despite the write barrier issued by CPU 1:
670 670
671 671
672In the above example, CPU 2 perceives that B is 7, despite the load of *C 672In the above example, CPU 2 perceives that B is 7, despite the load of *C
673(which would be B) coming after the the LOAD of C. 673(which would be B) coming after the LOAD of C.
674 674
675If, however, a data dependency barrier were to be placed between the load of C 675If, however, a data dependency barrier were to be placed between the load of C
676and the load of *C (ie: B) on CPU 2: 676and the load of *C (ie: B) on CPU 2:
@@ -1915,7 +1915,7 @@ Whilst most CPUs do imply a data dependency barrier on the read when a memory
1915access depends on a read, not all do, so it may not be relied on. 1915access depends on a read, not all do, so it may not be relied on.
1916 1916
1917Other CPUs may also have split caches, but must coordinate between the various 1917Other CPUs may also have split caches, but must coordinate between the various
1918cachelets for normal memory accesss. The semantics of the Alpha removes the 1918cachelets for normal memory accesses. The semantics of the Alpha removes the
1919need for coordination in absence of memory barriers. 1919need for coordination in absence of memory barriers.
1920 1920
1921 1921
diff --git a/Documentation/mono.txt b/Documentation/mono.txt
index 807a0c7b4737..e8e1758e87da 100644
--- a/Documentation/mono.txt
+++ b/Documentation/mono.txt
@@ -26,7 +26,7 @@ other program after you have done the following:
26 the kernel (CONFIG_BINFMT_MISC) and set it up properly. 26 the kernel (CONFIG_BINFMT_MISC) and set it up properly.
27 If you choose to compile it as a module, you will have 27 If you choose to compile it as a module, you will have
28 to insert it manually with modprobe/insmod, as kmod 28 to insert it manually with modprobe/insmod, as kmod
29 can not be easily supported with binfmt_misc. 29 cannot be easily supported with binfmt_misc.
30 Read the file 'binfmt_misc.txt' in this directory to know 30 Read the file 'binfmt_misc.txt' in this directory to know
31 more about the configuration process. 31 more about the configuration process.
32 32
diff --git a/Documentation/networking/3c509.txt b/Documentation/networking/3c509.txt
index 867a99f88c68..0643e3b7168c 100644
--- a/Documentation/networking/3c509.txt
+++ b/Documentation/networking/3c509.txt
@@ -126,7 +126,7 @@ packets faster than they can be removed from the card. This should be rare
126or impossible in normal operation. Possible causes of this error report are: 126or impossible in normal operation. Possible causes of this error report are:
127 127
128 - a "green" mode enabled that slows the processor down when there is no 128 - a "green" mode enabled that slows the processor down when there is no
129 keyboard activitiy. 129 keyboard activity.
130 130
131 - some other device or device driver hogging the bus or disabling interrupts. 131 - some other device or device driver hogging the bus or disabling interrupts.
132 Check /proc/interrupts for excessive interrupt counts. The timer tick 132 Check /proc/interrupts for excessive interrupt counts. The timer tick
diff --git a/Documentation/networking/NAPI_HOWTO.txt b/Documentation/networking/NAPI_HOWTO.txt
index 54376e8249c1..93af3e87c65b 100644
--- a/Documentation/networking/NAPI_HOWTO.txt
+++ b/Documentation/networking/NAPI_HOWTO.txt
@@ -35,7 +35,7 @@ Legend:
35packets out of the rx ring. Note from this that the lower the 35packets out of the rx ring. Note from this that the lower the
36load the more we could clean up the rxring 36load the more we could clean up the rxring
37"Ndone" == is the converse of "Done". Note again, that the higher 37"Ndone" == is the converse of "Done". Note again, that the higher
38the load the more times we couldnt clean up the rxring. 38the load the more times we couldn't clean up the rxring.
39 39
40Observe that: 40Observe that:
41when the NIC receives 890Kpackets/sec only 17 rx interrupts are generated. 41when the NIC receives 890Kpackets/sec only 17 rx interrupts are generated.
diff --git a/Documentation/networking/arcnet-hardware.txt b/Documentation/networking/arcnet-hardware.txt
index 30a5f01403d3..731de411513c 100644
--- a/Documentation/networking/arcnet-hardware.txt
+++ b/Documentation/networking/arcnet-hardware.txt
@@ -139,7 +139,7 @@ And now to the cabling. What you can connect together:
139 139
1405. An active hub to passive hub. 1405. An active hub to passive hub.
141 141
142Remember, that you can not connect two passive hubs together. The power loss 142Remember that you cannot connect two passive hubs together. The power loss
143implied by such a connection is too high for the net to operate reliably. 143implied by such a connection is too high for the net to operate reliably.
144 144
145An example of a typical ARCnet network: 145An example of a typical ARCnet network:
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index dc942eaf490f..de809e58092f 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -1023,7 +1023,7 @@ Changing a Bond's Configuration
1023files located in /sys/class/net/<bond name>/bonding 1023files located in /sys/class/net/<bond name>/bonding
1024 1024
1025 The names of these files correspond directly with the command- 1025 The names of these files correspond directly with the command-
1026line parameters described elsewhere in in this file, and, with the 1026line parameters described elsewhere in this file, and, with the
1027exception of arp_ip_target, they accept the same values. To see the 1027exception of arp_ip_target, they accept the same values. To see the
1028current setting, simply cat the appropriate file. 1028current setting, simply cat the appropriate file.
1029 1029
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt
index 188beb7d6a17..64896470e279 100644
--- a/Documentation/networking/cs89x0.txt
+++ b/Documentation/networking/cs89x0.txt
@@ -227,7 +227,7 @@ configuration options are available on the command line:
227* media=rj45 - specify media type 227* media=rj45 - specify media type
228 or media=bnc 228 or media=bnc
229 or media=aui 229 or media=aui
230 or medai=auto 230 or media=auto
231* duplex=full - specify forced half/full/autonegotiate duplex 231* duplex=full - specify forced half/full/autonegotiate duplex
232 or duplex=half 232 or duplex=half
233 or duplex=auto 233 or duplex=auto
@@ -584,7 +584,7 @@ of four ways after installing and or configuring the CS8900/20-based adapter:
584 584
585 1.) The system does not boot properly (or at all). 585 1.) The system does not boot properly (or at all).
586 586
587 2.) The driver can not communicate with the adapter, reporting an "Adapter 587 2.) The driver cannot communicate with the adapter, reporting an "Adapter
588 not found" error message. 588 not found" error message.
589 589
590 3.) You cannot connect to the network or the driver will not load. 590 3.) You cannot connect to the network or the driver will not load.
@@ -684,7 +684,7 @@ ethernet@crystal.cirrus.com) and request that you be registered for automatic
684software-update notification. 684software-update notification.
685 685
686Cirrus Logic maintains a web page at http://www.cirrus.com with the 686Cirrus Logic maintains a web page at http://www.cirrus.com with the
687the latest drivers and technical publications. 687latest drivers and technical publications.
688 688
689 689
6906.4 Current maintainer 6906.4 Current maintainer
diff --git a/Documentation/networking/cxgb.txt b/Documentation/networking/cxgb.txt
index 76324638626b..20a887615c4a 100644
--- a/Documentation/networking/cxgb.txt
+++ b/Documentation/networking/cxgb.txt
@@ -56,7 +56,7 @@ FEATURES
56 56
57 ethtool -C eth0 rx-usecs 100 57 ethtool -C eth0 rx-usecs 100
58 58
59 You may also provide a timer latency value while disabling adpative-rx: 59 You may also provide a timer latency value while disabling adaptive-rx:
60 60
61 ethtool -C <interface> adaptive-rx off rx-usecs <microseconds> 61 ethtool -C <interface> adaptive-rx off rx-usecs <microseconds>
62 62
@@ -172,7 +172,7 @@ PERFORMANCE
172 smaller window prevents congestion and facilitates better pacing, 172 smaller window prevents congestion and facilitates better pacing,
173 especially if/when MAC level flow control does not work well or when it is 173 especially if/when MAC level flow control does not work well or when it is
174 not supported on the machine. Experimentation may be necessary to attain 174 not supported on the machine. Experimentation may be necessary to attain
175 the correct value. This method is provided as a starting point fot the 175 the correct value. This method is provided as a starting point for the
176 correct receive buffer size. 176 correct receive buffer size.
177 Setting the min, max, and default receive buffer (RX_WINDOW) size is 177 Setting the min, max, and default receive buffer (RX_WINDOW) size is
178 performed in the same manner as single connection. 178 performed in the same manner as single connection.
diff --git a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt
index e6c39c5831f5..badb7480ea62 100644
--- a/Documentation/networking/decnet.txt
+++ b/Documentation/networking/decnet.txt
@@ -82,7 +82,7 @@ ethernet address of your ethernet card has to be set according to the DECnet
82address of the node in order for it to be autoconfigured (and then appear in 82address of the node in order for it to be autoconfigured (and then appear in
83/proc/net/decnet_dev). There is a utility available at the above 83/proc/net/decnet_dev). There is a utility available at the above
84FTP sites called dn2ethaddr which can compute the correct ethernet 84FTP sites called dn2ethaddr which can compute the correct ethernet
85address to use. The address can be set by ifconfig either before at 85address to use. The address can be set by ifconfig either before or
86at the time the device is brought up. If you are using RedHat you can 86at the time the device is brought up. If you are using RedHat you can
87add the line: 87add the line:
88 88
diff --git a/Documentation/networking/dl2k.txt b/Documentation/networking/dl2k.txt
index d460492037ef..10e8490fa406 100644
--- a/Documentation/networking/dl2k.txt
+++ b/Documentation/networking/dl2k.txt
@@ -173,7 +173,7 @@ Installing the Driver
173 173
174Parameter Description 174Parameter Description
175===================== 175=====================
176You can install this driver without any addtional parameter. However, if you 176You can install this driver without any additional parameter. However, if you
177are going to have extensive functions then it is necessary to set extra 177are going to have extensive functions then it is necessary to set extra
178parameter. Below is a list of the command line parameters supported by the 178parameter. Below is a list of the command line parameters supported by the
179Linux device 179Linux device
@@ -222,7 +222,7 @@ rx_timeout=n - Rx DMA wait time for an interrupt.
222 reach timeout of n * 640 nano seconds. 222 reach timeout of n * 640 nano seconds.
223 Set proper rx_coalesce and rx_timeout can 223 Set proper rx_coalesce and rx_timeout can
224 reduce congestion collapse and overload which 224 reduce congestion collapse and overload which
225 has been a bottlenect for high speed network. 225 has been a bottleneck for high speed network.
226 226
227 For example, rx_coalesce=10 rx_timeout=800. 227 For example, rx_coalesce=10 rx_timeout=800.
228 that is, hardware assert only 1 interrupt 228 that is, hardware assert only 1 interrupt
diff --git a/Documentation/networking/dmfe.txt b/Documentation/networking/dmfe.txt
index 046363552d09..b1b7499dd9d3 100644
--- a/Documentation/networking/dmfe.txt
+++ b/Documentation/networking/dmfe.txt
@@ -34,7 +34,7 @@ Next you should configure your network interface with a command similar to :
34 34
35 ifconfig eth0 172.22.3.18 35 ifconfig eth0 172.22.3.18
36 ^^^^^^^^^^^ 36 ^^^^^^^^^^^
37 Your IP Adress 37 Your IP Address
38 38
39Then you may have to modify the default routing table with command : 39Then you may have to modify the default routing table with command :
40 40
diff --git a/Documentation/networking/driver.txt b/Documentation/networking/driver.txt
index a9ad58b49cc5..4f7da5a2bf4f 100644
--- a/Documentation/networking/driver.txt
+++ b/Documentation/networking/driver.txt
@@ -37,7 +37,7 @@ Transmit path guidelines:
37 ... 37 ...
38 } 38 }
39 39
40 And then at the end of your TX reclaimation event handling: 40 And then at the end of your TX reclamation event handling:
41 41
42 if (netif_queue_stopped(dp->dev) && 42 if (netif_queue_stopped(dp->dev) &&
43 TX_BUFFS_AVAIL(dp) > (MAX_SKB_FRAGS + 1)) 43 TX_BUFFS_AVAIL(dp) > (MAX_SKB_FRAGS + 1))
diff --git a/Documentation/networking/e1000.txt b/Documentation/networking/e1000.txt
index 71fe15af356c..5c0a5cc03998 100644
--- a/Documentation/networking/e1000.txt
+++ b/Documentation/networking/e1000.txt
@@ -350,7 +350,7 @@ Additional Configurations
350 350
351 As an example, if you install the e1000 driver for two PRO/1000 adapters 351 As an example, if you install the e1000 driver for two PRO/1000 adapters
352 (eth0 and eth1) and set the speed and duplex to 10full and 100half, add 352 (eth0 and eth1) and set the speed and duplex to 10full and 100half, add
353 the following to modules.conf or or modprobe.conf: 353 the following to modules.conf or modprobe.conf:
354 354
355 alias eth0 e1000 355 alias eth0 e1000
356 alias eth1 e1000 356 alias eth1 e1000
diff --git a/Documentation/networking/fib_trie.txt b/Documentation/networking/fib_trie.txt
index f50d0c673c57..0723db7f8495 100644
--- a/Documentation/networking/fib_trie.txt
+++ b/Documentation/networking/fib_trie.txt
@@ -79,7 +79,7 @@ trie_rebalance()
79 79
80resize() 80resize()
81 Analyzes a tnode and optimizes the child array size by either inflating 81 Analyzes a tnode and optimizes the child array size by either inflating
82 or shrinking it repeatedly until it fullfills the criteria for optimal 82 or shrinking it repeatedly until it fulfills the criteria for optimal
83 level compression. This part follows the original paper pretty closely 83 level compression. This part follows the original paper pretty closely
84 and there may be some room for experimentation here. 84 and there may be some room for experimentation here.
85 85
diff --git a/Documentation/networking/gen_stats.txt b/Documentation/networking/gen_stats.txt
index c3297f79c137..70e6275b757a 100644
--- a/Documentation/networking/gen_stats.txt
+++ b/Documentation/networking/gen_stats.txt
@@ -79,8 +79,8 @@ Rate Estimator:
79 79
800) Prepare an estimator attribute. Most likely this would be in user 800) Prepare an estimator attribute. Most likely this would be in user
81 space. The value of this TLV should contain a tc_estimator structure. 81 space. The value of this TLV should contain a tc_estimator structure.
82 As usual, such a TLV nees to be 32 bit aligned and therefore the 82 As usual, such a TLV needs to be 32 bit aligned and therefore the
83 length needs to be appropriately set etc. The estimator interval 83 length needs to be appropriately set, etc. The estimator interval
84 and ewma log need to be converted to the appropriate values. 84 and ewma log need to be converted to the appropriate values.
85 tc_estimator.c::tc_setup_estimator() is advisable to be used as the 85 tc_estimator.c::tc_setup_estimator() is advisable to be used as the
86 conversion routine. It does a few clever things. It takes a time 86 conversion routine. It does a few clever things. It takes a time
@@ -103,8 +103,8 @@ In the kernel when setting up:
103 else 103 else
104 failed 104 failed
105 105
106From now on, everytime you dump my_rate_est_stats it will contain 106From now on, every time you dump my_rate_est_stats it will contain
107uptodate info. 107up-to-date info.
108 108
109Once you are done, call gen_kill_estimator(my_basicstats, 109Once you are done, call gen_kill_estimator(my_basicstats,
110my_rate_est_stats) Make sure that my_basicstats and my_rate_est_stats 110my_rate_est_stats) Make sure that my_basicstats and my_rate_est_stats
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 935e298f674a..fd3c0c012351 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -495,7 +495,7 @@ icmp_errors_use_inbound_ifaddr - BOOLEAN
495 495
496 Note that if no primary address exists for the interface selected, 496 Note that if no primary address exists for the interface selected,
497 then the primary address of the first non-loopback interface that 497 then the primary address of the first non-loopback interface that
498 has one will be used regarldess of this setting. 498 has one will be used regardless of this setting.
499 499
500 Default: 0 500 Default: 0
501 501
@@ -787,7 +787,7 @@ accept_ra_defrtr - BOOLEAN
787 disabled if accept_ra is disabled. 787 disabled if accept_ra is disabled.
788 788
789accept_ra_pinfo - BOOLEAN 789accept_ra_pinfo - BOOLEAN
790 Learn Prefix Inforamtion in Router Advertisement. 790 Learn Prefix Information in Router Advertisement.
791 791
792 Functional default: enabled if accept_ra is enabled. 792 Functional default: enabled if accept_ra is enabled.
793 disabled if accept_ra is disabled. 793 disabled if accept_ra is disabled.
diff --git a/Documentation/networking/netconsole.txt b/Documentation/networking/netconsole.txt
index 53618fb1a717..1caa6c734691 100644
--- a/Documentation/networking/netconsole.txt
+++ b/Documentation/networking/netconsole.txt
@@ -52,6 +52,6 @@ messages is high, but should have no other impact.
52Netconsole was designed to be as instantaneous as possible, to 52Netconsole was designed to be as instantaneous as possible, to
53enable the logging of even the most critical kernel bugs. It works 53enable the logging of even the most critical kernel bugs. It works
54from IRQ contexts as well, and does not enable interrupts while 54from IRQ contexts as well, and does not enable interrupts while
55sending packets. Due to these unique needs, configuration can not 55sending packets. Due to these unique needs, configuration cannot
56be more automatic, and some fundamental limitations will remain: 56be more automatic, and some fundamental limitations will remain:
57only IP networks, UDP packets and ethernet devices are supported. 57only IP networks, UDP packets and ethernet devices are supported.
diff --git a/Documentation/networking/netif-msg.txt b/Documentation/networking/netif-msg.txt
index 18ad4cea6259..c967ddb90d0b 100644
--- a/Documentation/networking/netif-msg.txt
+++ b/Documentation/networking/netif-msg.txt
@@ -40,7 +40,7 @@ History
40 Per-interface rather than per-driver message level setting. 40 Per-interface rather than per-driver message level setting.
41 More selective control over the type of messages emitted. 41 More selective control over the type of messages emitted.
42 42
43 The netif_msg recommandation adds these features with only a minor 43 The netif_msg recommendation adds these features with only a minor
44 complexity and code size increase. 44 complexity and code size increase.
45 45
46 The recommendation is the following points 46 The recommendation is the following points
diff --git a/Documentation/networking/operstates.txt b/Documentation/networking/operstates.txt
index 4a21d9bb836b..c9074f9b78bb 100644
--- a/Documentation/networking/operstates.txt
+++ b/Documentation/networking/operstates.txt
@@ -2,7 +2,7 @@
21. Introduction 21. Introduction
3 3
4Linux distinguishes between administrative and operational state of an 4Linux distinguishes between administrative and operational state of an
5interface. Admininstrative state is the result of "ip link set dev 5interface. Administrative state is the result of "ip link set dev
6<dev> up or down" and reflects whether the administrator wants to use 6<dev> up or down" and reflects whether the administrator wants to use
7the device for traffic. 7the device for traffic.
8 8
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt
index aaf99d5f0dad..12a008a5c221 100644
--- a/Documentation/networking/packet_mmap.txt
+++ b/Documentation/networking/packet_mmap.txt
@@ -66,7 +66,7 @@ the following process:
66 66
67[setup] socket() -------> creation of the capture socket 67[setup] socket() -------> creation of the capture socket
68 setsockopt() ---> allocation of the circular buffer (ring) 68 setsockopt() ---> allocation of the circular buffer (ring)
69 mmap() ---------> maping of the allocated buffer to the 69 mmap() ---------> mapping of the allocated buffer to the
70 user process 70 user process
71 71
72[capture] poll() ---------> to wait for incoming packets 72[capture] poll() ---------> to wait for incoming packets
@@ -93,7 +93,7 @@ The destruction of the socket and all associated resources
93is done by a simple call to close(fd). 93is done by a simple call to close(fd).
94 94
95Next I will describe PACKET_MMAP settings and it's constraints, 95Next I will describe PACKET_MMAP settings and it's constraints,
96also the maping of the circular buffer in the user process and 96also the mapping of the circular buffer in the user process and
97the use of this buffer. 97the use of this buffer.
98 98
99-------------------------------------------------------------------------------- 99--------------------------------------------------------------------------------
@@ -153,8 +153,8 @@ we will get the following buffer structure:
153 153
154A frame can be of any size with the only condition it can fit in a block. A block 154A frame can be of any size with the only condition it can fit in a block. A block
155can only hold an integer number of frames, or in other words, a frame cannot 155can only hold an integer number of frames, or in other words, a frame cannot
156be spawn accross two blocks so there are some datails you have to take into 156be spawned accross two blocks, so there are some details you have to take into
157account when choosing the frame_size. See "Maping and use of the circular 157account when choosing the frame_size. See "Mapping and use of the circular
158buffer (ring)". 158buffer (ring)".
159 159
160 160
@@ -215,8 +215,8 @@ called pg_vec, its size limits the number of blocks that can be allocated.
215 block #1 215 block #1
216 216
217 217
218kmalloc allocates any number of bytes of phisically contiguous memory from 218kmalloc allocates any number of bytes of physically contiguous memory from
219a pool of pre-determined sizes. This pool of memory is mantained by the slab 219a pool of pre-determined sizes. This pool of memory is maintained by the slab
220allocator which is at the end the responsible for doing the allocation and 220allocator which is at the end the responsible for doing the allocation and
221hence which imposes the maximum memory that kmalloc can allocate. 221hence which imposes the maximum memory that kmalloc can allocate.
222 222
@@ -262,7 +262,7 @@ i386 architecture:
262 <pagesize> = 4096 bytes 262 <pagesize> = 4096 bytes
263 <max-order> = 11 263 <max-order> = 11
264 264
265and a value for <frame size> of 2048 byteas. These parameters will yield 265and a value for <frame size> of 2048 bytes. These parameters will yield
266 266
267 <block number> = 131072/4 = 32768 blocks 267 <block number> = 131072/4 = 32768 blocks
268 <block size> = 4096 << 11 = 8 MiB. 268 <block size> = 4096 << 11 = 8 MiB.
@@ -278,7 +278,7 @@ an i386 kernel's memory size is limited to 1GiB.
278All memory allocations are not freed until the socket is closed. The memory 278All memory allocations are not freed until the socket is closed. The memory
279allocations are done with GFP_KERNEL priority, this basically means that 279allocations are done with GFP_KERNEL priority, this basically means that
280the allocation can wait and swap other process' memory in order to allocate 280the allocation can wait and swap other process' memory in order to allocate
281the nececessary memory, so normally limits can be reached. 281the necessary memory, so normally limits can be reached.
282 282
283 Other constraints 283 Other constraints
284------------------- 284-------------------
@@ -296,7 +296,7 @@ the following (from include/linux/if_packet.h):
296 - struct tpacket_hdr 296 - struct tpacket_hdr
297 - pad to TPACKET_ALIGNMENT=16 297 - pad to TPACKET_ALIGNMENT=16
298 - struct sockaddr_ll 298 - struct sockaddr_ll
299 - Gap, chosen so that packet data (Start+tp_net) alignes to 299 - Gap, chosen so that packet data (Start+tp_net) aligns to
300 TPACKET_ALIGNMENT=16 300 TPACKET_ALIGNMENT=16
301 - Start+tp_mac: [ Optional MAC header ] 301 - Start+tp_mac: [ Optional MAC header ]
302 - Start+tp_net: Packet data, aligned to TPACKET_ALIGNMENT=16. 302 - Start+tp_net: Packet data, aligned to TPACKET_ALIGNMENT=16.
@@ -311,14 +311,14 @@ the following (from include/linux/if_packet.h):
311 tp_frame_size must be a multiple of TPACKET_ALIGNMENT 311 tp_frame_size must be a multiple of TPACKET_ALIGNMENT
312 tp_frame_nr must be exactly frames_per_block*tp_block_nr 312 tp_frame_nr must be exactly frames_per_block*tp_block_nr
313 313
314Note that tp_block_size should be choosed to be a power of two or there will 314Note that tp_block_size should be chosen to be a power of two or there will
315be a waste of memory. 315be a waste of memory.
316 316
317-------------------------------------------------------------------------------- 317--------------------------------------------------------------------------------
318+ Maping and use of the circular buffer (ring) 318+ Mapping and use of the circular buffer (ring)
319-------------------------------------------------------------------------------- 319--------------------------------------------------------------------------------
320 320
321The maping of the buffer in the user process is done with the conventional 321The mapping of the buffer in the user process is done with the conventional
322mmap function. Even the circular buffer is compound of several physically 322mmap function. Even the circular buffer is compound of several physically
323discontiguous blocks of memory, they are contiguous to the user space, hence 323discontiguous blocks of memory, they are contiguous to the user space, hence
324just one call to mmap is needed: 324just one call to mmap is needed:
diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt
index 18d385c068fc..c8eee23be8c0 100644
--- a/Documentation/networking/pktgen.txt
+++ b/Documentation/networking/pktgen.txt
@@ -7,7 +7,7 @@ Date: 041221
7 7
8Enable CONFIG_NET_PKTGEN to compile and build pktgen.o either in kernel 8Enable CONFIG_NET_PKTGEN to compile and build pktgen.o either in kernel
9or as module. Module is preferred. insmod pktgen if needed. Once running 9or as module. Module is preferred. insmod pktgen if needed. Once running
10pktgen creates a thread on each CPU where each thread has affinty it's CPU. 10pktgen creates a thread on each CPU where each thread has affinity to its CPU.
11Monitoring and controlling is done via /proc. Easiest to select a suitable 11Monitoring and controlling is done via /proc. Easiest to select a suitable
12a sample script and configure. 12a sample script and configure.
13 13
@@ -18,7 +18,7 @@ root 129 0.3 0.0 0 0 ? SW 2003 523:20 [pktgen/0]
18root 130 0.3 0.0 0 0 ? SW 2003 509:50 [pktgen/1] 18root 130 0.3 0.0 0 0 ? SW 2003 509:50 [pktgen/1]
19 19
20 20
21For montoring and control pktgen creates: 21For monitoring and control pktgen creates:
22 /proc/net/pktgen/pgctrl 22 /proc/net/pktgen/pgctrl
23 /proc/net/pktgen/kpktgend_X 23 /proc/net/pktgen/kpktgend_X
24 /proc/net/pktgen/ethX 24 /proc/net/pktgen/ethX
@@ -32,7 +32,7 @@ Running:
32Stopped: eth1 32Stopped: eth1
33Result: OK: max_before_softirq=10000 33Result: OK: max_before_softirq=10000
34 34
35Most important the devices assigend to thread. Note! A device can only belong 35Most important the devices assigned to thread. Note! A device can only belong
36to one thread. 36to one thread.
37 37
38 38
@@ -147,7 +147,7 @@ Examples:
147Example scripts 147Example scripts
148=============== 148===============
149 149
150A collection of small tutorial scripts for pktgen is in expamples dir. 150A collection of small tutorial scripts for pktgen is in examples dir.
151 151
152pktgen.conf-1-1 # 1 CPU 1 dev 152pktgen.conf-1-1 # 1 CPU 1 dev
153pktgen.conf-1-2 # 1 CPU 2 dev 153pktgen.conf-1-2 # 1 CPU 2 dev
diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt
index bd528ffbeb4b..4bde53e85f3f 100644
--- a/Documentation/networking/s2io.txt
+++ b/Documentation/networking/s2io.txt
@@ -126,7 +126,7 @@ However, you may want to set PCI latency timer to 248.
126#setpci -d 17d5:* LATENCY_TIMER=f8 126#setpci -d 17d5:* LATENCY_TIMER=f8
127For detailed description of the PCI registers, please see Xframe User Guide. 127For detailed description of the PCI registers, please see Xframe User Guide.
128b. Use 2-buffer mode. This results in large performance boost on 128b. Use 2-buffer mode. This results in large performance boost on
129on certain platforms(eg. SGI Altix, IBM xSeries). 129certain platforms(eg. SGI Altix, IBM xSeries).
130c. Ensure Receive Checksum offload is enabled. Use "ethtool -K ethX" command to 130c. Ensure Receive Checksum offload is enabled. Use "ethtool -K ethX" command to
131set/verify this option. 131set/verify this option.
132d. Enable NAPI feature(in kernel configuration Device Drivers ---> Network 132d. Enable NAPI feature(in kernel configuration Device Drivers ---> Network
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt
index 7837c53fd5fe..4e1cc745ec63 100644
--- a/Documentation/networking/sk98lin.txt
+++ b/Documentation/networking/sk98lin.txt
@@ -180,7 +180,7 @@ To set the driver parameters in this file, proceed as follows:
1801. Insert a line of the form : 1801. Insert a line of the form :
181 options sk98lin ... 181 options sk98lin ...
182 For "...", the same syntax is required as described for the command 182 For "...", the same syntax is required as described for the command
183 line paramaters of modprobe below. 183 line parameters of modprobe below.
1842. To activate the new parameters, either reboot your computer 1842. To activate the new parameters, either reboot your computer
185 or 185 or
186 unload and reload the driver. 186 unload and reload the driver.
@@ -320,7 +320,7 @@ Parameter: Moderation
320Values: None, Static, Dynamic 320Values: None, Static, Dynamic
321Default: None 321Default: None
322 322
323Interrupt moderation is employed to limit the maxmimum number of interrupts 323Interrupt moderation is employed to limit the maximum number of interrupts
324the driver has to serve. That is, one or more interrupts (which indicate any 324the driver has to serve. That is, one or more interrupts (which indicate any
325transmit or receive packet to be processed) are queued until the driver 325transmit or receive packet to be processed) are queued until the driver
326processes them. When queued interrupts are to be served, is determined by the 326processes them. When queued interrupts are to be served, is determined by the
@@ -364,9 +364,9 @@ Parameter: IntsPerSec
364Values: 30...40000 (interrupts per second) 364Values: 30...40000 (interrupts per second)
365Default: 2000 365Default: 2000
366 366
367This parameter is only used, if either static or dynamic interrupt moderation 367This parameter is only used if either static or dynamic interrupt moderation
368is used on a network adapter card. Using this paramter if no moderation is 368is used on a network adapter card. Using this parameter if no moderation is
369applied, will lead to no action performed. 369applied will lead to no action performed.
370 370
371This parameter determines the length of any interrupt moderation interval. 371This parameter determines the length of any interrupt moderation interval.
372Assuming that static interrupt moderation is to be used, an 'IntsPerSec' 372Assuming that static interrupt moderation is to be used, an 'IntsPerSec'
@@ -484,7 +484,7 @@ If any problems occur during the installation process, check the
484following list: 484following list:
485 485
486 486
487Problem: The SK-98xx adapter can not be found by the driver. 487Problem: The SK-98xx adapter cannot be found by the driver.
488Solution: In /proc/pci search for the following entry: 488Solution: In /proc/pci search for the following entry:
489 'Ethernet controller: SysKonnect SK-98xx ...' 489 'Ethernet controller: SysKonnect SK-98xx ...'
490 If this entry exists, the SK-98xx or SK-98xx V2.0 adapter has 490 If this entry exists, the SK-98xx or SK-98xx V2.0 adapter has
@@ -497,12 +497,12 @@ Solution: In /proc/pci search for the following entry:
497 www.syskonnect.com 497 www.syskonnect.com
498 498
499 Some COMPAQ machines have problems dealing with PCI under Linux. 499 Some COMPAQ machines have problems dealing with PCI under Linux.
500 Linux. This problem is described in the 'PCI howto' document 500 This problem is described in the 'PCI howto' document
501 (included in some distributions or available from the 501 (included in some distributions or available from the
502 web, e.g. at 'www.linux.org'). 502 web, e.g. at 'www.linux.org').
503 503
504 504
505Problem: Programs such as 'ifconfig' or 'route' can not be found or the 505Problem: Programs such as 'ifconfig' or 'route' cannot be found or the
506 error message 'Operation not permitted' is displayed. 506 error message 'Operation not permitted' is displayed.
507Reason: You are not logged in as user 'root'. 507Reason: You are not logged in as user 'root'.
508Solution: Logout and login as 'root' or change to 'root' via 'su'. 508Solution: Logout and login as 'root' or change to 'root' via 'su'.
diff --git a/Documentation/networking/skfp.txt b/Documentation/networking/skfp.txt
index 3a419ed42f81..abfddf81e34a 100644
--- a/Documentation/networking/skfp.txt
+++ b/Documentation/networking/skfp.txt
@@ -81,7 +81,7 @@ Makes my life much easier :-)
81 81
82If you run into problems during installation, check those items: 82If you run into problems during installation, check those items:
83 83
84Problem: The FDDI adapter can not be found by the driver. 84Problem: The FDDI adapter cannot be found by the driver.
85Reason: Look in /proc/pci for the following entry: 85Reason: Look in /proc/pci for the following entry:
86 'FDDI network controller: SysKonnect SK-FDDI-PCI ...' 86 'FDDI network controller: SysKonnect SK-FDDI-PCI ...'
87 If this entry exists, then the FDDI adapter has been 87 If this entry exists, then the FDDI adapter has been
@@ -99,7 +99,7 @@ Reason: Look in /proc/pci for the following entry:
99 99
100Problem: You want to use your computer as a router between 100Problem: You want to use your computer as a router between
101 multiple IP subnetworks (using multiple adapters), but 101 multiple IP subnetworks (using multiple adapters), but
102 you can not reach computers in other subnetworks. 102 you cannot reach computers in other subnetworks.
103Reason: Either the router's kernel is not configured for IP 103Reason: Either the router's kernel is not configured for IP
104 forwarding or there is a problem with the routing table 104 forwarding or there is a problem with the routing table
105 and gateway configuration in at least one of the 105 and gateway configuration in at least one of the
diff --git a/Documentation/networking/slicecom.txt b/Documentation/networking/slicecom.txt
index 59cfd95121fb..2f04c9267f89 100644
--- a/Documentation/networking/slicecom.txt
+++ b/Documentation/networking/slicecom.txt
@@ -89,7 +89,7 @@ red: green: meaning:
89 89
90- - no frame-sync, no signal received, or signal SNAFU. 90- - no frame-sync, no signal received, or signal SNAFU.
91- on "Everything is OK" 91- on "Everything is OK"
92on on Recepion is ok, but the remote end sends Remote Alarm 92on on Reception is ok, but the remote end sends Remote Alarm
93on - The interface is unconfigured 93on - The interface is unconfigured
94 94
95----------------------------------------------------------------- 95-----------------------------------------------------------------
@@ -257,12 +257,12 @@ which begin with '//' are the comments.
257// No alarms - Everything OK 257// No alarms - Everything OK
258// 258//
259// LOS - Loss Of Signal - No signal sensed on the input 259// LOS - Loss Of Signal - No signal sensed on the input
260// AIS - Alarm Indication Signal - The remot side sends '11111111'-s, 260// AIS - Alarm Indication Signal - The remote side sends '11111111'-s,
261// it tells, that there's an error condition, or it's not 261// it tells, that there's an error condition, or it's not
262// initialised. 262// initialised.
263// AUXP - Auxiliary Pattern Indication - 01010101.. received. 263// AUXP - Auxiliary Pattern Indication - 01010101.. received.
264// LFA - Loss of Frame Alignment - no frame sync received. 264// LFA - Loss of Frame Alignment - no frame sync received.
265// RRA - Receive Remote Alarm - the remote end's OK, but singnals error cond. 265// RRA - Receive Remote Alarm - the remote end's OK, but signals error cond.
266// LMFA - Loss of CRC4 Multiframe Alignment - no CRC4 multiframe sync. 266// LMFA - Loss of CRC4 Multiframe Alignment - no CRC4 multiframe sync.
267// NMF - No Multiframe alignment Found after 400 msec - no such alarm using 267// NMF - No Multiframe alignment Found after 400 msec - no such alarm using
268// no-crc4 or crc4 framing, see below. 268// no-crc4 or crc4 framing, see below.
@@ -364,6 +364,6 @@ Treat them very carefully, these can cause much trouble!
364 364
365 # echo >lbireg 0x1d 0x21 365 # echo >lbireg 0x1d 0x21
366 366
367 - Swithing the loop off: 367 - Switching the loop off:
368 368
369 # echo >lbireg 0x1d 0x00 369 # echo >lbireg 0x1d 0x00
diff --git a/Documentation/networking/smctr.txt b/Documentation/networking/smctr.txt
index 4c866f5a0ee4..9af25b810c1f 100644
--- a/Documentation/networking/smctr.txt
+++ b/Documentation/networking/smctr.txt
@@ -11,7 +11,7 @@ This driver is rather simple to use. Select Y to Token Ring adapter support
11in the kernel configuration. A choice for SMC Token Ring adapters will 11in the kernel configuration. A choice for SMC Token Ring adapters will
12appear. This drives supports all SMC ISA/MCA adapters. Choose this 12appear. This drives supports all SMC ISA/MCA adapters. Choose this
13option. I personally recommend compiling the driver as a module (M), but if you 13option. I personally recommend compiling the driver as a module (M), but if you
14you would like to compile it staticly answer Y instead. 14you would like to compile it statically answer Y instead.
15 15
16This driver supports multiple adapters without the need to load multiple copies 16This driver supports multiple adapters without the need to load multiple copies
17of the driver. You should be able to load up to 7 adapters without any kernel 17of the driver. You should be able to load up to 7 adapters without any kernel
diff --git a/Documentation/networking/tcp.txt b/Documentation/networking/tcp.txt
index 0fa300425575..0121edc3ba06 100644
--- a/Documentation/networking/tcp.txt
+++ b/Documentation/networking/tcp.txt
@@ -62,7 +62,7 @@ if needed and you will get the expected protocol. If you ask for an
62unknown congestion method, then the sysctl attempt will fail. 62unknown congestion method, then the sysctl attempt will fail.
63 63
64If you remove a tcp congestion control module, then you will get the next 64If you remove a tcp congestion control module, then you will get the next
65available one. Since reno can not be built as a module, and can not be 65available one. Since reno cannot be built as a module, and cannot be
66deleted, it will always be available. 66deleted, it will always be available.
67 67
68How the new TCP output machine [nyi] works. 68How the new TCP output machine [nyi] works.
diff --git a/Documentation/networking/tms380tr.txt b/Documentation/networking/tms380tr.txt
index 179e527b9da1..c169a57bc925 100644
--- a/Documentation/networking/tms380tr.txt
+++ b/Documentation/networking/tms380tr.txt
@@ -24,7 +24,7 @@ This driver is rather simple to use. Select Y to Token Ring adapter support
24in the kernel configuration. A choice for SysKonnect Token Ring adapters will 24in the kernel configuration. A choice for SysKonnect Token Ring adapters will
25appear. This drives supports all SysKonnect ISA and PCI adapters. Choose this 25appear. This drives supports all SysKonnect ISA and PCI adapters. Choose this
26option. I personally recommend compiling the driver as a module (M), but if you 26option. I personally recommend compiling the driver as a module (M), but if you
27you would like to compile it staticly answer Y instead. 27you would like to compile it statically answer Y instead.
28 28
29This driver supports multiple adapters without the need to load multiple copies 29This driver supports multiple adapters without the need to load multiple copies
30of the driver. You should be able to load up to 7 adapters without any kernel 30of the driver. You should be able to load up to 7 adapters without any kernel
diff --git a/Documentation/networking/vortex.txt b/Documentation/networking/vortex.txt
index 6091e5f6794f..6356d3faed36 100644
--- a/Documentation/networking/vortex.txt
+++ b/Documentation/networking/vortex.txt
@@ -359,13 +359,13 @@ steps you should take:
359 359
360 Eliminate some variables: try different cards, different 360 Eliminate some variables: try different cards, different
361 computers, different cables, different ports on the switch/hub, 361 computers, different cables, different ports on the switch/hub,
362 different versions of the kernel or ofthe driver, etc. 362 different versions of the kernel or of the driver, etc.
363 363
364- OK, it's a driver problem. 364- OK, it's a driver problem.
365 365
366 You need to generate a report. Typically this is an email to the 366 You need to generate a report. Typically this is an email to the
367 maintainer and/or linux-net@vger.kernel.org. The maintainer's 367 maintainer and/or linux-net@vger.kernel.org. The maintainer's
368 email address will be inthe driver source or in the MAINTAINERS file. 368 email address will be in the driver source or in the MAINTAINERS file.
369 369
370- The contents of your report will vary a lot depending upon the 370- The contents of your report will vary a lot depending upon the
371 problem. If it's a kernel crash then you should refer to the 371 problem. If it's a kernel crash then you should refer to the
diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt
index c96897aa08b6..0cf654147634 100644
--- a/Documentation/networking/wan-router.txt
+++ b/Documentation/networking/wan-router.txt
@@ -148,7 +148,7 @@ NEW IN THIS RELEASE
148 for async connections. 148 for async connections.
149 149
150 o Added the PPPCONFIG utility 150 o Added the PPPCONFIG utility
151 Used to configure the PPPD dameon for the 151 Used to configure the PPPD daemon for the
152 WANPIPE Async PPP and standard serial port. 152 WANPIPE Async PPP and standard serial port.
153 The wancfg calls the pppconfig to configure 153 The wancfg calls the pppconfig to configure
154 the pppd. 154 the pppd.
@@ -214,7 +214,7 @@ PRODUCT COMPONENTS AND RELATED FILES
214/usr/local/wanrouter/patches/kdrivers: 214/usr/local/wanrouter/patches/kdrivers:
215 Sources of the latest WANPIPE device drivers. 215 Sources of the latest WANPIPE device drivers.
216 These are used to UPGRADE the linux kernel to the newest 216 These are used to UPGRADE the linux kernel to the newest
217 version if the kernel source has already been pathced with 217 version if the kernel source has already been patched with
218 WANPIPE drivers. 218 WANPIPE drivers.
219 219
220/usr/local/wanrouter/samples: 220/usr/local/wanrouter/samples:
@@ -350,7 +350,7 @@ REVISION HISTORY
350 Available as a patch. 350 Available as a patch.
351 351
3522.0.6 Aug 17, 1999 Increased debugging in statup scripts 3522.0.6 Aug 17, 1999 Increased debugging in statup scripts
353 Fixed insallation bugs from 2.0.5 353 Fixed installation bugs from 2.0.5
354 Kernel patch works for both 2.2.10 and 2.2.11 kernels. 354 Kernel patch works for both 2.2.10 and 2.2.11 kernels.
355 There is no functional difference between the two packages 355 There is no functional difference between the two packages
356 356
@@ -434,11 +434,11 @@ beta3-2.1.4 Jul 2000 o X25 M_BIT Problem fix.
434 change. 434 change.
435 435
436beta1-2.1.5 Nov 15 2000 436beta1-2.1.5 Nov 15 2000
437 o Fixed the MulitPort PPP Support for kernels 2.2.16 and above. 437 o Fixed the MultiPort PPP Support for kernels 2.2.16 and above.
438 2.2.X kernels only 438 2.2.X kernels only
439 439
440 o Secured the driver UDP debugging calls 440 o Secured the driver UDP debugging calls
441 - All illegal netowrk debugging calls are reported to 441 - All illegal network debugging calls are reported to
442 the log. 442 the log.
443 - Defined a set of allowed commands, all other denied. 443 - Defined a set of allowed commands, all other denied.
444 444
@@ -451,7 +451,7 @@ beta1-2.1.5 Nov 15 2000
451 451
452 o Keyboard Led Monitor/Debugger 452 o Keyboard Led Monitor/Debugger
453 - A new utilty /usr/sbin/wpkbdmon uses keyboard leds 453 - A new utilty /usr/sbin/wpkbdmon uses keyboard leds
454 to convey operatinal statistic information of the 454 to convey operational statistic information of the
455 Sangoma WANPIPE cards. 455 Sangoma WANPIPE cards.
456 NUM_LOCK = Line State (On=connected, Off=disconnected) 456 NUM_LOCK = Line State (On=connected, Off=disconnected)
457 CAPS_LOCK = Tx data (On=transmitting, Off=no tx data) 457 CAPS_LOCK = Tx data (On=transmitting, Off=no tx data)
@@ -470,7 +470,7 @@ beta1-2.1.5 Nov 15 2000
470 o Fixed the Frame Relay and Chdlc network interfaces so they are 470 o Fixed the Frame Relay and Chdlc network interfaces so they are
471 compatible with libpcap libraries. Meaning, tcpdump, snort, 471 compatible with libpcap libraries. Meaning, tcpdump, snort,
472 ethereal, and all other packet sniffers and debuggers work on 472 ethereal, and all other packet sniffers and debuggers work on
473 all WANPIPE netowrk interfaces. 473 all WANPIPE network interfaces.
474 - Set the network interface encoding type to ARPHRD_PPP. 474 - Set the network interface encoding type to ARPHRD_PPP.
475 This tell the sniffers that data obtained from the 475 This tell the sniffers that data obtained from the
476 network interface is in pure IP format. 476 network interface is in pure IP format.
@@ -570,7 +570,7 @@ bata1-2.2.1 Feb 09 2001
570 570
571 Option to COMPILE WANPIPE modules against the currently 571 Option to COMPILE WANPIPE modules against the currently
572 running kernel, thus no need for manual kernel and module 572 running kernel, thus no need for manual kernel and module
573 re-compilatin. 573 re-compilation.
574 574
575 o Updates and Bug Fixes to wancfg utility. 575 o Updates and Bug Fixes to wancfg utility.
576 576
diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt
index 3cc953cb288f..719f9a9d60c0 100644
--- a/Documentation/nfsroot.txt
+++ b/Documentation/nfsroot.txt
@@ -11,7 +11,7 @@ Updated 2006 by Horms <horms@verge.net.au>
11In order to use a diskless system, such as an X-terminal or printer server 11In order to use a diskless system, such as an X-terminal or printer server
12for example, it is necessary for the root filesystem to be present on a 12for example, it is necessary for the root filesystem to be present on a
13non-disk device. This may be an initramfs (see Documentation/filesystems/ 13non-disk device. This may be an initramfs (see Documentation/filesystems/
14ramfs-rootfs-initramfs.txt), a ramdisk (see Documenation/initrd.txt) or a 14ramfs-rootfs-initramfs.txt), a ramdisk (see Documentation/initrd.txt) or a
15filesystem mounted via NFS. The following text describes on how to use NFS 15filesystem mounted via NFS. The following text describes on how to use NFS
16for the root filesystem. For the rest of this text 'client' means the 16for the root filesystem. For the rest of this text 'client' means the
17diskless system, and 'server' means the NFS server. 17diskless system, and 'server' means the NFS server.
diff --git a/Documentation/pci-error-recovery.txt b/Documentation/pci-error-recovery.txt
index 634d3e5b5756..6650af432523 100644
--- a/Documentation/pci-error-recovery.txt
+++ b/Documentation/pci-error-recovery.txt
@@ -172,7 +172,7 @@ is STEP 6 (Permanent Failure).
172>>> a value of 0xff on read, and writes will be dropped. If the device 172>>> a value of 0xff on read, and writes will be dropped. If the device
173>>> driver attempts more than 10K I/O's to a frozen adapter, it will 173>>> driver attempts more than 10K I/O's to a frozen adapter, it will
174>>> assume that the device driver has gone into an infinite loop, and 174>>> assume that the device driver has gone into an infinite loop, and
175>>> it will panic the the kernel. There doesn't seem to be any other 175>>> it will panic the kernel. There doesn't seem to be any other
176>>> way of stopping a device driver that insists on spinning on I/O. 176>>> way of stopping a device driver that insists on spinning on I/O.
177 177
178STEP 2: MMIO Enabled 178STEP 2: MMIO Enabled
diff --git a/Documentation/pi-futex.txt b/Documentation/pi-futex.txt
index 5d61dacd21f6..9a5bc8651c29 100644
--- a/Documentation/pi-futex.txt
+++ b/Documentation/pi-futex.txt
@@ -118,4 +118,4 @@ properties of futexes, and all four combinations are possible: futex,
118robust-futex, PI-futex, robust+PI-futex. 118robust-futex, PI-futex, robust+PI-futex.
119 119
120More details about priority inheritance can be found in 120More details about priority inheritance can be found in
121Documentation/rtmutex.txt. 121Documentation/rt-mutex.txt.
diff --git a/Documentation/pm.txt b/Documentation/pm.txt
index 79c0f32a760e..da8589a0e07d 100644
--- a/Documentation/pm.txt
+++ b/Documentation/pm.txt
@@ -18,10 +18,10 @@ enabled by default). If a working ACPI implementation is found, the
18ACPI driver will override and disable APM, otherwise the APM driver 18ACPI driver will override and disable APM, otherwise the APM driver
19will be used. 19will be used.
20 20
21No sorry, you can not have both ACPI and APM enabled and running at 21No, sorry, you cannot have both ACPI and APM enabled and running at
22once. Some people with broken ACPI or broken APM implementations 22once. Some people with broken ACPI or broken APM implementations
23would like to use both to get a full set of working features, but you 23would like to use both to get a full set of working features, but you
24simply can not mix and match the two. Only one power management 24simply cannot mix and match the two. Only one power management
25interface can be in control of the machine at once. Think about it.. 25interface can be in control of the machine at once. Think about it..
26 26
27User-space Daemons 27User-space Daemons
@@ -106,7 +106,7 @@ void pm_unregister_all(pm_callback cback);
106 * 106 *
107 * Returns: 0 if the request is successful 107 * Returns: 0 if the request is successful
108 * EINVAL if the request is not supported 108 * EINVAL if the request is not supported
109 * EBUSY if the device is now busy and can not handle the request 109 * EBUSY if the device is now busy and cannot handle the request
110 * ENOMEM if the device was unable to handle the request due to memory 110 * ENOMEM if the device was unable to handle the request due to memory
111 * 111 *
112 * Details: The device request callback will be called before the 112 * Details: The device request callback will be called before the
diff --git a/Documentation/pnp.txt b/Documentation/pnp.txt
index 9529c9c9fd59..9ff966bf76e6 100644
--- a/Documentation/pnp.txt
+++ b/Documentation/pnp.txt
@@ -222,7 +222,7 @@ static struct pnp_driver serial_pnp_driver = {
222 .remove = serial_pnp_remove, 222 .remove = serial_pnp_remove,
223}; 223};
224 224
225* name and id_table can not be NULL. 225* name and id_table cannot be NULL.
226 226
2274.) register the driver 2274.) register the driver
228ex: 228ex:
diff --git a/Documentation/power/pci.txt b/Documentation/power/pci.txt
index 73fc87e5dc38..24edf25b3bb7 100644
--- a/Documentation/power/pci.txt
+++ b/Documentation/power/pci.txt
@@ -326,7 +326,7 @@ A reference implementation
326 326
327This is a typical implementation. Drivers can slightly change the order 327This is a typical implementation. Drivers can slightly change the order
328of the operations in the implementation, ignore some operations or add 328of the operations in the implementation, ignore some operations or add
329more deriver specific operations in it, but drivers should do something like 329more driver specific operations in it, but drivers should do something like
330this on the whole. 330this on the whole.
331 331
3325. Resources 3325. Resources
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt
index 823b2cf6e3dc..9ea2208b43b5 100644
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
@@ -156,7 +156,7 @@ instead set the PF_NOFREEZE process flag when creating the thread (and
156be very carefull). 156be very carefull).
157 157
158 158
159Q: What is the difference between between "platform", "shutdown" and 159Q: What is the difference between "platform", "shutdown" and
160"firmware" in /sys/power/disk? 160"firmware" in /sys/power/disk?
161 161
162A: 162A:
@@ -175,8 +175,8 @@ reliable.
175Q: I do not understand why you have such strong objections to idea of 175Q: I do not understand why you have such strong objections to idea of
176selective suspend. 176selective suspend.
177 177
178A: Do selective suspend during runtime power managment, that's okay. But 178A: Do selective suspend during runtime power management, that's okay. But
179its useless for suspend-to-disk. (And I do not see how you could use 179it's useless for suspend-to-disk. (And I do not see how you could use
180it for suspend-to-ram, I hope you do not want that). 180it for suspend-to-ram, I hope you do not want that).
181 181
182Lets see, so you suggest to 182Lets see, so you suggest to
@@ -211,7 +211,7 @@ slowness may not matter to you. It can always be fixed later.
211For devices like disk it does matter, you do not want to spindown for 211For devices like disk it does matter, you do not want to spindown for
212FREEZE. 212FREEZE.
213 213
214Q: After resuming, system is paging heavilly, leading to very bad interactivity. 214Q: After resuming, system is paging heavily, leading to very bad interactivity.
215 215
216A: Try running 216A: Try running
217 217
diff --git a/Documentation/power/tricks.txt b/Documentation/power/tricks.txt
index c6d58d3da133..3b26bb502a4a 100644
--- a/Documentation/power/tricks.txt
+++ b/Documentation/power/tricks.txt
@@ -9,7 +9,7 @@ If you want to trick swsusp/S3 into working, you might want to try:
9 9
10* turn off APIC and preempt 10* turn off APIC and preempt
11 11
12* use ext2. At least it has working fsck. [If something seemes to go 12* use ext2. At least it has working fsck. [If something seems to go
13 wrong, force fsck when you have a chance] 13 wrong, force fsck when you have a chance]
14 14
15* turn off modules 15* turn off modules
diff --git a/Documentation/power/userland-swsusp.txt b/Documentation/power/userland-swsusp.txt
index 94058220aaf0..64755e9285db 100644
--- a/Documentation/power/userland-swsusp.txt
+++ b/Documentation/power/userland-swsusp.txt
@@ -91,7 +91,7 @@ unfreeze user space processes frozen by SNAPSHOT_UNFREEZE if they are
91still frozen when the device is being closed). 91still frozen when the device is being closed).
92 92
93Currently it is assumed that the userland utilities reading/writing the 93Currently it is assumed that the userland utilities reading/writing the
94snapshot image from/to the kernel will use a swap parition, called the resume 94snapshot image from/to the kernel will use a swap partition, called the resume
95partition, as storage space. However, this is not really required, as they 95partition, as storage space. However, this is not really required, as they
96can use, for example, a special (blank) suspend partition or a file on a partition 96can use, for example, a special (blank) suspend partition or a file on a partition
97that is unmounted before SNAPSHOT_ATOMIC_SNAPSHOT and mounted afterwards. 97that is unmounted before SNAPSHOT_ATOMIC_SNAPSHOT and mounted afterwards.
diff --git a/Documentation/power/video.txt b/Documentation/power/video.txt
index d859faa3a463..2b358498d095 100644
--- a/Documentation/power/video.txt
+++ b/Documentation/power/video.txt
@@ -16,7 +16,7 @@ problem for S1 standby, because hardware should retain its state over
16that. 16that.
17 17
18We either have to run video BIOS during early resume, or interpret it 18We either have to run video BIOS during early resume, or interpret it
19using vbetool later, or maybe nothing is neccessary on particular 19using vbetool later, or maybe nothing is necessary on particular
20system because video state is preserved. Unfortunately different 20system because video state is preserved. Unfortunately different
21methods work on different systems, and no known method suits all of 21methods work on different systems, and no known method suits all of
22them. 22them.
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index 5c0ba235f5a5..1ccc8a515b44 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -145,7 +145,7 @@ it with special cases.
145 in case you are entering the kernel with MMU enabled 145 in case you are entering the kernel with MMU enabled
146 and a non-1:1 mapping. 146 and a non-1:1 mapping.
147 147
148 r5 : NULL (as to differenciate with method a) 148 r5 : NULL (as to differentiate with method a)
149 149
150 Note about SMP entry: Either your firmware puts your other 150 Note about SMP entry: Either your firmware puts your other
151 CPUs in some sleep loop or spin loop in ROM where you can get 151 CPUs in some sleep loop or spin loop in ROM where you can get
@@ -245,7 +245,7 @@ the block to RAM before passing it to the kernel.
245--------- 245---------
246 246
247 The kernel is entered with r3 pointing to an area of memory that is 247 The kernel is entered with r3 pointing to an area of memory that is
248 roughtly described in include/asm-powerpc/prom.h by the structure 248 roughly described in include/asm-powerpc/prom.h by the structure
249 boot_param_header: 249 boot_param_header:
250 250
251struct boot_param_header { 251struct boot_param_header {
@@ -335,7 +335,7 @@ struct boot_param_header {
335 "compact" format for the tree itself that is however not backward 335 "compact" format for the tree itself that is however not backward
336 compatible. You should always generate a structure of the highest 336 compatible. You should always generate a structure of the highest
337 version defined at the time of your implementation. Currently 337 version defined at the time of your implementation. Currently
338 that is version 16, unless you explicitely aim at being backward 338 that is version 16, unless you explicitly aim at being backward
339 compatible. 339 compatible.
340 340
341 - last_comp_version 341 - last_comp_version
@@ -418,9 +418,9 @@ zero terminated string and is mandatory for version 1 to 3 of the
418format definition (as it is in Open Firmware). Version 0x10 makes it 418format definition (as it is in Open Firmware). Version 0x10 makes it
419optional as it can generate it from the unit name defined below. 419optional as it can generate it from the unit name defined below.
420 420
421There is also a "unit name" that is used to differenciate nodes with 421There is also a "unit name" that is used to differentiate nodes with
422the same name at the same level, it is usually made of the node 422the same name at the same level, it is usually made of the node
423name's, the "@" sign, and a "unit address", which definition is 423names, the "@" sign, and a "unit address", which definition is
424specific to the bus type the node sits on. 424specific to the bus type the node sits on.
425 425
426The unit name doesn't exist as a property per-se but is included in 426The unit name doesn't exist as a property per-se but is included in
@@ -550,11 +550,11 @@ Here's the basic structure of a single node:
550 * [child nodes if any] 550 * [child nodes if any]
551 * token OF_DT_END_NODE (that is 0x00000002) 551 * token OF_DT_END_NODE (that is 0x00000002)
552 552
553So the node content can be summmarised as a start token, a full path, 553So the node content can be summarised as a start token, a full path,
554a list of properties, a list of child node and an end token. Every 554a list of properties, a list of child nodes, and an end token. Every
555child node is a full node structure itself as defined above. 555child node is a full node structure itself as defined above.
556 556
5574) Device tree 'strings" block 5574) Device tree "strings" block
558 558
559In order to save space, property names, which are generally redundant, 559In order to save space, property names, which are generally redundant,
560are stored separately in the "strings" block. This block is simply the 560are stored separately in the "strings" block. This block is simply the
@@ -573,7 +573,7 @@ implementation of Open Firmware or an implementation compatible with
573the Open Firmware client interface, those properties will be created 573the Open Firmware client interface, those properties will be created
574by the trampoline code in the kernel's prom_init() file. For example, 574by the trampoline code in the kernel's prom_init() file. For example,
575that's where you'll have to add code to detect your board model and 575that's where you'll have to add code to detect your board model and
576set the platform number. However, when using the flatenned device-tree 576set the platform number. However, when using the flattened device-tree
577entry point, there is no prom_init() pass, and thus you have to 577entry point, there is no prom_init() pass, and thus you have to
578provide those properties yourself. 578provide those properties yourself.
579 579
@@ -630,12 +630,11 @@ like address space bits, you'll have to add a bus translator to the
630prom_parse.c file of the recent kernels for your bus type. 630prom_parse.c file of the recent kernels for your bus type.
631 631
632The "reg" property only defines addresses and sizes (if #size-cells 632The "reg" property only defines addresses and sizes (if #size-cells
633is 633is non-0) within a given bus. In order to translate addresses upward
634non-0) within a given bus. In order to translate addresses upward
635(that is into parent bus addresses, and possibly into cpu physical 634(that is into parent bus addresses, and possibly into cpu physical
636addresses), all busses must contain a "ranges" property. If the 635addresses), all busses must contain a "ranges" property. If the
637"ranges" property is missing at a given level, it's assumed that 636"ranges" property is missing at a given level, it's assumed that
638translation isn't possible. The format of the "ranges" proprety for a 637translation isn't possible. The format of the "ranges" property for a
639bus is a list of: 638bus is a list of:
640 639
641 bus address, parent bus address, size 640 bus address, parent bus address, size
@@ -689,7 +688,7 @@ is present).
6894) Note about node and property names and character set 6884) Note about node and property names and character set
690------------------------------------------------------- 689-------------------------------------------------------
691 690
692While open firmware provides more flexibe usage of 8859-1, this 691While open firmware provides more flexible usage of 8859-1, this
693specification enforces more strict rules. Nodes and properties should 692specification enforces more strict rules. Nodes and properties should
694be comprised only of ASCII characters 'a' to 'z', '0' to 693be comprised only of ASCII characters 'a' to 'z', '0' to
695'9', ',', '.', '_', '+', '#', '?', and '-'. Node names additionally 694'9', ',', '.', '_', '+', '#', '?', and '-'. Node names additionally
@@ -732,12 +731,12 @@ address which can extend beyond that limit.
732 that typically get driven by the same platform code in the 731 that typically get driven by the same platform code in the
733 kernel, you would use a different "model" property but put a 732 kernel, you would use a different "model" property but put a
734 value in "compatible". The kernel doesn't directly use that 733 value in "compatible". The kernel doesn't directly use that
735 value (see /chosen/linux,platform for how the kernel choses a 734 value (see /chosen/linux,platform for how the kernel chooses a
736 platform type) but it is generally useful. 735 platform type) but it is generally useful.
737 736
738 The root node is also generally where you add additional properties 737 The root node is also generally where you add additional properties
739 specific to your board like the serial number if any, that sort of 738 specific to your board like the serial number if any, that sort of
740 thing. it is recommended that if you add any "custom" property whose 739 thing. It is recommended that if you add any "custom" property whose
741 name may clash with standard defined ones, you prefix them with your 740 name may clash with standard defined ones, you prefix them with your
742 vendor name and a comma. 741 vendor name and a comma.
743 742
@@ -817,7 +816,7 @@ address which can extend beyond that limit.
817 your board. It's a list of addresses/sizes concatenated 816 your board. It's a list of addresses/sizes concatenated
818 together, with the number of cells of each defined by the 817 together, with the number of cells of each defined by the
819 #address-cells and #size-cells of the root node. For example, 818 #address-cells and #size-cells of the root node. For example,
820 with both of these properties beeing 2 like in the example given 819 with both of these properties being 2 like in the example given
821 earlier, a 970 based machine with 6Gb of RAM could typically 820 earlier, a 970 based machine with 6Gb of RAM could typically
822 have a "reg" property here that looks like: 821 have a "reg" property here that looks like:
823 822
@@ -970,7 +969,7 @@ device-tree in another format. The currently supported formats are:
970 - "asm": assembly language file. This is a file that can be 969 - "asm": assembly language file. This is a file that can be
971 sourced by gas to generate a device-tree "blob". That file can 970 sourced by gas to generate a device-tree "blob". That file can
972 then simply be added to your Makefile. Additionally, the 971 then simply be added to your Makefile. Additionally, the
973 assembly file exports some symbols that can be use 972 assembly file exports some symbols that can be used.
974 973
975 974
976The syntax of the dtc tool is 975The syntax of the dtc tool is
@@ -984,10 +983,10 @@ generated. Supported versions are 1,2,3 and 16. The default is
984currently version 3 but that may change in the future to version 16. 983currently version 3 but that may change in the future to version 16.
985 984
986Additionally, dtc performs various sanity checks on the tree, like the 985Additionally, dtc performs various sanity checks on the tree, like the
987uniqueness of linux,phandle properties, validity of strings, etc... 986uniqueness of linux, phandle properties, validity of strings, etc...
988 987
989The format of the .dts "source" file is "C" like, supports C and C++ 988The format of the .dts "source" file is "C" like, supports C and C++
990style commments. 989style comments.
991 990
992/ { 991/ {
993} 992}
@@ -1069,13 +1068,13 @@ while all this has been defined and implemented.
1069 around. It contains no internal offsets or pointers for this 1068 around. It contains no internal offsets or pointers for this
1070 purpose. 1069 purpose.
1071 1070
1072 - An example of code for iterating nodes & retreiving properties 1071 - An example of code for iterating nodes & retrieving properties
1073 directly from the flattened tree format can be found in the kernel 1072 directly from the flattened tree format can be found in the kernel
1074 file arch/ppc64/kernel/prom.c, look at scan_flat_dt() function, 1073 file arch/ppc64/kernel/prom.c, look at scan_flat_dt() function,
1075 it's usage in early_init_devtree(), and the corresponding various 1074 its usage in early_init_devtree(), and the corresponding various
1076 early_init_dt_scan_*() callbacks. That code can be re-used in a 1075 early_init_dt_scan_*() callbacks. That code can be re-used in a
1077 GPL bootloader, and as the author of that code, I would be happy 1076 GPL bootloader, and as the author of that code, I would be happy
1078 do discuss possible free licencing to any vendor who wishes to 1077 to discuss possible free licencing to any vendor who wishes to
1079 integrate all or part of this code into a non-GPL bootloader. 1078 integrate all or part of this code into a non-GPL bootloader.
1080 1079
1081 1080
diff --git a/Documentation/powerpc/eeh-pci-error-recovery.txt b/Documentation/powerpc/eeh-pci-error-recovery.txt
index 3764dd4b12cb..4530d1bf0286 100644
--- a/Documentation/powerpc/eeh-pci-error-recovery.txt
+++ b/Documentation/powerpc/eeh-pci-error-recovery.txt
@@ -90,7 +90,7 @@ EEH-isolated, there is a firmware call it can make to determine if
90this is the case. If so, then the device driver should put itself 90this is the case. If so, then the device driver should put itself
91into a consistent state (given that it won't be able to complete any 91into a consistent state (given that it won't be able to complete any
92pending work) and start recovery of the card. Recovery normally 92pending work) and start recovery of the card. Recovery normally
93would consist of reseting the PCI device (holding the PCI #RST 93would consist of resetting the PCI device (holding the PCI #RST
94line high for two seconds), followed by setting up the device 94line high for two seconds), followed by setting up the device
95config space (the base address registers (BAR's), latency timer, 95config space (the base address registers (BAR's), latency timer,
96cache line size, interrupt line, and so on). This is followed by a 96cache line size, interrupt line, and so on). This is followed by a
@@ -116,7 +116,7 @@ At this time, a generic EEH recovery mechanism has been implemented,
116so that individual device drivers do not need to be modified to support 116so that individual device drivers do not need to be modified to support
117EEH recovery. This generic mechanism piggy-backs on the PCI hotplug 117EEH recovery. This generic mechanism piggy-backs on the PCI hotplug
118infrastructure, and percolates events up through the userspace/udev 118infrastructure, and percolates events up through the userspace/udev
119infrastructure. Followiing is a detailed description of how this is 119infrastructure. Following is a detailed description of how this is
120accomplished. 120accomplished.
121 121
122EEH must be enabled in the PHB's very early during the boot process, 122EEH must be enabled in the PHB's very early during the boot process,
diff --git a/Documentation/powerpc/hvcs.txt b/Documentation/powerpc/hvcs.txt
index 1e38166f4e54..f93462c5db25 100644
--- a/Documentation/powerpc/hvcs.txt
+++ b/Documentation/powerpc/hvcs.txt
@@ -259,7 +259,7 @@ This index of '2' means that in order to connect to vty-server adapter
259 259
260It should be noted that due to the system hotplug I/O capabilities of a 260It should be noted that due to the system hotplug I/O capabilities of a
261system the /dev/hvcs* entry that interacts with a particular vty-server 261system the /dev/hvcs* entry that interacts with a particular vty-server
262adapter is not guarenteed to remain the same across system reboots. Look 262adapter is not guaranteed to remain the same across system reboots. Look
263in the Q & A section for more on this issue. 263in the Q & A section for more on this issue.
264 264
265--------------------------------------------------------------------------- 265---------------------------------------------------------------------------
diff --git a/Documentation/prio_tree.txt b/Documentation/prio_tree.txt
index 2fbb0c49bc5b..3aa68f9a117b 100644
--- a/Documentation/prio_tree.txt
+++ b/Documentation/prio_tree.txt
@@ -88,7 +88,7 @@ path which is not desirable. Hence, we do not optimize the height of the
88heap-and-size indexed overflow-sub-trees using prio_tree->index_bits. 88heap-and-size indexed overflow-sub-trees using prio_tree->index_bits.
89Instead the overflow sub-trees are indexed using full BITS_PER_LONG bits 89Instead the overflow sub-trees are indexed using full BITS_PER_LONG bits
90of size_index. This may lead to skewed sub-trees because most of the 90of size_index. This may lead to skewed sub-trees because most of the
91higher significant bits of the size_index are likely to be be 0 (zero). In 91higher significant bits of the size_index are likely to be 0 (zero). In
92the example above, all 3 overflow-sub-trees are skewed. This may marginally 92the example above, all 3 overflow-sub-trees are skewed. This may marginally
93affect the performance. However, processes rarely map many vmas with the 93affect the performance. However, processes rarely map many vmas with the
94same start_vm_pgoff but different end_vm_pgoffs. Therefore, we normally 94same start_vm_pgoff but different end_vm_pgoffs. Therefore, we normally
diff --git a/Documentation/rocket.txt b/Documentation/rocket.txt
index a10678004451..1d8582990435 100644
--- a/Documentation/rocket.txt
+++ b/Documentation/rocket.txt
@@ -97,7 +97,7 @@ a range of I/O addresses for it to use. The first RocketPort card
97requires a 68-byte contiguous block of I/O addresses, starting at one 97requires a 68-byte contiguous block of I/O addresses, starting at one
98of the following: 0x100h, 0x140h, 0x180h, 0x200h, 0x240h, 0x280h, 98of the following: 0x100h, 0x140h, 0x180h, 0x200h, 0x240h, 0x280h,
990x300h, 0x340h, 0x380h. This I/O address must be reflected in the DIP 990x300h, 0x340h, 0x380h. This I/O address must be reflected in the DIP
100switiches of *all* of the Rocketport cards. 100switches of *all* of the Rocketport cards.
101 101
102The second, third, and fourth RocketPort cards require a 64-byte 102The second, third, and fourth RocketPort cards require a 64-byte
103contiguous block of I/O addresses, starting at one of the following 103contiguous block of I/O addresses, starting at one of the following
@@ -107,7 +107,7 @@ second, third, and fourth Rocketport cards (if present) are set via
107software control. The DIP switch settings for the I/O address must be 107software control. The DIP switch settings for the I/O address must be
108set to the value of the first Rocketport cards. 108set to the value of the first Rocketport cards.
109 109
110In order to destinguish each of the card from the others, each card 110In order to distinguish each of the card from the others, each card
111must have a unique board ID set on the dip switches. The first 111must have a unique board ID set on the dip switches. The first
112Rocketport board must be set with the DIP switches corresponding to 112Rocketport board must be set with the DIP switches corresponding to
113the first board, the second board must be set with the DIP switches 113the first board, the second board must be set with the DIP switches
@@ -120,7 +120,7 @@ conflict with any other cards in the system, including other
120RocketPort cards. Below, you will find a list of commonly used I/O 120RocketPort cards. Below, you will find a list of commonly used I/O
121address ranges which may be in use by other devices in your system. 121address ranges which may be in use by other devices in your system.
122On a Linux system, "cat /proc/ioports" will also be helpful in 122On a Linux system, "cat /proc/ioports" will also be helpful in
123identifying what I/O addresses are being used by devics on your 123identifying what I/O addresses are being used by devices on your
124system. 124system.
125 125
126Remember, the FIRST RocketPort uses 68 I/O addresses. So, if you set it 126Remember, the FIRST RocketPort uses 68 I/O addresses. So, if you set it
diff --git a/Documentation/rpc-cache.txt b/Documentation/rpc-cache.txt
index 5f757c8cf979..8a382bea6808 100644
--- a/Documentation/rpc-cache.txt
+++ b/Documentation/rpc-cache.txt
@@ -24,7 +24,7 @@ The common code handles such things as:
24 - general cache lookup with correct locking 24 - general cache lookup with correct locking
25 - supporting 'NEGATIVE' as well as positive entries 25 - supporting 'NEGATIVE' as well as positive entries
26 - allowing an EXPIRED time on cache items, and removing 26 - allowing an EXPIRED time on cache items, and removing
27 items after they expire, and are no longe in-use. 27 items after they expire, and are no longer in-use.
28 - making requests to user-space to fill in cache entries 28 - making requests to user-space to fill in cache entries
29 - allowing user-space to directly set entries in the cache 29 - allowing user-space to directly set entries in the cache
30 - delaying RPC requests that depend on as-yet incomplete 30 - delaying RPC requests that depend on as-yet incomplete
@@ -53,7 +53,7 @@ Creating a Cache
53 structure 53 structure
54 void cache_put(struct kref *) 54 void cache_put(struct kref *)
55 This is called when the last reference to an item is 55 This is called when the last reference to an item is
56 is dropped. The pointer passed is to the 'ref' field 56 dropped. The pointer passed is to the 'ref' field
57 in the cache_head. cache_put should release any 57 in the cache_head. cache_put should release any
58 references create by 'cache_init' and, if CACHE_VALID 58 references create by 'cache_init' and, if CACHE_VALID
59 is set, any references created by cache_update. 59 is set, any references created by cache_update.
diff --git a/Documentation/s390/3270.txt b/Documentation/s390/3270.txt
index 0a044e647d2d..7a5c73a7ed7f 100644
--- a/Documentation/s390/3270.txt
+++ b/Documentation/s390/3270.txt
@@ -111,9 +111,7 @@ Here are the installation steps in detail:
111 config3270.sh. Inspect the output script it produces, 111 config3270.sh. Inspect the output script it produces,
112 /tmp/mkdev3270, and then run that script. This will create the 112 /tmp/mkdev3270, and then run that script. This will create the
113 necessary character special device files and make the necessary 113 necessary character special device files and make the necessary
114 changes to /etc/inittab. If you have selected DEVFS, the driver 114 changes to /etc/inittab.
115 itself creates the device files, and /tmp/mkdev3270 only changes
116 /etc/inittab.
117 115
118 Then notify /sbin/init that /etc/inittab has changed, by issuing 116 Then notify /sbin/init that /etc/inittab has changed, by issuing
119 the telinit command with the q operand: 117 the telinit command with the q operand:
diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt
index 844c03fe7921..4dd25ee549e9 100644
--- a/Documentation/s390/Debugging390.txt
+++ b/Documentation/s390/Debugging390.txt
@@ -8,8 +8,8 @@
8Overview of Document: 8Overview of Document:
9===================== 9=====================
10This document is intended to give an good overview of how to debug 10This document is intended to give an good overview of how to debug
11Linux for s/390 & z/Architecture it isn't intended as a complete reference & not a 11Linux for s/390 & z/Architecture. It isn't intended as a complete reference & not a
12tutorial on the fundamentals of C & assembly, it dosen't go into 12tutorial on the fundamentals of C & assembly. It doesn't go into
13390 IO in any detail. It is intended to complement the documents in the 13390 IO in any detail. It is intended to complement the documents in the
14reference section below & any other worthwhile references you get. 14reference section below & any other worthwhile references you get.
15 15
@@ -88,7 +88,7 @@ s/390 z/Architecture
880 0 Reserved ( must be 0 ) otherwise specification exception occurs. 880 0 Reserved ( must be 0 ) otherwise specification exception occurs.
89 89
901 1 Program Event Recording 1 PER enabled, 901 1 Program Event Recording 1 PER enabled,
91 PER is used to facilititate debugging e.g. single stepping. 91 PER is used to facilitate debugging e.g. single stepping.
92 92
932-4 2-4 Reserved ( must be 0 ). 932-4 2-4 Reserved ( must be 0 ).
94 94
@@ -163,7 +163,7 @@ s/390 z/Architecture
163 1 1 64 bit 163 1 1 64 bit
164 164
16532 1=31 bit addressing mode 0=24 bit addressing mode (for backward 16532 1=31 bit addressing mode 0=24 bit addressing mode (for backward
166 compatibility ), linux always runs with this bit set to 1 166 compatibility), linux always runs with this bit set to 1
167 167
16833-64 Instruction address. 16833-64 Instruction address.
169 33-63 Reserved must be 0 169 33-63 Reserved must be 0
@@ -188,7 +188,7 @@ Bytes 0-512 ( 200 hex ) on s/390 & 0-512,4096-4544,4604-5119 currently on z/Arch
188are used by the processor itself for holding such information as exception indications & 188are used by the processor itself for holding such information as exception indications &
189entry points for exceptions. 189entry points for exceptions.
190Bytes after 0xc00 hex are used by linux for per processor globals on s/390 & z/Architecture 190Bytes after 0xc00 hex are used by linux for per processor globals on s/390 & z/Architecture
191( there is a gap on z/Architecure too currently between 0xc00 & 1000 which linux uses ). 191( there is a gap on z/Architecture too currently between 0xc00 & 1000 which linux uses ).
192The closest thing to this on traditional architectures is the interrupt 192The closest thing to this on traditional architectures is the interrupt
193vector table. This is a good thing & does simplify some of the kernel coding 193vector table. This is a good thing & does simplify some of the kernel coding
194however it means that we now cannot catch stray NULL pointers in the 194however it means that we now cannot catch stray NULL pointers in the
@@ -239,7 +239,7 @@ they go to 64 Bit.
239 239
240On 390 our limitations & strengths make us slightly different. 240On 390 our limitations & strengths make us slightly different.
241For backward compatibility we are only allowed use 31 bits (2GB) 241For backward compatibility we are only allowed use 31 bits (2GB)
242of our 32 bit addresses,however, we use entirely separate address 242of our 32 bit addresses, however, we use entirely separate address
243spaces for the user & kernel. 243spaces for the user & kernel.
244 244
245This means we can support 2GB of non Extended RAM on s/390, & more 245This means we can support 2GB of non Extended RAM on s/390, & more
@@ -317,9 +317,9 @@ Each process/thread under Linux for S390 has its own kernel task_struct
317defined in linux/include/linux/sched.h 317defined in linux/include/linux/sched.h
318The S390 on initialisation & resuming of a process on a cpu sets 318The S390 on initialisation & resuming of a process on a cpu sets
319the __LC_KERNEL_STACK variable in the spare prefix area for this cpu 319the __LC_KERNEL_STACK variable in the spare prefix area for this cpu
320( which we use for per processor globals). 320(which we use for per-processor globals).
321 321
322The kernel stack pointer is intimately tied with the task stucture for 322The kernel stack pointer is intimately tied with the task structure for
323each processor as follows. 323each processor as follows.
324 324
325 s/390 325 s/390
@@ -354,7 +354,7 @@ static inline struct task_struct * get_current(void)
354} 354}
355 355
356i.e. just anding the current kernel stack pointer with the mask -8192. 356i.e. just anding the current kernel stack pointer with the mask -8192.
357Thankfully because Linux dosen't have support for nested IO interrupts 357Thankfully because Linux doesn't have support for nested IO interrupts
358& our devices have large buffers can survive interrupts being shut for 358& our devices have large buffers can survive interrupts being shut for
359short amounts of time we don't need a separate stack for interrupts. 359short amounts of time we don't need a separate stack for interrupts.
360 360
@@ -366,8 +366,8 @@ Register Usage & Stackframes on Linux for s/390 & z/Architecture
366Overview: 366Overview:
367--------- 367---------
368This is the code that gcc produces at the top & the bottom of 368This is the code that gcc produces at the top & the bottom of
369each function, it usually is fairly consistent & similar from 369each function. It usually is fairly consistent & similar from
370function to function & if you know its layout you can probalby 370function to function & if you know its layout you can probably
371make some headway in finding the ultimate cause of a problem 371make some headway in finding the ultimate cause of a problem
372after a crash without a source level debugger. 372after a crash without a source level debugger.
373 373
@@ -394,7 +394,7 @@ i.e they aren't in registers & they aren't static.
394back-chain: 394back-chain:
395This is a pointer to the stack pointer before entering a 395This is a pointer to the stack pointer before entering a
396framed functions ( see frameless function ) prologue got by 396framed functions ( see frameless function ) prologue got by
397deferencing the address of the current stack pointer, 397dereferencing the address of the current stack pointer,
398 i.e. got by accessing the 32 bit value at the stack pointers 398 i.e. got by accessing the 32 bit value at the stack pointers
399current location. 399current location.
400 400
@@ -724,7 +724,7 @@ This is useful for debugging because
7241) You can double check whether the files you expect to be included are the ones 7241) You can double check whether the files you expect to be included are the ones
725that are being included ( e.g. double check that you aren't going to the i386 asm directory ). 725that are being included ( e.g. double check that you aren't going to the i386 asm directory ).
7262) Check that macro definitions aren't clashing with typedefs, 7262) Check that macro definitions aren't clashing with typedefs,
7273) Check that definitons aren't being used before they are being included. 7273) Check that definitions aren't being used before they are being included.
7284) Helps put the line emitting the error under the microscope if it contains macros. 7284) Helps put the line emitting the error under the microscope if it contains macros.
729 729
730For convenience the Linux kernel's makefile will do preprocessing automatically for you 730For convenience the Linux kernel's makefile will do preprocessing automatically for you
@@ -840,12 +840,11 @@ using the strip command to make it a more reasonable size to boot it.
840 840
841A source/assembly mixed dump of the kernel can be done with the line 841A source/assembly mixed dump of the kernel can be done with the line
842objdump --source vmlinux > vmlinux.lst 842objdump --source vmlinux > vmlinux.lst
843Also if the file isn't compiled -g this will output as much debugging information 843Also, if the file isn't compiled -g, this will output as much debugging information
844as it can ( e.g. function names ), however, this is very slow as it spends lots 844as it can (e.g. function names). This is very slow as it spends lots
845of time searching for debugging info, the following self explanitory line should be used 845of time searching for debugging info. The following self explanatory line should be used
846instead if the code isn't compiled -g. 846instead if the code isn't compiled -g, as it is much faster:
847objdump --disassemble-all --syms vmlinux > vmlinux.lst 847objdump --disassemble-all --syms vmlinux > vmlinux.lst
848as it is much faster
849 848
850As hard drive space is valuble most of us use the following approach. 849As hard drive space is valuble most of us use the following approach.
8511) Look at the emitted psw on the console to find the crash address in the kernel. 8501) Look at the emitted psw on the console to find the crash address in the kernel.
@@ -861,7 +860,7 @@ Linux source tree.
8616) rm /arch/s390/kernel/signal.o 8606) rm /arch/s390/kernel/signal.o
8627) make /arch/s390/kernel/signal.o 8617) make /arch/s390/kernel/signal.o
8638) watch the gcc command line emitted 8628) watch the gcc command line emitted
8649) type it in again or alernatively cut & paste it on the console adding the -g option. 8639) type it in again or alternatively cut & paste it on the console adding the -g option.
86510) objdump --source arch/s390/kernel/signal.o > signal.lst 86410) objdump --source arch/s390/kernel/signal.o > signal.lst
866This will output the source & the assembly intermixed, as the snippet below shows 865This will output the source & the assembly intermixed, as the snippet below shows
867This will unfortunately output addresses which aren't the same 866This will unfortunately output addresses which aren't the same
@@ -913,8 +912,8 @@ If you wanted to know does ping work but didn't have the source
913strace ping -c 1 127.0.0.1 912strace ping -c 1 127.0.0.1
914& then look at the man pages for each of the syscalls below, 913& then look at the man pages for each of the syscalls below,
915( In fact this is sometimes easier than looking at some spagetti 914( In fact this is sometimes easier than looking at some spagetti
916source which conditionally compiles for several architectures ) 915source which conditionally compiles for several architectures ).
917Not everything that it throws out needs to make sense immeadiately 916Not everything that it throws out needs to make sense immediately.
918 917
919Just looking quickly you can see that it is making up a RAW socket 918Just looking quickly you can see that it is making up a RAW socket
920for the ICMP protocol. 919for the ICMP protocol.
@@ -974,8 +973,9 @@ through the pipe for each line containing the string open.
974 973
975Example 3 974Example 3
976--------- 975---------
977Getting sophistocated 976Getting sophisticated
978telnetd crashes on & I don't know why 977telnetd crashes & I don't know why
978
979Steps 979Steps
980----- 980-----
9811) Replace the following line in /etc/inetd.conf 9811) Replace the following line in /etc/inetd.conf
@@ -1085,8 +1085,7 @@ Notes
1085----- 1085-----
1086Addresses & values in the VM debugger are always hex never decimal 1086Addresses & values in the VM debugger are always hex never decimal
1087Address ranges are of the format <HexValue1>-<HexValue2> or <HexValue1>.<HexValue2> 1087Address ranges are of the format <HexValue1>-<HexValue2> or <HexValue1>.<HexValue2>
1088e.g. The address range 0x2000 to 0x3000 can be described described as 1088e.g. The address range 0x2000 to 0x3000 can be described as 2000-3000 or 2000.1000
10892000-3000 or 2000.1000
1090 1089
1091The VM Debugger is case insensitive. 1090The VM Debugger is case insensitive.
1092 1091
@@ -1311,7 +1310,7 @@ for finding out when a particular variable changes.
1311 1310
1312An alternative way of finding the STD of a currently running process 1311An alternative way of finding the STD of a currently running process
1313is to do the following, ( this method is more complex but 1312is to do the following, ( this method is more complex but
1314could be quite convient if you aren't updating the kernel much & 1313could be quite convenient if you aren't updating the kernel much &
1315so your kernel structures will stay constant for a reasonable period of 1314so your kernel structures will stay constant for a reasonable period of
1316time ). 1315time ).
1317 1316
@@ -1413,7 +1412,7 @@ SMP Specific commands
1413To find out how many cpus you have 1412To find out how many cpus you have
1414Q CPUS displays all the CPU's available to your virtual machine 1413Q CPUS displays all the CPU's available to your virtual machine
1415To find the cpu that the current cpu VM debugger commands are being directed at do 1414To find the cpu that the current cpu VM debugger commands are being directed at do
1416Q CPU to change the current cpu cpu VM debugger commands are being directed at do 1415Q CPU to change the current cpu VM debugger commands are being directed at do
1417CPU <desired cpu no> 1416CPU <desired cpu no>
1418 1417
1419On a SMP guest issue a command to all CPUs try prefixing the command with cpu all. 1418On a SMP guest issue a command to all CPUs try prefixing the command with cpu all.
@@ -1674,8 +1673,8 @@ channel is idle & the second for device end ( secondary status ) sometimes you g
1674concurrently, you check how the IO went on by issuing a TEST SUBCHANNEL at each interrupt, 1673concurrently, you check how the IO went on by issuing a TEST SUBCHANNEL at each interrupt,
1675from which you receive an Interruption response block (IRB). If you get channel & device end 1674from which you receive an Interruption response block (IRB). If you get channel & device end
1676status in the IRB without channel checks etc. your IO probably went okay. If you didn't you 1675status in the IRB without channel checks etc. your IO probably went okay. If you didn't you
1677probably need a doctorto examine the IRB & extended status word etc. 1676probably need a doctor to examine the IRB & extended status word etc.
1678If an error occurs more sophistocated control units have a facitity known as 1677If an error occurs, more sophistocated control units have a facitity known as
1679concurrent sense this means that if an error occurs Extended sense information will 1678concurrent sense this means that if an error occurs Extended sense information will
1680be presented in the Extended status word in the IRB if not you have to issue a 1679be presented in the Extended status word in the IRB if not you have to issue a
1681subsequent SENSE CCW command after the test subchannel. 1680subsequent SENSE CCW command after the test subchannel.
@@ -1704,7 +1703,7 @@ concentrate on data processing.
1704IOP's can use one or more links ( known as channel paths ) to talk to each 1703IOP's can use one or more links ( known as channel paths ) to talk to each
1705IO device. It first checks for path availability & chooses an available one, 1704IO device. It first checks for path availability & chooses an available one,
1706then starts ( & sometimes terminates IO ). 1705then starts ( & sometimes terminates IO ).
1707There are two types of channel path ESCON & the Paralell IO interface. 1706There are two types of channel path: ESCON & the Parallel IO interface.
1708 1707
1709IO devices are attached to control units, control units provide the 1708IO devices are attached to control units, control units provide the
1710logic to interface the channel paths & channel path IO protocols to 1709logic to interface the channel paths & channel path IO protocols to
@@ -1743,11 +1742,11 @@ controllers or a control unit which connects to 1000 3270 terminals ).
1743 1742
1744The 390 IO systems come in 2 flavours the current 390 machines support both 1743The 390 IO systems come in 2 flavours the current 390 machines support both
1745 1744
1746The Older 360 & 370 Interface,sometimes called the paralell I/O interface, 1745The Older 360 & 370 Interface,sometimes called the Parallel I/O interface,
1747sometimes called Bus-and Tag & sometimes Original Equipment Manufacturers 1746sometimes called Bus-and Tag & sometimes Original Equipment Manufacturers
1748Interface (OEMI). 1747Interface (OEMI).
1749 1748
1750This byte wide paralell channel path/bus has parity & data on the "Bus" cable 1749This byte wide Parallel channel path/bus has parity & data on the "Bus" cable
1751& control lines on the "Tag" cable. These can operate in byte multiplex mode for 1750& control lines on the "Tag" cable. These can operate in byte multiplex mode for
1752sharing between several slow devices or burst mode & monopolize the channel for the 1751sharing between several slow devices or burst mode & monopolize the channel for the
1753whole burst. Upto 256 devices can be addressed on one of these cables. These cables are 1752whole burst. Upto 256 devices can be addressed on one of these cables. These cables are
@@ -1777,7 +1776,7 @@ Consoles 3270 & 3215 ( a teletype emulated under linux for a line mode console )
1777DASD's direct access storage devices ( otherwise known as hard disks ). 1776DASD's direct access storage devices ( otherwise known as hard disks ).
1778Tape Drives. 1777Tape Drives.
1779CTC ( Channel to Channel Adapters ), 1778CTC ( Channel to Channel Adapters ),
1780ESCON or Paralell Cables used as a very high speed serial link 1779ESCON or Parallel Cables used as a very high speed serial link
1781between 2 machines. We use 2 cables under linux to do a bi-directional serial link. 1780between 2 machines. We use 2 cables under linux to do a bi-directional serial link.
1782 1781
1783 1782
@@ -1803,8 +1802,8 @@ OSA 7C09 ON OSA 7C09 SUBCHANNEL = 0001
1803OSA 7C14 ON OSA 7C14 SUBCHANNEL = 0002 1802OSA 7C14 ON OSA 7C14 SUBCHANNEL = 0002
1804OSA 7C15 ON OSA 7C15 SUBCHANNEL = 0003 1803OSA 7C15 ON OSA 7C15 SUBCHANNEL = 0003
1805 1804
1806If you have a guest with certain priviliges you may be able to see devices 1805If you have a guest with certain privileges you may be able to see devices
1807which don't belong to you to avoid this do add the option V. 1806which don't belong to you. To avoid this, add the option V.
1808e.g. 1807e.g.
1809Q V OSA 1808Q V OSA
1810 1809
@@ -1837,7 +1836,7 @@ RDRLIST
1837RECEIVE / LOG TXT A1 ( replace 1836RECEIVE / LOG TXT A1 ( replace
18388) 18378)
1839filel & press F11 to look at it 1838filel & press F11 to look at it
1840You should see someting like. 1839You should see something like:
1841 1840
184200020942' SSCH B2334000 0048813C CC 0 SCH 0000 DEV 7C08 184100020942' SSCH B2334000 0048813C CC 0 SCH 0000 DEV 7C08
1843 CPA 000FFDF0 PARM 00E2C9C4 KEY 0 FPI C0 LPM 80 1842 CPA 000FFDF0 PARM 00E2C9C4 KEY 0 FPI C0 LPM 80
@@ -1916,7 +1915,7 @@ Assembly
1916-------- 1915--------
1917info registers: displays registers other than floating point. 1916info registers: displays registers other than floating point.
1918info all-registers: displays floating points as well. 1917info all-registers: displays floating points as well.
1919disassemble: dissassembles 1918disassemble: disassembles
1920e.g. 1919e.g.
1921disassemble without parameters will disassemble the current function 1920disassemble without parameters will disassemble the current function
1922disassemble $pc $pc+10 1921disassemble $pc $pc+10
@@ -1935,7 +1934,7 @@ undisplay : undo's display's
1935 1934
1936info breakpoints: shows all current breakpoints 1935info breakpoints: shows all current breakpoints
1937 1936
1938info stack: shows stack back trace ( if this dosent work too well, I'll show you the 1937info stack: shows stack back trace ( if this doesn't work too well, I'll show you the
1939stacktrace by hand below ). 1938stacktrace by hand below ).
1940 1939
1941info locals: displays local variables. 1940info locals: displays local variables.
@@ -2045,13 +2044,13 @@ what gdb does when the victim receives certain signals.
2045list: 2044list:
2046e.g. 2045e.g.
2047list lists current function source 2046list lists current function source
2048list 1,10 list first 10 lines of curret file. 2047list 1,10 list first 10 lines of current file.
2049list test.c:1,10 2048list test.c:1,10
2050 2049
2051 2050
2052directory: 2051directory:
2053Adds directories to be searched for source if gdb cannot find the source. 2052Adds directories to be searched for source if gdb cannot find the source.
2054(note it is a bit sensititive about slashes ) 2053(note it is a bit sensititive about slashes)
2055e.g. To add the root of the filesystem to the searchpath do 2054e.g. To add the root of the filesystem to the searchpath do
2056directory // 2055directory //
2057 2056
@@ -2123,9 +2122,9 @@ p/x (*(**$sp+56))&0x7fffffff
2123 2122
2124Disassembling instructions without debug info 2123Disassembling instructions without debug info
2125--------------------------------------------- 2124---------------------------------------------
2126gdb typically compains if there is a lack of debugging 2125gdb typically complains if there is a lack of debugging
2127symbols in the disassemble command with 2126symbols in the disassemble command with
2128"No function contains specified address." to get around 2127"No function contains specified address." To get around
2129this do 2128this do
2130x/<number lines to disassemble>xi <address> 2129x/<number lines to disassemble>xi <address>
2131e.g. 2130e.g.
@@ -2184,7 +2183,7 @@ ps -aux | grep gdb
2184kill -SIGSEGV <gdb's pid> 2183kill -SIGSEGV <gdb's pid>
2185or alternatively use killall -SIGSEGV gdb if you have the killall command. 2184or alternatively use killall -SIGSEGV gdb if you have the killall command.
2186Now look at the core dump. 2185Now look at the core dump.
2187./gdb ./gdb core 2186./gdb core
2188Displays the following 2187Displays the following
2189GNU gdb 4.18 2188GNU gdb 4.18
2190Copyright 1998 Free Software Foundation, Inc. 2189Copyright 1998 Free Software Foundation, Inc.
@@ -2316,7 +2315,7 @@ Showing us the shared libraries init uses where they are in memory
2316/proc/1/mem is the current running processes memory which you 2315/proc/1/mem is the current running processes memory which you
2317can read & write to like a file. 2316can read & write to like a file.
2318strace uses this sometimes as it is a bit faster than the 2317strace uses this sometimes as it is a bit faster than the
2319rather inefficent ptrace interface for peeking at DATA. 2318rather inefficient ptrace interface for peeking at DATA.
2320 2319
2321 2320
2322cat status 2321cat status
@@ -2446,7 +2445,7 @@ displays the following lines as it executes them.
2446+ RELSTATUS=release 2445+ RELSTATUS=release
2447+ MACHTYPE=i586-pc-linux-gnu 2446+ MACHTYPE=i586-pc-linux-gnu
2448 2447
2449perl -d <scriptname> runs the perlscript in a fully intercative debugger 2448perl -d <scriptname> runs the perlscript in a fully interactive debugger
2450<like gdb>. 2449<like gdb>.
2451Type 'h' in the debugger for help. 2450Type 'h' in the debugger for help.
2452 2451
@@ -2477,7 +2476,7 @@ Lcrash is a perfectly normal program,however, it requires 2
2477additional files, Kerntypes which is built using a patch to the 2476additional files, Kerntypes which is built using a patch to the
2478linux kernel sources in the linux root directory & the System.map. 2477linux kernel sources in the linux root directory & the System.map.
2479 2478
2480Kerntypes is an an objectfile whose sole purpose in life 2479Kerntypes is an objectfile whose sole purpose in life
2481is to provide stabs debug info to lcrash, to do this 2480is to provide stabs debug info to lcrash, to do this
2482Kerntypes is built from kerntypes.c which just includes the most commonly 2481Kerntypes is built from kerntypes.c which just includes the most commonly
2483referenced header files used when debugging, lcrash can then read the 2482referenced header files used when debugging, lcrash can then read the
diff --git a/Documentation/s390/cds.txt b/Documentation/s390/cds.txt
index f0be389c7116..d80e5733827d 100644
--- a/Documentation/s390/cds.txt
+++ b/Documentation/s390/cds.txt
@@ -133,7 +133,7 @@ determine the device driver owning the device that raised the interrupt.
133In order not to introduce a new I/O concept to the common Linux code, 133In order not to introduce a new I/O concept to the common Linux code,
134Linux/390 preserves the IRQ concept and semantically maps the ESA/390 134Linux/390 preserves the IRQ concept and semantically maps the ESA/390
135subchannels to Linux as IRQs. This allows Linux/390 to support up to 64k 135subchannels to Linux as IRQs. This allows Linux/390 to support up to 64k
136different IRQs, uniquely representig a single device each. 136different IRQs, uniquely representing a single device each.
137 137
138Up to kernel 2.4, Linux/390 used to provide interfaces via the IRQ (subchannel). 138Up to kernel 2.4, Linux/390 used to provide interfaces via the IRQ (subchannel).
139For internal use of the common I/O layer, these are still there. However, 139For internal use of the common I/O layer, these are still there. However,
@@ -143,7 +143,7 @@ During its startup the Linux/390 system checks for peripheral devices. Each
143of those devices is uniquely defined by a so called subchannel by the ESA/390 143of those devices is uniquely defined by a so called subchannel by the ESA/390
144channel subsystem. While the subchannel numbers are system generated, each 144channel subsystem. While the subchannel numbers are system generated, each
145subchannel also takes a user defined attribute, the so called device number. 145subchannel also takes a user defined attribute, the so called device number.
146Both subchannel number and device number can not exceed 65535. During driverfs 146Both subchannel number and device number cannot exceed 65535. During driverfs
147initialisation, the information about control unit type and device types that 147initialisation, the information about control unit type and device types that
148imply specific I/O commands (channel command words - CCWs) in order to operate 148imply specific I/O commands (channel command words - CCWs) in order to operate
149the device are gathered. Device drivers can retrieve this set of hardware 149the device are gathered. Device drivers can retrieve this set of hardware
@@ -177,11 +177,11 @@ This routine returns the characteristics for the device specified.
177The function is meant to be called with an irq handler in place; that is, 177The function is meant to be called with an irq handler in place; that is,
178at earliest during set_online() processing. 178at earliest during set_online() processing.
179 179
180While the request is procesed synchronously, the device interrupt 180While the request is processed synchronously, the device interrupt
181handler is called for final ending status. In case of error situations the 181handler is called for final ending status. In case of error situations the
182interrupt handler may recover appropriately. The device irq handler can 182interrupt handler may recover appropriately. The device irq handler can
183recognize the corresponding interrupts by the interruption parameter be 183recognize the corresponding interrupts by the interruption parameter be
1840x00524443.The ccw_device must not be locked prior to calling read_dev_chars(). 1840x00524443. The ccw_device must not be locked prior to calling read_dev_chars().
185 185
186The function may be called enabled or disabled. 186The function may be called enabled or disabled.
187 187
@@ -325,7 +325,7 @@ with the following CCW flags values defined :
325 325
326CCW_FLAG_DC - data chaining 326CCW_FLAG_DC - data chaining
327CCW_FLAG_CC - command chaining 327CCW_FLAG_CC - command chaining
328CCW_FLAG_SLI - suppress incorrct length 328CCW_FLAG_SLI - suppress incorrect length
329CCW_FLAG_SKIP - skip 329CCW_FLAG_SKIP - skip
330CCW_FLAG_PCI - PCI 330CCW_FLAG_PCI - PCI
331CCW_FLAG_IDA - indirect addressing 331CCW_FLAG_IDA - indirect addressing
@@ -348,7 +348,7 @@ The ccw_device_start() function returns :
348 not online. 348 not online.
349 349
350When the I/O request completes, the CDS first level interrupt handler will 350When the I/O request completes, the CDS first level interrupt handler will
351accumalate the status in a struct irb and then call the device interrupt handler. 351accumulate the status in a struct irb and then call the device interrupt handler.
352The intparm field will contain the value the device driver has associated with a 352The intparm field will contain the value the device driver has associated with a
353particular I/O request. If a pending device status was recognized, 353particular I/O request. If a pending device status was recognized,
354intparm will be set to 0 (zero). This may happen during I/O initiation or delayed 354intparm will be set to 0 (zero). This may happen during I/O initiation or delayed
@@ -433,7 +433,7 @@ puts the CPU into I/O disabled state by preserving the current PSW flags.
433 433
434The device driver is allowed to issue the next ccw_device_start() call from 434The device driver is allowed to issue the next ccw_device_start() call from
435within its interrupt handler already. It is not required to schedule a 435within its interrupt handler already. It is not required to schedule a
436bottom-half, unless an non deterministicly long running error recovery procedure 436bottom-half, unless an non deterministically long running error recovery procedure
437or similar needs to be scheduled. During I/O processing the Linux/390 generic 437or similar needs to be scheduled. During I/O processing the Linux/390 generic
438I/O device driver support has already obtained the IRQ lock, i.e. the handler 438I/O device driver support has already obtained the IRQ lock, i.e. the handler
439must not try to obtain it again when calling ccw_device_start() or we end in a 439must not try to obtain it again when calling ccw_device_start() or we end in a
diff --git a/Documentation/s390/crypto/crypto-API.txt b/Documentation/s390/crypto/crypto-API.txt
index 78a77624a716..29dee792c887 100644
--- a/Documentation/s390/crypto/crypto-API.txt
+++ b/Documentation/s390/crypto/crypto-API.txt
@@ -61,9 +61,9 @@ Example: z990 crypto instruction for SHA1 algorithm is available
61 -> when the sha1 algorithm is requested through the crypto API 61 -> when the sha1 algorithm is requested through the crypto API
62 (which has a module autoloader) the z990 module will be loaded. 62 (which has a module autoloader) the z990 module will be loaded.
63 63
64TBD: a userspace module probin mechanism 64TBD: a userspace module probing mechanism
65 something like 'probe sha1 sha1_z990 sha1' in modprobe.conf 65 something like 'probe sha1 sha1_z990 sha1' in modprobe.conf
66 -> try module sha1_z990, if it fails to load load standard module sha1 66 -> try module sha1_z990, if it fails to load standard module sha1
67 the 'probe' statement is currently not supported in modprobe.conf 67 the 'probe' statement is currently not supported in modprobe.conf
68 68
69 69
diff --git a/Documentation/s390/driver-model.txt b/Documentation/s390/driver-model.txt
index efb674eda4d4..62c082387aea 100644
--- a/Documentation/s390/driver-model.txt
+++ b/Documentation/s390/driver-model.txt
@@ -157,7 +157,7 @@ notify: This function is called by the common I/O layer for some state changes
157 * In online state, device detached (CIO_GONE) or last path gone 157 * In online state, device detached (CIO_GONE) or last path gone
158 (CIO_NO_PATH). The driver must return !0 to keep the device; for 158 (CIO_NO_PATH). The driver must return !0 to keep the device; for
159 return code 0, the device will be deleted as usual (also when no 159 return code 0, the device will be deleted as usual (also when no
160 notify function is registerd). If the driver wants to keep the 160 notify function is registered). If the driver wants to keep the
161 device, it is moved into disconnected state. 161 device, it is moved into disconnected state.
162 * In disconnected state, device operational again (CIO_OPER). The 162 * In disconnected state, device operational again (CIO_OPER). The
163 common I/O layer performs some sanity checks on device number and 163 common I/O layer performs some sanity checks on device number and
@@ -262,7 +262,7 @@ attribute 'online' which can be 0 or 1.
262----------- 262-----------
263 263
264The netiucv driver creates an attribute 'connection' under 264The netiucv driver creates an attribute 'connection' under
265bus/iucv/drivers/netiucv. Piping to this attibute creates a new netiucv 265bus/iucv/drivers/netiucv. Piping to this attribute creates a new netiucv
266connection to the specified host. 266connection to the specified host.
267 267
268Netiucv connections show up under devices/iucv/ as "netiucv<ifnum>". The interface 268Netiucv connections show up under devices/iucv/ as "netiucv<ifnum>". The interface
diff --git a/Documentation/s390/monreader.txt b/Documentation/s390/monreader.txt
index d843bb04906e..beeaa4b24427 100644
--- a/Documentation/s390/monreader.txt
+++ b/Documentation/s390/monreader.txt
@@ -83,7 +83,7 @@ This loads the module and sets the DCSS name to "MYDCSS".
83 83
84NOTE: 84NOTE:
85----- 85-----
86This API provides no interface to control the *MONITOR service, e.g. specifiy 86This API provides no interface to control the *MONITOR service, e.g. specify
87which data should be collected. This can be done by the CP command MONITOR 87which data should be collected. This can be done by the CP command MONITOR
88(Class E privileged), see "CP Command and Utility Reference". 88(Class E privileged), see "CP Command and Utility Reference".
89 89
diff --git a/Documentation/s390/s390dbf.txt b/Documentation/s390/s390dbf.txt
index e321a8ed2a2d..000230cd26db 100644
--- a/Documentation/s390/s390dbf.txt
+++ b/Documentation/s390/s390dbf.txt
@@ -11,7 +11,7 @@ where log records can be stored efficiently in memory, where each component
11(e.g. device drivers) can have one separate debug log. 11(e.g. device drivers) can have one separate debug log.
12One purpose of this is to inspect the debug logs after a production system crash 12One purpose of this is to inspect the debug logs after a production system crash
13in order to analyze the reason for the crash. 13in order to analyze the reason for the crash.
14If the system still runs but only a subcomponent which uses dbf failes, 14If the system still runs but only a subcomponent which uses dbf fails,
15it is possible to look at the debug logs on a live system via the Linux 15it is possible to look at the debug logs on a live system via the Linux
16debugfs filesystem. 16debugfs filesystem.
17The debug feature may also very useful for kernel and driver development. 17The debug feature may also very useful for kernel and driver development.
@@ -65,7 +65,7 @@ Predefined views for hex/ascii, sprintf and raw binary data are provided.
65It is also possible to define other views. The content of 65It is also possible to define other views. The content of
66a view can be inspected simply by reading the corresponding debugfs file. 66a view can be inspected simply by reading the corresponding debugfs file.
67 67
68All debug logs have an an actual debug level (range from 0 to 6). 68All debug logs have an actual debug level (range from 0 to 6).
69The default level is 3. Event and Exception functions have a 'level' 69The default level is 3. Event and Exception functions have a 'level'
70parameter. Only debug entries with a level that is lower or equal 70parameter. Only debug entries with a level that is lower or equal
71than the actual level are written to the log. This means, when 71than the actual level are written to the log. This means, when
@@ -83,8 +83,8 @@ Example:
83It is also possible to deactivate the debug feature globally for every 83It is also possible to deactivate the debug feature globally for every
84debug log. You can change the behavior using 2 sysctl parameters in 84debug log. You can change the behavior using 2 sysctl parameters in
85/proc/sys/s390dbf: 85/proc/sys/s390dbf:
86There are currently 2 possible triggers, which stop the debug feature 86There are currently 2 possible triggers, which stop the debug feature
87globally. The first possbility is to use the "debug_active" sysctl. If 87globally. The first possibility is to use the "debug_active" sysctl. If
88set to 1 the debug feature is running. If "debug_active" is set to 0 the 88set to 1 the debug feature is running. If "debug_active" is set to 0 the
89debug feature is turned off. 89debug feature is turned off.
90The second trigger which stops the debug feature is an kernel oops. 90The second trigger which stops the debug feature is an kernel oops.
@@ -468,7 +468,7 @@ The hex_ascii view shows the data field in hex and ascii representation
468The raw view returns a bytestream as the debug areas are stored in memory. 468The raw view returns a bytestream as the debug areas are stored in memory.
469 469
470The sprintf view formats the debug entries in the same way as the sprintf 470The sprintf view formats the debug entries in the same way as the sprintf
471function would do. The sprintf event/expection functions write to the 471function would do. The sprintf event/exception functions write to the
472debug entry a pointer to the format string (size = sizeof(long)) 472debug entry a pointer to the format string (size = sizeof(long))
473and for each vararg a long value. So e.g. for a debug entry with a format 473and for each vararg a long value. So e.g. for a debug entry with a format
474string plus two varargs one would need to allocate a (3 * sizeof(long)) 474string plus two varargs one would need to allocate a (3 * sizeof(long))
@@ -556,7 +556,7 @@ The input_proc can be used to implement functionality when it is written to
556the view (e.g. like with 'echo "0" > /sys/kernel/debug/s390dbf/dasd/level). 556the view (e.g. like with 'echo "0" > /sys/kernel/debug/s390dbf/dasd/level).
557 557
558For header_proc there can be used the default function 558For header_proc there can be used the default function
559debug_dflt_header_fn() which is defined in in debug.h. 559debug_dflt_header_fn() which is defined in debug.h.
560and which produces the same header output as the predefined views. 560and which produces the same header output as the predefined views.
561E.g: 561E.g:
56200 00964419409:440761 2 - 00 88023ec 56200 00964419409:440761 2 - 00 88023ec
diff --git a/Documentation/sched-coding.txt b/Documentation/sched-coding.txt
index 2b75ef67c9fe..cbd8db752acf 100644
--- a/Documentation/sched-coding.txt
+++ b/Documentation/sched-coding.txt
@@ -15,7 +15,7 @@ Main Scheduling Methods
15void load_balance(runqueue_t *this_rq, int idle) 15void load_balance(runqueue_t *this_rq, int idle)
16 Attempts to pull tasks from one cpu to another to balance cpu usage, 16 Attempts to pull tasks from one cpu to another to balance cpu usage,
17 if needed. This method is called explicitly if the runqueues are 17 if needed. This method is called explicitly if the runqueues are
18 inbalanced or periodically by the timer tick. Prior to calling, 18 imbalanced or periodically by the timer tick. Prior to calling,
19 the current runqueue must be locked and interrupts disabled. 19 the current runqueue must be locked and interrupts disabled.
20 20
21void schedule() 21void schedule()
diff --git a/Documentation/sched-design.txt b/Documentation/sched-design.txt
index 9d04e7bbf45f..1605bf0cba8b 100644
--- a/Documentation/sched-design.txt
+++ b/Documentation/sched-design.txt
@@ -93,9 +93,9 @@ and the goal is also to add a few new things:
93Design 93Design
94====== 94======
95 95
96the core of the new scheduler are the following mechanizms: 96The core of the new scheduler contains the following mechanisms:
97 97
98 - *two*, priority-ordered 'priority arrays' per CPU. There is an 'active' 98 - *two* priority-ordered 'priority arrays' per CPU. There is an 'active'
99 array and an 'expired' array. The active array contains all tasks that 99 array and an 'expired' array. The active array contains all tasks that
100 are affine to this CPU and have timeslices left. The expired array 100 are affine to this CPU and have timeslices left. The expired array
101 contains all tasks which have used up their timeslices - but this array 101 contains all tasks which have used up their timeslices - but this array
diff --git a/Documentation/scsi/ChangeLog.1992-1997 b/Documentation/scsi/ChangeLog.1992-1997
index dc88ee2ab73d..6faad7e6417c 100644
--- a/Documentation/scsi/ChangeLog.1992-1997
+++ b/Documentation/scsi/ChangeLog.1992-1997
@@ -1214,7 +1214,7 @@ Thu Jul 21 10:37:39 1994 Eric Youngdale (eric@esp22)
1214 1214
1215 * sr.c(sr_open): Do not allow opens with write access. 1215 * sr.c(sr_open): Do not allow opens with write access.
1216 1216
1217Mon Jul 18 09:51:22 1994 1994 Eric Youngdale (eric@esp22) 1217Mon Jul 18 09:51:22 1994 Eric Youngdale (eric@esp22)
1218 1218
1219 * Linux 1.1.31 released. 1219 * Linux 1.1.31 released.
1220 1220
diff --git a/Documentation/scsi/NinjaSCSI.txt b/Documentation/scsi/NinjaSCSI.txt
index 041780f428ac..3229b64cf24e 100644
--- a/Documentation/scsi/NinjaSCSI.txt
+++ b/Documentation/scsi/NinjaSCSI.txt
@@ -24,7 +24,7 @@ SCSI device: I-O data CDPS-PX24 (CD-ROM drive)
24 You can also use "cardctl" program (this program is in pcmcia-cs source 24 You can also use "cardctl" program (this program is in pcmcia-cs source
25 code) to get more info. 25 code) to get more info.
26 26
27# cat /var/log/messgaes 27# cat /var/log/messages
28... 28...
29Jan 2 03:45:06 lindberg cardmgr[78]: unsupported card in socket 1 29Jan 2 03:45:06 lindberg cardmgr[78]: unsupported card in socket 1
30Jan 2 03:45:06 lindberg cardmgr[78]: product info: "WBT", "NinjaSCSI-3", "R1.0" 30Jan 2 03:45:06 lindberg cardmgr[78]: product info: "WBT", "NinjaSCSI-3", "R1.0"
@@ -36,18 +36,18 @@ Socket 1:
36 product info: "IO DATA", "CBSC16 ", "1" 36 product info: "IO DATA", "CBSC16 ", "1"
37 37
38 38
39[2] Get Linux kernel source, and extract it to /usr/src. 39[2] Get the Linux kernel source, and extract it to /usr/src.
40 Because NinjaSCSI driver requiers some SCSI header files in Linux kernel 40 Because the NinjaSCSI driver requires some SCSI header files in Linux
41 source. 41 kernel source, I recommend rebuilding your kernel; this eliminates
42 I recomend rebuilding your kernel. This eliminate some versioning problem. 42 some versioning problems.
43$ cd /usr/src 43$ cd /usr/src
44$ tar -zxvf linux-x.x.x.tar.gz 44$ tar -zxvf linux-x.x.x.tar.gz
45$ cd linux 45$ cd linux
46$ make config 46$ make config
47... 47...
48 48
49[3] If you use this driver with Kernel 2.2, Unpack pcmcia-cs in some directory 49[3] If you use this driver with Kernel 2.2, unpack pcmcia-cs in some directory
50 and make & install. This driver requies pcmcia-cs header file. 50 and make & install. This driver requires the pcmcia-cs header file.
51$ cd /usr/src 51$ cd /usr/src
52$ tar zxvf cs-pcmcia-cs-3.x.x.tar.gz 52$ tar zxvf cs-pcmcia-cs-3.x.x.tar.gz
53... 53...
@@ -59,10 +59,10 @@ $ emacs Makefile
59... 59...
60$ make 60$ make
61 61
62[5] Copy nsp_cs.o to suitable plase, like /lib/modules/<Kernel version>/pcmcia/ . 62[5] Copy nsp_cs.ko to suitable place, like /lib/modules/<Kernel version>/pcmcia/ .
63 63
64[6] Add these lines to /etc/pcmcia/config . 64[6] Add these lines to /etc/pcmcia/config .
65 If you yse pcmcia-cs-3.1.8 or later, we can use "nsp_cs.conf" file. 65 If you use pcmcia-cs-3.1.8 or later, we can use "nsp_cs.conf" file.
66 So, you don't need to edit file. Just copy to /etc/pcmcia/ . 66 So, you don't need to edit file. Just copy to /etc/pcmcia/ .
67 67
68------------------------------------- 68-------------------------------------
diff --git a/Documentation/scsi/aacraid.txt b/Documentation/scsi/aacraid.txt
index ee03678c8029..3367130e64f6 100644
--- a/Documentation/scsi/aacraid.txt
+++ b/Documentation/scsi/aacraid.txt
@@ -4,7 +4,7 @@ Introduction
4------------------------- 4-------------------------
5The aacraid driver adds support for Adaptec (http://www.adaptec.com) 5The aacraid driver adds support for Adaptec (http://www.adaptec.com)
6RAID controllers. This is a major rewrite from the original 6RAID controllers. This is a major rewrite from the original
7Adaptec supplied driver. It has signficantly cleaned up both the code 7Adaptec supplied driver. It has significantly cleaned up both the code
8and the running binary size (the module is less than half the size of 8and the running binary size (the module is less than half the size of
9the original). 9the original).
10 10
diff --git a/Documentation/scsi/aic79xx.txt b/Documentation/scsi/aic79xx.txt
index 382b439b439e..904d49e90ef2 100644
--- a/Documentation/scsi/aic79xx.txt
+++ b/Documentation/scsi/aic79xx.txt
@@ -81,7 +81,7 @@ The following information is available in this file:
81 an SDTR with an offset of 0 to be sure the target 81 an SDTR with an offset of 0 to be sure the target
82 knows we are async. This works around a firmware defect 82 knows we are async. This works around a firmware defect
83 in the Quantum Atlas 10K. 83 in the Quantum Atlas 10K.
84 - Implement controller susupend and resume. 84 - Implement controller suspend and resume.
85 - Clear PCI error state during driver attach so that we 85 - Clear PCI error state during driver attach so that we
86 don't disable memory mapped I/O due to a stray write 86 don't disable memory mapped I/O due to a stray write
87 by some other driver probe that occurred before we 87 by some other driver probe that occurred before we
@@ -94,7 +94,7 @@ The following information is available in this file:
94 - Add support for scsi_report_device_reset() found in 94 - Add support for scsi_report_device_reset() found in
95 2.5.X kernels. 95 2.5.X kernels.
96 - Add 7901B support. 96 - Add 7901B support.
97 - Simplify handling of the packtized lun Rev A workaround. 97 - Simplify handling of the packetized lun Rev A workaround.
98 - Correct and simplify handling of the ignore wide residue 98 - Correct and simplify handling of the ignore wide residue
99 message. The previous code would fail to report a residual 99 message. The previous code would fail to report a residual
100 if the transaction data length was even and we received 100 if the transaction data length was even and we received
diff --git a/Documentation/scsi/aic7xxx.txt b/Documentation/scsi/aic7xxx.txt
index 3481fcded4c2..9b894f116d95 100644
--- a/Documentation/scsi/aic7xxx.txt
+++ b/Documentation/scsi/aic7xxx.txt
@@ -160,7 +160,7 @@ The following information is available in this file:
160 160
161 6.2.34 (May 5th, 2003) 161 6.2.34 (May 5th, 2003)
162 - Fix locking regression instroduced in 6.2.29 that 162 - Fix locking regression instroduced in 6.2.29 that
163 could cuase a lock order reversal between the io_request_lock 163 could cause a lock order reversal between the io_request_lock
164 and our per-softc lock. This was only possible on RH9, 164 and our per-softc lock. This was only possible on RH9,
165 SuSE, and kernel.org 2.4.X kernels. 165 SuSE, and kernel.org 2.4.X kernels.
166 166
diff --git a/Documentation/scsi/aic7xxx_old.txt b/Documentation/scsi/aic7xxx_old.txt
index 79e5ac6cb6ff..c92f4473193b 100644
--- a/Documentation/scsi/aic7xxx_old.txt
+++ b/Documentation/scsi/aic7xxx_old.txt
@@ -102,7 +102,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD
102 The hardware RAID devices sold by Adaptec are *NOT* supported by this 102 The hardware RAID devices sold by Adaptec are *NOT* supported by this
103 driver (and will people please stop emailing me about them, they are 103 driver (and will people please stop emailing me about them, they are
104 a totally separate beast from the bare SCSI controllers and this driver 104 a totally separate beast from the bare SCSI controllers and this driver
105 can not be retrofitted in any sane manner to support the hardware RAID 105 cannot be retrofitted in any sane manner to support the hardware RAID
106 features on those cards - Doug Ledford). 106 features on those cards - Doug Ledford).
107 107
108 108
@@ -241,7 +241,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD
241 that instead of dumping the register contents on the card, this 241 that instead of dumping the register contents on the card, this
242 option dumps the contents of the sequencer program RAM. This gives 242 option dumps the contents of the sequencer program RAM. This gives
243 the ability to verify that the instructions downloaded to the 243 the ability to verify that the instructions downloaded to the
244 card's sequencer are indeed what they are suppossed to be. Again, 244 card's sequencer are indeed what they are supposed to be. Again,
245 unless you have documentation to tell you how to interpret these 245 unless you have documentation to tell you how to interpret these
246 numbers, then it is totally useless. 246 numbers, then it is totally useless.
247 247
@@ -317,7 +317,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD
317 initial DEVCONFIG values for each of your aic7xxx controllers as 317 initial DEVCONFIG values for each of your aic7xxx controllers as
318 they are listed, and also record what the machine is detecting as 318 they are listed, and also record what the machine is detecting as
319 the proper termination on your controllers. NOTE: the order in 319 the proper termination on your controllers. NOTE: the order in
320 which the initial DEVCONFIG values are printed out is not gauranteed 320 which the initial DEVCONFIG values are printed out is not guaranteed
321 to be the same order as the SCSI controllers are registered. The 321 to be the same order as the SCSI controllers are registered. The
322 above option and this option both work on the order of the SCSI 322 above option and this option both work on the order of the SCSI
323 controllers as they are registered, so make sure you match the right 323 controllers as they are registered, so make sure you match the right
diff --git a/Documentation/scsi/dc395x.txt b/Documentation/scsi/dc395x.txt
index ae3b79a2d275..88219f96633d 100644
--- a/Documentation/scsi/dc395x.txt
+++ b/Documentation/scsi/dc395x.txt
@@ -20,7 +20,7 @@ Parameters
20---------- 20----------
21The driver uses the settings from the EEPROM set in the SCSI BIOS 21The driver uses the settings from the EEPROM set in the SCSI BIOS
22setup. If there is no EEPROM, the driver uses default values. 22setup. If there is no EEPROM, the driver uses default values.
23Both can be overriden by command line parameters (module or kernel 23Both can be overridden by command line parameters (module or kernel
24parameters). 24parameters).
25 25
26The following parameters are available: 26The following parameters are available:
diff --git a/Documentation/scsi/dpti.txt b/Documentation/scsi/dpti.txt
index 6e45e70243e5..f36dc0e7c8da 100644
--- a/Documentation/scsi/dpti.txt
+++ b/Documentation/scsi/dpti.txt
@@ -48,7 +48,7 @@
48 * Implemented suggestions from Alan Cox 48 * Implemented suggestions from Alan Cox
49 * Added calculation of resid for sg layer 49 * Added calculation of resid for sg layer
50 * Better error handling 50 * Better error handling
51 * Added checking underflow condtions 51 * Added checking underflow conditions
52 * Added DATAPROTECT checking 52 * Added DATAPROTECT checking
53 * Changed error return codes 53 * Changed error return codes
54 * Fixed pointer bug in bus reset routine 54 * Fixed pointer bug in bus reset routine
diff --git a/Documentation/scsi/ibmmca.txt b/Documentation/scsi/ibmmca.txt
index d16ce5b540f4..35f6b8ed2295 100644
--- a/Documentation/scsi/ibmmca.txt
+++ b/Documentation/scsi/ibmmca.txt
@@ -229,7 +229,7 @@
229 229
230 In a second step of the driver development, the following improvement has 230 In a second step of the driver development, the following improvement has
231 been applied: The first approach limited the number of devices to 7, far 231 been applied: The first approach limited the number of devices to 7, far
232 fewer than the 15 that it could usem then it just maped ldn -> 232 fewer than the 15 that it could use, then it just mapped ldn ->
233 (ldn/8,ldn%8) for pun,lun. We ended up with a real mishmash of puns 233 (ldn/8,ldn%8) for pun,lun. We ended up with a real mishmash of puns
234 and luns, but it all seemed to work. 234 and luns, but it all seemed to work.
235 235
@@ -254,12 +254,12 @@
254 device to be existant, but it has no ldn assigned, it gets a ldn out of 7 254 device to be existant, but it has no ldn assigned, it gets a ldn out of 7
255 to 14. The numbers are assigned in cyclic order. Therefore it takes 8 255 to 14. The numbers are assigned in cyclic order. Therefore it takes 8
256 dynamical reassignments on the SCSI-devices, until a certain device 256 dynamical reassignments on the SCSI-devices, until a certain device
257 loses its ldn again. This assures, that dynamical remapping is avoided 257 loses its ldn again. This assures that dynamical remapping is avoided
258 during intense I/O between up to 15 SCSI-devices (means pun,lun 258 during intense I/O between up to 15 SCSI-devices (means pun,lun
259 combinations). A further advantage of this method is, that people who 259 combinations). A further advantage of this method is that people who
260 build their kernel without probing on all luns will get what they expect, 260 build their kernel without probing on all luns will get what they expect,
261 because the driver just won't assign everything with lun>0 when 261 because the driver just won't assign everything with lun>0 when
262 multpile lun probing is inactive. 262 multiple lun probing is inactive.
263 263
264 2.4 SCSI-Device Order 264 2.4 SCSI-Device Order
265 --------------------- 265 ---------------------
@@ -309,9 +309,9 @@
309 2.6 Abort & Reset Commands 309 2.6 Abort & Reset Commands
310 -------------------------- 310 --------------------------
311 These are implemented with busy waiting for interrupt to arrive. 311 These are implemented with busy waiting for interrupt to arrive.
312 ibmmca_reset() and ibmmca_abort() do not work sufficently well 312 ibmmca_reset() and ibmmca_abort() do not work sufficiently well
313 up to now and need still a lot of development work. But, this seems 313 up to now and need still a lot of development work. This seems
314 to be even a problem with other SCSI-low level drivers, too. However, 314 to be a problem with other low-level SCSI drivers too, however
315 this should be no excuse. 315 this should be no excuse.
316 316
317 2.7 Disk Geometry 317 2.7 Disk Geometry
@@ -684,8 +684,8 @@
684 not like sending commands to non-existing SCSI-devices and will react 684 not like sending commands to non-existing SCSI-devices and will react
685 with a command error as a sign of protest. While this error is not 685 with a command error as a sign of protest. While this error is not
686 present on IBM SCSI Adapter w/cache, it appears on IBM Integrated SCSI 686 present on IBM SCSI Adapter w/cache, it appears on IBM Integrated SCSI
687 Adapters. Therefore, I implemented a workarround to forgive those 687 Adapters. Therefore, I implemented a workaround to forgive those
688 adapters their protests, but it is marked up in the statisctis, so 688 adapters their protests, but it is marked up in the statistics, so
689 after a successful boot, you can see in /proc/scsi/ibmmca/<host_number> 689 after a successful boot, you can see in /proc/scsi/ibmmca/<host_number>
690 how often the command errors have been forgiven to the SCSI-subsystem. 690 how often the command errors have been forgiven to the SCSI-subsystem.
691 If the number is bigger than 0, you have a SCSI subsystem of older 691 If the number is bigger than 0, you have a SCSI subsystem of older
@@ -778,15 +778,15 @@
778 not accept this, as they stick quite near to ANSI-SCSI and report 778 not accept this, as they stick quite near to ANSI-SCSI and report
779 a COMMAND_ERROR message which causes the driver to panic. The main 779 a COMMAND_ERROR message which causes the driver to panic. The main
780 problem was located around the INQUIRY command. Now, for all the 780 problem was located around the INQUIRY command. Now, for all the
781 mentioned commands, the buffersize, sent to the adapter is at 781 mentioned commands, the buffersize sent to the adapter is at
782 maximum 255 which seems to be a quite reasonable solution. 782 maximum 255 which seems to be a quite reasonable solution.
783 TEST_UNIT_READY gets a buffersize of 0 to make sure, that no 783 TEST_UNIT_READY gets a buffersize of 0 to make sure that no
784 data is transferred in order to avoid any possible command failure. 784 data is transferred in order to avoid any possible command failure.
785 2) On unsuccessful TEST_UNIT_READY, the midlevel-driver has to send 785 2) On unsuccessful TEST_UNIT_READY, the mid-level driver has to send
786 a REQUEST_SENSE in order to see, where the problem is located. This 786 a REQUEST_SENSE in order to see where the problem is located. This
787 REQUEST_SENSE may have various length in its answer-buffer. IBM 787 REQUEST_SENSE may have various length in its answer-buffer. IBM
788 SCSI-subsystems report a command failure, if the returned buffersize 788 SCSI-subsystems report a command failure if the returned buffersize
789 is different from the sent buffersize, but this can be supressed by 789 is different from the sent buffersize, but this can be suppressed by
790 a special bit, which is now done and problems seem to be solved. 790 a special bit, which is now done and problems seem to be solved.
791 2) Code adaption to all kernel-releases. Now, the 3.2 code compiles on 791 2) Code adaption to all kernel-releases. Now, the 3.2 code compiles on
792 2.0.x, 2.1.x, 2.2.x and 2.3.x kernel releases without any code-changes. 792 2.0.x, 2.1.x, 2.2.x and 2.3.x kernel releases without any code-changes.
@@ -1086,7 +1086,7 @@
1086 1086
1087 Q: "Reset SCSI-devices at boottime" halts the system at boottime, why? 1087 Q: "Reset SCSI-devices at boottime" halts the system at boottime, why?
1088 A: This is only tested with the IBM SCSI Adapter w/cache. It is not 1088 A: This is only tested with the IBM SCSI Adapter w/cache. It is not
1089 yet prooved to run on other adapters, however you may be lucky. 1089 yet proven to run on other adapters, however you may be lucky.
1090 In version 3.1d this has been hugely improved and should work better, 1090 In version 3.1d this has been hugely improved and should work better,
1091 now. Normally you really won't need to activate this flag in the 1091 now. Normally you really won't need to activate this flag in the
1092 kernel configuration, as all post 1989 SCSI-devices should accept 1092 kernel configuration, as all post 1989 SCSI-devices should accept
@@ -1104,7 +1104,7 @@
1104 The parameter 'normal' sets the new industry standard, starting 1104 The parameter 'normal' sets the new industry standard, starting
1105 from pun 0, scanning up to pun 6. This allows you to change your 1105 from pun 0, scanning up to pun 6. This allows you to change your
1106 opinion still after having already compiled the kernel. 1106 opinion still after having already compiled the kernel.
1107 Q: Why I cannot find the IBM MCA SCSI support in the config menue? 1107 Q: Why can't I find IBM MCA SCSI support in the config menu?
1108 A: You have to activate MCA bus support, first. 1108 A: You have to activate MCA bus support, first.
1109 Q: Where can I find the latest info about this driver? 1109 Q: Where can I find the latest info about this driver?
1110 A: See the file MAINTAINERS for the current WWW-address, which offers 1110 A: See the file MAINTAINERS for the current WWW-address, which offers
@@ -1156,7 +1156,7 @@
1156 Guide) what has to be done for reset, we still share the bad shape of 1156 Guide) what has to be done for reset, we still share the bad shape of
1157 the reset functions with all other low level SCSI-drivers. 1157 the reset functions with all other low level SCSI-drivers.
1158 Astonishingly, reset works in most cases quite ok, but the harddisks 1158 Astonishingly, reset works in most cases quite ok, but the harddisks
1159 won't run in synchonous mode anymore after a reset, until you reboot. 1159 won't run in synchronous mode anymore after a reset, until you reboot.
1160 Q: Why does my XXX w/Cache adapter not use read-prefetch? 1160 Q: Why does my XXX w/Cache adapter not use read-prefetch?
1161 A: Ok, that is not completely possible. If a cache is present, the 1161 A: Ok, that is not completely possible. If a cache is present, the
1162 adapter tries to use it internally. Explicitly, one can use the cache 1162 adapter tries to use it internally. Explicitly, one can use the cache
diff --git a/Documentation/scsi/megaraid.txt b/Documentation/scsi/megaraid.txt
index ff864c0f494c..3c7cea51e687 100644
--- a/Documentation/scsi/megaraid.txt
+++ b/Documentation/scsi/megaraid.txt
@@ -4,11 +4,11 @@
4Overview: 4Overview:
5-------- 5--------
6 6
7Different classes of controllers from LSI Logic, accept and respond to the 7Different classes of controllers from LSI Logic accept and respond to the
8user applications in a similar way. They understand the same firmware control 8user applications in a similar way. They understand the same firmware control
9commands. Furthermore, the applications also can treat different classes of 9commands. Furthermore, the applications also can treat different classes of
10the controllers uniformly. Hence it is logical to have a single module that 10the controllers uniformly. Hence it is logical to have a single module that
11interefaces with the applications on one side and all the low level drivers 11interfaces with the applications on one side and all the low level drivers
12on the other. 12on the other.
13 13
14The advantages, though obvious, are listed for completeness: 14The advantages, though obvious, are listed for completeness:
diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt
index 822d2aca3700..58ad8db333d9 100644
--- a/Documentation/scsi/ncr53c8xx.txt
+++ b/Documentation/scsi/ncr53c8xx.txt
@@ -70,7 +70,7 @@ Written by Gerard Roudier <groudier@free.fr>
7015. SCSI problem troubleshooting 7015. SCSI problem troubleshooting
71 15.1 Problem tracking 71 15.1 Problem tracking
72 15.2 Understanding hardware error reports 72 15.2 Understanding hardware error reports
7316. Synchonous transfer negotiation tables 7316. Synchronous transfer negotiation tables
74 16.1 Synchronous timings for 53C875 and 53C860 Ultra-SCSI controllers 74 16.1 Synchronous timings for 53C875 and 53C860 Ultra-SCSI controllers
75 16.2 Synchronous timings for fast SCSI-2 53C8XX controllers 75 16.2 Synchronous timings for fast SCSI-2 53C8XX controllers
7617. Serial NVRAM support (by Richard Waltham) 7617. Serial NVRAM support (by Richard Waltham)
@@ -96,10 +96,10 @@ The original driver has been written for 386bsd and FreeBSD by:
96It is now available as a bundle of 2 drivers: 96It is now available as a bundle of 2 drivers:
97 97
98- ncr53c8xx generic driver that supports all the SYM53C8XX family including 98- ncr53c8xx generic driver that supports all the SYM53C8XX family including
99 the ealiest 810 rev. 1, the latest 896 (2 channel LVD SCSI controller) and 99 the earliest 810 rev. 1, the latest 896 (2 channel LVD SCSI controller) and
100 the new 895A (1 channel LVD SCSI controller). 100 the new 895A (1 channel LVD SCSI controller).
101- sym53c8xx enhanced driver (a.k.a. 896 drivers) that drops support of oldest 101- sym53c8xx enhanced driver (a.k.a. 896 drivers) that drops support of oldest
102 chips in order to gain advantage of new features, as LOAD/STORE intructions 102 chips in order to gain advantage of new features, as LOAD/STORE instructions
103 available since the 810A and hardware phase mismatch available with the 103 available since the 810A and hardware phase mismatch available with the
104 896 and the 895A. 104 896 and the 895A.
105 105
@@ -207,7 +207,7 @@ The 896 and the 895A allows handling of the phase mismatch context from
207SCRIPTS (avoids the phase mismatch interrupt that stops the SCSI processor 207SCRIPTS (avoids the phase mismatch interrupt that stops the SCSI processor
208until the C code has saved the context of the transfer). 208until the C code has saved the context of the transfer).
209Implementing this without using LOAD/STORE instructions would be painfull 209Implementing this without using LOAD/STORE instructions would be painfull
210and I did'nt even want to try it. 210and I didn't even want to try it.
211 211
212The 896 chip supports 64 bit PCI transactions and addressing, while the 212The 896 chip supports 64 bit PCI transactions and addressing, while the
213895A supports 32 bit PCI transactions and 64 bit addressing. 213895A supports 32 bit PCI transactions and 64 bit addressing.
@@ -631,8 +631,8 @@ string variable using 'insmod'.
631 631
632A boot setup command for the ncr53c8xx (sym53c8xx) driver begins with the 632A boot setup command for the ncr53c8xx (sym53c8xx) driver begins with the
633driver name "ncr53c8xx="(sym53c8xx). The kernel syntax parser then expects 633driver name "ncr53c8xx="(sym53c8xx). The kernel syntax parser then expects
634an optionnal list of integers separated with comma followed by an optional 634an optional list of integers separated with comma followed by an optional
635list of comma-separated strings. Example of boot setup command under lilo 635list of comma-separated strings. Example of boot setup command under lilo
636prompt: 636prompt:
637 637
638lilo: linux root=/dev/hda2 ncr53c8xx=tags:4,sync:10,debug:0x200 638lilo: linux root=/dev/hda2 ncr53c8xx=tags:4,sync:10,debug:0x200
@@ -778,7 +778,7 @@ port address 0x1400.
778 Some scsi boards use a 875 (ultra wide) and only supply narrow connectors. 778 Some scsi boards use a 875 (ultra wide) and only supply narrow connectors.
779 If you have connected a wide device with a 50 pins to 68 pins cable 779 If you have connected a wide device with a 50 pins to 68 pins cable
780 converter, any accepted wide negotiation will break further data transfers. 780 converter, any accepted wide negotiation will break further data transfers.
781 In such a case, using "wide:0" in the bootup command will be helpfull. 781 In such a case, using "wide:0" in the bootup command will be helpful.
782 782
78310.2.14 Differential mode 78310.2.14 Differential mode
784 diff:0 never set up diff mode 784 diff:0 never set up diff mode
@@ -899,7 +899,7 @@ boot setup can be:
899 ncr53c8xx=safe:y,mpar:y 899 ncr53c8xx=safe:y,mpar:y
900 ncr53c8xx=safe:y 900 ncr53c8xx=safe:y
901 901
902My personnal system works flawlessly with the following equivalent setup: 902My personal system works flawlessly with the following equivalent setup:
903 903
904 ncr53c8xx=mpar:y,spar:y,disc:y,specf:1,fsn:n,ultra:2,fsn:n,revprob:n,verb:1\ 904 ncr53c8xx=mpar:y,spar:y,disc:y,specf:1,fsn:n,ultra:2,fsn:n,revprob:n,verb:1\
905 tags:32,sync:12,debug:0,burst:7,led:1,wide:1,settle:2,diff:0,irqm:0 905 tags:32,sync:12,debug:0,burst:7,led:1,wide:1,settle:2,diff:0,irqm:0
@@ -1151,7 +1151,7 @@ Driver files:
1151 1151
1152New driver versions are made available separately in order to allow testing 1152New driver versions are made available separately in order to allow testing
1153changes and new features prior to including them into the linux kernel 1153changes and new features prior to including them into the linux kernel
1154distribution. The following URL provides informations on latest avalaible 1154distribution. The following URL provides information on latest available
1155patches: 1155patches:
1156 1156
1157 ftp://ftp.tux.org/pub/people/gerard-roudier/README 1157 ftp://ftp.tux.org/pub/people/gerard-roudier/README
@@ -1382,7 +1382,7 @@ SCSI standards, chip cores functionnals and internal driver data structures.
1382You are not required to decode and understand them, unless you want to help 1382You are not required to decode and understand them, unless you want to help
1383maintain the driver code. 1383maintain the driver code.
1384 1384
138516. Synchonous transfer negotiation tables 138516. Synchronous transfer negotiation tables
1386 1386
1387Tables below have been created by calling the routine the driver uses 1387Tables below have been created by calling the routine the driver uses
1388for synchronisation negotiation timing calculation and chip setting. 1388for synchronisation negotiation timing calculation and chip setting.
diff --git a/Documentation/scsi/osst.txt b/Documentation/scsi/osst.txt
index ce574e7791ab..f536907e241d 100644
--- a/Documentation/scsi/osst.txt
+++ b/Documentation/scsi/osst.txt
@@ -56,8 +56,7 @@ Compile your kernel and install the modules.
56 56
57Now, your osst driver is inside the kernel or available as a module, 57Now, your osst driver is inside the kernel or available as a module,
58depending on your choice during kernel config. You may still need to create 58depending on your choice during kernel config. You may still need to create
59the device nodes by calling the Makedevs.sh script (see below) manually, 59the device nodes by calling the Makedevs.sh script (see below) manually.
60unless you use a devfs kernel, where this won't be needed.
61 60
62To load your module, you may use the command 61To load your module, you may use the command
63modprobe osst 62modprobe osst
diff --git a/Documentation/scsi/ppa.txt b/Documentation/scsi/ppa.txt
index 5d9223bc1bd5..067ac394e0b2 100644
--- a/Documentation/scsi/ppa.txt
+++ b/Documentation/scsi/ppa.txt
@@ -3,7 +3,7 @@
3General Iomega ZIP drive page for Linux: 3General Iomega ZIP drive page for Linux:
4http://www.torque.net/~campbell/ 4http://www.torque.net/~campbell/
5 5
6Driver achive for old drivers: 6Driver archive for old drivers:
7http://www.torque.net/~campbell/ppa/ 7http://www.torque.net/~campbell/ppa/
8 8
9Linux Parport page (parallel port) 9Linux Parport page (parallel port)
diff --git a/Documentation/scsi/scsi-changer.txt b/Documentation/scsi/scsi-changer.txt
index c132687b017a..d74bbd29eb3a 100644
--- a/Documentation/scsi/scsi-changer.txt
+++ b/Documentation/scsi/scsi-changer.txt
@@ -31,7 +31,7 @@ changers. But it allows to handle nearly all possible cases. It knows
31 media transport - this one shuffles around the media, i.e. the 31 media transport - this one shuffles around the media, i.e. the
32 transport arm. Also known as "picker". 32 transport arm. Also known as "picker".
33 storage - a slot which can hold a media. 33 storage - a slot which can hold a media.
34 import/export - the same as above, but is accessable from outside, 34 import/export - the same as above, but is accessible from outside,
35 i.e. there the operator (you !) can use this to 35 i.e. there the operator (you !) can use this to
36 fill in and remove media from the changer. 36 fill in and remove media from the changer.
37 Sometimes named "mailslot". 37 Sometimes named "mailslot".
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt
index ce767b90bb0d..b964eef2f62f 100644
--- a/Documentation/scsi/scsi_eh.txt
+++ b/Documentation/scsi/scsi_eh.txt
@@ -160,7 +160,7 @@ ways.
160 - Fine-grained EH callbacks 160 - Fine-grained EH callbacks
161 LLDD can implement fine-grained EH callbacks and let SCSI 161 LLDD can implement fine-grained EH callbacks and let SCSI
162 midlayer drive error handling and call appropriate callbacks. 162 midlayer drive error handling and call appropriate callbacks.
163 This will be dicussed further in [2-1]. 163 This will be discussed further in [2-1].
164 164
165 - eh_strategy_handler() callback 165 - eh_strategy_handler() callback
166 This is one big callback which should perform whole error 166 This is one big callback which should perform whole error
@@ -194,7 +194,7 @@ lower layers and lower layers are ready to process or fail the scmd
194again. 194again.
195 195
196 To achieve these goals, EH performs recovery actions with increasing 196 To achieve these goals, EH performs recovery actions with increasing
197severity. Some actions are performed by issueing SCSI commands and 197severity. Some actions are performed by issuing SCSI commands and
198others are performed by invoking one of the following fine-grained 198others are performed by invoking one of the following fine-grained
199hostt EH callbacks. Callbacks may be omitted and omitted ones are 199hostt EH callbacks. Callbacks may be omitted and omitted ones are
200considered to fail always. 200considered to fail always.
diff --git a/Documentation/scsi/st.txt b/Documentation/scsi/st.txt
index 20e30cf31877..5ff65b184265 100644
--- a/Documentation/scsi/st.txt
+++ b/Documentation/scsi/st.txt
@@ -249,7 +249,7 @@ BOOT TIME CONFIGURATION
249 249
250If the driver is compiled into the kernel, the same parameters can be 250If the driver is compiled into the kernel, the same parameters can be
251also set using, e.g., the LILO command line. The preferred syntax is 251also set using, e.g., the LILO command line. The preferred syntax is
252is to use the same keyword used when loading as module but prepended 252to use the same keyword used when loading as module but prepended
253with 'st.'. For instance, to set the maximum number of scatter/gather 253with 'st.'. For instance, to set the maximum number of scatter/gather
254segments, the parameter 'st.max_sg_segs=xx' should be used (xx is the 254segments, the parameter 'st.max_sg_segs=xx' should be used (xx is the
255number of scatter/gather segments). 255number of scatter/gather segments).
@@ -369,7 +369,7 @@ MTSETDRVBUFFER
369 the device dependent address. It is recommended to set 369 the device dependent address. It is recommended to set
370 this flag unless there are tapes using the device 370 this flag unless there are tapes using the device
371 dependent (from the old times) (global) 371 dependent (from the old times) (global)
372 MT_ST_SYSV sets the SYSV sematics (mode) 372 MT_ST_SYSV sets the SYSV semantics (mode)
373 MT_ST_NOWAIT enables immediate mode (i.e., don't wait for 373 MT_ST_NOWAIT enables immediate mode (i.e., don't wait for
374 the command to finish) for some commands (e.g., rewind) 374 the command to finish) for some commands (e.g., rewind)
375 MT_ST_DEBUGGING debugging (global; debugging must be 375 MT_ST_DEBUGGING debugging (global; debugging must be
diff --git a/Documentation/scsi/sym53c8xx_2.txt b/Documentation/scsi/sym53c8xx_2.txt
index 7f516cdcd262..26c8a08ca3ea 100644
--- a/Documentation/scsi/sym53c8xx_2.txt
+++ b/Documentation/scsi/sym53c8xx_2.txt
@@ -67,7 +67,7 @@ under Linux is contained in 2 files named sym_glue.h and sym_glue.c.
67Other drivers files are intended not to depend on the Operating System 67Other drivers files are intended not to depend on the Operating System
68on which the driver is used. 68on which the driver is used.
69 69
70The history of this driver can be summerized as follows: 70The history of this driver can be summarized as follows:
71 71
721993: ncr driver written for 386bsd and FreeBSD by: 721993: ncr driver written for 386bsd and FreeBSD by:
73 Wolfgang Stanglmeier <wolf@cologne.de> 73 Wolfgang Stanglmeier <wolf@cologne.de>
@@ -684,7 +684,7 @@ Field H : SCNTL3 Scsi Control Register 3
684 Contains the setting of timing values for both asynchronous and 684 Contains the setting of timing values for both asynchronous and
685 synchronous data transfers. 685 synchronous data transfers.
686Field I : SCNTL4 Scsi Control Register 4 686Field I : SCNTL4 Scsi Control Register 4
687 Only meaninful for 53C1010 Ultra3 controllers. 687 Only meaningful for 53C1010 Ultra3 controllers.
688 688
689Understanding Fields J, K, L and dumps requires to have good knowledge of 689Understanding Fields J, K, L and dumps requires to have good knowledge of
690SCSI standards, chip cores functionnals and internal driver data structures. 690SCSI standards, chip cores functionnals and internal driver data structures.
diff --git a/Documentation/scsi/tmscsim.txt b/Documentation/scsi/tmscsim.txt
index df7a02bfb5bf..8b2168aa4fc7 100644
--- a/Documentation/scsi/tmscsim.txt
+++ b/Documentation/scsi/tmscsim.txt
@@ -27,7 +27,7 @@ Tekram DC390(T) adapter. This is where the name comes from: tm = Tekram
27scsi = SCSI driver, m = AMD (?) as opposed to w for the DC390W/U/F 27scsi = SCSI driver, m = AMD (?) as opposed to w for the DC390W/U/F
28(NCR53c8X5, X=2/7) driver. Yes, there was also a driver for the latter, 28(NCR53c8X5, X=2/7) driver. Yes, there was also a driver for the latter,
29tmscsiw, which supported DC390W/U/F adapters. It's not maintained any more, 29tmscsiw, which supported DC390W/U/F adapters. It's not maintained any more,
30as the ncr53c8xx is perfectly supporting these adpaters since some time. 30as the ncr53c8xx is perfectly supporting these adapters since some time.
31 31
32The driver first appeared in April 1996, exclusively supported the DC390 32The driver first appeared in April 1996, exclusively supported the DC390
33and has been enhanced since then in various steps. In May 1998 support for 33and has been enhanced since then in various steps. In May 1998 support for
@@ -381,7 +381,7 @@ Please see http://www.garloff.de/kurt/linux/dc390/problems.html
381 replaced by the dev index of your scanner). You may try to reset your SCSI 381 replaced by the dev index of your scanner). You may try to reset your SCSI
382 bus afterwards (echo "RESET" >/proc/scsi/tmscsim/?). 382 bus afterwards (echo "RESET" >/proc/scsi/tmscsim/?).
383 The problem seems to be solved as of 2.0d18, thanks to Andreas Rick. 383 The problem seems to be solved as of 2.0d18, thanks to Andreas Rick.
384* If there is a valid partition table, the driver will use it for determing 384* If there is a valid partition table, the driver will use it for determining
385 the mapping. If there's none, a reasonable mapping (Symbios-like) will be 385 the mapping. If there's none, a reasonable mapping (Symbios-like) will be
386 assumed. Other operating systems may not like this mapping, though 386 assumed. Other operating systems may not like this mapping, though
387 it's consistent with the BIOS' behaviour. Old DC390 drivers ignored the 387 it's consistent with the BIOS' behaviour. Old DC390 drivers ignored the
diff --git a/Documentation/sh/kgdb.txt b/Documentation/sh/kgdb.txt
index 5b04f7f306fc..05b4ba89d28c 100644
--- a/Documentation/sh/kgdb.txt
+++ b/Documentation/sh/kgdb.txt
@@ -69,7 +69,7 @@ might specify the halt option:
69 69
70 kgdb=halt 70 kgdb=halt
71 71
72Boot the TARGET machinem, which will appear to hang. 72Boot the TARGET machine, which will appear to hang.
73 73
74On your DEVELOPMENT machine, cd to the source directory and run the gdb 74On your DEVELOPMENT machine, cd to the source directory and run the gdb
75program. (This is likely to be a cross GDB which runs on your host but 75program. (This is likely to be a cross GDB which runs on your host but
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index e6b57dd46a4f..138673a907f5 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -57,11 +57,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
57 - Default: 1 57 - Default: 1
58 - For auto-loading more than one card, specify this 58 - For auto-loading more than one card, specify this
59 option together with snd-card-X aliases. 59 option together with snd-card-X aliases.
60 device_mode
61 - permission mask for dynamic sound device filesystem
62 - This is available only when DEVFS is enabled
63 - Default: 0666
64 - E.g.: device_mode=0660
65 60
66 61
67 Module snd-pcm-oss 62 Module snd-pcm-oss
@@ -1268,8 +1263,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1268 1263
1269 Note: on some notebooks the buffer address cannot be detected 1264 Note: on some notebooks the buffer address cannot be detected
1270 automatically, or causes hang-up during initialization. 1265 automatically, or causes hang-up during initialization.
1271 In such a case, specify the buffer top address explicity via 1266 In such a case, specify the buffer top address explicitly via
1272 buffer_top option. 1267 the buffer_top option.
1273 For example, 1268 For example,
1274 Sony F250: buffer_top=0x25a800 1269 Sony F250: buffer_top=0x25a800
1275 Sony F270: buffer_top=0x272800 1270 Sony F270: buffer_top=0x272800
@@ -1887,7 +1882,7 @@ options snd-ens1371 index=1
1887# OSS/Free portion 1882# OSS/Free portion
1888alias sound-slot-0 snd-interwave 1883alias sound-slot-0 snd-interwave
1889alias sound-slot-1 snd-ens1371 1884alias sound-slot-1 snd-ens1371
1890----- /etc/moprobe.conf 1885----- /etc/modprobe.conf
1891 1886
1892In this example, the interwave card is always loaded as the first card 1887In this example, the interwave card is always loaded as the first card
1893(index 0) and ens1371 as the second (index 1). 1888(index 0) and ens1371 as the second (index 1).
@@ -1915,21 +1910,6 @@ Please note that the device mapping above may be varied via the module
1915options of snd-pcm-oss module. 1910options of snd-pcm-oss module.
1916 1911
1917 1912
1918DEVFS support
1919=============
1920
1921The ALSA driver fully supports the devfs extension.
1922You should add lines below to your devfsd.conf file:
1923
1924LOOKUP snd MODLOAD ACTION snd
1925REGISTER ^sound/.* PERMISSIONS root.audio 660
1926REGISTER ^snd/.* PERMISSIONS root.audio 660
1927
1928Warning: These lines assume that you have the audio group in your system.
1929 Otherwise replace audio word with another group name (root for
1930 example).
1931
1932
1933Proc interfaces (/proc/asound) 1913Proc interfaces (/proc/asound)
1934============================== 1914==============================
1935 1915
diff --git a/Documentation/sound/alsa/Audiophile-Usb.txt b/Documentation/sound/alsa/Audiophile-Usb.txt
index b535c2a198f8..e40cce83327c 100644
--- a/Documentation/sound/alsa/Audiophile-Usb.txt
+++ b/Documentation/sound/alsa/Audiophile-Usb.txt
@@ -126,7 +126,7 @@ Here is a list of supported device_setup values for this device:
126 - Alsa driver default mode 126 - Alsa driver default mode
127 - maintains backward compatibility with setups that do not use this 127 - maintains backward compatibility with setups that do not use this
128 parameter by not introducing any change 128 parameter by not introducing any change
129 - results sometimes in corrupted sound as decribed earlier 129 - results sometimes in corrupted sound as described earlier
130 * device_setup=0x01 130 * device_setup=0x01
131 - 16bits 48kHz mode with Di disabled 131 - 16bits 48kHz mode with Di disabled
132 - Ai,Ao,Do can be used at the same time 132 - Ai,Ao,Do can be used at the same time
diff --git a/Documentation/sound/alsa/CMIPCI.txt b/Documentation/sound/alsa/CMIPCI.txt
index 1872e24442a4..4b2b15387056 100644
--- a/Documentation/sound/alsa/CMIPCI.txt
+++ b/Documentation/sound/alsa/CMIPCI.txt
@@ -16,11 +16,11 @@ As default, ALSA driver assigns the first PCM device (i.e. hw:0,0 for
16card#0) for front and 4/6ch playbacks, while the second PCM device 16card#0) for front and 4/6ch playbacks, while the second PCM device
17(hw:0,1) is assigned to the second DAC for rear playback. 17(hw:0,1) is assigned to the second DAC for rear playback.
18 18
19There are slight difference between two DACs. 19There are slight differences between the two DACs:
20 20
21- The first DAC supports U8 and S16LE formats, while the second DAC 21- The first DAC supports U8 and S16LE formats, while the second DAC
22 supports only S16LE. 22 supports only S16LE.
23- The seconde DAC supports only two channel stereo. 23- The second DAC supports only two channel stereo.
24 24
25Please note that the CM8x38 DAC doesn't support continuous playback 25Please note that the CM8x38 DAC doesn't support continuous playback
26rate but only fixed rates: 5512, 8000, 11025, 16000, 22050, 32000, 26rate but only fixed rates: 5512, 8000, 11025, 16000, 22050, 32000,
@@ -76,7 +76,7 @@ in alsa-lib. For example, you can play a WAV file with 6 channels like
76 76
77 % aplay -Dsurround51 sixchannels.wav 77 % aplay -Dsurround51 sixchannels.wav
78 78
79For programmin the 4/6 channel playback, you need to specify the PCM 79For programming the 4/6 channel playback, you need to specify the PCM
80channels as you like and set the format S16LE. For example, for playback 80channels as you like and set the format S16LE. For example, for playback
81with 4 channels, 81with 4 channels,
82 82
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 4807ef79a94d..077fbe25ebf4 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -5486,7 +5486,7 @@ struct _snd_pcm_runtime {
5486 <chapter id="power-management"> 5486 <chapter id="power-management">
5487 <title>Power Management</title> 5487 <title>Power Management</title>
5488 <para> 5488 <para>
5489 If the chip is supposed to work with with suspend/resume 5489 If the chip is supposed to work with suspend/resume
5490 functions, you need to add the power-management codes to the 5490 functions, you need to add the power-management codes to the
5491 driver. The additional codes for the power-management should be 5491 driver. The additional codes for the power-management should be
5492 <function>ifdef</function>'ed with 5492 <function>ifdef</function>'ed with
diff --git a/Documentation/sound/alsa/MIXART.txt b/Documentation/sound/alsa/MIXART.txt
index 5cb970612870..ef42c44fa1f2 100644
--- a/Documentation/sound/alsa/MIXART.txt
+++ b/Documentation/sound/alsa/MIXART.txt
@@ -31,7 +31,7 @@ With a miXart8AES/EBU there is in addition 1 stereo digital input
31Formats 31Formats
32------- 32-------
33U8, S16_LE, S16_BE, S24_3LE, S24_3BE, FLOAT_LE, FLOAT_BE 33U8, S16_LE, S16_BE, S24_3LE, S24_3BE, FLOAT_LE, FLOAT_BE
34Sample rates : 8000 - 48000 Hz continously 34Sample rates : 8000 - 48000 Hz continuously
35 35
36Playback 36Playback
37-------- 37--------
@@ -39,7 +39,7 @@ For instance the playback devices are configured to have max. 4
39substreams performing hardware mixing. This could be changed to a 39substreams performing hardware mixing. This could be changed to a
40maximum of 24 substreams if wished. 40maximum of 24 substreams if wished.
41Mono files will be played on the left and right channel. Each channel 41Mono files will be played on the left and right channel. Each channel
42can be muted for each stream to use 8 analog/digital outputs seperately. 42can be muted for each stream to use 8 analog/digital outputs separately.
43 43
44Capture 44Capture
45------- 45-------
@@ -97,4 +97,4 @@ COPYRIGHT
97========= 97=========
98 98
99Copyright (c) 2003 Digigram SA <alsa@digigram.com> 99Copyright (c) 2003 Digigram SA <alsa@digigram.com>
100Distributalbe under GPL. 100Distributable under GPL.
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt
index 1fe48846d78f..f738b296440a 100644
--- a/Documentation/sound/alsa/Procfile.txt
+++ b/Documentation/sound/alsa/Procfile.txt
@@ -71,7 +71,7 @@ The status of MIDI I/O is found in midi* files. It shows the device
71name and the received/transmitted bytes through the MIDI device. 71name and the received/transmitted bytes through the MIDI device.
72 72
73When the card is equipped with AC97 codecs, there are codec97#* 73When the card is equipped with AC97 codecs, there are codec97#*
74subdirectories (desribed later). 74subdirectories (described later).
75 75
76When the OSS mixer emulation is enabled (and the module is loaded), 76When the OSS mixer emulation is enabled (and the module is loaded),
77oss_mixer file appears here, too. This shows the current mapping of 77oss_mixer file appears here, too. This shows the current mapping of
@@ -161,12 +161,12 @@ seq/drivers
161 Lists the currently available ALSA sequencer drivers. 161 Lists the currently available ALSA sequencer drivers.
162 162
163seq/clients 163seq/clients
164 Shows the list of currently available sequencer clinets and 164 Shows the list of currently available sequencer clients and
165 ports. The connection status and the running status are shown 165 ports. The connection status and the running status are shown
166 in this file, too. 166 in this file, too.
167 167
168seq/queues 168seq/queues
169 Lists the currently allocated/running sequener queues. 169 Lists the currently allocated/running sequencer queues.
170 170
171seq/timer 171seq/timer
172 Lists the currently allocated/running sequencer timers. 172 Lists the currently allocated/running sequencer timers.
@@ -182,10 +182,10 @@ When the problem is related with PCM, first try to turn on xrun_debug
182mode. This will give you the kernel messages when and where xrun 182mode. This will give you the kernel messages when and where xrun
183happened. 183happened.
184 184
185If it's really a bug, report it with the following information 185If it's really a bug, report it with the following information:
186 186
187 - the name of the driver/card, show in /proc/asound/cards 187 - the name of the driver/card, show in /proc/asound/cards
188 - the reigster dump, if available (e.g. card*/cmipci) 188 - the register dump, if available (e.g. card*/cmipci)
189 189
190when it's a PCM problem, 190when it's a PCM problem,
191 191
diff --git a/Documentation/sound/oss/AWE32 b/Documentation/sound/oss/AWE32
index cb179bfeb522..b5908a66ff55 100644
--- a/Documentation/sound/oss/AWE32
+++ b/Documentation/sound/oss/AWE32
@@ -55,7 +55,7 @@ SB32.
55 install awe_wave /sbin/modprobe --first-time -i awe_wave && /usr/local/bin/sfxload PATH_TO_SOUND_BANK_FILE 55 install awe_wave /sbin/modprobe --first-time -i awe_wave && /usr/local/bin/sfxload PATH_TO_SOUND_BANK_FILE
56 56
57 You will of course have to change "PATH_TO_SOUND_BANK_FILE" to the full 57 You will of course have to change "PATH_TO_SOUND_BANK_FILE" to the full
58 path of of the sound bank file. That will enable the Sound Blaster and AWE 58 path of the sound bank file. That will enable the Sound Blaster and AWE
59 wave synthesis. To play midi files you should get one of these programs if 59 wave synthesis. To play midi files you should get one of these programs if
60 you don't already have them: 60 you don't already have them:
61 61
diff --git a/Documentation/sound/oss/solo1 b/Documentation/sound/oss/solo1
index 6f53d407d027..95c4c83422b3 100644
--- a/Documentation/sound/oss/solo1
+++ b/Documentation/sound/oss/solo1
@@ -6,7 +6,7 @@ is at least one report of it working on later silicon.
6The chip behaves differently than described in the data sheet, 6The chip behaves differently than described in the data sheet,
7likely due to a chip bug. Working around this would require 7likely due to a chip bug. Working around this would require
8the help of ESS (for example by publishing an errata sheet), 8the help of ESS (for example by publishing an errata sheet),
9but ESS has not done so so far. 9but ESS has not done so far.
10 10
11Also, the chip only supports 24 bit addresses for recording, 11Also, the chip only supports 24 bit addresses for recording,
12which means it cannot work on some Alpha mainboards. 12which means it cannot work on some Alpha mainboards.
diff --git a/Documentation/sound/oss/ultrasound b/Documentation/sound/oss/ultrasound
index 32cd50478b36..eed331c738a3 100644
--- a/Documentation/sound/oss/ultrasound
+++ b/Documentation/sound/oss/ultrasound
@@ -19,7 +19,7 @@ db16 ???
19no_wave_dma option 19no_wave_dma option
20 20
21This option defaults to a value of 0, which allows the Ultrasound wavetable 21This option defaults to a value of 0, which allows the Ultrasound wavetable
22DSP to use DMA for for playback and downloading samples. This is the same 22DSP to use DMA for playback and downloading samples. This is the same
23as the old behaviour. If set to 1, no DMA is needed for downloading samples, 23as the old behaviour. If set to 1, no DMA is needed for downloading samples,
24and allows owners of a GUS MAX to make use of simultaneous digital audio 24and allows owners of a GUS MAX to make use of simultaneous digital audio
25(/dev/dsp), MIDI, and wavetable playback. 25(/dev/dsp), MIDI, and wavetable playback.
diff --git a/Documentation/sound/oss/vwsnd b/Documentation/sound/oss/vwsnd
index a6ea0a1df9e4..4c6cbdb3c548 100644
--- a/Documentation/sound/oss/vwsnd
+++ b/Documentation/sound/oss/vwsnd
@@ -12,7 +12,7 @@ boxes.
12 12
13The Visual Workstation has an Analog Devices AD1843 "SoundComm" audio 13The Visual Workstation has an Analog Devices AD1843 "SoundComm" audio
14codec chip. The AD1843 is accessed through the Cobalt I/O ASIC, also 14codec chip. The AD1843 is accessed through the Cobalt I/O ASIC, also
15known as Lithium. This driver programs both both chips. 15known as Lithium. This driver programs both chips.
16 16
17============================================================================== 17==============================================================================
18QUICK CONFIGURATION 18QUICK CONFIGURATION
diff --git a/Documentation/sparc/sbus_drivers.txt b/Documentation/sparc/sbus_drivers.txt
index 4b9351624f13..8418d35484fc 100644
--- a/Documentation/sparc/sbus_drivers.txt
+++ b/Documentation/sparc/sbus_drivers.txt
@@ -25,8 +25,8 @@ the bits necessary to run your device. The most commonly
25used members of this structure, and their typical usage, 25used members of this structure, and their typical usage,
26will be detailed below. 26will be detailed below.
27 27
28 Here is a piece of skeleton code for perofming a device 28 Here is a piece of skeleton code for performing a device
29probe in an SBUS driverunder Linux: 29probe in an SBUS driver under Linux:
30 30
31 static int __devinit mydevice_probe_one(struct sbus_dev *sdev) 31 static int __devinit mydevice_probe_one(struct sbus_dev *sdev)
32 { 32 {
@@ -98,7 +98,7 @@ in your .remove method.
98 98
99 Any memory allocated, registers mapped, IRQs registered, 99 Any memory allocated, registers mapped, IRQs registered,
100etc. must be undone by your .remove method so that all resources 100etc. must be undone by your .remove method so that all resources
101of your device are relased by the time it returns. 101of your device are released by the time it returns.
102 102
103 You should _NOT_ use the for_each_sbus(), for_each_sbusdev(), 103 You should _NOT_ use the for_each_sbus(), for_each_sbusdev(),
104and for_all_sbusdev() interfaces. They are deprecated, will be 104and for_all_sbusdev() interfaces. They are deprecated, will be
diff --git a/Documentation/spi/pxa2xx b/Documentation/spi/pxa2xx
index 9c45f3df2e18..a1e0ee20f595 100644
--- a/Documentation/spi/pxa2xx
+++ b/Documentation/spi/pxa2xx
@@ -124,12 +124,12 @@ use a value of 8.
124The "pxa2xx_spi_chip.timeout_microsecs" fields is used to efficiently handle 124The "pxa2xx_spi_chip.timeout_microsecs" fields is used to efficiently handle
125trailing bytes in the SSP receiver fifo. The correct value for this field is 125trailing bytes in the SSP receiver fifo. The correct value for this field is
126dependent on the SPI bus speed ("spi_board_info.max_speed_hz") and the specific 126dependent on the SPI bus speed ("spi_board_info.max_speed_hz") and the specific
127slave device. Please note the the PXA2xx SSP 1 does not support trailing byte 127slave device. Please note that the PXA2xx SSP 1 does not support trailing byte
128timeouts and must busy-wait any trailing bytes. 128timeouts and must busy-wait any trailing bytes.
129 129
130The "pxa2xx_spi_chip.enable_loopback" field is used to place the SSP porting 130The "pxa2xx_spi_chip.enable_loopback" field is used to place the SSP porting
131into internal loopback mode. In this mode the SSP controller internally 131into internal loopback mode. In this mode the SSP controller internally
132connects the SSPTX pin the the SSPRX pin. This is useful for initial setup 132connects the SSPTX pin to the SSPRX pin. This is useful for initial setup
133testing. 133testing.
134 134
135The "pxa2xx_spi_chip.cs_control" field is used to point to a board specific 135The "pxa2xx_spi_chip.cs_control" field is used to point to a board specific
@@ -208,7 +208,7 @@ DMA and PIO I/O Support
208----------------------- 208-----------------------
209The pxa2xx_spi driver support both DMA and interrupt driven PIO message 209The pxa2xx_spi driver support both DMA and interrupt driven PIO message
210transfers. The driver defaults to PIO mode and DMA transfers must enabled by 210transfers. The driver defaults to PIO mode and DMA transfers must enabled by
211setting the "enable_dma" flag in the "pxa2xx_spi_master" structure and and 211setting the "enable_dma" flag in the "pxa2xx_spi_master" structure and
212ensuring that the "pxa2xx_spi_chip.dma_burst_size" field is non-zero. The DMA 212ensuring that the "pxa2xx_spi_chip.dma_burst_size" field is non-zero. The DMA
213mode support both coherent and stream based DMA mappings. 213mode support both coherent and stream based DMA mappings.
214 214
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary
index 068732d32276..72795796b13d 100644
--- a/Documentation/spi/spi-summary
+++ b/Documentation/spi/spi-summary
@@ -262,7 +262,7 @@ NON-STATIC CONFIGURATIONS
262Developer boards often play by different rules than product boards, and one 262Developer boards often play by different rules than product boards, and one
263example is the potential need to hotplug SPI devices and/or controllers. 263example is the potential need to hotplug SPI devices and/or controllers.
264 264
265For those cases you might need to use use spi_busnum_to_master() to look 265For those cases you might need to use spi_busnum_to_master() to look
266up the spi bus master, and will likely need spi_new_device() to provide the 266up the spi bus master, and will likely need spi_new_device() to provide the
267board info based on the board that was hotplugged. Of course, you'd later 267board info based on the board that was hotplugged. Of course, you'd later
268call at least spi_unregister_device() when that board is removed. 268call at least spi_unregister_device() when that board is removed.
@@ -322,7 +322,7 @@ As soon as it enters probe(), the driver may issue I/O requests to
322the SPI device using "struct spi_message". When remove() returns, 322the SPI device using "struct spi_message". When remove() returns,
323the driver guarantees that it won't submit any more such messages. 323the driver guarantees that it won't submit any more such messages.
324 324
325 - An spi_message is a sequence of of protocol operations, executed 325 - An spi_message is a sequence of protocol operations, executed
326 as one atomic sequence. SPI driver controls include: 326 as one atomic sequence. SPI driver controls include:
327 327
328 + when bidirectional reads and writes start ... by how its 328 + when bidirectional reads and writes start ... by how its
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt
index e409e5d07486..02a481225b0d 100644
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
@@ -4,7 +4,7 @@ Rules on what kind of patches are accepted, and which ones are not, into the
4"-stable" tree: 4"-stable" tree:
5 5
6 - It must be obviously correct and tested. 6 - It must be obviously correct and tested.
7 - It can not be bigger than 100 lines, with context. 7 - It cannot be bigger than 100 lines, with context.
8 - It must fix only one thing. 8 - It must fix only one thing.
9 - It must fix a real bug that bothers people (not a, "This could be a 9 - It must fix a real bug that bothers people (not a, "This could be a
10 problem..." type thing). 10 problem..." type thing).
@@ -14,7 +14,7 @@ Rules on what kind of patches are accepted, and which ones are not, into the
14 critical. 14 critical.
15 - No "theoretical race condition" issues, unless an explanation of how the 15 - No "theoretical race condition" issues, unless an explanation of how the
16 race can be exploited is also provided. 16 race can be exploited is also provided.
17 - It can not contain any "trivial" fixes in it (spelling changes, 17 - It cannot contain any "trivial" fixes in it (spelling changes,
18 whitespace cleanups, etc). 18 whitespace cleanups, etc).
19 - It must be accepted by the relevant subsystem maintainer. 19 - It must be accepted by the relevant subsystem maintainer.
20 - It must follow the Documentation/SubmittingPatches rules. 20 - It must follow the Documentation/SubmittingPatches rules.
diff --git a/Documentation/uml/UserModeLinux-HOWTO.txt b/Documentation/uml/UserModeLinux-HOWTO.txt
index 544430e39980..b60590eca18f 100644
--- a/Documentation/uml/UserModeLinux-HOWTO.txt
+++ b/Documentation/uml/UserModeLinux-HOWTO.txt
@@ -157,7 +157,7 @@
157 13. What to do when UML doesn't work 157 13. What to do when UML doesn't work
158 158
159 13.1 Strange compilation errors when you build from source 159 13.1 Strange compilation errors when you build from source
160 13.2 UML hangs on boot after mounting devfs 160 13.2 (obsolete)
161 13.3 A variety of panics and hangs with /tmp on a reiserfs filesystem 161 13.3 A variety of panics and hangs with /tmp on a reiserfs filesystem
162 13.4 The compile fails with errors about conflicting types for 'open', 'dup', and 'waitpid' 162 13.4 The compile fails with errors about conflicting types for 'open', 'dup', and 'waitpid'
163 13.5 UML doesn't work when /tmp is an NFS filesystem 163 13.5 UML doesn't work when /tmp is an NFS filesystem
@@ -379,31 +379,6 @@
379 bug fixes and enhancements that have gone into subsequent releases. 379 bug fixes and enhancements that have gone into subsequent releases.
380 380
381 381
382 If you build your own kernel, and want to boot it from one of the
383 filesystems distributed from this site, then, in nearly all cases,
384 devfs must be compiled into the kernel and mounted at boot time. The
385 exception is the SuSE filesystem. For this, devfs must either not be
386 in the kernel at all, or "devfs=nomount" must be on the kernel command
387 line. Any disagreement between the kernel and the filesystem being
388 booted about whether devfs is being used will result in the boot
389 getting no further than single-user mode.
390
391
392 If you don't want to use devfs, you can remove the need for it from a
393 filesystem by copying /dev from someplace, making a bunch of /dev/ubd
394 devices:
395
396
397 UML# for i in 0 1 2 3 4 5 6 7; do mknod ubd$i b 98 $i; done
398
399
400
401
402 and changing /etc/fstab and /etc/inittab to refer to the non-devfs
403 devices.
404
405
406
407 22..22.. CCoommppiilliinngg aanndd iinnssttaalllliinngg kkeerrnneell mmoodduulleess 382 22..22.. CCoommppiilliinngg aanndd iinnssttaalllliinngg kkeerrnneell mmoodduulleess
408 383
409 UML modules are built in the same way as the native kernel (with the 384 UML modules are built in the same way as the native kernel (with the
@@ -839,9 +814,7 @@
839 +o None - device=none 814 +o None - device=none
840 815
841 816
842 This causes the device to disappear. If you are using devfs, the 817 This causes the device to disappear.
843 device will not appear in /dev. If not, then attempts to open it
844 will return -ENODEV.
845 818
846 819
847 820
@@ -1047,7 +1020,7 @@
1047 1020
1048 Note that the IP address you assign to the host end of the tap device 1021 Note that the IP address you assign to the host end of the tap device
1049 must be different than the IP you assign to the eth device inside UML. 1022 must be different than the IP you assign to the eth device inside UML.
1050 If you are short on IPs and don't want to comsume two per UML, then 1023 If you are short on IPs and don't want to consume two per UML, then
1051 you can reuse the host's eth IP address for the host ends of the tap 1024 you can reuse the host's eth IP address for the host ends of the tap
1052 devices. Internally, the UMLs must still get unique IPs for their eth 1025 devices. Internally, the UMLs must still get unique IPs for their eth
1053 devices. You can also give the UMLs non-routable IPs (192.168.x.x or 1026 devices. You can also give the UMLs non-routable IPs (192.168.x.x or
@@ -2058,7 +2031,7 @@
2058 there are multiple COWs associated with a backing file, a -d merge of 2031 there are multiple COWs associated with a backing file, a -d merge of
2059 one of them will invalidate all of the others. However, it is 2032 one of them will invalidate all of the others. However, it is
2060 convenient if you're short of disk space, and it should also be 2033 convenient if you're short of disk space, and it should also be
2061 noticably faster than a non-destructive merge. 2034 noticeably faster than a non-destructive merge.
2062 2035
2063 2036
2064 2037
@@ -3898,29 +3871,6 @@
3898 3871
3899 3872
3900 3873
3901 1133..22.. UUMMLL hhaannggss oonn bboooott aafftteerr mmoouunnttiinngg ddeevvffss
3902
3903 The boot looks like this:
3904
3905
3906 VFS: Mounted root (ext2 filesystem) readonly.
3907 Mounted devfs on /dev
3908
3909
3910
3911
3912 You're probably running a recent distribution on an old machine. I
3913 saw this with the RH7.1 filesystem running on a Pentium. The shared
3914 library loader, ld.so, was executing an instruction (cmove) which the
3915 Pentium didn't support. That instruction was apparently added later.
3916 If you run UML under the debugger, you'll see the hang caused by one
3917 instruction causing an infinite SIGILL stream.
3918
3919
3920 The fix is to boot UML on an older filesystem.
3921
3922
3923
3924 1133..33.. AA vvaarriieettyy ooff ppaanniiccss aanndd hhaannggss wwiitthh //ttmmpp oonn aa rreeiisseerrffss ffiilleessyyss-- 3874 1133..33.. AA vvaarriieettyy ooff ppaanniiccss aanndd hhaannggss wwiitthh //ttmmpp oonn aa rreeiisseerrffss ffiilleessyyss--
3925 tteemm 3875 tteemm
3926 3876
@@ -3953,9 +3903,9 @@
3953 3903
3954 1133..55.. UUMMLL ddooeessnn''tt wwoorrkk wwhheenn //ttmmpp iiss aann NNFFSS ffiilleessyysstteemm 3904 1133..55.. UUMMLL ddooeessnn''tt wwoorrkk wwhheenn //ttmmpp iiss aann NNFFSS ffiilleessyysstteemm
3955 3905
3956 This seems to be a similar situation with the resierfs problem above. 3906 This seems to be a similar situation with the ReiserFS problem above.
3957 Some versions of NFS seems not to handle mmap correctly, which UML 3907 Some versions of NFS seems not to handle mmap correctly, which UML
3958 depends on. The workaround is have /tmp be non-NFS directory. 3908 depends on. The workaround is have /tmp be a non-NFS directory.
3959 3909
3960 3910
3961 1133..66.. UUMMLL hhaannggss oonn bboooott wwhheenn ccoommppiilleedd wwiitthh ggpprrooff ssuuppppoorrtt 3911 1133..66.. UUMMLL hhaannggss oonn bboooott wwhheenn ccoommppiilleedd wwiitthh ggpprrooff ssuuppppoorrtt
@@ -4022,7 +3972,7 @@
4022 nneett 3972 nneett
4023 3973
4024 If you can connect to the host, and the host can connect to UML, but 3974 If you can connect to the host, and the host can connect to UML, but
4025 you can not connect to any other machines, then you may need to enable 3975 you cannot connect to any other machines, then you may need to enable
4026 IP Masquerading on the host. Usually this is only experienced when 3976 IP Masquerading on the host. Usually this is only experienced when
4027 using private IP addresses (192.168.x.x or 10.x.x.x) for host/UML 3977 using private IP addresses (192.168.x.x or 10.x.x.x) for host/UML
4028 networking, rather than the public address space that your host is 3978 networking, rather than the public address space that your host is
@@ -4671,7 +4621,7 @@
4671 Chris Reahard built a specialized root filesystem for running a DNS 4621 Chris Reahard built a specialized root filesystem for running a DNS
4672 server jailed inside UML. It's available from the download 4622 server jailed inside UML. It's available from the download
4673 <http://user-mode-linux.sourceforge.net/dl-sf.html> page in the Jail 4623 <http://user-mode-linux.sourceforge.net/dl-sf.html> page in the Jail
4674 Filesysems section. 4624 Filesystems section.
4675 4625
4676 4626
4677 4627
diff --git a/Documentation/unshare.txt b/Documentation/unshare.txt
index 90a5e9e5bef1..a8643513a5f6 100644
--- a/Documentation/unshare.txt
+++ b/Documentation/unshare.txt
@@ -260,7 +260,7 @@ items:
260 a pointer to it. 260 a pointer to it.
261 261
262 7.4) Appropriately modify architecture specific code to register the 262 7.4) Appropriately modify architecture specific code to register the
263 the new system call. 263 new system call.
264 264
2658) Test Specification 2658) Test Specification
266--------------------- 266---------------------
diff --git a/Documentation/usb/URB.txt b/Documentation/usb/URB.txt
index a49e5f2c2b46..8ffce746d496 100644
--- a/Documentation/usb/URB.txt
+++ b/Documentation/usb/URB.txt
@@ -184,7 +184,7 @@ you can pass information to the completion handler.
184Note that even when an error (or unlink) is reported, data may have been 184Note that even when an error (or unlink) is reported, data may have been
185transferred. That's because USB transfers are packetized; it might take 185transferred. That's because USB transfers are packetized; it might take
186sixteen packets to transfer your 1KByte buffer, and ten of them might 186sixteen packets to transfer your 1KByte buffer, and ten of them might
187have transferred succesfully before the completion was called. 187have transferred successfully before the completion was called.
188 188
189 189
190NOTE: ***** WARNING ***** 190NOTE: ***** WARNING *****
diff --git a/Documentation/usb/acm.txt b/Documentation/usb/acm.txt
index 8ef45ea8f691..737d6104c3f3 100644
--- a/Documentation/usb/acm.txt
+++ b/Documentation/usb/acm.txt
@@ -49,20 +49,6 @@ Abstract Control Model (USB CDC ACM) specification.
49 Unfortunately many modems and most ISDN TAs use proprietary interfaces and 49 Unfortunately many modems and most ISDN TAs use proprietary interfaces and
50thus won't work with this drivers. Check for ACM compliance before buying. 50thus won't work with this drivers. Check for ACM compliance before buying.
51 51
52 The driver (with devfs) creates these devices in /dev/usb/acm:
53
54 crw-r--r-- 1 root root 166, 0 Apr 1 10:49 0
55 crw-r--r-- 1 root root 166, 1 Apr 1 10:49 1
56 crw-r--r-- 1 root root 166, 2 Apr 1 10:49 2
57
58 And so on, up to 31, with the limit being possible to change in acm.c to up
59to 256, so you can use up to 256 USB modems with one computer (you'll need
60three USB cards for that, though).
61
62 If you don't use devfs, then you can create device nodes with the same
63minor/major numbers anywhere you want, but either the above location or
64/dev/usb/ttyACM0 is preferred.
65
66 To use the modems you need these modules loaded: 52 To use the modems you need these modules loaded:
67 53
68 usbcore.ko 54 usbcore.ko
diff --git a/Documentation/usb/error-codes.txt b/Documentation/usb/error-codes.txt
index 39c68f8c4e6c..9cf83e8c27b8 100644
--- a/Documentation/usb/error-codes.txt
+++ b/Documentation/usb/error-codes.txt
@@ -126,7 +126,7 @@ one or more packets could finish before an error stops further endpoint I/O.
126 urb->transfer_flags. 126 urb->transfer_flags.
127 127
128-ENODEV Device was removed. Often preceded by a burst of 128-ENODEV Device was removed. Often preceded by a burst of
129 other errors, since the hub driver does't detect 129 other errors, since the hub driver doesn't detect
130 device removal events immediately. 130 device removal events immediately.
131 131
132-EXDEV ISO transfer only partially completed 132-EXDEV ISO transfer only partially completed
@@ -145,7 +145,7 @@ one or more packets could finish before an error stops further endpoint I/O.
145hardware problems such as bad devices (including firmware) or cables. 145hardware problems such as bad devices (including firmware) or cables.
146 146
147(**) This is also one of several codes that different kinds of host 147(**) This is also one of several codes that different kinds of host
148controller use to to indicate a transfer has failed because of device 148controller use to indicate a transfer has failed because of device
149disconnect. In the interval before the hub driver starts disconnect 149disconnect. In the interval before the hub driver starts disconnect
150processing, devices may receive such fault reports for every request. 150processing, devices may receive such fault reports for every request.
151 151
diff --git a/Documentation/usb/hiddev.txt b/Documentation/usb/hiddev.txt
index cd6fb4b58e1f..6a790754e963 100644
--- a/Documentation/usb/hiddev.txt
+++ b/Documentation/usb/hiddev.txt
@@ -118,7 +118,7 @@ index, the ioctl returns -1 and sets errno to -EINVAL.
118HIDIOCGDEVINFO - struct hiddev_devinfo (read) 118HIDIOCGDEVINFO - struct hiddev_devinfo (read)
119Gets a hiddev_devinfo structure which describes the device. 119Gets a hiddev_devinfo structure which describes the device.
120 120
121HIDIOCGSTRING - struct struct hiddev_string_descriptor (read/write) 121HIDIOCGSTRING - struct hiddev_string_descriptor (read/write)
122Gets a string descriptor from the device. The caller must fill in the 122Gets a string descriptor from the device. The caller must fill in the
123"index" field to indicate which descriptor should be returned. 123"index" field to indicate which descriptor should be returned.
124 124
diff --git a/Documentation/usb/mtouchusb.txt b/Documentation/usb/mtouchusb.txt
index cd806bfc8b81..e43cfffaa100 100644
--- a/Documentation/usb/mtouchusb.txt
+++ b/Documentation/usb/mtouchusb.txt
@@ -11,7 +11,7 @@ CHANGES
11 Changed reset from standard USB dev reset to vendor reset 11 Changed reset from standard USB dev reset to vendor reset
12 Changed data sent to host from compensated to raw coordinates 12 Changed data sent to host from compensated to raw coordinates
13 Eliminated vendor/product module params 13 Eliminated vendor/product module params
14 Performed multiple successfull tests with an EXII-5010UC 14 Performed multiple successful tests with an EXII-5010UC
15 15
16SUPPORTED HARDWARE: 16SUPPORTED HARDWARE:
17 17
@@ -38,7 +38,7 @@ This driver appears to be one of possible 2 Linux USB Input Touchscreen
38drivers. Although 3M produces a binary only driver available for 38drivers. Although 3M produces a binary only driver available for
39download, I persist in updating this driver since I would like to use the 39download, I persist in updating this driver since I would like to use the
40touchscreen for embedded apps using QTEmbedded, DirectFB, etc. So I feel the 40touchscreen for embedded apps using QTEmbedded, DirectFB, etc. So I feel the
41logical choice is to use Linux Imput. 41logical choice is to use Linux Input.
42 42
43Currently there is no way to calibrate the device via this driver. Even if 43Currently there is no way to calibrate the device via this driver. Even if
44the device could be calibrated, the driver pulls to raw coordinate data from 44the device could be calibrated, the driver pulls to raw coordinate data from
@@ -63,7 +63,7 @@ TODO:
63Implement a control urb again to handle requests to and from the device 63Implement a control urb again to handle requests to and from the device
64such as calibration, etc once/if it becomes available. 64such as calibration, etc once/if it becomes available.
65 65
66DISCLAMER: 66DISCLAIMER:
67 67
68I am not a MicroTouch/3M employee, nor have I ever been. 3M does not support 68I am not a MicroTouch/3M employee, nor have I ever been. 3M does not support
69this driver! If you want touch drivers only supported within X, please go to: 69this driver! If you want touch drivers only supported within X, please go to:
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index a2dee6e6190d..8dc2bacc8f1f 100644
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -13,7 +13,6 @@ CONFIGURATION
13 Currently the driver can handle up to 256 different serial interfaces at 13 Currently the driver can handle up to 256 different serial interfaces at
14 one time. 14 one time.
15 15
16 If you are not using devfs:
17 The major number that the driver uses is 188 so to use the driver, 16 The major number that the driver uses is 188 so to use the driver,
18 create the following nodes: 17 create the following nodes:
19 mknod /dev/ttyUSB0 c 188 0 18 mknod /dev/ttyUSB0 c 188 0
@@ -26,10 +25,6 @@ CONFIGURATION
26 mknod /dev/ttyUSB254 c 188 254 25 mknod /dev/ttyUSB254 c 188 254
27 mknod /dev/ttyUSB255 c 188 255 26 mknod /dev/ttyUSB255 c 188 255
28 27
29 If you are using devfs:
30 The devices supported by this driver will show up as
31 /dev/usb/tts/{0,1,...}
32
33 When the device is connected and recognized by the driver, the driver 28 When the device is connected and recognized by the driver, the driver
34 will print to the system log, which node(s) the device has been bound 29 will print to the system log, which node(s) the device has been bound
35 to. 30 to.
@@ -228,7 +223,7 @@ Cypress M8 CY4601 Family Serial Driver
228 -Cypress HID->COM RS232 adapter 223 -Cypress HID->COM RS232 adapter
229 224
230 Note: Cypress Semiconductor claims no affiliation with the 225 Note: Cypress Semiconductor claims no affiliation with the
231 the hid->com device. 226 hid->com device.
232 227
233 Most devices using chipsets under the CY4601 family should 228 Most devices using chipsets under the CY4601 family should
234 work with the driver. As long as they stay true to the CY4601 229 work with the driver. As long as they stay true to the CY4601
@@ -277,7 +272,7 @@ Digi AccelePort Driver
277 work under SMP with the uhci driver. 272 work under SMP with the uhci driver.
278 273
279 The driver is generally working, though we still have a few more ioctls 274 The driver is generally working, though we still have a few more ioctls
280 to implement and final testing and debugging to do. The paralled port 275 to implement and final testing and debugging to do. The parallel port
281 on the USB 2 is supported as a serial to parallel converter; in other 276 on the USB 2 is supported as a serial to parallel converter; in other
282 words, it appears as another USB serial port on Linux, even though 277 words, it appears as another USB serial port on Linux, even though
283 physically it is really a parallel port. The Digi Acceleport USB 8 278 physically it is really a parallel port. The Digi Acceleport USB 8
@@ -427,7 +422,7 @@ Options supported:
427 debug - extra verbose debugging info 422 debug - extra verbose debugging info
428 (default: 0; nonzero enables) 423 (default: 0; nonzero enables)
429 use_lowlatency - use low_latency flag to speed up tty layer 424 use_lowlatency - use low_latency flag to speed up tty layer
430 when reading from from the device. 425 when reading from the device.
431 (default: 0; nonzero enables) 426 (default: 0; nonzero enables)
432 427
433 See http://www.uuhaus.de/linux/palmconnect.html for up-to-date 428 See http://www.uuhaus.de/linux/palmconnect.html for up-to-date
diff --git a/Documentation/video4linux/README.pvrusb2 b/Documentation/video4linux/README.pvrusb2
index c73a32c34528..a4b7ae800866 100644
--- a/Documentation/video4linux/README.pvrusb2
+++ b/Documentation/video4linux/README.pvrusb2
@@ -155,7 +155,7 @@ Source file list / functional overview:
155 pvrusb2-i2c-core.[ch] - This module provides an implementation of a 155 pvrusb2-i2c-core.[ch] - This module provides an implementation of a
156 kernel-friendly I2C adaptor driver, through which other external 156 kernel-friendly I2C adaptor driver, through which other external
157 I2C client drivers (e.g. msp3400, tuner, lirc) may connect and 157 I2C client drivers (e.g. msp3400, tuner, lirc) may connect and
158 operate corresponding chips within the the pvrusb2 device. It is 158 operate corresponding chips within the pvrusb2 device. It is
159 through here that other V4L modules can reach into this driver to 159 through here that other V4L modules can reach into this driver to
160 operate specific pieces (and those modules are in turn driven by 160 operate specific pieces (and those modules are in turn driven by
161 glue logic which is coordinated by pvrusb2-hdw, doled out by 161 glue logic which is coordinated by pvrusb2-hdw, doled out by
diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran
index 040a2c841ae9..deb218f77adb 100644
--- a/Documentation/video4linux/Zoran
+++ b/Documentation/video4linux/Zoran
@@ -144,7 +144,7 @@ tv broadcast formats all aver the world.
144 144
145The CCIR defines parameters needed for broadcasting the signal. 145The CCIR defines parameters needed for broadcasting the signal.
146The CCIR has defined different standards: A,B,D,E,F,G,D,H,I,K,K1,L,M,N,... 146The CCIR has defined different standards: A,B,D,E,F,G,D,H,I,K,K1,L,M,N,...
147The CCIR says not much about about the colorsystem used !!! 147The CCIR says not much about the colorsystem used !!!
148And talking about a colorsystem says not to much about how it is broadcast. 148And talking about a colorsystem says not to much about how it is broadcast.
149 149
150The CCIR standards A,E,F are not used any more. 150The CCIR standards A,E,F are not used any more.
diff --git a/Documentation/video4linux/cx2341x/fw-decoder-api.txt b/Documentation/video4linux/cx2341x/fw-decoder-api.txt
index 9df4fb3ea0f2..78bf5f21e513 100644
--- a/Documentation/video4linux/cx2341x/fw-decoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-decoder-api.txt
@@ -102,7 +102,7 @@ Param[0]
102Name CX2341X_DEC_GET_XFER_INFO 102Name CX2341X_DEC_GET_XFER_INFO
103Enum 9/0x09 103Enum 9/0x09
104Description 104Description
105 This API call may be used to detect an end of stream condtion. 105 This API call may be used to detect an end of stream condition.
106Result[0] 106Result[0]
107 Stream type 107 Stream type
108Result[1] 108Result[1]
diff --git a/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
index 001c68644b08..15df0df57ddd 100644
--- a/Documentation/video4linux/cx2341x/fw-encoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
@@ -280,7 +280,7 @@ Param[0]
280Param[1] 280Param[1]
281 Unknown, but leaving this to 0 seems to work best. Indications are that 281 Unknown, but leaving this to 0 seems to work best. Indications are that
282 this might have to do with USB support, although passing anything but 0 282 this might have to do with USB support, although passing anything but 0
283 onl breaks things. 283 only breaks things.
284 284
285------------------------------------------------------------------------------- 285-------------------------------------------------------------------------------
286 286
diff --git a/Documentation/video4linux/cx2341x/fw-osd-api.txt b/Documentation/video4linux/cx2341x/fw-osd-api.txt
index da98ae30a37a..0a602f3e601b 100644
--- a/Documentation/video4linux/cx2341x/fw-osd-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-osd-api.txt
@@ -97,7 +97,7 @@ Result[0]
97Result[1] 97Result[1]
98 top left vertical offset 98 top left vertical offset
99Result[2] 99Result[2]
100 bottom right hotizontal offset 100 bottom right horizontal offset
101Result[3] 101Result[3]
102 bottom right vertical offset 102 bottom right vertical offset
103 103
diff --git a/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt b/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
index 93fec32a1188..faccee68f603 100644
--- a/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
+++ b/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
@@ -30,7 +30,7 @@ provide for a handler)
30GP_SAMPLE register is at 0x35C058 30GP_SAMPLE register is at 0x35C058
31 31
32Bits are then right shifted into the GP_SAMPLE register at the specified 32Bits are then right shifted into the GP_SAMPLE register at the specified
33rate; you get an interrupt when a full DWORD is recieved. 33rate; you get an interrupt when a full DWORD is received.
34You need to recover the actual RC5 bits out of the (oversampled) IR sensor 34You need to recover the actual RC5 bits out of the (oversampled) IR sensor
35bits. (Hint: look for the 0/1and 1/0 crossings of the RC5 bi-phase data) An 35bits. (Hint: look for the 0/1and 1/0 crossings of the RC5 bi-phase data) An
36actual raw RC5 code will span 2-3 DWORDS, depending on the actual alignment. 36actual raw RC5 code will span 2-3 DWORDS, depending on the actual alignment.
diff --git a/Documentation/video4linux/et61x251.txt b/Documentation/video4linux/et61x251.txt
index cd584f20a997..1bdee8f85b9a 100644
--- a/Documentation/video4linux/et61x251.txt
+++ b/Documentation/video4linux/et61x251.txt
@@ -80,7 +80,7 @@ Some of the features of the driver are:
80 high compression quality (see also "Notes for V4L2 application developers" 80 high compression quality (see also "Notes for V4L2 application developers"
81 paragraph); 81 paragraph);
82- full support for the capabilities of every possible image sensors that can 82- full support for the capabilities of every possible image sensors that can
83 be connected to the ET61X[12]51 bridges, including, for istance, red, green, 83 be connected to the ET61X[12]51 bridges, including, for instance, red, green,
84 blue and global gain adjustments and exposure control (see "Supported 84 blue and global gain adjustments and exposure control (see "Supported
85 devices" paragraph for details); 85 devices" paragraph for details);
86- use of default color settings for sunlight conditions; 86- use of default color settings for sunlight conditions;
@@ -222,7 +222,7 @@ identifier - of the camera registered as "/dev/video0":
222 [root@localhost #] echo 1 > i2c_reg 222 [root@localhost #] echo 1 > i2c_reg
223 [root@localhost #] cat i2c_val 223 [root@localhost #] cat i2c_val
224 224
225Note that if the sensor registers can not be read, "cat" will fail. 225Note that if the sensor registers cannot be read, "cat" will fail.
226To avoid race conditions, all the I/O accesses to the files are serialized. 226To avoid race conditions, all the I/O accesses to the files are serialized.
227 227
228 228
diff --git a/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt b/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt
index 93fec32a1188..faccee68f603 100644
--- a/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt
+++ b/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt
@@ -30,7 +30,7 @@ provide for a handler)
30GP_SAMPLE register is at 0x35C058 30GP_SAMPLE register is at 0x35C058
31 31
32Bits are then right shifted into the GP_SAMPLE register at the specified 32Bits are then right shifted into the GP_SAMPLE register at the specified
33rate; you get an interrupt when a full DWORD is recieved. 33rate; you get an interrupt when a full DWORD is received.
34You need to recover the actual RC5 bits out of the (oversampled) IR sensor 34You need to recover the actual RC5 bits out of the (oversampled) IR sensor
35bits. (Hint: look for the 0/1and 1/0 crossings of the RC5 bi-phase data) An 35bits. (Hint: look for the 0/1and 1/0 crossings of the RC5 bi-phase data) An
36actual raw RC5 code will span 2-3 DWORDS, depending on the actual alignment. 36actual raw RC5 code will span 2-3 DWORDS, depending on the actual alignment.
diff --git a/Documentation/video4linux/meye.txt b/Documentation/video4linux/meye.txt
index 2137da97552f..ecb34160e61d 100644
--- a/Documentation/video4linux/meye.txt
+++ b/Documentation/video4linux/meye.txt
@@ -29,7 +29,7 @@ driver (PCI vendor/device is 0x136b/0xff01)
29 29
30The third one, present in recent (more or less last year) Picturebooks 30The third one, present in recent (more or less last year) Picturebooks
31(C1M* models), is not supported. The manufacturer has given the specs 31(C1M* models), is not supported. The manufacturer has given the specs
32to the developers under a NDA (which allows the develoment of a GPL 32to the developers under a NDA (which allows the development of a GPL
33driver however), but things are not moving very fast (see 33driver however), but things are not moving very fast (see
34http://r-engine.sourceforge.net/) (PCI vendor/device is 0x10cf/0x2011). 34http://r-engine.sourceforge.net/) (PCI vendor/device is 0x10cf/0x2011).
35 35
diff --git a/Documentation/video4linux/sn9c102.txt b/Documentation/video4linux/sn9c102.txt
index 1d20895b4354..8cda472db36d 100644
--- a/Documentation/video4linux/sn9c102.txt
+++ b/Documentation/video4linux/sn9c102.txt
@@ -60,7 +60,7 @@ It's worth to note that SONiX has never collaborated with the author during the
60development of this project, despite several requests for enough detailed 60development of this project, despite several requests for enough detailed
61specifications of the register tables, compression engine and video data format 61specifications of the register tables, compression engine and video data format
62of the above chips. Nevertheless, these informations are no longer necessary, 62of the above chips. Nevertheless, these informations are no longer necessary,
63becouse all the aspects related to these chips are known and have been 63because all the aspects related to these chips are known and have been
64described in detail in this documentation. 64described in detail in this documentation.
65 65
66The driver relies on the Video4Linux2 and USB core modules. It has been 66The driver relies on the Video4Linux2 and USB core modules. It has been
@@ -85,7 +85,7 @@ Some of the features of the driver are:
85 high compression quality (see also "Notes for V4L2 application developers" 85 high compression quality (see also "Notes for V4L2 application developers"
86 and "Video frame formats" paragraphs); 86 and "Video frame formats" paragraphs);
87- full support for the capabilities of many of the possible image sensors that 87- full support for the capabilities of many of the possible image sensors that
88 can be connected to the SN9C10x bridges, including, for istance, red, green, 88 can be connected to the SN9C10x bridges, including, for instance, red, green,
89 blue and global gain adjustments and exposure (see "Supported devices" 89 blue and global gain adjustments and exposure (see "Supported devices"
90 paragraph for details); 90 paragraph for details);
91- use of default color settings for sunlight conditions; 91- use of default color settings for sunlight conditions;
diff --git a/Documentation/video4linux/w9968cf.txt b/Documentation/video4linux/w9968cf.txt
index 0d53ce774b01..e0bba8393c77 100644
--- a/Documentation/video4linux/w9968cf.txt
+++ b/Documentation/video4linux/w9968cf.txt
@@ -15,7 +15,7 @@ Index
155. Supported devices 155. Supported devices
166. Module dependencies 166. Module dependencies
177. Module loading 177. Module loading
188. Module paramaters 188. Module parameters
199. Contact information 199. Contact information
2010. Credits 2010. Credits
21 21
diff --git a/Documentation/video4linux/zr36120.txt b/Documentation/video4linux/zr36120.txt
index ac6d92d01944..1a1c2d03a5c8 100644
--- a/Documentation/video4linux/zr36120.txt
+++ b/Documentation/video4linux/zr36120.txt
@@ -118,9 +118,9 @@ card is not there, please try if any other card gives some
118response, and mail me if you got a working tvcard addition. 118response, and mail me if you got a working tvcard addition.
119 119
120PS. <TVCard editors behold!) 120PS. <TVCard editors behold!)
121 Dont forget to set video_input to the number of inputs 121 Don't forget to set video_input to the number of inputs
122 you defined in the video_mux part of the tvcard definition. 122 you defined in the video_mux part of the tvcard definition.
123 Its a common error to add a channel but not incrementing 123 It's a common error to add a channel but not incrementing
124 video_input and getting angry with me/v4l/linux/linus :( 124 video_input and getting angry with me/v4l/linux/linus :(
125 125
126You are now ready to test the framegrabber with your favorite 126You are now ready to test the framegrabber with your favorite
diff --git a/Documentation/vm/numa b/Documentation/vm/numa
index 4b8db1bd3b78..e93ad9425e2a 100644
--- a/Documentation/vm/numa
+++ b/Documentation/vm/numa
@@ -22,7 +22,7 @@ The initial port includes NUMAizing the bootmem allocator code by
22encapsulating all the pieces of information into a bootmem_data_t 22encapsulating all the pieces of information into a bootmem_data_t
23structure. Node specific calls have been added to the allocator. 23structure. Node specific calls have been added to the allocator.
24In theory, any platform which uses the bootmem allocator should 24In theory, any platform which uses the bootmem allocator should
25be able to to put the bootmem and mem_map data structures anywhere 25be able to put the bootmem and mem_map data structures anywhere
26it deems best. 26it deems best.
27 27
28Each node's page allocation data structures have also been encapsulated 28Each node's page allocation data structures have also been encapsulated
diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt
index 958ff3d48be3..7e8ae83e9847 100644
--- a/Documentation/watchdog/watchdog-api.txt
+++ b/Documentation/watchdog/watchdog-api.txt
@@ -45,7 +45,7 @@ daemon and it crashes the system will not reboot. Because of this,
45some of the drivers support the configuration option "Disable watchdog 45some of the drivers support the configuration option "Disable watchdog
46shutdown on close", CONFIG_WATCHDOG_NOWAYOUT. If it is set to Y when 46shutdown on close", CONFIG_WATCHDOG_NOWAYOUT. If it is set to Y when
47compiling the kernel, there is no way of disabling the watchdog once 47compiling the kernel, there is no way of disabling the watchdog once
48it has been started. So, if the watchdog dameon crashes, the system 48it has been started. So, if the watchdog daemon crashes, the system
49will reboot after the timeout has passed. 49will reboot after the timeout has passed.
50 50
51Some other drivers will not disable the watchdog, unless a specific 51Some other drivers will not disable the watchdog, unless a specific
@@ -207,7 +207,7 @@ Note that not all devices support these two calls, and some only
207support the GETBOOTSTATUS call. 207support the GETBOOTSTATUS call.
208 208
209Some drivers can measure the temperature using the GETTEMP ioctl. The 209Some drivers can measure the temperature using the GETTEMP ioctl. The
210returned value is the temperature in degrees farenheit. 210returned value is the temperature in degrees fahrenheit.
211 211
212 int temperature; 212 int temperature;
213 ioctl(fd, WDIOC_GETTEMP, &temperature); 213 ioctl(fd, WDIOC_GETTEMP, &temperature);
@@ -258,13 +258,13 @@ booke_wdt.c -- PowerPC BookE Watchdog Timer
258 Timeout default varies according to frequency, supports 258 Timeout default varies according to frequency, supports
259 SETTIMEOUT 259 SETTIMEOUT
260 260
261 Watchdog can not be turned off, CONFIG_WATCHDOG_NOWAYOUT 261 Watchdog cannot be turned off, CONFIG_WATCHDOG_NOWAYOUT
262 does not make sense 262 does not make sense
263 263
264 GETSUPPORT returns the watchdog_info struct, and 264 GETSUPPORT returns the watchdog_info struct, and
265 GETSTATUS returns the supported options. GETBOOTSTATUS 265 GETSTATUS returns the supported options. GETBOOTSTATUS
266 returns a 1 if the last reset was caused by the 266 returns a 1 if the last reset was caused by the
267 watchdog and a 0 otherwise. This watchdog can not be 267 watchdog and a 0 otherwise. This watchdog cannot be
268 disabled once it has been started. The wdt_period kernel 268 disabled once it has been started. The wdt_period kernel
269 parameter selects which bit of the time base changing 269 parameter selects which bit of the time base changing
270 from 0->1 will trigger the watchdog exception. Changing 270 from 0->1 will trigger the watchdog exception. Changing
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 74b77f9e91bc..f3c57f43ba64 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -109,7 +109,7 @@ Idle loop
109Rebooting 109Rebooting
110 110
111 reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old] 111 reboot=b[ios] | t[riple] | k[bd] [, [w]arm | [c]old]
112 bios Use the CPU reboto vector for warm reset 112 bios Use the CPU reboot vector for warm reset
113 warm Don't set the cold reboot flag 113 warm Don't set the cold reboot flag
114 cold Set the cold reboot flag 114 cold Set the cold reboot flag
115 triple Force a triple fault (init) 115 triple Force a triple fault (init)
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
534 bool "Discontiguous Memory Support (EXPERIMENTAL)" 534 bool "Discontiguous Memory Support (EXPERIMENTAL)"
535 depends on EXPERIMENTAL 535 depends on EXPERIMENTAL
536 help 536 help
537 Say Y to upport efficient handling of discontiguous physical memory, 537 Say Y to support efficient handling of discontiguous physical memory,
538 for architectures which are either NUMA (Non-Uniform Memory Access) 538 for architectures which are either NUMA (Non-Uniform Memory Access)
539 or have huge holes in the physical address space for other reasons. 539 or have huge holes in the physical address space for other reasons.
540 See <file:Documentation/vm/numa> for more. 540 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 @@
1/* 1/*
2 * linux/arch/alpha/kernel/ksyms.c 2 * linux/arch/alpha/kernel/alpha_ksyms.c
3 * 3 *
4 * Export the alpha-specific functions that are needed for loadable 4 * Export the alpha-specific functions that are needed for loadable
5 * modules. 5 * 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 @@
1/* 1/*
2 * alpha/boot/head.S 2 * arch/alpha/kernel/head.S
3 * 3 *
4 * initial boot stuff.. At this point, the bootloader has already 4 * initial boot stuff.. At this point, the bootloader has already
5 * switched into OSF/1 PAL-code, and loaded us at the correct address 5 * 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 @@
1/* 1/*
2 * linux/arch/alpha/kernel/machvec.h 2 * linux/arch/alpha/kernel/machvec_impl.h
3 * 3 *
4 * Copyright (C) 1997, 1998 Richard Henderson 4 * Copyright (C) 1997, 1998 Richard Henderson
5 * 5 *
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 @@
1/* 1/*
2 * arch/alpha/lib/stackcheck.S 2 * arch/alpha/lib/dbg_stackcheck.S
3 * Contributed by Richard Henderson (rth@tamu.edu) 3 * Contributed by Richard Henderson (rth@tamu.edu)
4 * 4 *
5 * Verify that we have not overflowed the stack. Oops if we have. 5 * 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 @@
1/* 1/*
2 * arch/alpha/lib/killstack.S 2 * arch/alpha/lib/dbg_stackkill.S
3 * Contributed by Richard Henderson (rth@cygnus.com) 3 * Contributed by Richard Henderson (rth@cygnus.com)
4 * 4 *
5 * Clobber the balance of the kernel stack, hoping to catch 5 * 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 @@
1/* 1/*
2 * linux/arch/alpha/memset.S 2 * linux/arch/alpha/lib/memset.S
3 * 3 *
4 * This is an efficient (and small) implementation of the C library "memset()" 4 * This is an efficient (and small) implementation of the C library "memset()"
5 * function for the alpha. 5 * 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
629 depends on CPU_CP15_MMU 629 depends on CPU_CP15_MMU
630 default y if !ARCH_EBSA110 630 default y if !ARCH_EBSA110
631 help 631 help
632 ARM processors can not fetch/store information which is not 632 ARM processors cannot fetch/store information which is not
633 naturally aligned on the bus, i.e., a 4 byte fetch must start at an 633 naturally aligned on the bus, i.e., a 4 byte fetch must start at an
634 address divisible by 4. On 32-bit ARM processors, these non-aligned 634 address divisible by 4. On 32-bit ARM processors, these non-aligned
635 fetch/store instructions will be emulated in software if you say 635 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 @@
1/* 1/*
2 * linux/arch/arm/boot/compressed/head.S 2 * linux/arch/arm/boot/compressed/head-clps7500.S
3 * 3 *
4 * Copyright (C) 1999, 2000, 2001 Nexus Electronics Ltd 4 * Copyright (C) 1999, 2000, 2001 Nexus Electronics Ltd
5 */ 5 */
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 @@
1/* 1/*
2 * linux/arch/arm/mach-sa1100/sa1111.c 2 * linux/arch/arm/common/sa1111.c
3 * 3 *
4 * SA1111 support 4 * SA1111 support
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/arm/mach-imx/leds.h 2 * linux/arch/arm/mach-imx/leds.c
3 * 3 *
4 * Copyright (C) 2004 Sascha Hauer <sascha@saschahauer.de> 4 * Copyright (C) 2004 Sascha Hauer <sascha@saschahauer.de>
5 * 5 *
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 @@
1/* 1/*
2 * include/asm-arm/arch-imx/leds.h 2 * arch/arm/mach-imx/leds.h
3 * 3 *
4 * Copyright (c) 2004 Sascha Hauer <sascha@saschahauer.de> 4 * Copyright (c) 2004 Sascha Hauer <sascha@saschahauer.de>
5 * 5 *
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 @@
1/* 1/*
2 * arch/arch/mach-ixp4xx/coyote-pci.c 2 * arch/arm/mach-ixp4xx/coyote-pci.c
3 * 3 *
4 * PCI setup routines for ADI Engineering Coyote platform 4 * PCI setup routines for ADI Engineering Coyote platform
5 * 5 *
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 @@
1/* 1/*
2 * arch/arch/mach-ixp4xx/ixdpg425-pci.c 2 * arch/arm/mach-ixp4xx/ixdpg425-pci.c
3 * 3 *
4 * PCI setup routines for Intel IXDPG425 Platform 4 * PCI setup routines for Intel IXDPG425 Platform
5 * 5 *
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/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 @@
1/* 1/*
2 * linux/arch/arm/mach-omap1/id.c 2 * linux/arch/arm/mach-omap1/serial.c
3 * 3 *
4 * OMAP1 CPU identification code 4 * OMAP1 CPU identification code
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/arm/mach-omap/omap2/board-apollon.c 2 * linux/arch/arm/mach-omap2/board-apollon.c
3 * 3 *
4 * Copyright (C) 2005,2006 Samsung Electronics 4 * Copyright (C) 2005,2006 Samsung Electronics
5 * Author: Kyungmin Park <kyungmin.park@samsung.com> 5 * 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 @@
1/* 1/*
2 * linux/arch/arm/mach-omap/omap2/board-generic.c 2 * linux/arch/arm/mach-omap2/board-generic.c
3 * 3 *
4 * Copyright (C) 2005 Nokia Corporation 4 * Copyright (C) 2005 Nokia Corporation
5 * Author: Paul Mundt <paul.mundt@nokia.com> 5 * 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 @@
1/* 1/*
2 * linux/arch/arm/mach-omap/omap2/board-h4.c 2 * linux/arch/arm/mach-omap2/board-h4.c
3 * 3 *
4 * Copyright (C) 2005 Nokia Corporation 4 * Copyright (C) 2005 Nokia Corporation
5 * Author: Paul Mundt <paul.mundt@nokia.com> 5 * 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 @@
1/* 1/*
2 * linux/arch/arm/mach-omap/omap2/irq.c 2 * linux/arch/arm/mach-omap2/irq.c
3 * 3 *
4 * Interrupt handler for OMAP2 boards. 4 * Interrupt handler for OMAP2 boards.
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/arm/mach-omap2/prcm-reg.h 2 * linux/arch/arm/mach-omap2/prcm-regs.h
3 * 3 *
4 * OMAP24XX Power Reset and Clock Management (PRCM) registers 4 * OMAP24XX Power Reset and Clock Management (PRCM) registers
5 * 5 *
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 @@
1/* 1/*
2 * arch/arm/mach-omap/omap2/serial.c 2 * arch/arm/mach-omap2/serial.c
3 * 3 *
4 * OMAP2 serial support. 4 * OMAP2 serial support.
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/arm/mach-omap2/sram.S 2 * linux/arch/arm/mach-omap2/sram-fn.S
3 * 3 *
4 * Omap2 specific functions that need to be run in internal SRAM 4 * Omap2 specific functions that need to be run in internal SRAM
5 * 5 *
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 @@
1/* 1/*
2 * linux/drivers/video/w100fb.c 2 * linux/arch/arm/mach-pxa/corgi_lcd.c
3 * 3 *
4 * Corgi/Spitz LCD Specific Code 4 * Corgi/Spitz LCD Specific Code
5 * 5 *
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 @@
1/* 1/*
2 * include/asm-arm/arch-pxa/leds.h 2 * arch/arm/mach-pxa/leds.h
3 * 3 *
4 * Copyright (c) 2001 Jeff Sutherland, Accelent Systems Inc. 4 * Copyright (c) 2001 Jeff Sutherland, Accelent Systems Inc.
5 * 5 *
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
13 bool "Simtec Electronics ANUBIS" 13 bool "Simtec Electronics ANUBIS"
14 select CPU_S3C2440 14 select CPU_S3C2440
15 help 15 help
16 Say Y gere if you are using the Simtec Electronics ANUBIS 16 Say Y here if you are using the Simtec Electronics ANUBIS
17 development system 17 development system
18 18
19config MACH_OSIRIS 19config 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 @@
1/* linux/arch/arm/mach-s3c2410/gpio.c 1/* linux/arch/arm/mach-s3c2410/s3c2400-gpio.c
2 * 2 *
3 * Copyright (c) 2006 Lucas Correia Villa Real <lucasvr@gobolinux.org> 3 * Copyright (c) 2006 Lucas Correia Villa Real <lucasvr@gobolinux.org>
4 * 4 *
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 @@
1/* linux/arch/arm/mach-s3c2410/clock.c 1/* linux/arch/arm/mach-s3c2410/s3c2410-clock.c
2 * 2 *
3 * Copyright (c) 2006 Simtec Electronics 3 * Copyright (c) 2006 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk> 4 * 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 @@
1/* linux/arch/arm/mach-s3c2410/gpio.c 1/* linux/arch/arm/mach-s3c2410/s3c2410-gpio.c
2 * 2 *
3 * Copyright (c) 2004-2006 Simtec Electronics 3 * Copyright (c) 2004-2006 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk> 4 * 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 @@
1/* linux/arch/arm/mach-s3c2410/s3c2440.c 1/* linux/arch/arm/mach-s3c2410/s3c2442.c
2 * 2 *
3 * Copyright (c) 2006 Simtec Electronics 3 * Copyright (c) 2006 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk> 4 * 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 @@
1/* linux/arch/arm/mach-s3c2410/s3c2440-irq.c 1/* linux/arch/arm/mach-s3c2410/s3c244x-irq.c
2 * 2 *
3 * Copyright (c) 2003,2004 Simtec Electronics 3 * Copyright (c) 2003,2004 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk> 4 * 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 @@
1/* arch/arm/mach-s3c2410/s3c2440.h 1/* arch/arm/mach-s3c2410/s3c244x.h
2 * 2 *
3 * Copyright (c) 2004-2005 Simtec Electronics 3 * Copyright (c) 2004-2005 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk> 4 * 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 @@
1/* linux/arch/arm/mach-s3c2410/usb-simtec.c 1/* linux/arch/arm/mach-s3c2410/usb-simtec.h
2 * 2 *
3 * Copyright (c) 2004 Simtec Electronics 3 * Copyright (c) 2004 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk> 4 * 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 @@
1/* 1/*
2 * arch/arm/kernel/dma-sa1100.c 2 * arch/arm/mach-sa1100/dma.c
3 * 3 *
4 * Support functions for the SA11x0 internal DMA channels. 4 * Support functions for the SA11x0 internal DMA channels.
5 * 5 *
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 @@
1/* 1/*
2 * arch/arm/kernel/leds-shark.c 2 * arch/arm/mach-shark/leds.c
3 * by Alexander Schulz 3 * by Alexander Schulz
4 * 4 *
5 * derived from: 5 * 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 @@
1/* 1/*
2 * linux/arch/arm/plat-omap/sram.S 2 * linux/arch/arm/plat-omap/sram-fn.S
3 * 3 *
4 * Functions that need to be run in internal SRAM 4 * Functions that need to be run in internal SRAM
5 * 5 *
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
550 select BLK_DEV_IDEDMA 550 select BLK_DEV_IDEDMA
551 help 551 help
552 Enable this to get support for ATA/IDE. 552 Enable this to get support for ATA/IDE.
553 You can't use paralell ports or SCSI ports 553 You can't use parallel ports or SCSI ports
554 at the same time. 554 at the same time.
555 555
556 556
@@ -744,7 +744,7 @@ config ETRAX_PA_CHANGEABLE_BITS
744 default "FF" 744 default "FF"
745 help 745 help
746 This is a bitmask with information of what bits in PA that a user 746 This is a bitmask with information of what bits in PA that a user
747 can change change the value on using ioctl's. 747 can change the value on using ioctl's.
748 Bit set = changeable. 748 Bit set = changeable.
749 You probably want 00 here. 749 You probably want 00 here.
750 750
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
162 depends on ETRAX_ARCH_V32 162 depends on ETRAX_ARCH_V32
163 default "0" 163 default "0"
164 help 164 help
165 SDRAM configuration for group 1. The defult value is 0 165 SDRAM configuration for group 1. The default value is 0
166 because group 1 is not used in the default configuration, 166 because group 1 is not used in the default configuration,
167 described in the help for SDRAM_GRP0_CONFIG. 167 described in the help for SDRAM_GRP0_CONFIG.
168 168
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 @@
1/* 1/*
2 * linux/arch/h8300/platform/h8300h/ints.c 2 * linux/arch/h8300/kernel/ints.c
3 * 3 *
4 * Yoshinori Sato <ysato@users.sourceforge.jp> 4 * Yoshinori Sato <ysato@users.sourceforge.jp>
5 * 5 *
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/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:
669 */ 669 */
670 atomic_inc(&init_mm.mm_count); 670 atomic_inc(&init_mm.mm_count);
671 current->active_mm = &init_mm; 671 current->active_mm = &init_mm;
672 if (current->mm) 672 BUG_ON(current->mm);
673 BUG();
674 enter_lazy_tlb(&init_mm, current); 673 enter_lazy_tlb(&init_mm, current);
675 674
676 load_esp0(t, thread); 675 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)
498 check_range_for_systab(md); 498 check_range_for_systab(md);
499 } 499 }
500 500
501 if (!efi.systab) 501 BUG_ON(!efi.systab);
502 BUG();
503 502
504 status = phys_efi_set_virtual_address_map( 503 status = phys_efi_set_virtual_address_map(
505 memmap.desc_size * memmap.nr_map, 504 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 @@
1/* 1/*
2 * linux/kernel/ldt.c 2 * linux/arch/i386/kernel/ldt.c
3 * 3 *
4 * Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds 4 * Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
5 * Copyright (C) 1999 Ingo Molnar <mingo@redhat.com> 5 * 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 @@
1/* 1/*
2 * linux/arch/i386/mach_visws/visws_apic.c 2 * linux/arch/i386/mach-visws/visws_apic.c
3 * 3 *
4 * Copyright (C) 1999 Bent Hagemark, Ingo Molnar 4 * Copyright (C) 1999 Bent Hagemark, Ingo Molnar
5 * 5 *
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)
153 */ 153 */
154 if (node_start_pfn[nid] > max_pfn) 154 if (node_start_pfn[nid] > max_pfn)
155 node_start_pfn[nid] = max_pfn; 155 node_start_pfn[nid] = max_pfn;
156 if (node_start_pfn[nid] > node_end_pfn[nid]) 156 BUG_ON(node_start_pfn[nid] > node_end_pfn[nid]);
157 BUG();
158} 157}
159 158
160/* 159/*
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)
569 int bad_ppro; 569 int bad_ppro;
570 570
571#ifdef CONFIG_FLATMEM 571#ifdef CONFIG_FLATMEM
572 if (!mem_map) 572 BUG_ON(!mem_map);
573 BUG();
574#endif 573#endif
575 574
576 bad_ppro = ppro_with_ram_bug(); 575 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);
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/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 @@
1/* 1/*
2 * arch/ia64/kernel/cpufreq/processor.c 2 * arch/ia64/kernel/acpi-processor.c
3 * 3 *
4 * Copyright (C) 2005 Intel Corporation 4 * Copyright (C) 2005 Intel Corporation
5 * Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> 5 * 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 @@
1/* 1/*
2 * ia64/kernel/entry.S 2 * arch/ia64/kernel/entry.S
3 * 3 *
4 * Kernel entry points. 4 * Kernel entry points.
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/ia64/kernel/irq.c 2 * linux/arch/ia64/kernel/irq_ia64.c
3 * 3 *
4 * Copyright (C) 1998-2001 Hewlett-Packard Co 4 * Copyright (C) 1998-2001 Hewlett-Packard Co
5 * Stephane Eranian <eranian@hpl.hp.com> 5 * 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)
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/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 @@
1/* 1/*
2 * linux/arch/m68k/motorola.c 2 * linux/arch/m68k/mm/motorola.c
3 * 3 *
4 * Routines specific to the Motorola MMU, originally from: 4 * Routines specific to the Motorola MMU, originally from:
5 * linux/arch/m68k/init.c 5 * 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 @@
1/* 1/*
2 * linux/arch/m68k/mm/sun3dvma.c 2 * linux/arch/m68k/sun3/sun3dvma.c
3 * 3 *
4 * Copyright (C) 2000 Sam Creasey 4 * Copyright (C) 2000 Sam Creasey
5 * 5 *
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
161 frequency, it may or may not be the same as the external clock 161 frequency, it may or may not be the same as the external clock
162 crystal fitted to your board. Some processors have an internal 162 crystal fitted to your board. Some processors have an internal
163 PLL and can have their frequency programmed at run time, others 163 PLL and can have their frequency programmed at run time, others
164 use internal dividers. In gernal the kernel won't setup a PLL 164 use internal dividers. In general the kernel won't setup a PLL
165 if it is fitted (there are some expections). This value will be 165 if it is fitted (there are some exceptions). This value will be
166 specific to the exact CPU that you are using. 166 specific to the exact CPU that you are using.
167 167
168config CLOCK_DIV 168config CLOCK_DIV
@@ -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/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 @@
1/* 1/*
2 * linux/arch/m68knommu/platform/68328/head-rom.S 2 * linux/arch/m68knommu/platform/68328/head-pilot.S
3 * - A startup file for the MC68328 3 * - A startup file for the MC68328
4 * 4 *
5 * Copyright (C) 1998 D. Jeff Dionne <jeff@ryeham.ee.ryerson.ca>, 5 * 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 @@
1/* 1/*
2 * arch/mips/dec/call_o32.S 2 * arch/mips/dec/prom/call_o32.S
3 * 3 *
4 * O32 interface for the 64 (or N32) ABI. 4 * O32 interface for the 64 (or N32) ABI.
5 * 5 *
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/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 @@
1/* 1/*
2 * arch/mips/vr41xx/nec-cmbvr4133/pci_fixup.c 2 * arch/mips/pci/fixup-vr4133.c
3 * 3 *
4 * The NEC CMB-VR4133 Board specific PCI fixups. 4 * The NEC CMB-VR4133 Board specific PCI fixups.
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/mps/tx4938/common/irq.c 2 * linux/arch/mips/tx4938/common/irq.c
3 * 3 *
4 * Common tx4938 irq handler 4 * Common tx4938 irq handler
5 * Copyright (C) 2000-2001 Toshiba Corporation 5 * 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:
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/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 @@
1/* kernel/perfmon_fsl_booke.c 1/* arch/powerpc/kernel/perfmon_fsl_booke.c
2 * Freescale Book-E Performance Monitor code 2 * Freescale Book-E Performance Monitor code
3 * 3 *
4 * Author: Andy Fleming 4 * 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 @@
1/* 1/*
2 * oprofile/op_model_7450.c 2 * arch/powerpc/oprofile/op_model_7450.c
3 * 3 *
4 * Freescale 745x/744x oprofile support, based on fsl_booke support 4 * Freescale 745x/744x oprofile support, based on fsl_booke support
5 * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM 5 * 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 @@
1/* 1/*
2 * oprofile/op_model_e500.c 2 * arch/powerpc/oprofile/op_model_fsl_booke.c
3 * 3 *
4 * Freescale Book-E oprofile support, based on ppc64 oprofile support 4 * Freescale Book-E oprofile support, based on ppc64 oprofile support
5 * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM 5 * 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 @@
1/* 1/*
2 * arch/powerppc/platforms/83xx/mpc834x_sys.h 2 * arch/powerpc/platforms/83xx/mpc834x_sys.h
3 * 3 *
4 * MPC834X SYS common board definitions 4 * MPC834X SYS common board definitions
5 * 5 *
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 @@
1/* 1/*
2 * arch/ppc/platforms/85xx/mpc8540_ads.h 2 * arch/powerpc/platforms/85xx/mpc8540_ads.h
3 * 3 *
4 * MPC8540ADS board definitions 4 * MPC8540ADS board definitions
5 * 5 *
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 @@
1/* 1/*
2 * arch/ppc/platforms/85xx/mpc85xx.h 2 * arch/powerpc/platforms/85xx/mpc85xx.h
3 * 3 *
4 * MPC85xx soc definitions/function decls 4 * MPC85xx soc definitions/function decls
5 * 5 *
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 @@
1/* 1/*
2 * arch/ppc/platforms/85xx/mpc85xx_cds_common.h 2 * arch/powerpc/platforms/85xx/mpc85xx_cds.h
3 * 3 *
4 * MPC85xx CDS board definitions 4 * MPC85xx CDS board definitions
5 * 5 *
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 @@
1/* 1/*
2 * include/asm-ppc/ipic.c 2 * arch/powerpc/sysdev/ipic.c
3 * 3 *
4 * IPIC routines implementations. 4 * IPIC routines implementations.
5 * 5 *
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/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 @@
1/* 1/*
2 * drivers/serial/mpsc/mpsc_defs.h 2 * arch/ppc/boot/include/mpsc_defs.h
3 * 3 *
4 * Register definitions for the Marvell Multi-Protocol Serial Controller (MPSC), 4 * Register definitions for the Marvell Multi-Protocol Serial Controller (MPSC),
5 * Serial DMA Controller (SDMA), and Baud Rate Generator (BRG). 5 * 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 @@
1/* 1/*
2 * include/asm-ppc/xparameters.h 2 * arch/ppc/platforms/4xx/xparameters/xparameters.h
3 * 3 *
4 * This file includes the correct xparameters.h for the CONFIG'ed board plus 4 * This file includes the correct xparameters.h for the CONFIG'ed board plus
5 * fixups to translate board specific XPAR values to a common set of names 5 * 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
24config MPC8548_CDS 24config MPC8548_CDS
25 bool "Freescale MPC8548 CDS" 25 bool "Freescale MPC8548 CDS"
26 help 26 help
27 This option enablese support for the MPC8548 CDS evaluation board. 27 This option enables support for the MPC8548 CDS evaluation board.
28 28
29config MPC8555_CDS 29config MPC8555_CDS
30 bool "Freescale MPC8555 CDS" 30 bool "Freescale MPC8555 CDS"
31 help 31 help
32 This option enablese support for the MPC8555 CDS evaluation board. 32 This option enables support for the MPC8555 CDS evaluation board.
33 33
34config MPC8560_ADS 34config MPC8560_ADS
35 bool "Freescale MPC8560 ADS" 35 bool "Freescale MPC8560 ADS"
@@ -51,22 +51,22 @@ config STX_GP3
51config TQM8540 51config TQM8540
52 bool "TQ Components TQM8540" 52 bool "TQ Components TQM8540"
53 help 53 help
54 This option enablese support for the TQ Components TQM8540 board. 54 This option enables support for the TQ Components TQM8540 board.
55 55
56config TQM8541 56config TQM8541
57 bool "TQ Components TQM8541" 57 bool "TQ Components TQM8541"
58 help 58 help
59 This option enablese support for the TQ Components TQM8541 board. 59 This option enables support for the TQ Components TQM8541 board.
60 60
61config TQM8555 61config TQM8555
62 bool "TQ Components TQM8555" 62 bool "TQ Components TQM8555"
63 help 63 help
64 This option enablese support for the TQ Components TQM8555 board. 64 This option enables support for the TQ Components TQM8555 board.
65 65
66config TQM8560 66config TQM8560
67 bool "TQ Components TQM8560" 67 bool "TQ Components TQM8560"
68 help 68 help
69 This option enablese support for the TQ Components TQM8560 board. 69 This option enables support for the TQ Components TQM8560 board.
70 70
71endchoice 71endchoice
72 72
@@ -94,7 +94,7 @@ config MPC8560
94 default y 94 default y
95 95
96config 85xx_PCI2 96config 85xx_PCI2
97 bool "Supprt for 2nd PCI host controller" 97 bool "Support for 2nd PCI host controller"
98 depends on MPC8555_CDS 98 depends on MPC8555_CDS
99 default y 99 default y
100 100
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 @@
1/* 1/*
2 * include/asm-ppc/lopec_serial.h 2 * arch/ppc/platforms/lopec.h
3 * 3 *
4 * Definitions for Motorola LoPEC board. 4 * Definitions for Motorola LoPEC board.
5 * 5 *
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 @@
1/* 1/*
2 * arch/ppc/platforms/82xx/pq2ads_pd.c 2 * arch/ppc/platforms/mpc8272ads_setup.c
3 * 3 *
4 * MPC82xx Board-specific PlatformDevice descriptions 4 * MPC82xx Board-specific PlatformDevice descriptions
5 * 5 *
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 @@
1/*arch/ppc/platforms/mpc885ads-setup.c 1/*arch/ppc/platforms/mpc885ads_setup.c
2 * 2 *
3 * Platform setup for the Freescale mpc885ads board 3 * Platform setup for the Freescale mpc885ads board
4 * 4 *
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 @@
1/* 1/*
2 * include/asm-ppc/platforms/mvme5100.h 2 * arch/ppc/platforms/mvme5100.h
3 * 3 *
4 * Definitions for Motorola MVME5100. 4 * Definitions for Motorola MVME5100.
5 * 5 *
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 @@
1/* 1/*
2 * include/asm-ppc/platforms/powerpmc250.h 2 * arch/ppc/platforms/powerpmc250.h
3 * 3 *
4 * Definitions for Force PowerPMC-250 board support 4 * Definitions for Force PowerPMC-250 board support
5 * 5 *
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 @@
1/* 1/*
2 * include/asm-ppc/platforms/prpmc750.h 2 * arch/ppc/platforms/prpmc750.h
3 * 3 *
4 * Definitions for Motorola PrPMC750 board support 4 * Definitions for Motorola PrPMC750 board support
5 * 5 *
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 @@
1/* 1/*
2 * include/asm-ppc/platforms/prpmc800.h 2 * arch/ppc/platforms/prpmc800.h
3 * 3 *
4 * Definitions for Motorola PrPMC800 board support 4 * Definitions for Motorola PrPMC800 board support
5 * 5 *
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 @@
1/* 1/*
2 * include/asm-ppc/platforms/spruce.h 2 * arch/ppc/platforms/spruce.h
3 * 3 *
4 * Definitions for IBM Spruce reference board support 4 * Definitions for IBM Spruce reference board support
5 * 5 *
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 @@
1/* 1/*
2 * include/asm-sh/io_bigsur.c 2 * arch/sh/boards/bigsur/io.c
3 * 3 *
4 * By Dustin McIntire (dustin@sensoria.com) (c)2001 4 * By Dustin McIntire (dustin@sensoria.com) (c)2001
5 * Derived from io_hd64465.h, which bore the message: 5 * 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 @@
1/* 1/*
2 * linux/arch/sh/kernel/led_bigsur.c 2 * linux/arch/sh/boards/bigsur/led.c
3 * 3 *
4 * By Dustin McIntire (dustin@sensoria.com) (c)2001 4 * By Dustin McIntire (dustin@sensoria.com) (c)2001
5 * Derived from led_se.c and led.c, which bore the message: 5 * 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 @@
1/* 1/*
2 * linux/arch/sh/kernel/io_ec3104.c 2 * linux/arch/sh/boards/ec3104/io.c
3 * EC3104 companion chip support 3 * EC3104 companion chip support
4 * 4 *
5 * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org> 5 * 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 @@
1/* 1/*
2 * linux/arch/sh/boards/hp6xx/hp680/setup.c 2 * linux/arch/sh/boards/hp6xx/setup.c
3 * 3 *
4 * Copyright (C) 2002 Andriy Skulysh 4 * Copyright (C) 2002 Andriy Skulysh
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/kernel/led_mpc1211.c 2 * linux/arch/sh/boards/mpc1211/led.c
3 * 3 *
4 * Copyright (C) 2001 Saito.K & Jeanne 4 * Copyright (C) 2001 Saito.K & Jeanne
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/board/mpc1211/setup.c 2 * linux/arch/sh/boards/mpc1211/setup.c
3 * 3 *
4 * Copyright (C) 2002 Saito.K & Jeanne, Fujii.Y 4 * Copyright (C) 2002 Saito.K & Jeanne, Fujii.Y
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/kernel/io_hs7751rvoip.c 2 * linux/arch/sh/boards/renesas/hs7751rvoip/io.c
3 * 3 *
4 * Copyright (C) 2001 Ian da Silva, Jeremy Siegel 4 * Copyright (C) 2001 Ian da Silva, Jeremy Siegel
5 * Based largely on io_se.c. 5 * 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 @@
1/* 1/*
2 * linux/arch/sh/kernel/pci-hs7751rvoip.c 2 * linux/arch/sh/boards/renesas/hs7751rvoip/pci.c
3 * 3 *
4 * Author: Ian DaSilva (idasilva@mvista.com) 4 * Author: Ian DaSilva (idasilva@mvista.com)
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/kernel/led_rts7751r2d.c 2 * linux/arch/sh/boards/renesas/rts7751r2d/led.c
3 * 3 *
4 * Copyright (C) Atom Create Engineering Co., Ltd. 4 * Copyright (C) Atom Create Engineering Co., Ltd.
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/boards/systemh/io.c 2 * linux/arch/sh/boards/renesas/systemh/io.c
3 * 3 *
4 * Copyright (C) 2001 Ian da Silva, Jeremy Siegel 4 * Copyright (C) 2001 Ian da Silva, Jeremy Siegel
5 * Based largely on io_se.c. 5 * 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 @@
1/* 1/*
2 * linux/arch/sh/boards/systemh/irq.c 2 * linux/arch/sh/boards/renesas/systemh/irq.c
3 * 3 *
4 * Copyright (C) 2000 Kazumoto Kojima 4 * Copyright (C) 2000 Kazumoto Kojima
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/boards/systemh/setup.c 2 * linux/arch/sh/boards/renesas/systemh/setup.c
3 * 3 *
4 * Copyright (C) 2000 Kazumoto Kojima 4 * Copyright (C) 2000 Kazumoto Kojima
5 * Copyright (C) 2003 Paul Mundt 5 * 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 @@
1/* 1/*
2 * linux/arch/sh/kernel/led_se.c 2 * linux/arch/sh/boards/se/770x/led.c
3 * 3 *
4 * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com> 4 * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com>
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/kernel/led_se.c 2 * linux/arch/sh/boards/se/7751/led.c
3 * 3 *
4 * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com> 4 * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com>
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/kernel/pci-7751se.c 2 * linux/arch/sh/boards/se/7751/pci.c
3 * 3 *
4 * Author: Ian DaSilva (idasilva@mvista.com) 4 * Author: Ian DaSilva (idasilva@mvista.com)
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/kernel/io_microdev.c 2 * linux/arch/sh/boards/superh/microdev/io.c
3 * 3 *
4 * Copyright (C) 2003 Sean McGoogan (Sean.McGoogan@superh.com) 4 * Copyright (C) 2003 Sean McGoogan (Sean.McGoogan@superh.com)
5 * Copyright (C) 2003, 2004 SuperH, Inc. 5 * 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 @@
1/* 1/*
2 * linux/arch/sh/kernel/led_microdev.c 2 * linux/arch/sh/boards/superh/microdev/led.c
3 * 3 *
4 * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com> 4 * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
5 * Copyright (C) 2003 Richard Curnow (Richard.Curnow@superh.com) 5 * 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 @@
1/* 1/*
2 * arch/sh/boards/dreamcast/dma-pvr2.c 2 * arch/sh/drivers/dma/dma-pvr2.c
3 * 3 *
4 * NEC PowerVR 2 (Dreamcast) DMA support 4 * NEC PowerVR 2 (Dreamcast) DMA support
5 * 5 *
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 @@
1/* 1/*
2 * arch/sh/pci/dma-dreamcast.c 2 * arch/sh/drivers/pci/dma-dreamcast.c
3 * 3 *
4 * PCI DMA support for the Sega Dreamcast 4 * PCI DMA support for the Sega Dreamcast
5 * 5 *
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 @@
1/* 1/*
2 * arch/sh/pci/fixups-dreamcast.c 2 * arch/sh/drivers/pci/fixups-dreamcast.c
3 * 3 *
4 * PCI fixups for the Sega Dreamcast 4 * PCI fixups for the Sega Dreamcast
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/kernel/pci-bigsur.c 2 * linux/arch/sh/drivers/pci/ops-bigsur.c
3 * 3 *
4 * By Dustin McIntire (dustin@sensoria.com) (c)2001 4 * By Dustin McIntire (dustin@sensoria.com) (c)2001
5 * 5 *
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 @@
1/* 1/*
2 * arch/sh/pci/ops-dreamcast.c 2 * arch/sh/drivers/pci/ops-dreamcast.c
3 * 3 *
4 * PCI operations for the Sega Dreamcast 4 * PCI operations for the Sega Dreamcast
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sh/kernel/pci-rts7751r2d.c 2 * linux/arch/sh/drivers/pci/ops-rts7751r2d.c
3 * 3 *
4 * Author: Ian DaSilva (idasilva@mvista.com) 4 * Author: Ian DaSilva (idasilva@mvista.com)
5 * 5 *
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 @@
1/* 1/*
2 * arch/sh/kernel/ubc.S 2 * arch/sh/kernel/cpu/ubc.S
3 * 3 *
4 * Set of management routines for the User Break Controller (UBC) 4 * Set of management routines for the User Break Controller (UBC)
5 * 5 *
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 @@
1/* 1/*
2 * arch/shmedia/boot/compressed/misc.c 2 * arch/sh64/boot/compressed/misc.c
3 * 3 *
4 * This is a collection of several routines from gzip-1.0.3 4 * This is a collection of several routines from gzip-1.0.3
5 * adapted for Linux. 5 * 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 @@
1/* 1/*
2 * arch/sh64/kernel/alpanum.c 2 * arch/sh64/kernel/alphanum.c
3 * 3 *
4 * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com> 4 * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
5 * 5 *
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 @@
1/* 1/*
2 * arch/sh/lib/csum_parial.c 2 * arch/sh64/lib/c-checksum.c
3 * 3 *
4 * This file contains network checksum routines that are better done 4 * This file contains network checksum routines that are better done
5 * in an architecture-specific manner due to speed.. 5 * 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 @@
1/* 1/*
2 * arch/sh64/kernel/led_cayman.c 2 * arch/sh64/mach-cayman/led.c
3 * 3 *
4 * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com> 4 * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
5 * 5 *
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 @@
1/* 1/*
2 * arch/sh/oprofile/op_model_null.c 2 * arch/sh64/oprofile/op_model_null.c
3 * 3 *
4 * Copyright (C) 2003 Paul Mundt 4 * Copyright (C) 2003 Paul Mundt
5 * 5 *
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 @@
1/* 1/*
2 * linux/arch/sparc/sys_solaris.c 2 * linux/arch/sparc/kernel/sys_solaris.c
3 * 3 *
4 * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx) 4 * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
5 */ 5 */
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
257 UML and spend long times with UML stopped at a breakpoint. In this 257 UML and spend long times with UML stopped at a breakpoint. In this
258 case, when UML is restarted, it will call the timer enough times to make 258 case, when UML is restarted, it will call the timer enough times to make
259 up for the time spent at the breakpoint. This could result in a 259 up for the time spent at the breakpoint. This could result in a
260 noticable lag. If this is a problem, then disable this option. 260 noticeable lag. If this is a problem, then disable this option.
261 261
262endmenu 262endmenu
263 263
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/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
310 help 310 help
311 Enable K8 NUMA node topology detection. You should say Y here if 311 Enable K8 NUMA node topology detection. You should say Y here if
312 you have a multi processor AMD K8 system. This uses an old 312 you have a multi processor AMD K8 system. This uses an old
313 method to read the NUMA configurtion directly from the builtin 313 method to read the NUMA configuration directly from the builtin
314 Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA 314 Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
315 instead, which also takes priority if both are compiled in. 315 instead, which also takes priority if both are compiled in.
316 316
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"
206 206
207endmenu 207endmenu
208 208
209menu "Exectuable file formats" 209menu "Executable file formats"
210 210
211# only elf supported 211# only elf supported
212config KCORE_ELF 212config KCORE_ELF
@@ -241,7 +241,7 @@ menu "Xtensa initrd options"
241 bool "Embed root filesystem ramdisk into the kernel" 241 bool "Embed root filesystem ramdisk into the kernel"
242 242
243config EMBEDDED_RAMDISK_IMAGE 243config EMBEDDED_RAMDISK_IMAGE
244 string "Filename of gziped ramdisk image" 244 string "Filename of gzipped ramdisk image"
245 depends on EMBEDDED_RAMDISK 245 depends on EMBEDDED_RAMDISK
246 default "ramdisk.gz" 246 default "ramdisk.gz"
247 help 247 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 @@
1/* 1/*
2 * arch/xtensa/kernel/platform.c 2 * arch/xtensa/kernel/module.c
3 * 3 *
4 * Module support. 4 * Module support.
5 * 5 *
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 @@
1/* 1/*
2 * arch/xtensa/pci-dma.c 2 * arch/xtensa/kernel/pci-dma.c
3 * 3 *
4 * DMA coherent memory allocation. 4 * DMA coherent memory allocation.
5 * 5 *
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 @@
1/* 1/*
2 * arch/xtensa/pcibios.c 2 * arch/xtensa/kernel/pci.c
3 * 3 *
4 * PCI bios-type initialisation for PCI machines 4 * PCI bios-type initialisation for PCI machines
5 * 5 *
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 @@
1/* 1/*
2 * arch/xtensa/setup.c 2 * arch/xtensa/kernel/setup.c
3 * 3 *
4 * This file is subject to the terms and conditions of the GNU General Public 4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive 5 * 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 @@
1/* 1/*
2 * arch/xtensa/kernel/syscall.c 2 * arch/xtensa/kernel/syscalls.c
3 * 3 *
4 * This file is subject to the terms and conditions of the GNU General Public 4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive 5 * 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 @@
1/* 1/*
2 * arch/xtensa/kernel/pci-auto.c 2 * arch/xtensa/lib/pci-auto.c
3 * 3 *
4 * PCI autoconfiguration library 4 * PCI autoconfiguration library
5 * 5 *
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 *
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 @@
1/* 1/*
2 * arch/xtensa/mm/fault.c 2 * arch/xtensa/mm/pgtable.c
3 * 3 *
4 * This file is subject to the terms and conditions of the GNU General Public 4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive 5 * 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 @@
1/* 1/*
2 * arch/xtensa/mm/mmu.c 2 * arch/xtensa/mm/tlb.c
3 * 3 *
4 * Logic that manipulates the Xtensa MMU. Derived from MIPS. 4 * Logic that manipulates the Xtensa MMU. Derived from MIPS.
5 * 5 *
diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c
index 3dd6b7bb5d35..1bace29f4b6a 100644
--- a/drivers/acorn/block/mfmhd.c
+++ b/drivers/acorn/block/mfmhd.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/arm/drivers/block/mfmhd.c 2 * linux/drivers/acorn/block/mfmhd.c
3 * 3 *
4 * Copyright (C) 1995, 1996 Russell King, Dave Alan Gilbert (gilbertd@cs.man.ac.uk) 4 * Copyright (C) 1995, 1996 Russell King, Dave Alan Gilbert (gilbertd@cs.man.ac.uk)
5 * 5 *
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 56c5ba874623..0f9d4be7ed75 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -253,7 +253,7 @@ config ACPI_CUSTOM_DSDT
253 depends on !STANDALONE 253 depends on !STANDALONE
254 default n 254 default n
255 help 255 help
256 Thist option is to load a custom ACPI DSDT 256 This option is to load a custom ACPI DSDT
257 If you don't know what that is, say N. 257 If you don't know what that is, say N.
258 258
259config ACPI_CUSTOM_DSDT_FILE 259config ACPI_CUSTOM_DSDT_FILE
@@ -310,7 +310,7 @@ config X86_PM_TIMER
310 The Power Management Timer is available on all ACPI-capable, 310 The Power Management Timer is available on all ACPI-capable,
311 in most cases even if ACPI is unusable or blacklisted. 311 in most cases even if ACPI is unusable or blacklisted.
312 312
313 This timing source is not affected by powermanagement features 313 This timing source is not affected by power management features
314 like aggressive processor idling, throttling, frequency and/or 314 like aggressive processor idling, throttling, frequency and/or
315 voltage scaling, unlike the commonly used Time Stamp Counter 315 voltage scaling, unlike the commonly used Time Stamp Counter
316 (TSC) timing source. 316 (TSC) timing source.
@@ -345,7 +345,7 @@ config ACPI_HOTPLUG_MEMORY
345 Enabling this driver assumes that your platform hardware 345 Enabling this driver assumes that your platform hardware
346 and firmware have support for hot-plugging physical memory. If 346 and firmware have support for hot-plugging physical memory. If
347 your system does not support physically adding or ripping out 347 your system does not support physically adding or ripping out
348 memory DIMMs at some platfrom defined granularity (individually 348 memory DIMMs at some platform defined granularity (individually
349 or as a bank) at runtime, then you need not enable this driver. 349 or as a bank) at runtime, then you need not enable this driver.
350 350
351 If one selects "m," this driver can be loaded using the following 351 If one selects "m," this driver can be loaded using the following
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 422e31d5f8e5..17dc22282e14 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -207,8 +207,7 @@ config BLK_DEV_UMEM
207 module will be called umem. 207 module will be called umem.
208 208
209 The umem driver has not yet been allocated a MAJOR number, so 209 The umem driver has not yet been allocated a MAJOR number, so
210 one is chosen dynamically. Use "devfs" or look in /proc/devices 210 one is chosen dynamically.
211 for the device number
212 211
213config BLK_DEV_UBD 212config BLK_DEV_UBD
214 bool "Virtual block device" 213 bool "Virtual block device"
@@ -407,7 +406,7 @@ config BLK_DEV_RAM_BLOCKSIZE
407 depends on BLK_DEV_RAM 406 depends on BLK_DEV_RAM
408 default "1024" 407 default "1024"
409 help 408 help
410 The default value is 1024 kilobytes. PAGE_SIZE is a much more 409 The default value is 1024 bytes. PAGE_SIZE is a much more
411 efficient choice however. The default is kept to ensure initrd 410 efficient choice however. The default is kept to ensure initrd
412 setups function - apparently needed by the rd_load_image routine 411 setups function - apparently needed by the rd_load_image routine
413 that supposes the filesystem in the image uses a 1024 blocksize. 412 that supposes the filesystem in the image uses a 1024 blocksize.
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index b38c84a7a8e3..2a0c50d84fc5 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1,4 +1,4 @@
1/* linux/drivers/cdrom/cdrom.c. 1/* linux/drivers/cdrom/cdrom.c
2 Copyright (c) 1996, 1997 David A. van Leeuwen. 2 Copyright (c) 1996, 1997 David A. van Leeuwen.
3 Copyright (c) 1997, 1998 Erik Andersen <andersee@debian.org> 3 Copyright (c) 1997, 1998 Erik Andersen <andersee@debian.org>
4 Copyright (c) 1998, 1999 Jens Axboe <axboe@image.dk> 4 Copyright (c) 1998, 1999 Jens Axboe <axboe@image.dk>
diff --git a/drivers/char/hw_random/ixp4xx-rng.c b/drivers/char/hw_random/ixp4xx-rng.c
index ef71022423c9..3cf4d641a51c 100644
--- a/drivers/char/hw_random/ixp4xx-rng.c
+++ b/drivers/char/hw_random/ixp4xx-rng.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/char/rng/ixp4xx-rng.c 2 * drivers/char/hw_random/ixp4xx-rng.c
3 * 3 *
4 * RNG driver for Intel IXP4xx family of NPUs 4 * RNG driver for Intel IXP4xx family of NPUs
5 * 5 *
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index a01d796d1eeb..e13dd1892bfd 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * driver/char/hw_random/omap-rng.c 2 * drivers/char/hw_random/omap-rng.c
3 * 3 *
4 * RNG driver for TI OMAP CPU family 4 * RNG driver for TI OMAP CPU family
5 * 5 *
diff --git a/drivers/char/mwave/README b/drivers/char/mwave/README
index 70f8d19fb79f..480251fc78e2 100644
--- a/drivers/char/mwave/README
+++ b/drivers/char/mwave/README
@@ -41,10 +41,7 @@ Example to enable the 3780i DSP using ttyS1 resources:
41Accessing the driver 41Accessing the driver
42-------------------- 42--------------------
43 43
44You must also create a node for the driver. Without devfs: 44You must also create a node for the driver:
45 mkdir -p /dev/modems 45 mkdir -p /dev/modems
46 mknod --mode=660 /dev/modems/mwave c 10 219 46 mknod --mode=660 /dev/modems/mwave c 10 219
47With devfs:
48 mkdir -p /dev/modems
49 ln -s ../misc/mwave /dev/modems/mwave
50 47
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index c91d9a660ec0..fd955dbd588c 100644
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/watchdog/ixp2000_wdt.c 2 * drivers/char/watchdog/ixp2000_wdt.c
3 * 3 *
4 * Watchdog driver for Intel IXP2000 network processors 4 * Watchdog driver for Intel IXP2000 network processors
5 * 5 *
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c
index db477f712388..5864bb865cfe 100644
--- a/drivers/char/watchdog/ixp4xx_wdt.c
+++ b/drivers/char/watchdog/ixp4xx_wdt.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/watchdog/ixp4xx_wdt.c 2 * drivers/char/watchdog/ixp4xx_wdt.c
3 * 3 *
4 * Watchdog driver for Intel IXP4xx network processors 4 * Watchdog driver for Intel IXP4xx network processors
5 * 5 *
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 731c3d5da0dc..88f462122a30 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -64,7 +64,7 @@ config DELL_RBU
64 help 64 help
65 Say m if you want to have the option of updating the BIOS for your 65 Say m if you want to have the option of updating the BIOS for your
66 DELL system. Note you need a Dell OpenManage or Dell Update package (DUP) 66 DELL system. Note you need a Dell OpenManage or Dell Update package (DUP)
67 supporting application to comunicate with the BIOS regarding the new 67 supporting application to communicate with the BIOS regarding the new
68 image for the image update to take effect. 68 image for the image update to take effect.
69 See <file:Documentation/dell_rbu.txt> for more details on the driver. 69 See <file:Documentation/dell_rbu.txt> for more details on the driver.
70 70
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index b4502ed65793..5c261e1f92b2 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/i386/kernel/edd.c 2 * linux/drivers/firmware/edd.c
3 * Copyright (C) 2002, 2003, 2004 Dell Inc. 3 * Copyright (C) 2002, 2003, 2004 Dell Inc.
4 * by Matt Domsch <Matt_Domsch@dell.com> 4 * by Matt Domsch <Matt_Domsch@dell.com>
5 * disk signature by Matt Domsch, Andrew Wilks, and Sandeep K. Shandilya 5 * disk signature by Matt Domsch, Andrew Wilks, and Sandeep K. Shandilya
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 0d9667921f61..510816c16da3 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -333,10 +333,10 @@ config I2C_PARPORT_LIGHT
333 333
334 This driver is a light version of i2c-parport. It doesn't depend 334 This driver is a light version of i2c-parport. It doesn't depend
335 on the parport driver, and uses direct I/O access instead. This 335 on the parport driver, and uses direct I/O access instead. This
336 might be prefered on embedded systems where wasting memory for 336 might be preferred on embedded systems where wasting memory for
337 the clean but heavy parport handling is not an option. The 337 the clean but heavy parport handling is not an option. The
338 drawback is a reduced portability and the impossibility to 338 drawback is a reduced portability and the impossibility to
339 dasiy-chain other parallel port devices. 339 daisy-chain other parallel port devices.
340 340
341 Don't say Y here if you said Y or M to i2c-parport. Saying M to 341 Don't say Y here if you said Y or M to i2c-parport. Saying M to
342 both is possible but both modules should not be loaded at the same 342 both is possible but both modules should not be loaded at the same
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 5bccb5d68318..80d4ba1bdfec 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/i2c/i2c-ibm_iic.c 2 * drivers/i2c/busses/i2c-ibm_iic.c
3 * 3 *
4 * Support for the IIC peripheral on IBM PPC 4xx 4 * Support for the IIC peripheral on IBM PPC 4xx
5 * 5 *
diff --git a/drivers/i2c/busses/i2c-ibm_iic.h b/drivers/i2c/busses/i2c-ibm_iic.h
index 2b3219d00e92..59d7b437f7ff 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.h
+++ b/drivers/i2c/busses/i2c-ibm_iic.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/i2c/i2c-ibm_iic.h 2 * drivers/i2c/busses/i2c-ibm_iic.h
3 * 3 *
4 * Support for the IIC peripheral on IBM PPC 4xx 4 * Support for the IIC peripheral on IBM PPC 4xx
5 * 5 *
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index ab573254a8aa..1ce01fb0ac09 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/i2c/i2c-adap-ixp4xx.c 2 * drivers/i2c/busses/i2c-ixp4xx.c
3 * 3 *
4 * Intel's IXP4xx XScale NPU chipsets (IXP420, 421, 422, 425) do not have 4 * Intel's IXP4xx XScale NPU chipsets (IXP420, 421, 422, 425) do not have
5 * an on board I2C controller but provide 16 GPIO pins that are often 5 * an on board I2C controller but provide 16 GPIO pins that are often
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index 8b65a5cf8251..8ddbae4fafe6 100644
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -1,4 +1,4 @@
1/* linux/drivers/i2c/scx200_i2c.c 1/* linux/drivers/i2c/busses/scx200_i2c.c
2 2
3 Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com> 3 Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
4 4
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 15955996a1f3..608ca871744b 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/ide/ide-h8300.c 2 * drivers/ide/h8300/ide-h8300.c
3 * H8/300 generic IDE interface 3 * H8/300 generic IDE interface
4 */ 4 */
5 5
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 31ad79f52df7..91c5344a945d 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/ide/ide-pmac.c 2 * linux/drivers/ide/ppc/pmac.c
3 * 3 *
4 * Support for IDE interfaces on PowerMacs. 4 * Support for IDE interfaces on PowerMacs.
5 * These IDE interfaces are memory-mapped and have a DBDMA channel 5 * These IDE interfaces are memory-mapped and have a DBDMA channel
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 2769e505f051..672b92ef9f21 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -140,7 +140,7 @@ config IEEE1394_SBP2_PHYS_DMA
140 help 140 help
141 This builds sbp2 for use with non-OHCI host adapters which do not 141 This builds sbp2 for use with non-OHCI host adapters which do not
142 support physical DMA or for when ohci1394 is run with phys_dma=0. 142 support physical DMA or for when ohci1394 is run with phys_dma=0.
143 Physical DMA is data movement without assistence of the drivers' 143 Physical DMA is data movement without assistance of the drivers'
144 interrupt handlers. This option includes the interrupt handlers 144 interrupt handlers. This option includes the interrupt handlers
145 that are required in absence of this hardware feature. 145 that are required in absence of this hardware feature.
146 146
diff --git a/drivers/infiniband/ulp/ipoib/Kconfig b/drivers/infiniband/ulp/ipoib/Kconfig
index d74653d7de1c..c75322d820d4 100644
--- a/drivers/infiniband/ulp/ipoib/Kconfig
+++ b/drivers/infiniband/ulp/ipoib/Kconfig
@@ -26,7 +26,7 @@ config INFINIBAND_IPOIB_DEBUG_DATA
26 bool "IP-over-InfiniBand data path debugging" 26 bool "IP-over-InfiniBand data path debugging"
27 depends on INFINIBAND_IPOIB_DEBUG 27 depends on INFINIBAND_IPOIB_DEBUG
28 ---help--- 28 ---help---
29 This option compiles debugging code into the the data path 29 This option compiles debugging code into the data path
30 of the IPoIB driver. The output can be turned on via the 30 of the IPoIB driver. The output can be turned on via the
31 data_debug_level module parameter; however, even with output 31 data_debug_level module parameter; however, even with output
32 turned off, this debugging code will have some performance 32 turned off, this debugging code will have some performance
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 67519ef0ef95..271263443c37 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -32,7 +32,7 @@ config JOYSTICK_ANALOG
32 module will be called analog. 32 module will be called analog.
33 33
34config JOYSTICK_A3D 34config JOYSTICK_A3D
35 tristate "Assasin 3D and MadCatz Panther devices" 35 tristate "Assassin 3D and MadCatz Panther devices"
36 select GAMEPORT 36 select GAMEPORT
37 help 37 help
38 Say Y here if you have an FPGaming or MadCatz controller using the 38 Say Y here if you have an FPGaming or MadCatz controller using the
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c62e00c79dec..679bde34d247 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -177,7 +177,7 @@ config KEYBOARD_HIL_OLD
177 However, it has been thoroughly tested and is stable. 177 However, it has been thoroughly tested and is stable.
178 178
179 If you want full HIL support including support for multiple 179 If you want full HIL support including support for multiple
180 keyboards, mices and tablets, you have to enable the 180 keyboards, mice, and tablets, you have to enable the
181 "HP System Device Controller i8042 Support" in the input/serio 181 "HP System Device Controller i8042 Support" in the input/serio
182 submenu. 182 submenu.
183 183
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 98acf170252c..8cdbfeca5903 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -115,9 +115,9 @@ config HP_SDC
115 depends on GSC && SERIO 115 depends on GSC && SERIO
116 default y 116 default y
117 ---help--- 117 ---help---
118 This option enables supports for the the "System Device 118 This option enables support for the "System Device
119 Controller", an i8042 carrying microcode to manage a 119 Controller", an i8042 carrying microcode to manage a
120 few miscellanous devices on some Hewlett Packard systems. 120 few miscellaneous devices on some Hewlett Packard systems.
121 The SDC itself contains a 10ms resolution timer/clock capable 121 The SDC itself contains a 10ms resolution timer/clock capable
122 of delivering interrupts on a periodic and one-shot basis. 122 of delivering interrupts on a periodic and one-shot basis.
123 The SDC may also be connected to a battery-backed real-time 123 The SDC may also be connected to a battery-backed real-time
diff --git a/drivers/isdn/hardware/eicon/Kconfig b/drivers/isdn/hardware/eicon/Kconfig
index 51e66bc64208..01d4afd9d843 100644
--- a/drivers/isdn/hardware/eicon/Kconfig
+++ b/drivers/isdn/hardware/eicon/Kconfig
@@ -47,7 +47,7 @@ config ISDN_DIVAS_MAINT
47 tristate "DIVA Maint driver support" 47 tristate "DIVA Maint driver support"
48 depends on ISDN_DIVAS && m 48 depends on ISDN_DIVAS && m
49 help 49 help
50 Enable Divas Maintainance driver. 50 Enable Divas Maintenance driver.
51 51
52endmenu 52endmenu
53 53
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 6dfc94122dd9..eb57a988e048 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -321,7 +321,7 @@ config HISAX_HFC_PCI
321 help 321 help
322 This enables HiSax support for the HFC-S PCI 2BDS0 based cards. 322 This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
323 323
324 For more informations see under 324 For more information see under
325 <file:Documentation/isdn/README.hfc-pci>. 325 <file:Documentation/isdn/README.hfc-pci>.
326 326
327config HISAX_W6692 327config HISAX_W6692
diff --git a/drivers/isdn/hisax/amd7930_fn.h b/drivers/isdn/hisax/amd7930_fn.h
index e039c3a0f2a2..1f4d80c5e5a6 100644
--- a/drivers/isdn/hisax/amd7930_fn.h
+++ b/drivers/isdn/hisax/amd7930_fn.h
@@ -1,4 +1,4 @@
1/* 2001/10/02 1/* drivers/isdn/hisax/amd7930_fn.h
2 * 2 *
3 * gerdes_amd7930.h Header-file included by 3 * gerdes_amd7930.h Header-file included by
4 * gerdes_amd7930.c 4 * gerdes_amd7930.c
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index d424b4452028..aecbbe2e89a9 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -125,7 +125,7 @@ EXPORT_SYMBOL_GPL(led_classdev_register);
125 125
126/** 126/**
127 * led_classdev_unregister - unregisters a object of led_properties class. 127 * led_classdev_unregister - unregisters a object of led_properties class.
128 * @led_cdev: the led device to unreigister 128 * @led_cdev: the led device to unregister
129 * 129 *
130 * Unregisters a previously registered via led_classdev_register object. 130 * Unregisters a previously registered via led_classdev_register object.
131 */ 131 */
diff --git a/drivers/leds/leds-locomo.c b/drivers/leds/leds-locomo.c
index 3b87951aa555..6f2d449ba983 100644
--- a/drivers/leds/leds-locomo.c
+++ b/drivers/leds/leds-locomo.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/leds/locomo.c 2 * linux/drivers/leds/leds-locomo.c
3 * 3 *
4 * Copyright (C) 2005 John Lenz <lenz@cs.wisc.edu> 4 * Copyright (C) 2005 John Lenz <lenz@cs.wisc.edu>
5 * 5 *
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index d5d649f5ccdb..7f8477d3a661 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -186,7 +186,7 @@ config THERM_ADT746X
186 depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64 186 depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
187 help 187 help
188 This driver provides some thermostat and fan control for the 188 This driver provides some thermostat and fan control for the
189 iBook G4, and the ATI based aluminium PowerBooks, allowing slighlty 189 iBook G4, and the ATI based aluminium PowerBooks, allowing slightly
190 better fan behaviour by default, and some manual control. 190 better fan behaviour by default, and some manual control.
191 191
192config THERM_PM72 192config THERM_PM72
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index efd51e01c06e..b7fb367808d8 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/input/adbhid.c 2 * drivers/macintosh/adbhid.c
3 * 3 *
4 * ADB HID driver for Power Macintosh computers. 4 * ADB HID driver for Power Macintosh computers.
5 * 5 *
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 38a0a5741d52..cb8281605be8 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4438,8 +4438,7 @@ static int md_release(struct inode *inode, struct file * file)
4438{ 4438{
4439 mddev_t *mddev = inode->i_bdev->bd_disk->private_data; 4439 mddev_t *mddev = inode->i_bdev->bd_disk->private_data;
4440 4440
4441 if (!mddev) 4441 BUG_ON(!mddev);
4442 BUG();
4443 mddev_put(mddev); 4442 mddev_put(mddev);
4444 4443
4445 return 0; 4444 return 0;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 37e4ff661b6c..e14f45780720 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1105,7 +1105,7 @@ static void compute_parity6(struct stripe_head *sh, int method)
1105 if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags)) 1105 if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags))
1106 wake_up(&conf->wait_for_overlap); 1106 wake_up(&conf->wait_for_overlap);
1107 1107
1108 if (sh->dev[i].written) BUG(); 1108 BUG_ON(sh->dev[i].written);
1109 sh->dev[i].written = chosen; 1109 sh->dev[i].written = chosen;
1110 } 1110 }
1111 break; 1111 break;
diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig
index b5cdd57ec6f5..3d778c5aba68 100644
--- a/drivers/media/dvb/cinergyT2/Kconfig
+++ b/drivers/media/dvb/cinergyT2/Kconfig
@@ -56,7 +56,7 @@ config DVB_CINERGYT2_QUERY_INTERVAL
56 measurements. 56 measurements.
57 57
58 Please keep in mind that these updates cause traffic on the tuner 58 Please keep in mind that these updates cause traffic on the tuner
59 control bus and thus may or may not affect receiption sensitivity. 59 control bus and thus may or may not affect reception sensitivity.
60 60
61 The default value should be a safe choice for common applications. 61 The default value should be a safe choice for common applications.
62 62
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 7015517e2c1b..6d96b17a7f81 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -195,8 +195,7 @@ config RADIO_MIROPCM20_RDS
195 ---help--- 195 ---help---
196 Choose Y here if you want to see RDS/RBDS information like 196 Choose Y here if you want to see RDS/RBDS information like
197 RadioText, Programme Service name, Clock Time and date, Programme 197 RadioText, Programme Service name, Clock Time and date, Programme
198 TYpe and Traffic Announcement/Programme identification. You also 198 Type and Traffic Announcement/Programme identification.
199 need to say Y to "miroSOUND PCM20 radio" and devfs!
200 199
201 It's not possible to read the raw RDS packets from the device, so 200 It's not possible to read the raw RDS packets from the device, so
202 the driver cant provide an V4L interface for this. But the 201 the driver cant provide an V4L interface for this. But the
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 5c53fe62d38b..afb734df6e05 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -353,7 +353,7 @@ config VIDEO_SAA6588
353 help 353 help
354 Support for Radio Data System (RDS) decoder. This allows seeing 354 Support for Radio Data System (RDS) decoder. This allows seeing
355 radio station identification transmitted using this standard. 355 radio station identification transmitted using this standard.
356 Currentlly, it works only with bt8x8 chips. 356 Currently, it works only with bt8x8 chips.
357 357
358 To compile this driver as a module, choose M here: the 358 To compile this driver as a module, choose M here: the
359 module will be called saa6588. 359 module will be called saa6588.
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 51d68f32aa06..0f9d96963618 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -69,6 +69,6 @@ config VIDEO_CX88_VP3054
69 depends on VIDEO_CX88_DVB && DVB_MT352 69 depends on VIDEO_CX88_DVB && DVB_MT352
70 ---help--- 70 ---help---
71 This adds DVB-T support for cards based on the 71 This adds DVB-T support for cards based on the
72 Connexant 2388x chip and the MT352 demodulator, 72 Conexant 2388x chip and the MT352 demodulator,
73 which also require support for the VP-3054 73 which also require support for the VP-3054
74 Secondary I2C bus, such at DNTV Live! DVB-T Pro. 74 Secondary I2C bus, such at DNTV Live! DVB-T Pro.
diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt
index 11f751a6bda5..f5e848410311 100644
--- a/drivers/media/video/pwc/philips.txt
+++ b/drivers/media/video/pwc/philips.txt
@@ -175,8 +175,8 @@ dev_hint
175 - If a device node is already occupied, registration will fail and 175 - If a device node is already occupied, registration will fail and
176 the webcam is not available. 176 the webcam is not available.
177 - You can have up to 64 video devices; be sure to make enough device 177 - You can have up to 64 video devices; be sure to make enough device
178 nodes in /dev if you want to spread the numbers (this does not apply 178 nodes in /dev if you want to spread the numbers.
179 to devfs). After /dev/video9 comes /dev/video10 (not /dev/videoA). 179 After /dev/video9 comes /dev/video10 (not /dev/videoA).
180 - If a camera does not match any dev_hint, it will simply get assigned 180 - If a camera does not match any dev_hint, it will simply get assigned
181 the first available device node, just as it used to be. 181 the first available device node, just as it used to be.
182 182
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index 6d8f30deb868..72e6d73beb40 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -270,7 +270,7 @@ config MTD_JEDEC
270 tristate "JEDEC device support" 270 tristate "JEDEC device support"
271 depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN 271 depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN
272 help 272 help
273 Enable older older JEDEC flash interface devices for self 273 Enable older JEDEC flash interface devices for self
274 programming flash. It is commonly used in older AMD chips. It is 274 programming flash. It is commonly used in older AMD chips. It is
275 only called JEDEC because the JEDEC association 275 only called JEDEC because the JEDEC association
276 <http://www.jedec.org/> distributes the identification codes for the 276 <http://www.jedec.org/> distributes the identification codes for the
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index 51f962dd7e31..e074bb6787d2 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -1,4 +1,4 @@
1/* linux/drivers/mtd/maps/bast_flash.c 1/* linux/drivers/mtd/maps/bast-flash.c
2 * 2 *
3 * Copyright (c) 2004-2005 Simtec Electronics 3 * Copyright (c) 2004-2005 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
diff --git a/drivers/mtd/maps/dmv182.c b/drivers/mtd/maps/dmv182.c
index a43c49905cac..e0558b0b2fe6 100644
--- a/drivers/mtd/maps/dmv182.c
+++ b/drivers/mtd/maps/dmv182.c
@@ -1,6 +1,6 @@
1 1
2/* 2/*
3 * drivers/mtd/maps/svme182.c 3 * drivers/mtd/maps/dmv182.c
4 * 4 *
5 * Flash map driver for the Dy4 SVME182 board 5 * Flash map driver for the Dy4 SVME182 board
6 * 6 *
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index c99302ed3823..1831340e5f51 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -21,7 +21,7 @@ config MTD_NAND_VERIFY_WRITE
21 NAND flash device internally checks only bits transitioning 21 NAND flash device internally checks only bits transitioning
22 from 1 to 0. There is a rare possibility that even though the 22 from 1 to 0. There is a rare possibility that even though the
23 device thinks the write was successful, a bit could have been 23 device thinks the write was successful, a bit could have been
24 flipped accidentaly due to device wear or something else. 24 flipped accidentally due to device wear or something else.
25 25
26config MTD_NAND_ECC_SMC 26config MTD_NAND_ECC_SMC
27 bool "NAND ECC Smart Media byte order" 27 bool "NAND ECC Smart Media byte order"
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig
index 465961b8bcd1..373bddce8f1c 100644
--- a/drivers/mtd/onenand/Kconfig
+++ b/drivers/mtd/onenand/Kconfig
@@ -21,7 +21,7 @@ config MTD_ONENAND_VERIFY_WRITE
21 OneNAND flash device internally checks only bits transitioning 21 OneNAND flash device internally checks only bits transitioning
22 from 1 to 0. There is a rare possibility that even though the 22 from 1 to 0. There is a rare possibility that even though the
23 device thinks the write was successful, a bit could have been 23 device thinks the write was successful, a bit could have been
24 flipped accidentaly due to device wear or something else. 24 flipped accidentally due to device wear or something else.
25 25
26config MTD_ONENAND_GENERIC 26config MTD_ONENAND_GENERIC
27 tristate "OneNAND Flash device via platform device driver" 27 tristate "OneNAND Flash device via platform device driver"
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ff8a8c0a26d5..ab92cc794c64 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2115,7 +2115,7 @@ config SKY2
2115 depends on PCI && EXPERIMENTAL 2115 depends on PCI && EXPERIMENTAL
2116 select CRC32 2116 select CRC32
2117 ---help--- 2117 ---help---
2118 This driver supports Gigabit Ethernet adapters based on the the 2118 This driver supports Gigabit Ethernet adapters based on the
2119 Marvell Yukon 2 chipset: 2119 Marvell Yukon 2 chipset:
2120 Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ 2120 Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
2121 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 2121 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
diff --git a/drivers/net/arm/am79c961a.h b/drivers/net/arm/am79c961a.h
index 6a49ac7f6d46..483009fe6ec2 100644
--- a/drivers/net/arm/am79c961a.h
+++ b/drivers/net/arm/am79c961a.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/net/am79c961.h 2 * linux/drivers/net/arm/am79c961a.h
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify 4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as 5 * it under the terms of the GNU General Public License version 2 as
diff --git a/drivers/net/ibm_emac/ibm_emac_debug.h b/drivers/net/ibm_emac/ibm_emac_debug.h
index 5761389495d0..6c7dccc84bf5 100644
--- a/drivers/net/ibm_emac/ibm_emac_debug.h
+++ b/drivers/net/ibm_emac/ibm_emac_debug.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/net/ibm_emac/ibm_ocp_debug.h 2 * drivers/net/ibm_emac/ibm_emac_debug.h
3 * 3 *
4 * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines. 4 * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
5 * 5 *
diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.h b/drivers/net/ibm_emac/ibm_emac_rgmii.h
index 94abde55e2e9..117ea486c2ca 100644
--- a/drivers/net/ibm_emac/ibm_emac_rgmii.h
+++ b/drivers/net/ibm_emac/ibm_emac_rgmii.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/net/ibm_emac/ibm_emac_rgmii.c 2 * drivers/net/ibm_emac/ibm_emac_rgmii.h
3 * 3 *
4 * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support. 4 * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
5 * 5 *
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index 7d3e270c4f45..3b2f00b9b7bd 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -224,8 +224,7 @@ static void __devexit tms_pci_detach (struct pci_dev *pdev)
224{ 224{
225 struct net_device *dev = pci_get_drvdata(pdev); 225 struct net_device *dev = pci_get_drvdata(pdev);
226 226
227 if (!dev) 227 BUG_ON(!dev);
228 BUG();
229 unregister_netdev(dev); 228 unregister_netdev(dev);
230 release_region(dev->base_addr, TMS_PCI_IO_EXTENT); 229 release_region(dev->base_addr, TMS_PCI_IO_EXTENT);
231 free_irq(dev->irq, dev); 230 free_irq(dev->irq, dev);
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index bd4a68c85a47..ece3d9c2dc61 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -301,7 +301,7 @@ config HERMES
301 tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)" 301 tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
302 depends on NET_RADIO && (PPC_PMAC || PCI || PCMCIA) 302 depends on NET_RADIO && (PPC_PMAC || PCI || PCMCIA)
303 ---help--- 303 ---help---
304 A driver for 802.11b wireless cards based based on the "Hermes" or 304 A driver for 802.11b wireless cards based on the "Hermes" or
305 Intersil HFA384x (Prism 2) MAC controller. This includes the vast 305 Intersil HFA384x (Prism 2) MAC controller. This includes the vast
306 majority of the PCMCIA 802.11b cards (which are nearly all rebadges) 306 majority of the PCMCIA 802.11b cards (which are nearly all rebadges)
307 - except for the Cisco/Aironet cards. Cards supported include the 307 - except for the Cisco/Aironet cards. Cards supported include the
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 4a9f025a6b58..2eb3577a88c5 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/parisc/kernel/power.c 2 * linux/drivers/parisc/power.c
3 * HP PARISC soft power switch support driver 3 * HP PARISC soft power switch support driver
4 * 4 *
5 * Copyright (c) 2001-2005 Helge Deller <deller@gmx.de> 5 * Copyright (c) 2001-2005 Helge Deller <deller@gmx.de>
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index fd41e28101ea..83ee095ec6e2 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -30,7 +30,7 @@
30#undef DEBUG 30#undef DEBUG
31 31
32#ifdef DEBUG 32#ifdef DEBUG
33#define DPRINTK(stuff...) printk (stuff) 33#define DPRINTK(stuff...) printk(stuff)
34#else 34#else
35#define DPRINTK(stuff...) 35#define DPRINTK(stuff...)
36#endif 36#endif
@@ -46,16 +46,16 @@ static DEFINE_SPINLOCK(topology_lock);
46static int numdevs = 0; 46static int numdevs = 0;
47 47
48/* Forward-declaration of lower-level functions. */ 48/* Forward-declaration of lower-level functions. */
49static int mux_present (struct parport *port); 49static int mux_present(struct parport *port);
50static int num_mux_ports (struct parport *port); 50static int num_mux_ports(struct parport *port);
51static int select_port (struct parport *port); 51static int select_port(struct parport *port);
52static int assign_addrs (struct parport *port); 52static int assign_addrs(struct parport *port);
53 53
54/* Add a device to the discovered topology. */ 54/* Add a device to the discovered topology. */
55static void add_dev (int devnum, struct parport *port, int daisy) 55static void add_dev(int devnum, struct parport *port, int daisy)
56{ 56{
57 struct daisydev *newdev, **p; 57 struct daisydev *newdev, **p;
58 newdev = kmalloc (sizeof (struct daisydev), GFP_KERNEL); 58 newdev = kmalloc(sizeof(struct daisydev), GFP_KERNEL);
59 if (newdev) { 59 if (newdev) {
60 newdev->port = port; 60 newdev->port = port;
61 newdev->daisy = daisy; 61 newdev->daisy = daisy;
@@ -70,9 +70,9 @@ static void add_dev (int devnum, struct parport *port, int daisy)
70} 70}
71 71
72/* Clone a parport (actually, make an alias). */ 72/* Clone a parport (actually, make an alias). */
73static struct parport *clone_parport (struct parport *real, int muxport) 73static struct parport *clone_parport(struct parport *real, int muxport)
74{ 74{
75 struct parport *extra = parport_register_port (real->base, 75 struct parport *extra = parport_register_port(real->base,
76 real->irq, 76 real->irq,
77 real->dma, 77 real->dma,
78 real->ops); 78 real->ops);
@@ -88,7 +88,7 @@ static struct parport *clone_parport (struct parport *real, int muxport)
88 88
89/* Discover the IEEE1284.3 topology on a port -- muxes and daisy chains. 89/* Discover the IEEE1284.3 topology on a port -- muxes and daisy chains.
90 * Return value is number of devices actually detected. */ 90 * Return value is number of devices actually detected. */
91int parport_daisy_init (struct parport *port) 91int parport_daisy_init(struct parport *port)
92{ 92{
93 int detected = 0; 93 int detected = 0;
94 char *deviceid; 94 char *deviceid;
@@ -103,26 +103,26 @@ again:
103 103
104 /* If mux present on normal port, need to create new 104 /* If mux present on normal port, need to create new
105 * parports for each extra port. */ 105 * parports for each extra port. */
106 if (port->muxport < 0 && mux_present (port) && 106 if (port->muxport < 0 && mux_present(port) &&
107 /* don't be fooled: a mux must have 2 or 4 ports. */ 107 /* don't be fooled: a mux must have 2 or 4 ports. */
108 ((num_ports = num_mux_ports (port)) == 2 || num_ports == 4)) { 108 ((num_ports = num_mux_ports(port)) == 2 || num_ports == 4)) {
109 /* Leave original as port zero. */ 109 /* Leave original as port zero. */
110 port->muxport = 0; 110 port->muxport = 0;
111 printk (KERN_INFO 111 printk(KERN_INFO
112 "%s: 1st (default) port of %d-way multiplexor\n", 112 "%s: 1st (default) port of %d-way multiplexor\n",
113 port->name, num_ports); 113 port->name, num_ports);
114 for (i = 1; i < num_ports; i++) { 114 for (i = 1; i < num_ports; i++) {
115 /* Clone the port. */ 115 /* Clone the port. */
116 struct parport *extra = clone_parport (port, i); 116 struct parport *extra = clone_parport(port, i);
117 if (!extra) { 117 if (!extra) {
118 if (signal_pending (current)) 118 if (signal_pending(current))
119 break; 119 break;
120 120
121 schedule (); 121 schedule();
122 continue; 122 continue;
123 } 123 }
124 124
125 printk (KERN_INFO 125 printk(KERN_INFO
126 "%s: %d%s port of %d-way multiplexor on %s\n", 126 "%s: %d%s port of %d-way multiplexor on %s\n",
127 extra->name, i + 1, th[i + 1], num_ports, 127 extra->name, i + 1, th[i + 1], num_ports,
128 port->name); 128 port->name);
@@ -135,34 +135,34 @@ again:
135 } 135 }
136 136
137 if (port->muxport >= 0) 137 if (port->muxport >= 0)
138 select_port (port); 138 select_port(port);
139 139
140 parport_daisy_deselect_all (port); 140 parport_daisy_deselect_all(port);
141 detected += assign_addrs (port); 141 detected += assign_addrs(port);
142 142
143 /* Count the potential legacy device at the end. */ 143 /* Count the potential legacy device at the end. */
144 add_dev (numdevs++, port, -1); 144 add_dev(numdevs++, port, -1);
145 145
146 /* Find out the legacy device's IEEE 1284 device ID. */ 146 /* Find out the legacy device's IEEE 1284 device ID. */
147 deviceid = kmalloc (1024, GFP_KERNEL); 147 deviceid = kmalloc(1024, GFP_KERNEL);
148 if (deviceid) { 148 if (deviceid) {
149 if (parport_device_id (numdevs - 1, deviceid, 1024) > 2) 149 if (parport_device_id(numdevs - 1, deviceid, 1024) > 2)
150 detected++; 150 detected++;
151 151
152 kfree (deviceid); 152 kfree(deviceid);
153 } 153 }
154 154
155 if (!detected && !last_try) { 155 if (!detected && !last_try) {
156 /* No devices were detected. Perhaps they are in some 156 /* No devices were detected. Perhaps they are in some
157 funny state; let's try to reset them and see if 157 funny state; let's try to reset them and see if
158 they wake up. */ 158 they wake up. */
159 parport_daisy_fini (port); 159 parport_daisy_fini(port);
160 parport_write_control (port, PARPORT_CONTROL_SELECT); 160 parport_write_control(port, PARPORT_CONTROL_SELECT);
161 udelay (50); 161 udelay(50);
162 parport_write_control (port, 162 parport_write_control(port,
163 PARPORT_CONTROL_SELECT | 163 PARPORT_CONTROL_SELECT |
164 PARPORT_CONTROL_INIT); 164 PARPORT_CONTROL_INIT);
165 udelay (50); 165 udelay(50);
166 last_try = 1; 166 last_try = 1;
167 goto again; 167 goto again;
168 } 168 }
@@ -171,7 +171,7 @@ again:
171} 171}
172 172
173/* Forget about devices on a physical port. */ 173/* Forget about devices on a physical port. */
174void parport_daisy_fini (struct parport *port) 174void parport_daisy_fini(struct parport *port)
175{ 175{
176 struct daisydev **p; 176 struct daisydev **p;
177 177
@@ -214,7 +214,7 @@ void parport_daisy_fini (struct parport *port)
214 * for parport_register_device(). 214 * for parport_register_device().
215 **/ 215 **/
216 216
217struct pardevice *parport_open (int devnum, const char *name, 217struct pardevice *parport_open(int devnum, const char *name,
218 int (*pf) (void *), void (*kf) (void *), 218 int (*pf) (void *), void (*kf) (void *),
219 void (*irqf) (int, void *, struct pt_regs *), 219 void (*irqf) (int, void *, struct pt_regs *),
220 int flags, void *handle) 220 int flags, void *handle)
@@ -237,7 +237,7 @@ struct pardevice *parport_open (int devnum, const char *name,
237 port = parport_get_port(p->port); 237 port = parport_get_port(p->port);
238 spin_unlock(&topology_lock); 238 spin_unlock(&topology_lock);
239 239
240 dev = parport_register_device (port, name, pf, kf, 240 dev = parport_register_device(port, name, pf, kf,
241 irqf, flags, handle); 241 irqf, flags, handle);
242 parport_put_port(port); 242 parport_put_port(port);
243 if (!dev) 243 if (!dev)
@@ -248,13 +248,13 @@ struct pardevice *parport_open (int devnum, const char *name,
248 /* Check that there really is a device to select. */ 248 /* Check that there really is a device to select. */
249 if (daisy >= 0) { 249 if (daisy >= 0) {
250 int selected; 250 int selected;
251 parport_claim_or_block (dev); 251 parport_claim_or_block(dev);
252 selected = port->daisy; 252 selected = port->daisy;
253 parport_release (dev); 253 parport_release(dev);
254 254
255 if (selected != daisy) { 255 if (selected != daisy) {
256 /* No corresponding device. */ 256 /* No corresponding device. */
257 parport_unregister_device (dev); 257 parport_unregister_device(dev);
258 return NULL; 258 return NULL;
259 } 259 }
260 } 260 }
@@ -270,9 +270,9 @@ struct pardevice *parport_open (int devnum, const char *name,
270 * parport_register_device(). 270 * parport_register_device().
271 **/ 271 **/
272 272
273void parport_close (struct pardevice *dev) 273void parport_close(struct pardevice *dev)
274{ 274{
275 parport_unregister_device (dev); 275 parport_unregister_device(dev);
276} 276}
277 277
278/** 278/**
@@ -287,7 +287,7 @@ void parport_close (struct pardevice *dev)
287 * exists. 287 * exists.
288 **/ 288 **/
289 289
290int parport_device_num (int parport, int mux, int daisy) 290int parport_device_num(int parport, int mux, int daisy)
291{ 291{
292 int res = -ENXIO; 292 int res = -ENXIO;
293 struct daisydev *dev; 293 struct daisydev *dev;
@@ -305,16 +305,16 @@ int parport_device_num (int parport, int mux, int daisy)
305} 305}
306 306
307/* Send a daisy-chain-style CPP command packet. */ 307/* Send a daisy-chain-style CPP command packet. */
308static int cpp_daisy (struct parport *port, int cmd) 308static int cpp_daisy(struct parport *port, int cmd)
309{ 309{
310 unsigned char s; 310 unsigned char s;
311 311
312 parport_data_forward (port); 312 parport_data_forward(port);
313 parport_write_data (port, 0xaa); udelay (2); 313 parport_write_data(port, 0xaa); udelay(2);
314 parport_write_data (port, 0x55); udelay (2); 314 parport_write_data(port, 0x55); udelay(2);
315 parport_write_data (port, 0x00); udelay (2); 315 parport_write_data(port, 0x00); udelay(2);
316 parport_write_data (port, 0xff); udelay (2); 316 parport_write_data(port, 0xff); udelay(2);
317 s = parport_read_status (port) & (PARPORT_STATUS_BUSY 317 s = parport_read_status(port) & (PARPORT_STATUS_BUSY
318 | PARPORT_STATUS_PAPEROUT 318 | PARPORT_STATUS_PAPEROUT
319 | PARPORT_STATUS_SELECT 319 | PARPORT_STATUS_SELECT
320 | PARPORT_STATUS_ERROR); 320 | PARPORT_STATUS_ERROR);
@@ -322,54 +322,54 @@ static int cpp_daisy (struct parport *port, int cmd)
322 | PARPORT_STATUS_PAPEROUT 322 | PARPORT_STATUS_PAPEROUT
323 | PARPORT_STATUS_SELECT 323 | PARPORT_STATUS_SELECT
324 | PARPORT_STATUS_ERROR)) { 324 | PARPORT_STATUS_ERROR)) {
325 DPRINTK (KERN_DEBUG "%s: cpp_daisy: aa5500ff(%02x)\n", 325 DPRINTK(KERN_DEBUG "%s: cpp_daisy: aa5500ff(%02x)\n",
326 port->name, s); 326 port->name, s);
327 return -ENXIO; 327 return -ENXIO;
328 } 328 }
329 329
330 parport_write_data (port, 0x87); udelay (2); 330 parport_write_data(port, 0x87); udelay(2);
331 s = parport_read_status (port) & (PARPORT_STATUS_BUSY 331 s = parport_read_status(port) & (PARPORT_STATUS_BUSY
332 | PARPORT_STATUS_PAPEROUT 332 | PARPORT_STATUS_PAPEROUT
333 | PARPORT_STATUS_SELECT 333 | PARPORT_STATUS_SELECT
334 | PARPORT_STATUS_ERROR); 334 | PARPORT_STATUS_ERROR);
335 if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) { 335 if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) {
336 DPRINTK (KERN_DEBUG "%s: cpp_daisy: aa5500ff87(%02x)\n", 336 DPRINTK(KERN_DEBUG "%s: cpp_daisy: aa5500ff87(%02x)\n",
337 port->name, s); 337 port->name, s);
338 return -ENXIO; 338 return -ENXIO;
339 } 339 }
340 340
341 parport_write_data (port, 0x78); udelay (2); 341 parport_write_data(port, 0x78); udelay(2);
342 parport_write_data (port, cmd); udelay (2); 342 parport_write_data(port, cmd); udelay(2);
343 parport_frob_control (port, 343 parport_frob_control(port,
344 PARPORT_CONTROL_STROBE, 344 PARPORT_CONTROL_STROBE,
345 PARPORT_CONTROL_STROBE); 345 PARPORT_CONTROL_STROBE);
346 udelay (1); 346 udelay(1);
347 s = parport_read_status (port); 347 s = parport_read_status(port);
348 parport_frob_control (port, PARPORT_CONTROL_STROBE, 0); 348 parport_frob_control(port, PARPORT_CONTROL_STROBE, 0);
349 udelay (1); 349 udelay(1);
350 parport_write_data (port, 0xff); udelay (2); 350 parport_write_data(port, 0xff); udelay(2);
351 351
352 return s; 352 return s;
353} 353}
354 354
355/* Send a mux-style CPP command packet. */ 355/* Send a mux-style CPP command packet. */
356static int cpp_mux (struct parport *port, int cmd) 356static int cpp_mux(struct parport *port, int cmd)
357{ 357{
358 unsigned char s; 358 unsigned char s;
359 int rc; 359 int rc;
360 360
361 parport_data_forward (port); 361 parport_data_forward(port);
362 parport_write_data (port, 0xaa); udelay (2); 362 parport_write_data(port, 0xaa); udelay(2);
363 parport_write_data (port, 0x55); udelay (2); 363 parport_write_data(port, 0x55); udelay(2);
364 parport_write_data (port, 0xf0); udelay (2); 364 parport_write_data(port, 0xf0); udelay(2);
365 parport_write_data (port, 0x0f); udelay (2); 365 parport_write_data(port, 0x0f); udelay(2);
366 parport_write_data (port, 0x52); udelay (2); 366 parport_write_data(port, 0x52); udelay(2);
367 parport_write_data (port, 0xad); udelay (2); 367 parport_write_data(port, 0xad); udelay(2);
368 parport_write_data (port, cmd); udelay (2); 368 parport_write_data(port, cmd); udelay(2);
369 369
370 s = parport_read_status (port); 370 s = parport_read_status(port);
371 if (!(s & PARPORT_STATUS_ACK)) { 371 if (!(s & PARPORT_STATUS_ACK)) {
372 DPRINTK (KERN_DEBUG "%s: cpp_mux: aa55f00f52ad%02x(%02x)\n", 372 DPRINTK(KERN_DEBUG "%s: cpp_mux: aa55f00f52ad%02x(%02x)\n",
373 port->name, cmd, s); 373 port->name, cmd, s);
374 return -EIO; 374 return -EIO;
375 } 375 }
@@ -382,12 +382,12 @@ static int cpp_mux (struct parport *port, int cmd)
382 return rc; 382 return rc;
383} 383}
384 384
385void parport_daisy_deselect_all (struct parport *port) 385void parport_daisy_deselect_all(struct parport *port)
386{ 386{
387 cpp_daisy (port, 0x30); 387 cpp_daisy(port, 0x30);
388} 388}
389 389
390int parport_daisy_select (struct parport *port, int daisy, int mode) 390int parport_daisy_select(struct parport *port, int daisy, int mode)
391{ 391{
392 switch (mode) 392 switch (mode)
393 { 393 {
@@ -395,14 +395,14 @@ int parport_daisy_select (struct parport *port, int daisy, int mode)
395 case IEEE1284_MODE_EPP: 395 case IEEE1284_MODE_EPP:
396 case IEEE1284_MODE_EPPSL: 396 case IEEE1284_MODE_EPPSL:
397 case IEEE1284_MODE_EPPSWE: 397 case IEEE1284_MODE_EPPSWE:
398 return !(cpp_daisy (port, 0x20 + daisy) & 398 return !(cpp_daisy(port, 0x20 + daisy) &
399 PARPORT_STATUS_ERROR); 399 PARPORT_STATUS_ERROR);
400 400
401 // For these modes we should switch to ECP mode: 401 // For these modes we should switch to ECP mode:
402 case IEEE1284_MODE_ECP: 402 case IEEE1284_MODE_ECP:
403 case IEEE1284_MODE_ECPRLE: 403 case IEEE1284_MODE_ECPRLE:
404 case IEEE1284_MODE_ECPSWE: 404 case IEEE1284_MODE_ECPSWE:
405 return !(cpp_daisy (port, 0xd0 + daisy) & 405 return !(cpp_daisy(port, 0xd0 + daisy) &
406 PARPORT_STATUS_ERROR); 406 PARPORT_STATUS_ERROR);
407 407
408 // Nothing was told for BECP in Daisy chain specification. 408 // Nothing was told for BECP in Daisy chain specification.
@@ -413,28 +413,28 @@ int parport_daisy_select (struct parport *port, int daisy, int mode)
413 case IEEE1284_MODE_BYTE: 413 case IEEE1284_MODE_BYTE:
414 case IEEE1284_MODE_COMPAT: 414 case IEEE1284_MODE_COMPAT:
415 default: 415 default:
416 return !(cpp_daisy (port, 0xe0 + daisy) & 416 return !(cpp_daisy(port, 0xe0 + daisy) &
417 PARPORT_STATUS_ERROR); 417 PARPORT_STATUS_ERROR);
418 } 418 }
419} 419}
420 420
421static int mux_present (struct parport *port) 421static int mux_present(struct parport *port)
422{ 422{
423 return cpp_mux (port, 0x51) == 3; 423 return cpp_mux(port, 0x51) == 3;
424} 424}
425 425
426static int num_mux_ports (struct parport *port) 426static int num_mux_ports(struct parport *port)
427{ 427{
428 return cpp_mux (port, 0x58); 428 return cpp_mux(port, 0x58);
429} 429}
430 430
431static int select_port (struct parport *port) 431static int select_port(struct parport *port)
432{ 432{
433 int muxport = port->muxport; 433 int muxport = port->muxport;
434 return cpp_mux (port, 0x60 + muxport) == muxport; 434 return cpp_mux(port, 0x60 + muxport) == muxport;
435} 435}
436 436
437static int assign_addrs (struct parport *port) 437static int assign_addrs(struct parport *port)
438{ 438{
439 unsigned char s; 439 unsigned char s;
440 unsigned char daisy; 440 unsigned char daisy;
@@ -442,12 +442,12 @@ static int assign_addrs (struct parport *port)
442 int detected; 442 int detected;
443 char *deviceid; 443 char *deviceid;
444 444
445 parport_data_forward (port); 445 parport_data_forward(port);
446 parport_write_data (port, 0xaa); udelay (2); 446 parport_write_data(port, 0xaa); udelay(2);
447 parport_write_data (port, 0x55); udelay (2); 447 parport_write_data(port, 0x55); udelay(2);
448 parport_write_data (port, 0x00); udelay (2); 448 parport_write_data(port, 0x00); udelay(2);
449 parport_write_data (port, 0xff); udelay (2); 449 parport_write_data(port, 0xff); udelay(2);
450 s = parport_read_status (port) & (PARPORT_STATUS_BUSY 450 s = parport_read_status(port) & (PARPORT_STATUS_BUSY
451 | PARPORT_STATUS_PAPEROUT 451 | PARPORT_STATUS_PAPEROUT
452 | PARPORT_STATUS_SELECT 452 | PARPORT_STATUS_SELECT
453 | PARPORT_STATUS_ERROR); 453 | PARPORT_STATUS_ERROR);
@@ -455,40 +455,40 @@ static int assign_addrs (struct parport *port)
455 | PARPORT_STATUS_PAPEROUT 455 | PARPORT_STATUS_PAPEROUT
456 | PARPORT_STATUS_SELECT 456 | PARPORT_STATUS_SELECT
457 | PARPORT_STATUS_ERROR)) { 457 | PARPORT_STATUS_ERROR)) {
458 DPRINTK (KERN_DEBUG "%s: assign_addrs: aa5500ff(%02x)\n", 458 DPRINTK(KERN_DEBUG "%s: assign_addrs: aa5500ff(%02x)\n",
459 port->name, s); 459 port->name, s);
460 return 0; 460 return 0;
461 } 461 }
462 462
463 parport_write_data (port, 0x87); udelay (2); 463 parport_write_data(port, 0x87); udelay(2);
464 s = parport_read_status (port) & (PARPORT_STATUS_BUSY 464 s = parport_read_status(port) & (PARPORT_STATUS_BUSY
465 | PARPORT_STATUS_PAPEROUT 465 | PARPORT_STATUS_PAPEROUT
466 | PARPORT_STATUS_SELECT 466 | PARPORT_STATUS_SELECT
467 | PARPORT_STATUS_ERROR); 467 | PARPORT_STATUS_ERROR);
468 if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) { 468 if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) {
469 DPRINTK (KERN_DEBUG "%s: assign_addrs: aa5500ff87(%02x)\n", 469 DPRINTK(KERN_DEBUG "%s: assign_addrs: aa5500ff87(%02x)\n",
470 port->name, s); 470 port->name, s);
471 return 0; 471 return 0;
472 } 472 }
473 473
474 parport_write_data (port, 0x78); udelay (2); 474 parport_write_data(port, 0x78); udelay(2);
475 s = parport_read_status (port); 475 s = parport_read_status(port);
476 476
477 for (daisy = 0; 477 for (daisy = 0;
478 (s & (PARPORT_STATUS_PAPEROUT|PARPORT_STATUS_SELECT)) 478 (s & (PARPORT_STATUS_PAPEROUT|PARPORT_STATUS_SELECT))
479 == (PARPORT_STATUS_PAPEROUT|PARPORT_STATUS_SELECT) 479 == (PARPORT_STATUS_PAPEROUT|PARPORT_STATUS_SELECT)
480 && daisy < 4; 480 && daisy < 4;
481 ++daisy) { 481 ++daisy) {
482 parport_write_data (port, daisy); 482 parport_write_data(port, daisy);
483 udelay (2); 483 udelay(2);
484 parport_frob_control (port, 484 parport_frob_control(port,
485 PARPORT_CONTROL_STROBE, 485 PARPORT_CONTROL_STROBE,
486 PARPORT_CONTROL_STROBE); 486 PARPORT_CONTROL_STROBE);
487 udelay (1); 487 udelay(1);
488 parport_frob_control (port, PARPORT_CONTROL_STROBE, 0); 488 parport_frob_control(port, PARPORT_CONTROL_STROBE, 0);
489 udelay (1); 489 udelay(1);
490 490
491 add_dev (numdevs++, port, daisy); 491 add_dev(numdevs++, port, daisy);
492 492
493 /* See if this device thought it was the last in the 493 /* See if this device thought it was the last in the
494 * chain. */ 494 * chain. */
@@ -499,21 +499,21 @@ static int assign_addrs (struct parport *port)
499 last_dev from next device or if last_dev does not 499 last_dev from next device or if last_dev does not
500 work status lines from some non-daisy chain 500 work status lines from some non-daisy chain
501 device. */ 501 device. */
502 s = parport_read_status (port); 502 s = parport_read_status(port);
503 } 503 }
504 504
505 parport_write_data (port, 0xff); udelay (2); 505 parport_write_data(port, 0xff); udelay(2);
506 detected = numdevs - thisdev; 506 detected = numdevs - thisdev;
507 DPRINTK (KERN_DEBUG "%s: Found %d daisy-chained devices\n", port->name, 507 DPRINTK(KERN_DEBUG "%s: Found %d daisy-chained devices\n", port->name,
508 detected); 508 detected);
509 509
510 /* Ask the new devices to introduce themselves. */ 510 /* Ask the new devices to introduce themselves. */
511 deviceid = kmalloc (1024, GFP_KERNEL); 511 deviceid = kmalloc(1024, GFP_KERNEL);
512 if (!deviceid) return 0; 512 if (!deviceid) return 0;
513 513
514 for (daisy = 0; thisdev < numdevs; thisdev++, daisy++) 514 for (daisy = 0; thisdev < numdevs; thisdev++, daisy++)
515 parport_device_id (thisdev, deviceid, 1024); 515 parport_device_id(thisdev, deviceid, 1024);
516 516
517 kfree (deviceid); 517 kfree(deviceid);
518 return detected; 518 return detected;
519} 519}
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 8a60f391ffcf..6e780db9454d 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -157,7 +157,7 @@ config HOTPLUG_PCI_RPA
157 tristate "RPA PCI Hotplug driver" 157 tristate "RPA PCI Hotplug driver"
158 depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE 158 depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
159 help 159 help
160 Say Y here if you have a a RPA system that supports PCI Hotplug. 160 Say Y here if you have a RPA system that supports PCI Hotplug.
161 161
162 To compile this driver as a module, choose M here: the 162 To compile this driver as a module, choose M here: the
163 module will be called rpaphp. 163 module will be called rpaphp.
diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
index 0b2d2c3579a7..4142115d298e 100644
--- a/drivers/rapidio/Kconfig
+++ b/drivers/rapidio/Kconfig
@@ -15,4 +15,4 @@ config RAPIDIO_DISC_TIMEOUT
15 default "30" 15 default "30"
16 ---help--- 16 ---help---
17 Amount of time a discovery node waits for a host to complete 17 Amount of time a discovery node waits for a host to complete
18 enumeration beforing giving up. 18 enumeration before giving up.
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 9eeef964663a..2f0b77724192 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -1,4 +1,4 @@
1/* drivers/char/max6902.c 1/* drivers/rtc/rtc-max6902.c
2 * 2 *
3 * Copyright (C) 2006 8D Technologies inc. 3 * Copyright (C) 2006 8D Technologies inc.
4 * Copyright (C) 2004 Compulab Ltd. 4 * Copyright (C) 2004 Compulab Ltd.
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 836a58bb0305..40b6fc86f6a8 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -10,8 +10,6 @@
10 * timer interrupts. We use a timer to periodically 10 * timer interrupts. We use a timer to periodically
11 * reset 'stopped' watchdogs on affected platforms. 11 * reset 'stopped' watchdogs on affected platforms.
12 * 12 *
13 * TODO: DevFS support (/dev/watchdogs/0 ... /dev/watchdogs/2)
14 *
15 * Copyright (c) 2000 Eric Brower (ebrower@usa.net) 13 * Copyright (c) 2000 Eric Brower (ebrower@usa.net)
16 */ 14 */
17 15
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index dab082002e6f..c6dfb6fa13bf 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -40,10 +40,10 @@ config SCSI_PROC_FS
40 default y 40 default y
41 ---help--- 41 ---help---
42 This option enables support for the various files in 42 This option enables support for the various files in
43 /proc/scsi. In Linux 2.6 this has been superceeded by 43 /proc/scsi. In Linux 2.6 this has been superseded by
44 files in sysfs but many legacy applications rely on this. 44 files in sysfs but many legacy applications rely on this.
45 45
46 If unusure say Y. 46 If unsure say Y.
47 47
48comment "SCSI support type (disk, tape, CD-ROM)" 48comment "SCSI support type (disk, tape, CD-ROM)"
49 depends on SCSI 49 depends on SCSI
@@ -85,7 +85,7 @@ config CHR_DEV_OSST
85 tristate "SCSI OnStream SC-x0 tape support" 85 tristate "SCSI OnStream SC-x0 tape support"
86 depends on SCSI 86 depends on SCSI
87 ---help--- 87 ---help---
88 The OnStream SC-x0 SCSI tape drives can not be driven by the 88 The OnStream SC-x0 SCSI tape drives cannot be driven by the
89 standard st driver, but instead need this special osst driver and 89 standard st driver, but instead need this special osst driver and
90 use the /dev/osstX char device nodes (major 206). Via usb-storage 90 use the /dev/osstX char device nodes (major 206). Via usb-storage
91 and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives 91 and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 7955ebe8e1e8..911ea1756e55 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -22,12 +22,12 @@ config AIC79XX_CMDS_PER_DEVICE
22 to be used for any device. The aic7xxx driver will automatically 22 to be used for any device. The aic7xxx driver will automatically
23 vary this number based on device behavior. For devices with a 23 vary this number based on device behavior. For devices with a
24 fixed maximum, the driver will eventually lock to this maximum 24 fixed maximum, the driver will eventually lock to this maximum
25 and display a console message inidicating this value. 25 and display a console message indicating this value.
26 26
27 Due to resource allocation issues in the Linux SCSI mid-layer, using 27 Due to resource allocation issues in the Linux SCSI mid-layer, using
28 a high number of commands per device may result in memory allocation 28 a high number of commands per device may result in memory allocation
29 failures when many devices are attached to the system. For this reason, 29 failures when many devices are attached to the system. For this reason,
30 the default is set to 32. Higher values may result in higer performance 30 the default is set to 32. Higher values may result in higher performance
31 on some devices. The upper bound is 253. 0 disables tagged queueing. 31 on some devices. The upper bound is 253. 0 disables tagged queueing.
32 32
33 Per device tag depth can be controlled via the kernel command line 33 Per device tag depth can be controlled via the kernel command line
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index 5517da5855f0..cd93f9a8611f 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -27,12 +27,12 @@ config AIC7XXX_CMDS_PER_DEVICE
27 to be used for any device. The aic7xxx driver will automatically 27 to be used for any device. The aic7xxx driver will automatically
28 vary this number based on device behavior. For devices with a 28 vary this number based on device behavior. For devices with a
29 fixed maximum, the driver will eventually lock to this maximum 29 fixed maximum, the driver will eventually lock to this maximum
30 and display a console message inidicating this value. 30 and display a console message indicating this value.
31 31
32 Due to resource allocation issues in the Linux SCSI mid-layer, using 32 Due to resource allocation issues in the Linux SCSI mid-layer, using
33 a high number of commands per device may result in memory allocation 33 a high number of commands per device may result in memory allocation
34 failures when many devices are attached to the system. For this reason, 34 failures when many devices are attached to the system. For this reason,
35 the default is set to 32. Higher values may result in higer performance 35 the default is set to 32. Higher values may result in higher performance
36 on some devices. The upper bound is 253. 0 disables tagged queueing. 36 on some devices. The upper bound is 253. 0 disables tagged queueing.
37 37
38 Per device tag depth can be controlled via the kernel command line 38 Per device tag depth can be controlled via the kernel command line
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index a28940156703..4385e9e3ded6 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/arm/drivers/scsi/arxescsi.c 2 * linux/drivers/scsi/arm/arxescsi.c
3 * 3 *
4 * Copyright (C) 1997-2000 Russell King, Stefan Hanske 4 * Copyright (C) 1997-2000 Russell King, Stefan Hanske
5 * 5 *
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 57438326b07f..76d83ade9857 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/char/21285.c 2 * linux/drivers/serial/21285.c
3 * 3 *
4 * Driver for the serial port on the 21285 StrongArm-110 core logic chip. 4 * Driver for the serial port on the 21285 StrongArm-110 core logic chip.
5 * 5 *
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index d926272a40db..653098bc2dd5 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -121,7 +121,7 @@ config SERIAL_8250_RUNTIME_UARTS
121 default "4" 121 default "4"
122 help 122 help
123 Set this to the maximum number of serial ports you want 123 Set this to the maximum number of serial ports you want
124 the kernel to register at boot time. This can be overriden 124 the kernel to register at boot time. This can be overridden
125 with the module parameter "nr_uarts", or boot-time parameter 125 with the module parameter "nr_uarts", or boot-time parameter
126 8250.nr_uarts 126 8250.nr_uarts
127 127
@@ -205,7 +205,7 @@ config SERIAL_8250_BOCA
205 depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS 205 depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
206 help 206 help
207 Say Y here if you have a Boca serial board. Please read the Boca 207 Say Y here if you have a Boca serial board. Please read the Boca
208 mini-HOWTO, avaialble from <http://www.tldp.org/docs.html#howto> 208 mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
209 209
210 To compile this driver as a module, choose M here: the module 210 To compile this driver as a module, choose M here: the module
211 will be called 8250_boca. 211 will be called 8250_boca.
@@ -667,7 +667,7 @@ config SERIAL_68328
667 depends on M68328 || M68EZ328 || M68VZ328 667 depends on M68328 || M68EZ328 || M68VZ328
668 help 668 help
669 This driver supports the built-in serial port of the Motorola 68328 669 This driver supports the built-in serial port of the Motorola 68328
670 (standard, EZ and VZ varities). 670 (standard, EZ and VZ varieties).
671 671
672config SERIAL_68328_RTS_CTS 672config SERIAL_68328_RTS_CTS
673 bool "Support RTS/CTS on 68328 serial port" 673 bool "Support RTS/CTS on 68328 serial port"
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
index 5d867ab581b7..5eb49ea63bfe 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/serial/cpm_uart_cpm1.h 2 * linux/drivers/serial/cpm_uart/cpm_uart_cpm1.h
3 * 3 *
4 * Driver for CPM (SCC/SMC) serial ports 4 * Driver for CPM (SCC/SMC) serial ports
5 * 5 *
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
index a663300d3476..4b779111eaf9 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/serial/cpm_uart_cpm2.h 2 * linux/drivers/serial/cpm_uart/cpm_uart_cpm2.h
3 * 3 *
4 * Driver for CPM (SCC/SMC) serial ports 4 * Driver for CPM (SCC/SMC) serial ports
5 * 5 *
diff --git a/drivers/usb/atm/Kconfig b/drivers/usb/atm/Kconfig
index 550ddfa71a43..b450cbaa3a0b 100644
--- a/drivers/usb/atm/Kconfig
+++ b/drivers/usb/atm/Kconfig
@@ -64,7 +64,7 @@ config USB_XUSBATM
64 Say Y here if you have a DSL USB modem not explicitly supported by 64 Say Y here if you have a DSL USB modem not explicitly supported by
65 another USB DSL drivers. In order to use your modem you will need to 65 another USB DSL drivers. In order to use your modem you will need to
66 pass the vendor ID, product ID, and endpoint numbers for transmission 66 pass the vendor ID, product ID, and endpoint numbers for transmission
67 and reception as module parameters. You may need to initialize the 67 and reception as module parameters. You may need to initialize
68 the modem using a user space utility (a firmware loader for example). 68 the modem using a user space utility (a firmware loader for example).
69 69
70 To compile this driver as a module, choose M here: the 70 To compile this driver as a module, choose M here: the
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index c376c655c5de..f794f07cfb33 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/usb/file.c 2 * drivers/usb/core/file.c
3 * 3 *
4 * (C) Copyright Linus Torvalds 1999 4 * (C) Copyright Linus Torvalds 1999
5 * (C) Copyright Johannes Erdfelt 1999-2001 5 * (C) Copyright Johannes Erdfelt 1999-2001
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index e4df9edf1bc0..467cb02832f3 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/usb/usb.c 2 * drivers/usb/core/usb.c
3 * 3 *
4 * (C) Copyright Linus Torvalds 1999 4 * (C) Copyright Linus Torvalds 1999
5 * (C) Copyright Johannes Erdfelt 1999-2001 5 * (C) Copyright Johannes Erdfelt 1999-2001
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 8e5dd6f29d0b..bbbc82a8336a 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -7,7 +7,7 @@
7# 7#
8# - Host systems (like PCs) need CONFIG_USB (with "A" jacks). 8# - Host systems (like PCs) need CONFIG_USB (with "A" jacks).
9# - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks). 9# - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks).
10# - Some systems have both kinds of of controller. 10# - Some systems have both kinds of controllers.
11# 11#
12# With help from a special transceiver and a "Mini-AB" jack, systems with 12# With help from a special transceiver and a "Mini-AB" jack, systems with
13# both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG). 13# both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 422a4b288e34..fe2c4cd53f5a 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -119,7 +119,7 @@ config USB_STORAGE_ALAUDA
119 Say Y here to include additional code to support the Olympus MAUSB-10 119 Say Y here to include additional code to support the Olympus MAUSB-10
120 and Fujifilm DPC-R1 USB Card reader/writer devices. 120 and Fujifilm DPC-R1 USB Card reader/writer devices.
121 121
122 These devices are based on the Alauda chip and support support both 122 These devices are based on the Alauda chip and support both
123 XD and SmartMedia cards. 123 XD and SmartMedia cards.
124 124
125config USB_STORAGE_ONETOUCH 125config USB_STORAGE_ONETOUCH
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index a1c8923b0bf5..daaa486159cf 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -188,7 +188,7 @@ config FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT
188 bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC" 188 bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC"
189 help 189 help
190 This is an implementation of the Sharp LQ035Q7DB02, a 3.5" 190 This is an implementation of the Sharp LQ035Q7DB02, a 3.5"
191 color QVGA, HRTFT panel. The LogicPD device includes an 191 color QVGA, HRTFT panel. The LogicPD device includes
192 an integrated HRTFT controller IC. 192 an integrated HRTFT controller IC.
193 The native resolution is 240x320. 193 The native resolution is 240x320.
194 194
@@ -403,7 +403,7 @@ config FB_ARC
403 is based on the KS-108 lcd controller and is typically a matrix 403 is based on the KS-108 lcd controller and is typically a matrix
404 of 2*n chips. This driver was tested with a 128x64 panel. This 404 of 2*n chips. This driver was tested with a 128x64 panel. This
405 driver supports it for use with x86 SBCs through a 16 bit GPIO 405 driver supports it for use with x86 SBCs through a 16 bit GPIO
406 interface (8 bit data, 8 bit control). If you anticpate using 406 interface (8 bit data, 8 bit control). If you anticipate using
407 this driver, say Y or M; otherwise say N. You must specify the 407 this driver, say Y or M; otherwise say N. You must specify the
408 GPIO IO address to be used for setting control and data. 408 GPIO IO address to be used for setting control and data.
409 409
@@ -771,7 +771,7 @@ config FB_RIVA_DEBUG
771 default n 771 default n
772 help 772 help
773 Say Y here if you want the Riva driver to output all sorts 773 Say Y here if you want the Riva driver to output all sorts
774 of debugging informations to provide to the maintainer when 774 of debugging information to provide to the maintainer when
775 something goes wrong. 775 something goes wrong.
776 776
777config FB_RIVA_BACKLIGHT 777config FB_RIVA_BACKLIGHT
@@ -865,7 +865,7 @@ config FB_INTEL_DEBUG
865 depends on FB_INTEL 865 depends on FB_INTEL
866 ---help--- 866 ---help---
867 Say Y here if you want the Intel driver to output all sorts 867 Say Y here if you want the Intel driver to output all sorts
868 of debugging informations to provide to the maintainer when 868 of debugging information to provide to the maintainer when
869 something goes wrong. 869 something goes wrong.
870 870
871config FB_INTEL_I2C 871config FB_INTEL_I2C
@@ -1062,7 +1062,7 @@ config FB_RADEON_DEBUG
1062 default n 1062 default n
1063 help 1063 help
1064 Say Y here if you want the Radeon driver to output all sorts 1064 Say Y here if you want the Radeon driver to output all sorts
1065 of debugging informations to provide to the maintainer when 1065 of debugging information to provide to the maintainer when
1066 something goes wrong. 1066 something goes wrong.
1067 1067
1068config FB_ATY128 1068config FB_ATY128
diff --git a/drivers/video/s3c2410fb.h b/drivers/video/s3c2410fb.h
index be40968f899e..f3f8a8e15012 100644
--- a/drivers/video/s3c2410fb.h
+++ b/drivers/video/s3c2410fb.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/s3c2410fb.h 2 * linux/drivers/video/s3c2410fb.h
3 * Copyright (c) Arnaud Patard 3 * Copyright (c) Arnaud Patard
4 * 4 *
5 * This file is subject to the terms and conditions of the GNU General Public 5 * This file is subject to the terms and conditions of the GNU General Public
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 8b3d0f0c7bd5..27c9d05d03ef 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -21,7 +21,7 @@ config W1_CON
21 There are three types of messages between w1 core and userspace: 21 There are three types of messages between w1 core and userspace:
22 1. Events. They are generated each time new master or slave device found 22 1. Events. They are generated each time new master or slave device found
23 either due to automatic or requested search. 23 either due to automatic or requested search.
24 2. Userspace commands. Includes read/write and search/alarm search comamnds. 24 2. Userspace commands. Includes read/write and search/alarm search commands.
25 3. Replies to userspace commands. 25 3. Replies to userspace commands.
26 26
27source drivers/w1/masters/Kconfig 27source drivers/w1/masters/Kconfig
diff --git a/fs/Kconfig b/fs/Kconfig
index 1453d2d164f7..68f4561423ff 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -74,11 +74,11 @@ config EXT3_FS
74 tristate "Ext3 journalling file system support" 74 tristate "Ext3 journalling file system support"
75 select JBD 75 select JBD
76 help 76 help
77 This is the journaling version of the Second extended file system 77 This is the journalling version of the Second extended file system
78 (often called ext3), the de facto standard Linux file system 78 (often called ext3), the de facto standard Linux file system
79 (method to organize files on a storage device) for hard disks. 79 (method to organize files on a storage device) for hard disks.
80 80
81 The journaling code included in this driver means you do not have 81 The journalling code included in this driver means you do not have
82 to run e2fsck (file system checker) on your file systems after a 82 to run e2fsck (file system checker) on your file systems after a
83 crash. The journal keeps track of any changes that were being made 83 crash. The journal keeps track of any changes that were being made
84 at the time the system crashed, and can ensure that your file system 84 at the time the system crashed, and can ensure that your file system
@@ -143,7 +143,7 @@ config EXT3_FS_SECURITY
143config JBD 143config JBD
144 tristate 144 tristate
145 help 145 help
146 This is a generic journaling layer for block devices. It is 146 This is a generic journalling layer for block devices. It is
147 currently used by the ext3 and OCFS2 file systems, but it could 147 currently used by the ext3 and OCFS2 file systems, but it could
148 also be used to add journal support to other file systems or block 148 also be used to add journal support to other file systems or block
149 devices such as RAID or LVM. 149 devices such as RAID or LVM.
@@ -183,7 +183,7 @@ config REISERFS_FS
183 tristate "Reiserfs support" 183 tristate "Reiserfs support"
184 help 184 help
185 Stores not just filenames but the files themselves in a balanced 185 Stores not just filenames but the files themselves in a balanced
186 tree. Uses journaling. 186 tree. Uses journalling.
187 187
188 Balanced trees are more efficient than traditional file system 188 Balanced trees are more efficient than traditional file system
189 architectural foundations. 189 architectural foundations.
@@ -1032,7 +1032,7 @@ config BEFS_FS
1032 on files and directories, and database-like indeces on selected 1032 on files and directories, and database-like indeces on selected
1033 attributes. (Also note that this driver doesn't make those features 1033 attributes. (Also note that this driver doesn't make those features
1034 available at this time). It is a 64 bit filesystem, so it supports 1034 available at this time). It is a 64 bit filesystem, so it supports
1035 extremly large volumes and files. 1035 extremely large volumes and files.
1036 1036
1037 If you use this filesystem, you should also say Y to at least one 1037 If you use this filesystem, you should also say Y to at least one
1038 of the NLS (native language support) options below. 1038 of the NLS (native language support) options below.
@@ -1090,7 +1090,7 @@ config JFFS_FS
1090 tristate "Journalling Flash File System (JFFS) support" 1090 tristate "Journalling Flash File System (JFFS) support"
1091 depends on MTD && BLOCK 1091 depends on MTD && BLOCK
1092 help 1092 help
1093 JFFS is the Journaling Flash File System developed by Axis 1093 JFFS is the Journalling Flash File System developed by Axis
1094 Communications in Sweden, aimed at providing a crash/powerdown-safe 1094 Communications in Sweden, aimed at providing a crash/powerdown-safe
1095 file system for disk-less embedded devices. Further information is 1095 file system for disk-less embedded devices. Further information is
1096 available at (<http://developer.axis.com/software/jffs/>). 1096 available at (<http://developer.axis.com/software/jffs/>).
@@ -1260,7 +1260,7 @@ config JFFS2_CMODE_NONE
1260config JFFS2_CMODE_PRIORITY 1260config JFFS2_CMODE_PRIORITY
1261 bool "priority" 1261 bool "priority"
1262 help 1262 help
1263 Tries the compressors in a predefinied order and chooses the first 1263 Tries the compressors in a predefined order and chooses the first
1264 successful one. 1264 successful one.
1265 1265
1266config JFFS2_CMODE_SIZE 1266config JFFS2_CMODE_SIZE
@@ -1365,7 +1365,7 @@ config SYSV_FS
1365 1365
1366 If you have floppies or hard disk partitions like that, it is likely 1366 If you have floppies or hard disk partitions like that, it is likely
1367 that they contain binaries from those other Unix systems; in order 1367 that they contain binaries from those other Unix systems; in order
1368 to run these binaries, you will want to install linux-abi which is a 1368 to run these binaries, you will want to install linux-abi which is
1369 a set of kernel modules that lets you run SCO, Xenix, Wyse, 1369 a set of kernel modules that lets you run SCO, Xenix, Wyse,
1370 UnixWare, Dell Unix and System V programs under Linux. It is 1370 UnixWare, Dell Unix and System V programs under Linux. It is
1371 available via FTP (user: ftp) from 1371 available via FTP (user: ftp) from
@@ -1950,7 +1950,7 @@ config AFS_FS
1950 If you say Y here, you will get an experimental Andrew File System 1950 If you say Y here, you will get an experimental Andrew File System
1951 driver. It currently only supports unsecured read-only AFS access. 1951 driver. It currently only supports unsecured read-only AFS access.
1952 1952
1953 See <file:Documentation/filesystems/afs.txt> for more intormation. 1953 See <file:Documentation/filesystems/afs.txt> for more information.
1954 1954
1955 If unsure, say N. 1955 If unsure, say N.
1956 1956
diff --git a/fs/befs/befs_fs_types.h b/fs/befs/befs_fs_types.h
index 9095518e918d..63ef1e18fb84 100644
--- a/fs/befs/befs_fs_types.h
+++ b/fs/befs/befs_fs_types.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/linux/befs_fs_types.h 2 * fs/befs/befs_fs_types.h
3 * 3 *
4 * Copyright (C) 2001 Will Dyson (will@cs.earlham.edu) 4 * Copyright (C) 2001 Will Dyson (will@cs.earlham.edu)
5 * 5 *
diff --git a/fs/cifs/README b/fs/cifs/README
index 5f0e1bd64fee..432e515431c4 100644
--- a/fs/cifs/README
+++ b/fs/cifs/README
@@ -269,7 +269,7 @@ A partial list of the supported mount options follows:
269 (gid) mount option is specified. For the uid (gid) of newly 269 (gid) mount option is specified. For the uid (gid) of newly
270 created files and directories, ie files created since 270 created files and directories, ie files created since
271 the last mount of the server share, the expected uid 271 the last mount of the server share, the expected uid
272 (gid) is cached as as long as the inode remains in 272 (gid) is cached as long as the inode remains in
273 memory on the client. Also note that permission 273 memory on the client. Also note that permission
274 checks (authorization checks) on accesses to a file occur 274 checks (authorization checks) on accesses to a file occur
275 at the server, but there are cases in which an administrator 275 at the server, but there are cases in which an administrator
@@ -375,7 +375,7 @@ A partial list of the supported mount options follows:
375 the local process on newly created files, directories, and 375 the local process on newly created files, directories, and
376 devices (create, mkdir, mknod). If the CIFS Unix Extensions 376 devices (create, mkdir, mknod). If the CIFS Unix Extensions
377 are not negotiated, for newly created files and directories 377 are not negotiated, for newly created files and directories
378 instead of using the default uid and gid specified on the 378 instead of using the default uid and gid specified on
379 the mount, cache the new file's uid and gid locally which means 379 the mount, cache the new file's uid and gid locally which means
380 that the uid for the file can change when the inode is 380 that the uid for the file can change when the inode is
381 reloaded (or the user remounts the share). 381 reloaded (or the user remounts the share).
@@ -440,7 +440,7 @@ A partial list of the supported mount options follows:
440 create device files and fifos in a format compatible with 440 create device files and fifos in a format compatible with
441 Services for Unix (SFU). In addition retrieve bits 10-12 441 Services for Unix (SFU). In addition retrieve bits 10-12
442 of the mode via the SETFILEBITS extended attribute (as 442 of the mode via the SETFILEBITS extended attribute (as
443 SFU does). In the future the bottom 9 bits of the mode 443 SFU does). In the future the bottom 9 bits of the
444 mode also will be emulated using queries of the security 444 mode also will be emulated using queries of the security
445 descriptor (ACL). 445 descriptor (ACL).
446 sign Must use packet signing (helps avoid unwanted data modification 446 sign Must use packet signing (helps avoid unwanted data modification
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index ecf3da9edf21..e77676df6713 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -252,7 +252,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir);
252 * 252 *
253 * This function removes a file or directory in debugfs that was previously 253 * This function removes a file or directory in debugfs that was previously
254 * created with a call to another debugfs function (like 254 * created with a call to another debugfs function (like
255 * debufs_create_file() or variants thereof.) 255 * debugfs_create_file() or variants thereof.)
256 * 256 *
257 * This function is required to be called in order for the file to be 257 * This function is required to be called in order for the file to be
258 * removed, no automatic cleanup of files will happen when a module is 258 * removed, no automatic cleanup of files will happen when a module is
diff --git a/fs/hfsplus/part_tbl.c b/fs/hfsplus/part_tbl.c
index ae783066fc3a..1528a6fd0299 100644
--- a/fs/hfsplus/part_tbl.c
+++ b/fs/hfsplus/part_tbl.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/hfs/part_tbl.c 2 * linux/fs/hfsplus/part_tbl.c
3 * 3 *
4 * Copyright (C) 1996-1997 Paul H. Hargrove 4 * Copyright (C) 1996-1997 Paul H. Hargrove
5 * This file may be distributed under the terms of the GNU General Public License. 5 * This file may be distributed under the terms of the GNU General Public License.
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index 32a8caf0c41e..10be51290a27 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/commit.c 2 * linux/fs/jbd/commit.c
3 * 3 *
4 * Written by Stephen C. Tweedie <sct@redhat.com>, 1998 4 * Written by Stephen C. Tweedie <sct@redhat.com>, 1998
5 * 5 *
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 7af6099c911c..c518dd8fe60a 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/journal.c 2 * linux/fs/jbd/journal.c
3 * 3 *
4 * Written by Stephen C. Tweedie <sct@redhat.com>, 1998 4 * Written by Stephen C. Tweedie <sct@redhat.com>, 1998
5 * 5 *
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index fc95c4df6693..fe56b38364cc 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nfsd/nfsacl.c 2 * linux/fs/nfsd/nfs2acl.c
3 * 3 *
4 * Process version 2 NFSACL requests. 4 * Process version 2 NFSACL requests.
5 * 5 *
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 5446a0861d1d..5be00436b5b8 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -198,8 +198,7 @@ static char *savemem(struct nfsd4_compoundargs *argp, u32 *p, int nbytes)
198 p = new; 198 p = new;
199 memcpy(p, argp->tmp, nbytes); 199 memcpy(p, argp->tmp, nbytes);
200 } else { 200 } else {
201 if (p != argp->tmpp) 201 BUG_ON(p != argp->tmpp);
202 BUG();
203 argp->tmpp = NULL; 202 argp->tmpp = NULL;
204 } 203 }
205 if (defer_free(argp, kfree, p)) { 204 if (defer_free(argp, kfree, p)) {
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index e3a0797dd56b..3f14a17eaa6e 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nfsd/xdr.c 2 * linux/fs/nfsd/nfsxdr.c
3 * 3 *
4 * XDR support for nfsd 4 * XDR support for nfsd
5 * 5 *
diff --git a/fs/nls/nls_ascii.c b/fs/nls/nls_ascii.c
index b83381c07ad6..6993faea28ac 100644
--- a/fs/nls/nls_ascii.c
+++ b/fs/nls/nls_ascii.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_ascii.c 2 * linux/fs/nls/nls_ascii.c
3 * 3 *
4 * Charset ascii translation tables. 4 * Charset ascii translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index b1317ad5ca18..7dfdab98729b 100644
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_base.c 2 * linux/fs/nls/nls_base.c
3 * 3 *
4 * Native language support--charsets and unicode translations. 4 * Native language support--charsets and unicode translations.
5 * By Gordon Chaffee 1996, 1997 5 * By Gordon Chaffee 1996, 1997
diff --git a/fs/nls/nls_cp1250.c b/fs/nls/nls_cp1250.c
index 32e78cf95180..570aa69846a0 100644
--- a/fs/nls/nls_cp1250.c
+++ b/fs/nls/nls_cp1250.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp1250.c 2 * linux/fs/nls/nls_cp1250.c
3 * 3 *
4 * Charset cp1250 translation tables. 4 * Charset cp1250 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp1251.c b/fs/nls/nls_cp1251.c
index cb41c8ae4486..f114afa069db 100644
--- a/fs/nls/nls_cp1251.c
+++ b/fs/nls/nls_cp1251.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp1251.c 2 * linux/fs/nls/nls_cp1251.c
3 * 3 *
4 * Charset cp1251 translation tables. 4 * Charset cp1251 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp1255.c b/fs/nls/nls_cp1255.c
index efdeefee5346..e57f2cbf5bc0 100644
--- a/fs/nls/nls_cp1255.c
+++ b/fs/nls/nls_cp1255.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp1255.c 2 * linux/fs/nls/nls_cp1255.c
3 * 3 *
4 * Charset cp1255 translation tables. 4 * Charset cp1255 translation tables.
5 * The Unicode to charset table has only exact mappings. 5 * The Unicode to charset table has only exact mappings.
diff --git a/fs/nls/nls_cp437.c b/fs/nls/nls_cp437.c
index 5c4a1cd685dd..d41930ce4a44 100644
--- a/fs/nls/nls_cp437.c
+++ b/fs/nls/nls_cp437.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp437.c 2 * linux/fs/nls/nls_cp437.c
3 * 3 *
4 * Charset cp437 translation tables. 4 * Charset cp437 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp737.c b/fs/nls/nls_cp737.c
index e8b3ca8462e7..d21f8790aa19 100644
--- a/fs/nls/nls_cp737.c
+++ b/fs/nls/nls_cp737.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp737.c 2 * linux/fs/nls/nls_cp737.c
3 * 3 *
4 * Charset cp737 translation tables. 4 * Charset cp737 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp775.c b/fs/nls/nls_cp775.c
index bdb290ea523a..c97714c38a90 100644
--- a/fs/nls/nls_cp775.c
+++ b/fs/nls/nls_cp775.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp775.c 2 * linux/fs/nls/nls_cp775.c
3 * 3 *
4 * Charset cp775 translation tables. 4 * Charset cp775 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp850.c b/fs/nls/nls_cp850.c
index 25deaa4c8648..843b7d975ba2 100644
--- a/fs/nls/nls_cp850.c
+++ b/fs/nls/nls_cp850.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp850.c 2 * linux/fs/nls/nls_cp850.c
3 * 3 *
4 * Charset cp850 translation tables. 4 * Charset cp850 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp852.c b/fs/nls/nls_cp852.c
index b822a7b6b970..83cfd844d5ca 100644
--- a/fs/nls/nls_cp852.c
+++ b/fs/nls/nls_cp852.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp852.c 2 * linux/fs/nls/nls_cp852.c
3 * 3 *
4 * Charset cp852 translation tables. 4 * Charset cp852 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp855.c b/fs/nls/nls_cp855.c
index e8641b7a8b27..9190b7b574ff 100644
--- a/fs/nls/nls_cp855.c
+++ b/fs/nls/nls_cp855.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp855.c 2 * linux/fs/nls/nls_cp855.c
3 * 3 *
4 * Charset cp855 translation tables. 4 * Charset cp855 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp857.c b/fs/nls/nls_cp857.c
index 7ba589ef8cc0..ef3d36db8082 100644
--- a/fs/nls/nls_cp857.c
+++ b/fs/nls/nls_cp857.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp857.c 2 * linux/fs/nls/nls_cp857.c
3 * 3 *
4 * Charset cp857 translation tables. 4 * Charset cp857 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp860.c b/fs/nls/nls_cp860.c
index 3b9e49ce8c80..7e2fb6645893 100644
--- a/fs/nls/nls_cp860.c
+++ b/fs/nls/nls_cp860.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp860.c 2 * linux/fs/nls/nls_cp860.c
3 * 3 *
4 * Charset cp860 translation tables. 4 * Charset cp860 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp861.c b/fs/nls/nls_cp861.c
index 959ff64ee971..66d8d808ccf1 100644
--- a/fs/nls/nls_cp861.c
+++ b/fs/nls/nls_cp861.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp861.c 2 * linux/fs/nls/nls_cp861.c
3 * 3 *
4 * Charset cp861 translation tables. 4 * Charset cp861 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp862.c b/fs/nls/nls_cp862.c
index b96928f5a023..360ba388485f 100644
--- a/fs/nls/nls_cp862.c
+++ b/fs/nls/nls_cp862.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp862.c 2 * linux/fs/nls/nls_cp862.c
3 * 3 *
4 * Charset cp862 translation tables. 4 * Charset cp862 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp863.c b/fs/nls/nls_cp863.c
index baa6e0eab1d6..656a93113e37 100644
--- a/fs/nls/nls_cp863.c
+++ b/fs/nls/nls_cp863.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp863.c 2 * linux/fs/nls/nls_cp863.c
3 * 3 *
4 * Charset cp863 translation tables. 4 * Charset cp863 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp864.c b/fs/nls/nls_cp864.c
index f4dabb037dfe..01ca7309753e 100644
--- a/fs/nls/nls_cp864.c
+++ b/fs/nls/nls_cp864.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp864.c 2 * linux/fs/nls/nls_cp864.c
3 * 3 *
4 * Charset cp864 translation tables. 4 * Charset cp864 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp865.c b/fs/nls/nls_cp865.c
index 4caeafae32c2..5ba6ee13e109 100644
--- a/fs/nls/nls_cp865.c
+++ b/fs/nls/nls_cp865.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp865.c 2 * linux/fs/nls/nls_cp865.c
3 * 3 *
4 * Charset cp865 translation tables. 4 * Charset cp865 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp866.c b/fs/nls/nls_cp866.c
index f2b4a9a293fb..c5f82221c9fe 100644
--- a/fs/nls/nls_cp866.c
+++ b/fs/nls/nls_cp866.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp866.c 2 * linux/fs/nls/nls_cp866.c
3 * 3 *
4 * Charset cp866 translation tables. 4 * Charset cp866 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp869.c b/fs/nls/nls_cp869.c
index 12b436f4eca1..8d4015124d11 100644
--- a/fs/nls/nls_cp869.c
+++ b/fs/nls/nls_cp869.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp869.c 2 * linux/fs/nls/nls_cp869.c
3 * 3 *
4 * Charset cp869 translation tables. 4 * Charset cp869 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp874.c b/fs/nls/nls_cp874.c
index b5766a01703a..df042052c2db 100644
--- a/fs/nls/nls_cp874.c
+++ b/fs/nls/nls_cp874.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp874.c 2 * linux/fs/nls/nls_cp874.c
3 * 3 *
4 * Charset cp874 translation tables. 4 * Charset cp874 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_cp932.c b/fs/nls/nls_cp932.c
index 2c1a17cdcd24..2a9ccf3bc7ef 100644
--- a/fs/nls/nls_cp932.c
+++ b/fs/nls/nls_cp932.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp932.c 2 * linux/fs/nls/nls_cp932.c
3 * 3 *
4 * Charset cp932 translation tables. 4 * Charset cp932 translation tables.
5 * This translation table was generated automatically, the 5 * This translation table was generated automatically, the
diff --git a/fs/nls/nls_cp936.c b/fs/nls/nls_cp936.c
index ef4cef464aba..046fde8170ea 100644
--- a/fs/nls/nls_cp936.c
+++ b/fs/nls/nls_cp936.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp936.c 2 * linux/fs/nls/nls_cp936.c
3 * 3 *
4 * Charset cp936 translation tables. 4 * Charset cp936 translation tables.
5 * This translation table was generated automatically, the 5 * This translation table was generated automatically, the
diff --git a/fs/nls/nls_cp949.c b/fs/nls/nls_cp949.c
index 4351ae21d897..92ae19372f0f 100644
--- a/fs/nls/nls_cp949.c
+++ b/fs/nls/nls_cp949.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp949.c 2 * linux/fs/nls/nls_cp949.c
3 * 3 *
4 * Charset cp949 translation tables. 4 * Charset cp949 translation tables.
5 * This translation table was generated automatically, the 5 * This translation table was generated automatically, the
diff --git a/fs/nls/nls_cp950.c b/fs/nls/nls_cp950.c
index 8167a2858879..5665945fb88c 100644
--- a/fs/nls/nls_cp950.c
+++ b/fs/nls/nls_cp950.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_cp950.c 2 * linux/fs/nls/nls_cp950.c
3 * 3 *
4 * Charset cp950 translation tables. 4 * Charset cp950 translation tables.
5 * This translation table was generated automatically, the 5 * This translation table was generated automatically, the
diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
index 06640c3e4021..73293511578b 100644
--- a/fs/nls/nls_euc-jp.c
+++ b/fs/nls/nls_euc-jp.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_euc-jp.c 2 * linux/fs/nls/nls_euc-jp.c
3 * 3 *
4 * Added `OSF/JVC Recommended Code Set Conversion Specification 4 * Added `OSF/JVC Recommended Code Set Conversion Specification
5 * between Japanese EUC and Shift-JIS' support: <hirofumi@mail.parknet.co.jp> 5 * between Japanese EUC and Shift-JIS' support: <hirofumi@mail.parknet.co.jp>
diff --git a/fs/nls/nls_iso8859-1.c b/fs/nls/nls_iso8859-1.c
index 70a2c1956723..2483c3c6c1c1 100644
--- a/fs/nls/nls_iso8859-1.c
+++ b/fs/nls/nls_iso8859-1.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-1.c 2 * linux/fs/nls/nls_iso8859-1.c
3 * 3 *
4 * Charset iso8859-1 translation tables. 4 * Charset iso8859-1 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_iso8859-13.c b/fs/nls/nls_iso8859-13.c
index 4547035f21a3..7b8721d74368 100644
--- a/fs/nls/nls_iso8859-13.c
+++ b/fs/nls/nls_iso8859-13.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-13.c 2 * linux/fs/nls/nls_iso8859-13.c
3 * 3 *
4 * Charset iso8859-13 translation tables. 4 * Charset iso8859-13 translation tables.
5 * The Unicode to charset table has only exact mappings. 5 * The Unicode to charset table has only exact mappings.
diff --git a/fs/nls/nls_iso8859-14.c b/fs/nls/nls_iso8859-14.c
index 13628d0dd3a9..2e895e638dba 100644
--- a/fs/nls/nls_iso8859-14.c
+++ b/fs/nls/nls_iso8859-14.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-14.c 2 * linux/fs/nls/nls_iso8859-14.c
3 * 3 *
4 * Charset iso8859-14 translation tables. 4 * Charset iso8859-14 translation tables.
5 * 5 *
diff --git a/fs/nls/nls_iso8859-15.c b/fs/nls/nls_iso8859-15.c
index 88b924bf7e18..5c91592779fe 100644
--- a/fs/nls/nls_iso8859-15.c
+++ b/fs/nls/nls_iso8859-15.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-15.c 2 * linux/fs/nls/nls_iso8859-15.c
3 * 3 *
4 * Charset iso8859-15 translation tables. 4 * Charset iso8859-15 translation tables.
5 * The Unicode to charset table has only exact mappings. 5 * The Unicode to charset table has only exact mappings.
diff --git a/fs/nls/nls_iso8859-2.c b/fs/nls/nls_iso8859-2.c
index 372528a6c40c..892d38fe9530 100644
--- a/fs/nls/nls_iso8859-2.c
+++ b/fs/nls/nls_iso8859-2.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-2.c 2 * linux/fs/nls/nls_iso8859-2.c
3 * 3 *
4 * Charset iso8859-2 translation tables. 4 * Charset iso8859-2 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_iso8859-3.c b/fs/nls/nls_iso8859-3.c
index 81b45a234369..49317bcdb4be 100644
--- a/fs/nls/nls_iso8859-3.c
+++ b/fs/nls/nls_iso8859-3.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-3.c 2 * linux/fs/nls/nls_iso8859-3.c
3 * 3 *
4 * Charset iso8859-3 translation tables. 4 * Charset iso8859-3 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_iso8859-4.c b/fs/nls/nls_iso8859-4.c
index 101b87f5a49b..9f3b9368c2cf 100644
--- a/fs/nls/nls_iso8859-4.c
+++ b/fs/nls/nls_iso8859-4.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-4.c 2 * linux/fs/nls/nls_iso8859-4.c
3 * 3 *
4 * Charset iso8859-4 translation tables. 4 * Charset iso8859-4 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_iso8859-5.c b/fs/nls/nls_iso8859-5.c
index 83b0084de5eb..001a2bb132ce 100644
--- a/fs/nls/nls_iso8859-5.c
+++ b/fs/nls/nls_iso8859-5.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-5.c 2 * linux/fs/nls/nls_iso8859-5.c
3 * 3 *
4 * Charset iso8859-5 translation tables. 4 * Charset iso8859-5 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_iso8859-6.c b/fs/nls/nls_iso8859-6.c
index 0c519d65f55b..8cec03d66088 100644
--- a/fs/nls/nls_iso8859-6.c
+++ b/fs/nls/nls_iso8859-6.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-6.c 2 * linux/fs/nls/nls_iso8859-6.c
3 * 3 *
4 * Charset iso8859-6 translation tables. 4 * Charset iso8859-6 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_iso8859-7.c b/fs/nls/nls_iso8859-7.c
index bd0854625acf..1be707d5ac31 100644
--- a/fs/nls/nls_iso8859-7.c
+++ b/fs/nls/nls_iso8859-7.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-7.c 2 * linux/fs/nls/nls_iso8859-7.c
3 * 3 *
4 * Charset iso8859-7 translation tables. 4 * Charset iso8859-7 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_iso8859-9.c b/fs/nls/nls_iso8859-9.c
index 988eff791c06..8c0146f73834 100644
--- a/fs/nls/nls_iso8859-9.c
+++ b/fs/nls/nls_iso8859-9.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_iso8859-9.c 2 * linux/fs/nls/nls_iso8859-9.c
3 * 3 *
4 * Charset iso8859-9 translation tables. 4 * Charset iso8859-9 translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_koi8-r.c b/fs/nls/nls_koi8-r.c
index 0ad22c249796..fefbe0807265 100644
--- a/fs/nls/nls_koi8-r.c
+++ b/fs/nls/nls_koi8-r.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_koi8-r.c 2 * linux/fs/nls/nls_koi8-r.c
3 * 3 *
4 * Charset koi8-r translation tables. 4 * Charset koi8-r translation tables.
5 * Generated automatically from the Unicode and charset 5 * Generated automatically from the Unicode and charset
diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
index 5db83efe27c6..e7bc1d75c78c 100644
--- a/fs/nls/nls_koi8-ru.c
+++ b/fs/nls/nls_koi8-ru.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_koi8-ru.c 2 * linux/fs/nls/nls_koi8-ru.c
3 * 3 *
4 * Charset koi8-ru translation based on charset koi8-u. 4 * Charset koi8-ru translation based on charset koi8-u.
5 * The Unicode to charset table has only exact mappings. 5 * The Unicode to charset table has only exact mappings.
diff --git a/fs/nls/nls_koi8-u.c b/fs/nls/nls_koi8-u.c
index 9d30fd61cf46..015070211f22 100644
--- a/fs/nls/nls_koi8-u.c
+++ b/fs/nls/nls_koi8-u.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/fs/nls_koi8-u.c 2 * linux/fs/nls/nls_koi8-u.c
3 * 3 *
4 * Charset koi8-u translation tables. 4 * Charset koi8-u translation tables.
5 * The Unicode to charset table has only exact mappings. 5 * The Unicode to charset table has only exact mappings.
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 41f24369e47a..c093642fb983 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -38,8 +38,7 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp)
38 int err; 38 int err;
39 int jbegin_failure = 0; 39 int jbegin_failure = 0;
40 40
41 if (!S_ISREG(inode->i_mode)) 41 BUG_ON(!S_ISREG(inode->i_mode));
42 BUG();
43 42
44 /* fast out for when nothing needs to be done */ 43 /* fast out for when nothing needs to be done */
45 if ((atomic_read(&inode->i_count) > 1 || 44 if ((atomic_read(&inode->i_count) > 1 ||
@@ -125,8 +124,7 @@ static int reiserfs_sync_file(struct file *p_s_filp,
125 int n_err; 124 int n_err;
126 int barrier_done; 125 int barrier_done;
127 126
128 if (!S_ISREG(p_s_inode->i_mode)) 127 BUG_ON(!S_ISREG(p_s_inode->i_mode));
129 BUG();
130 n_err = sync_mapping_buffers(p_s_inode->i_mapping); 128 n_err = sync_mapping_buffers(p_s_inode->i_mapping);
131 reiserfs_write_lock(p_s_inode->i_sb); 129 reiserfs_write_lock(p_s_inode->i_sb);
132 barrier_done = reiserfs_commit_for_inode(p_s_inode); 130 barrier_done = reiserfs_commit_for_inode(p_s_inode);
diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
index 7a88adbceef6..b9b423b22a8b 100644
--- a/fs/reiserfs/item_ops.c
+++ b/fs/reiserfs/item_ops.c
@@ -75,8 +75,7 @@ static int sd_create_vi(struct virtual_node *vn,
75static int sd_check_left(struct virtual_item *vi, int free, 75static int sd_check_left(struct virtual_item *vi, int free,
76 int start_skip, int end_skip) 76 int start_skip, int end_skip)
77{ 77{
78 if (start_skip || end_skip) 78 BUG_ON(start_skip || end_skip);
79 BUG();
80 return -1; 79 return -1;
81} 80}
82 81
@@ -87,8 +86,7 @@ static int sd_check_right(struct virtual_item *vi, int free)
87 86
88static int sd_part_size(struct virtual_item *vi, int first, int count) 87static int sd_part_size(struct virtual_item *vi, int first, int count)
89{ 88{
90 if (count) 89 BUG_ON(count);
91 BUG();
92 return 0; 90 return 0;
93} 91}
94 92
@@ -476,8 +474,7 @@ static int direntry_create_vi(struct virtual_node *vn,
476 474
477 vi->vi_index = TYPE_DIRENTRY; 475 vi->vi_index = TYPE_DIRENTRY;
478 476
479 if (!(vi->vi_ih) || !vi->vi_item) 477 BUG_ON(!(vi->vi_ih) || !vi->vi_item);
480 BUG();
481 478
482 dir_u->flags = 0; 479 dir_u->flags = 0;
483 if (le_ih_k_offset(vi->vi_ih) == DOT_OFFSET) 480 if (le_ih_k_offset(vi->vi_ih) == DOT_OFFSET)
@@ -575,8 +572,7 @@ static int direntry_check_right(struct virtual_item *vi, int free)
575 free -= dir_u->entry_sizes[i]; 572 free -= dir_u->entry_sizes[i];
576 entries++; 573 entries++;
577 } 574 }
578 if (entries == dir_u->entry_count) 575 BUG_ON(entries == dir_u->entry_count);
579 BUG();
580 576
581 /* "." and ".." can not be separated from each other */ 577 /* "." and ".." can not be separated from each other */
582 if ((dir_u->flags & DIRENTRY_VI_FIRST_DIRENTRY_ITEM) 578 if ((dir_u->flags & DIRENTRY_VI_FIRST_DIRENTRY_ITEM)
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index e6b5ccf23f15..ad8cbc49883a 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -718,8 +718,7 @@ static int add_to_chunk(struct buffer_chunk *chunk, struct buffer_head *bh,
718 spinlock_t * lock, void (fn) (struct buffer_chunk *)) 718 spinlock_t * lock, void (fn) (struct buffer_chunk *))
719{ 719{
720 int ret = 0; 720 int ret = 0;
721 if (chunk->nr >= CHUNK_SIZE) 721 BUG_ON(chunk->nr >= CHUNK_SIZE);
722 BUG();
723 chunk->bh[chunk->nr++] = bh; 722 chunk->bh[chunk->nr++] = bh;
724 if (chunk->nr >= CHUNK_SIZE) { 723 if (chunk->nr >= CHUNK_SIZE) {
725 ret = 1; 724 ret = 1;
@@ -788,8 +787,7 @@ static inline int __add_jh(struct reiserfs_journal *j, struct buffer_head *bh,
788 /* buffer must be locked for __add_jh, should be able to have 787 /* buffer must be locked for __add_jh, should be able to have
789 * two adds at the same time 788 * two adds at the same time
790 */ 789 */
791 if (bh->b_private) 790 BUG_ON(bh->b_private);
792 BUG();
793 jh->bh = bh; 791 jh->bh = bh;
794 bh->b_private = jh; 792 bh->b_private = jh;
795 } 793 }
@@ -2967,8 +2965,7 @@ static int do_journal_begin_r(struct reiserfs_transaction_handle *th,
2967 int retval; 2965 int retval;
2968 2966
2969 reiserfs_check_lock_depth(p_s_sb, "journal_begin"); 2967 reiserfs_check_lock_depth(p_s_sb, "journal_begin");
2970 if (nblocks > journal->j_trans_max) 2968 BUG_ON(nblocks > journal->j_trans_max);
2971 BUG();
2972 2969
2973 PROC_INFO_INC(p_s_sb, journal.journal_being); 2970 PROC_INFO_INC(p_s_sb, journal.journal_being);
2974 /* set here for journal_join */ 2971 /* set here for journal_join */
@@ -3084,9 +3081,8 @@ struct reiserfs_transaction_handle *reiserfs_persistent_transaction(struct
3084 if (reiserfs_transaction_running(s)) { 3081 if (reiserfs_transaction_running(s)) {
3085 th = current->journal_info; 3082 th = current->journal_info;
3086 th->t_refcount++; 3083 th->t_refcount++;
3087 if (th->t_refcount < 2) { 3084 BUG_ON(th->t_refcount < 2);
3088 BUG(); 3085
3089 }
3090 return th; 3086 return th;
3091 } 3087 }
3092 th = kmalloc(sizeof(struct reiserfs_transaction_handle), GFP_NOFS); 3088 th = kmalloc(sizeof(struct reiserfs_transaction_handle), GFP_NOFS);
@@ -3126,9 +3122,7 @@ static int journal_join(struct reiserfs_transaction_handle *th,
3126 ** pointer 3122 ** pointer
3127 */ 3123 */
3128 th->t_handle_save = cur_th; 3124 th->t_handle_save = cur_th;
3129 if (cur_th && cur_th->t_refcount > 1) { 3125 BUG_ON(cur_th && cur_th->t_refcount > 1);
3130 BUG();
3131 }
3132 return do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_JOIN); 3126 return do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_JOIN);
3133} 3127}
3134 3128
@@ -3141,9 +3135,7 @@ int journal_join_abort(struct reiserfs_transaction_handle *th,
3141 ** pointer 3135 ** pointer
3142 */ 3136 */
3143 th->t_handle_save = cur_th; 3137 th->t_handle_save = cur_th;
3144 if (cur_th && cur_th->t_refcount > 1) { 3138 BUG_ON(cur_th && cur_th->t_refcount > 1);
3145 BUG();
3146 }
3147 return do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_ABORT); 3139 return do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_ABORT);
3148} 3140}
3149 3141
@@ -3178,8 +3170,7 @@ int journal_begin(struct reiserfs_transaction_handle *th,
3178 current->journal_info = th; 3170 current->journal_info = th;
3179 } 3171 }
3180 ret = do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_REG); 3172 ret = do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_REG);
3181 if (current->journal_info != th) 3173 BUG_ON(current->journal_info != th);
3182 BUG();
3183 3174
3184 /* I guess this boils down to being the reciprocal of clm-2100 above. 3175 /* I guess this boils down to being the reciprocal of clm-2100 above.
3185 * If do_journal_begin_r fails, we need to put it back, since journal_end 3176 * If do_journal_begin_r fails, we need to put it back, since journal_end
@@ -3324,8 +3315,7 @@ int journal_end(struct reiserfs_transaction_handle *th,
3324 /* we aren't allowed to close a nested transaction on a different 3315 /* we aren't allowed to close a nested transaction on a different
3325 ** filesystem from the one in the task struct 3316 ** filesystem from the one in the task struct
3326 */ 3317 */
3327 if (cur_th->t_super != th->t_super) 3318 BUG_ON(cur_th->t_super != th->t_super);
3328 BUG();
3329 3319
3330 if (th != cur_th) { 3320 if (th != cur_th) {
3331 memcpy(current->journal_info, th, sizeof(*th)); 3321 memcpy(current->journal_info, th, sizeof(*th));
@@ -3444,9 +3434,7 @@ int journal_end_sync(struct reiserfs_transaction_handle *th,
3444 3434
3445 BUG_ON(!th->t_trans_id); 3435 BUG_ON(!th->t_trans_id);
3446 /* you can sync while nested, very, very bad */ 3436 /* you can sync while nested, very, very bad */
3447 if (th->t_refcount > 1) { 3437 BUG_ON(th->t_refcount > 1);
3448 BUG();
3449 }
3450 if (journal->j_len == 0) { 3438 if (journal->j_len == 0) {
3451 reiserfs_prepare_for_journal(p_s_sb, SB_BUFFER_WITH_SB(p_s_sb), 3439 reiserfs_prepare_for_journal(p_s_sb, SB_BUFFER_WITH_SB(p_s_sb),
3452 1); 3440 1);
@@ -3556,9 +3544,8 @@ static int check_journal_end(struct reiserfs_transaction_handle *th,
3556 ** will be dealt with by next transaction that actually writes something, but should be taken 3544 ** will be dealt with by next transaction that actually writes something, but should be taken
3557 ** care of in this trans 3545 ** care of in this trans
3558 */ 3546 */
3559 if (journal->j_len == 0) { 3547 BUG_ON(journal->j_len == 0);
3560 BUG(); 3548
3561 }
3562 /* if wcount > 0, and we are called to with flush or commit_now, 3549 /* if wcount > 0, and we are called to with flush or commit_now,
3563 ** we wait on j_join_wait. We will wake up when the last writer has 3550 ** we wait on j_join_wait. We will wake up when the last writer has
3564 ** finished the transaction, and started it on its way to the disk. 3551 ** finished the transaction, and started it on its way to the disk.
@@ -3592,9 +3579,8 @@ static int check_journal_end(struct reiserfs_transaction_handle *th,
3592 unlock_journal(p_s_sb); 3579 unlock_journal(p_s_sb);
3593 } 3580 }
3594 } 3581 }
3595 if (journal->j_trans_id == trans_id) { 3582 BUG_ON(journal->j_trans_id == trans_id);
3596 BUG(); 3583
3597 }
3598 if (commit_now 3584 if (commit_now
3599 && journal_list_still_alive(p_s_sb, trans_id) 3585 && journal_list_still_alive(p_s_sb, trans_id)
3600 && wait_on_commit) { 3586 && wait_on_commit) {
@@ -4074,9 +4060,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th,
4074 set_commit_trans_len(commit, journal->j_len); 4060 set_commit_trans_len(commit, journal->j_len);
4075 4061
4076 /* special check in case all buffers in the journal were marked for not logging */ 4062 /* special check in case all buffers in the journal were marked for not logging */
4077 if (journal->j_len == 0) { 4063 BUG_ON(journal->j_len == 0);
4078 BUG();
4079 }
4080 4064
4081 /* we're about to dirty all the log blocks, mark the description block 4065 /* we're about to dirty all the log blocks, mark the description block
4082 * dirty now too. Don't mark the commit block dirty until all the 4066 * dirty now too. Don't mark the commit block dirty until all the
@@ -4173,8 +4157,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th,
4173 journal, jl, &jl->j_tail_bh_list); 4157 journal, jl, &jl->j_tail_bh_list);
4174 lock_kernel(); 4158 lock_kernel();
4175 } 4159 }
4176 if (!list_empty(&jl->j_tail_bh_list)) 4160 BUG_ON(!list_empty(&jl->j_tail_bh_list));
4177 BUG();
4178 up(&jl->j_commit_lock); 4161 up(&jl->j_commit_lock);
4179 4162
4180 /* honor the flush wishes from the caller, simple commits can 4163 /* honor the flush wishes from the caller, simple commits can
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 16e9cff8f15d..abde1edc2235 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -67,8 +67,7 @@ inline void set_de_name_and_namelen(struct reiserfs_dir_entry *de)
67{ 67{
68 struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num; 68 struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num;
69 69
70 if (de->de_entry_num >= ih_entry_count(de->de_ih)) 70 BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
71 BUG();
72 71
73 de->de_entrylen = entry_length(de->de_bh, de->de_ih, de->de_entry_num); 72 de->de_entrylen = entry_length(de->de_bh, de->de_ih, de->de_entry_num);
74 de->de_namelen = de->de_entrylen - (de_with_sd(deh) ? SD_SIZE : 0); 73 de->de_namelen = de->de_entrylen - (de_with_sd(deh) ? SD_SIZE : 0);
@@ -80,8 +79,7 @@ inline void set_de_name_and_namelen(struct reiserfs_dir_entry *de)
80// what entry points to 79// what entry points to
81static inline void set_de_object_key(struct reiserfs_dir_entry *de) 80static inline void set_de_object_key(struct reiserfs_dir_entry *de)
82{ 81{
83 if (de->de_entry_num >= ih_entry_count(de->de_ih)) 82 BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
84 BUG();
85 de->de_dir_id = deh_dir_id(&(de->de_deh[de->de_entry_num])); 83 de->de_dir_id = deh_dir_id(&(de->de_deh[de->de_entry_num]));
86 de->de_objectid = deh_objectid(&(de->de_deh[de->de_entry_num])); 84 de->de_objectid = deh_objectid(&(de->de_deh[de->de_entry_num]));
87} 85}
@@ -90,8 +88,7 @@ static inline void store_de_entry_key(struct reiserfs_dir_entry *de)
90{ 88{
91 struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num; 89 struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num;
92 90
93 if (de->de_entry_num >= ih_entry_count(de->de_ih)) 91 BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih));
94 BUG();
95 92
96 /* store key of the found entry */ 93 /* store key of the found entry */
97 de->de_entry_key.version = KEY_FORMAT_3_5; 94 de->de_entry_key.version = KEY_FORMAT_3_5;
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 8b9b13127136..5240abe1a709 100644
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -1476,9 +1476,7 @@ static int maybe_indirect_to_direct(struct reiserfs_transaction_handle *th,
1476 int n_block_size = p_s_sb->s_blocksize; 1476 int n_block_size = p_s_sb->s_blocksize;
1477 int cut_bytes; 1477 int cut_bytes;
1478 BUG_ON(!th->t_trans_id); 1478 BUG_ON(!th->t_trans_id);
1479 1479 BUG_ON(n_new_file_size != p_s_inode->i_size);
1480 if (n_new_file_size != p_s_inode->i_size)
1481 BUG();
1482 1480
1483 /* the page being sent in could be NULL if there was an i/o error 1481 /* the page being sent in could be NULL if there was an i/o error
1484 ** reading in the last block. The user will hit problems trying to 1482 ** reading in the last block. The user will hit problems trying to
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c
index 36fbeccdc722..c75f68361e33 100644
--- a/fs/xfs/support/debug.c
+++ b/fs/xfs/support/debug.c
@@ -53,8 +53,7 @@ cmn_err(register int level, char *fmt, ...)
53 va_end(ap); 53 va_end(ap);
54 spin_unlock_irqrestore(&xfs_err_lock,flags); 54 spin_unlock_irqrestore(&xfs_err_lock,flags);
55 55
56 if (level == CE_PANIC) 56 BUG_ON(level == CE_PANIC);
57 BUG();
58} 57}
59 58
60void 59void
@@ -72,8 +71,7 @@ icmn_err(register int level, char *fmt, va_list ap)
72 strcat(message, "\n"); 71 strcat(message, "\n");
73 spin_unlock_irqrestore(&xfs_err_lock,flags); 72 spin_unlock_irqrestore(&xfs_err_lock,flags);
74 printk("%s%s", err_level[level], message); 73 printk("%s%s", err_level[level], message);
75 if (level == CE_PANIC) 74 BUG_ON(level == CE_PANIC);
76 BUG();
77} 75}
78 76
79void 77void
diff --git a/include/asm-arm/arch-clps711x/entry-macro.S b/include/asm-arm/arch-clps711x/entry-macro.S
index 21f6ee485819..de4481dd8ba0 100644
--- a/include/asm-arm/arch-clps711x/entry-macro.S
+++ b/include/asm-arm/arch-clps711x/entry-macro.S
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-arm/arch-CLPS711x/entry-macro.S 2 * include/asm-arm/arch-clps711x/entry-macro.S
3 * 3 *
4 * Low-level IRQ helper macros for CLPS711X-based platforms 4 * Low-level IRQ helper macros for CLPS711X-based platforms
5 * 5 *
diff --git a/include/asm-arm/arch-ebsa285/entry-macro.S b/include/asm-arm/arch-ebsa285/entry-macro.S
index cf10ac96fdde..ce812d4f4a33 100644
--- a/include/asm-arm/arch-ebsa285/entry-macro.S
+++ b/include/asm-arm/arch-ebsa285/entry-macro.S
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-arm/arch-footbridge/entry-macro.S 2 * include/asm-arm/arch-ebsa285/entry-macro.S
3 * 3 *
4 * Low-level IRQ helper macros for footbridge-based platforms 4 * Low-level IRQ helper macros for footbridge-based platforms
5 * 5 *
diff --git a/include/asm-arm/arch-h720x/system.h b/include/asm-arm/arch-h720x/system.h
index 09eda84592ff..8dc1460b2305 100644
--- a/include/asm-arm/arch-h720x/system.h
+++ b/include/asm-arm/arch-h720x/system.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/arm/mach-h720x/system.h 2 * linux/include/asm-arm/arch-h720x/system.h
3 * 3 *
4 * Copyright (C) 2001-2002 Jungjun Kim, Hynix Semiconductor Inc. 4 * Copyright (C) 2001-2002 Jungjun Kim, Hynix Semiconductor Inc.
5 * 5 *
diff --git a/include/asm-arm/arch-ixp4xx/system.h b/include/asm-arm/arch-ixp4xx/system.h
index 73589aad8dd6..8e1db423b1cc 100644
--- a/include/asm-arm/arch-ixp4xx/system.h
+++ b/include/asm-arm/arch-ixp4xx/system.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-arm/arch-ixp4x//system.h 2 * include/asm-arm/arch-ixp4xx/system.h
3 * 3 *
4 * Copyright (C) 2002 Intel Corporation. 4 * Copyright (C) 2002 Intel Corporation.
5 * 5 *
diff --git a/include/asm-arm/arch-omap/dmtimer.h b/include/asm-arm/arch-omap/dmtimer.h
index b5f3a71b899d..fefb276ed402 100644
--- a/include/asm-arm/arch-omap/dmtimer.h
+++ b/include/asm-arm/arch-omap/dmtimer.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-arm/arm/arch-omap/dmtimer.h 2 * linux/include/asm-arm/arch-omap/dmtimer.h
3 * 3 *
4 * OMAP Dual-Mode Timers 4 * OMAP Dual-Mode Timers
5 * 5 *
diff --git a/include/asm-arm/arch-omap/mcbsp.h b/include/asm-arm/arch-omap/mcbsp.h
index ed0dde4f7219..c7a0cc1c4e93 100644
--- a/include/asm-arm/arch-omap/mcbsp.h
+++ b/include/asm-arm/arch-omap/mcbsp.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-arm/arch-omap/gpio.h 2 * linux/include/asm-arm/arch-omap/mcbsp.h
3 * 3 *
4 * Defines for Multi-Channel Buffered Serial Port 4 * Defines for Multi-Channel Buffered Serial Port
5 * 5 *
diff --git a/include/asm-arm/arch-omap/pm.h b/include/asm-arm/arch-omap/pm.h
index e46623c61a72..14588059981f 100644
--- a/include/asm-arm/arch-omap/pm.h
+++ b/include/asm-arm/arch-omap/pm.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm/arch-omap/pm.h 2 * linux/include/asm-arm/arch-omap/pm.h
3 * 3 *
4 * Header file for OMAP Power Management Routines 4 * Header file for OMAP Power Management Routines
5 * 5 *
diff --git a/include/asm-arm/arch-pnx4008/platform.h b/include/asm-arm/arch-pnx4008/platform.h
index 485a3651b4d7..2613c7c669b1 100644
--- a/include/asm-arm/arch-pnx4008/platform.h
+++ b/include/asm-arm/arch-pnx4008/platform.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-arm/arch-pnx4008/platfrom.h 2 * include/asm-arm/arch-pnx4008/platform.h
3 * 3 *
4 * PNX4008 Base addresses - header file 4 * PNX4008 Base addresses - header file
5 * 5 *
diff --git a/include/asm-arm/arch-s3c2410/fb.h b/include/asm-arm/arch-s3c2410/fb.h
index 71161797bc89..90894214cace 100644
--- a/include/asm-arm/arch-s3c2410/fb.h
+++ b/include/asm-arm/arch-s3c2410/fb.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/arch-s3c2410/fb.h 1/* linux/include/asm-arm/arch-s3c2410/fb.h
2 * 2 *
3 * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org> 3 * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
4 * 4 *
diff --git a/include/asm-arm/arch-s3c2410/regs-adc.h b/include/asm-arm/arch-s3c2410/regs-adc.h
index c7b90b3ecc9e..3196a2849e8a 100644
--- a/include/asm-arm/arch-s3c2410/regs-adc.h
+++ b/include/asm-arm/arch-s3c2410/regs-adc.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/arch-s3c2410/regs-adc.h 1/* linux/include/asm-arm/arch-s3c2410/regs-adc.h
2 * 2 *
3 * Copyright (c) 2004 Shannon Holland <holland@loser.net> 3 * Copyright (c) 2004 Shannon Holland <holland@loser.net>
4 * 4 *
diff --git a/include/asm-arm/arch-s3c2410/regs-clock.h b/include/asm-arm/arch-s3c2410/regs-clock.h
index b2f4690c0791..e39656b7a086 100644
--- a/include/asm-arm/arch-s3c2410/regs-clock.h
+++ b/include/asm-arm/arch-s3c2410/regs-clock.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/arch-s3c2410/regs-clock.h 1/* linux/include/asm-arm/arch-s3c2410/regs-clock.h
2 * 2 *
3 * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk> 3 * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk>
4 * http://armlinux.simtec.co.uk/ 4 * http://armlinux.simtec.co.uk/
diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/include/asm-arm/arch-s3c2410/regs-dsc.h
index a0a124875164..c0748511edbc 100644
--- a/include/asm-arm/arch-s3c2410/regs-dsc.h
+++ b/include/asm-arm/arch-s3c2410/regs-dsc.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/hardware/s3c2410/regs-dsc.h 1/* linux/include/asm-arm/arch-s3c2410/regs-dsc.h
2 * 2 *
3 * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> 3 * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
4 * http://www.simtec.co.uk/products/SWLINUX/ 4 * http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-gpio.h b/include/asm-arm/arch-s3c2410/regs-gpio.h
index 93c49432db95..b2893e32a236 100644
--- a/include/asm-arm/arch-s3c2410/regs-gpio.h
+++ b/include/asm-arm/arch-s3c2410/regs-gpio.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/hardware/s3c2410/regs-gpio.h 1/* linux/include/asm-arm/arch-s3c2410/regs-gpio.h
2 * 2 *
3 * Copyright (c) 2003,2004 Simtec Electronics <linux@simtec.co.uk> 3 * Copyright (c) 2003,2004 Simtec Electronics <linux@simtec.co.uk>
4 * http://www.simtec.co.uk/products/SWLINUX/ 4 * http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-gpioj.h b/include/asm-arm/arch-s3c2410/regs-gpioj.h
index 91cefa260497..02131a5a1d3a 100644
--- a/include/asm-arm/arch-s3c2410/regs-gpioj.h
+++ b/include/asm-arm/arch-s3c2410/regs-gpioj.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/hardware/s3c2410/regs-gpioj.h 1/* linux/include/asm-arm/arch-s3c2410/regs-gpioj.h
2 * 2 *
3 * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> 3 * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
4 * http://www.simtec.co.uk/products/SWLINUX/ 4 * http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-iis.h b/include/asm-arm/arch-s3c2410/regs-iis.h
index 72cd2509822e..eaf77916a602 100644
--- a/include/asm-arm/arch-s3c2410/regs-iis.h
+++ b/include/asm-arm/arch-s3c2410/regs-iis.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/arch-s3c2410/regs-iis.h 1/* linux/include/asm-arm/arch-s3c2410/regs-iis.h
2 * 2 *
3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> 3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
4 * http://www.simtec.co.uk/products/SWLINUX/ 4 * http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-irq.h b/include/asm-arm/arch-s3c2410/regs-irq.h
index 29fb8ef670f0..498184cb8adc 100644
--- a/include/asm-arm/arch-s3c2410/regs-irq.h
+++ b/include/asm-arm/arch-s3c2410/regs-irq.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/arch-s3c2410/regs-irq.h 1/* linux/include/asm-arm/arch-s3c2410/regs-irq.h
2 * 2 *
3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> 3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
4 * http://www.simtec.co.uk/products/SWLINUX/ 4 * http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-lcd.h b/include/asm-arm/arch-s3c2410/regs-lcd.h
index 6d7881c8cfc8..b7faeb04c0ff 100644
--- a/include/asm-arm/arch-s3c2410/regs-lcd.h
+++ b/include/asm-arm/arch-s3c2410/regs-lcd.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/arch-s3c2410/regs-lcd.h 1/* linux/include/asm-arm/arch-s3c2410/regs-lcd.h
2 * 2 *
3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> 3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
4 * http://www.simtec.co.uk/products/SWLINUX/ 4 * http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-rtc.h b/include/asm-arm/arch-s3c2410/regs-rtc.h
index cd88fd634d12..93b03c49710a 100644
--- a/include/asm-arm/arch-s3c2410/regs-rtc.h
+++ b/include/asm-arm/arch-s3c2410/regs-rtc.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/arch-s3c2410/regs-rtc.h 1/* linux/include/asm-arm/arch-s3c2410/regs-rtc.h
2 * 2 *
3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> 3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
4 * http://www.simtec.co.uk/products/SWLINUX/ 4 * http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-sdi.h b/include/asm-arm/arch-s3c2410/regs-sdi.h
index 06e716e5b46d..bb9d30b72952 100644
--- a/include/asm-arm/arch-s3c2410/regs-sdi.h
+++ b/include/asm-arm/arch-s3c2410/regs-sdi.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/arch-s3c2410/regs-sdi.h 1/* linux/include/asm-arm/arch-s3c2410/regs-sdi.h
2 * 2 *
3 * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk> 3 * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
4 * http://www.simtec.co.uk/products/SWLINUX/ 4 * http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-timer.h b/include/asm-arm/arch-s3c2410/regs-timer.h
index 731918e77831..6f8fe432fe3a 100644
--- a/include/asm-arm/arch-s3c2410/regs-timer.h
+++ b/include/asm-arm/arch-s3c2410/regs-timer.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/arch-s3c2410/regs-timer.h 1/* linux/include/asm-arm/arch-s3c2410/regs-timer.h
2 * 2 *
3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> 3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
4 * http://www.simtec.co.uk/products/SWLINUX/ 4 * http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/regs-udc.h b/include/asm-arm/arch-s3c2410/regs-udc.h
index 3aa31a27da1a..487861d5b49a 100644
--- a/include/asm-arm/arch-s3c2410/regs-udc.h
+++ b/include/asm-arm/arch-s3c2410/regs-udc.h
@@ -1,4 +1,4 @@
1/* linux/include/asm/arch-s3c2410/regs-udc.h 1/* linux/include/asm-arm/arch-s3c2410/regs-udc.h
2 * 2 *
3 * Copyright (C) 2004 Herbert Poetzl <herbert@13thfloor.at> 3 * Copyright (C) 2004 Herbert Poetzl <herbert@13thfloor.at>
4 * 4 *
diff --git a/include/asm-arm/arch-s3c2410/spi-gpio.h b/include/asm-arm/arch-s3c2410/spi-gpio.h
index 258c00bca270..c1e4db7c9710 100644
--- a/include/asm-arm/arch-s3c2410/spi-gpio.h
+++ b/include/asm-arm/arch-s3c2410/spi-gpio.h
@@ -1,4 +1,4 @@
1/* linux/include/asm-arm/arch-s3c2410/spi.h 1/* linux/include/asm-arm/arch-s3c2410/spi-gpio.h
2 * 2 *
3 * Copyright (c) 2006 Simtec Electronics 3 * Copyright (c) 2006 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-sa1100/neponset.h b/include/asm-arm/arch-sa1100/neponset.h
index 8051fd73a80b..09ec9e2bd182 100644
--- a/include/asm-arm/arch-sa1100/neponset.h
+++ b/include/asm-arm/arch-sa1100/neponset.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-arm/arch-sa1100/assabet.h 2 * linux/include/asm-arm/arch-sa1100/neponset.h
3 * 3 *
4 * Created 2000/06/05 by Nicolas Pitre <nico@cam.org> 4 * Created 2000/06/05 by Nicolas Pitre <nico@cam.org>
5 * 5 *
diff --git a/include/asm-arm/arch-sa1100/uncompress.h b/include/asm-arm/arch-sa1100/uncompress.h
index 2601a77a6dda..17e64d232e7d 100644
--- a/include/asm-arm/arch-sa1100/uncompress.h
+++ b/include/asm-arm/arch-sa1100/uncompress.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-arm/arch-brutus/uncompress.h 2 * linux/include/asm-arm/arch-sa1100/uncompress.h
3 * 3 *
4 * (C) 1999 Nicolas Pitre <nico@cam.org> 4 * (C) 1999 Nicolas Pitre <nico@cam.org>
5 * 5 *
diff --git a/include/asm-arm/arch-shark/vmalloc.h b/include/asm-arm/arch-shark/vmalloc.h
index 10db5d188231..fac37c636b38 100644
--- a/include/asm-arm/arch-shark/vmalloc.h
+++ b/include/asm-arm/arch-shark/vmalloc.h
@@ -1,4 +1,4 @@
1/* 1/*
2 * linux/include/asm-arm/arch-rpc/vmalloc.h 2 * linux/include/asm-arm/arch-shark/vmalloc.h
3 */ 3 */
4#define VMALLOC_END (PAGE_OFFSET + 0x10000000) 4#define VMALLOC_END (PAGE_OFFSET + 0x10000000)
diff --git a/include/asm-arm/hardware/debug-8250.S b/include/asm-arm/hardware/debug-8250.S
index 4594fea91ec1..07c97fb233fc 100644
--- a/include/asm-arm/hardware/debug-8250.S
+++ b/include/asm-arm/hardware/debug-8250.S
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-arm/hardware/debug-8250.h 2 * linux/include/asm-arm/hardware/debug-8250.S
3 * 3 *
4 * Copyright (C) 1994-1999 Russell King 4 * Copyright (C) 1994-1999 Russell King
5 * 5 *
diff --git a/include/asm-arm/hardware/debug-pl01x.S b/include/asm-arm/hardware/debug-pl01x.S
index db0d0f7de5e9..23c541a9e89a 100644
--- a/include/asm-arm/hardware/debug-pl01x.S
+++ b/include/asm-arm/hardware/debug-pl01x.S
@@ -1,4 +1,4 @@
1/* linux/include/asm-arm/arch-integrator/debug-macro.S 1/* linux/include/asm-arm/hardware/debug-pl01x.S
2 * 2 *
3 * Debugging macro include header 3 * Debugging macro include header
4 * 4 *
diff --git a/include/asm-arm/hardware/entry-macro-iomd.S b/include/asm-arm/hardware/entry-macro-iomd.S
index 30c7b92c2416..fbed08f298d0 100644
--- a/include/asm-arm/hardware/entry-macro-iomd.S
+++ b/include/asm-arm/hardware/entry-macro-iomd.S
@@ -1,5 +1,5 @@
1/* 1/*
2 * arch/arm/commond/entry-macro-iomd.S 2 * include/asm-arm/hardware/entry-macro-iomd.S
3 * 3 *
4 * Low-level IRQ helper macros for IOC/IOMD based platforms 4 * Low-level IRQ helper macros for IOC/IOMD based platforms
5 * 5 *
diff --git a/include/asm-arm/hardware/sa1111.h b/include/asm-arm/hardware/sa1111.h
index 319aea064c36..6aa0a5b75b69 100644
--- a/include/asm-arm/hardware/sa1111.h
+++ b/include/asm-arm/hardware/sa1111.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-arm/hardware/SA-1111.h 2 * linux/include/asm-arm/hardware/sa1111.h
3 * 3 *
4 * Copyright (C) 2000 John G Dorsey <john+@cs.cmu.edu> 4 * Copyright (C) 2000 John G Dorsey <john+@cs.cmu.edu>
5 * 5 *
diff --git a/include/asm-arm26/assembler.h b/include/asm-arm26/assembler.h
index 83f9aec55e4f..bb507a9a4a55 100644
--- a/include/asm-arm26/assembler.h
+++ b/include/asm-arm26/assembler.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/asm/assembler.h 2 * linux/include/asm-arm26/assembler.h
3 * 3 *
4 * This file contains arm architecture specific defines 4 * This file contains arm architecture specific defines
5 * for the different processors. 5 * for the different processors.
diff --git a/include/asm-arm26/namei.h b/include/asm-arm26/namei.h
index a402d3b9d0f7..3f5d340110eb 100644
--- a/include/asm-arm26/namei.h
+++ b/include/asm-arm26/namei.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-arm/namei.h 2 * linux/include/asm-arm26/namei.h
3 * 3 *
4 * Routines to handle famous /usr/gnemul 4 * Routines to handle famous /usr/gnemul
5 * Derived from the Sparc version of this file 5 * Derived from the Sparc version of this file
diff --git a/include/asm-arm26/semaphore.h b/include/asm-arm26/semaphore.h
index ccf15e704109..1fda54375ed8 100644
--- a/include/asm-arm26/semaphore.h
+++ b/include/asm-arm26/semaphore.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-arm/semaphore.h 2 * linux/include/asm-arm26/semaphore.h
3 */ 3 */
4#ifndef __ASM_ARM_SEMAPHORE_H 4#ifndef __ASM_ARM_SEMAPHORE_H
5#define __ASM_ARM_SEMAPHORE_H 5#define __ASM_ARM_SEMAPHORE_H
diff --git a/include/asm-frv/namei.h b/include/asm-frv/namei.h
index 84ddd6445f23..4ea57171d951 100644
--- a/include/asm-frv/namei.h
+++ b/include/asm-frv/namei.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * asm/namei.h 2 * include/asm-frv/namei.h
3 * 3 *
4 * Included from linux/fs/namei.c 4 * Included from linux/fs/namei.c
5 */ 5 */
diff --git a/include/asm-generic/mutex-dec.h b/include/asm-generic/mutex-dec.h
index 29c6ac34e236..0134151656af 100644
--- a/include/asm-generic/mutex-dec.h
+++ b/include/asm-generic/mutex-dec.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * asm-generic/mutex-dec.h 2 * include/asm-generic/mutex-dec.h
3 * 3 *
4 * Generic implementation of the mutex fastpath, based on atomic 4 * Generic implementation of the mutex fastpath, based on atomic
5 * decrement/increment. 5 * decrement/increment.
diff --git a/include/asm-generic/mutex-null.h b/include/asm-generic/mutex-null.h
index 254a126ede5c..e1bbbc72b6a2 100644
--- a/include/asm-generic/mutex-null.h
+++ b/include/asm-generic/mutex-null.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * asm-generic/mutex-null.h 2 * include/asm-generic/mutex-null.h
3 * 3 *
4 * Generic implementation of the mutex fastpath, based on NOP :-) 4 * Generic implementation of the mutex fastpath, based on NOP :-)
5 * 5 *
diff --git a/include/asm-generic/mutex-xchg.h b/include/asm-generic/mutex-xchg.h
index 32a2100c1aeb..6a7e8c141b53 100644
--- a/include/asm-generic/mutex-xchg.h
+++ b/include/asm-generic/mutex-xchg.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * asm-generic/mutex-xchg.h 2 * include/asm-generic/mutex-xchg.h
3 * 3 *
4 * Generic implementation of the mutex fastpath, based on xchg(). 4 * Generic implementation of the mutex fastpath, based on xchg().
5 * 5 *
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
index 4087037a4225..d3238f1f70a6 100644
--- a/include/asm-generic/rtc.h
+++ b/include/asm-generic/rtc.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * inclue/asm-generic/rtc.h 2 * include/asm-generic/rtc.h
3 * 3 *
4 * Author: Tom Rini <trini@mvista.com> 4 * Author: Tom Rini <trini@mvista.com>
5 * 5 *
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index 867d9008fafa..f490e43a90b9 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -1,4 +1,4 @@
1/* asm-generic/tlb.h 1/* include/asm-generic/tlb.h
2 * 2 *
3 * Generic TLB shootdown code 3 * Generic TLB shootdown code
4 * 4 *
diff --git a/include/asm-m32r/m32104ut/m32104ut_pld.h b/include/asm-m32r/m32104ut/m32104ut_pld.h
index 6ba4ddf7dcf7..cbdbc5891445 100644
--- a/include/asm-m32r/m32104ut/m32104ut_pld.h
+++ b/include/asm-m32r/m32104ut/m32104ut_pld.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm/m32104ut/m32104ut_pld.h 2 * include/asm-m32r/m32104ut/m32104ut_pld.h
3 * 3 *
4 * Definitions for Programable Logic Device(PLD) on M32104UT board. 4 * Definitions for Programable Logic Device(PLD) on M32104UT board.
5 * Based on m32700ut_pld.h 5 * Based on m32700ut_pld.h
diff --git a/include/asm-m32r/m32700ut/m32700ut_lan.h b/include/asm-m32r/m32700ut/m32700ut_lan.h
index c050b19e8101..f1e47ae1f891 100644
--- a/include/asm-m32r/m32700ut/m32700ut_lan.h
+++ b/include/asm-m32r/m32700ut/m32700ut_lan.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm/m32700ut_lan.h 2 * include/asm-m32r/m32700ut/m32700ut_lan.h
3 * 3 *
4 * M32700UT-LAN board 4 * M32700UT-LAN board
5 * 5 *
diff --git a/include/asm-m32r/m32700ut/m32700ut_lcd.h b/include/asm-m32r/m32700ut/m32700ut_lcd.h
index 4da4e822e2f3..e41c4aa48b4c 100644
--- a/include/asm-m32r/m32700ut/m32700ut_lcd.h
+++ b/include/asm-m32r/m32700ut/m32700ut_lcd.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm/m32700ut_lcd.h 2 * include/asm-m32r/m32700ut/m32700ut_lcd.h
3 * 3 *
4 * M32700UT-LCD board 4 * M32700UT-LCD board
5 * 5 *
diff --git a/include/asm-m32r/m32700ut/m32700ut_pld.h b/include/asm-m32r/m32700ut/m32700ut_pld.h
index f35f9159acff..a48c22c978ca 100644
--- a/include/asm-m32r/m32700ut/m32700ut_pld.h
+++ b/include/asm-m32r/m32700ut/m32700ut_pld.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm/m32700ut/m32700ut_pld.h 2 * include/asm-m32r/m32700ut/m32700ut_pld.h
3 * 3 *
4 * Definitions for Programable Logic Device(PLD) on M32700UT board. 4 * Definitions for Programable Logic Device(PLD) on M32700UT board.
5 * 5 *
diff --git a/include/asm-m32r/mappi2/mappi2_pld.h b/include/asm-m32r/mappi2/mappi2_pld.h
index 01dcdd19dbe6..56a2b12f2bfc 100644
--- a/include/asm-m32r/mappi2/mappi2_pld.h
+++ b/include/asm-m32r/mappi2/mappi2_pld.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm/mappi2/mappi2_pld.h 2 * include/asm-m32r/mappi2/mappi2_pld.h
3 * 3 *
4 * Definitions for Extended IO Logic on MAPPI2 board. 4 * Definitions for Extended IO Logic on MAPPI2 board.
5 * based on m32700ut_pld.h by 5 * based on m32700ut_pld.h by
diff --git a/include/asm-m32r/mappi3/mappi3_pld.h b/include/asm-m32r/mappi3/mappi3_pld.h
index 031369a7afc8..92f10defaef8 100644
--- a/include/asm-m32r/mappi3/mappi3_pld.h
+++ b/include/asm-m32r/mappi3/mappi3_pld.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm/mappi3/mappi3_pld.h 2 * include/asm-m32r/mappi3/mappi3_pld.h
3 * 3 *
4 * Definitions for Extended IO Logic on MAPPI3 board. 4 * Definitions for Extended IO Logic on MAPPI3 board.
5 * based on m32700ut_pld.h 5 * based on m32700ut_pld.h
diff --git a/include/asm-m32r/opsput/opsput_lan.h b/include/asm-m32r/opsput/opsput_lan.h
index 61948296f445..f53e10187c03 100644
--- a/include/asm-m32r/opsput/opsput_lan.h
+++ b/include/asm-m32r/opsput/opsput_lan.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm/opsput_lan.h 2 * include/asm-m32r/opsput/opsput_lan.h
3 * 3 *
4 * OPSPUT-LAN board 4 * OPSPUT-LAN board
5 * 5 *
diff --git a/include/asm-m32r/opsput/opsput_lcd.h b/include/asm-m32r/opsput/opsput_lcd.h
index 44cfd7fe2d88..99f296e1b61b 100644
--- a/include/asm-m32r/opsput/opsput_lcd.h
+++ b/include/asm-m32r/opsput/opsput_lcd.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm/opsput_lcd.h 2 * include/asm-m32r/opsput/opsput_lcd.h
3 * 3 *
4 * OPSPUT-LCD board 4 * OPSPUT-LCD board
5 * 5 *
diff --git a/include/asm-m32r/opsput/opsput_pld.h b/include/asm-m32r/opsput/opsput_pld.h
index 46296fe1ec1a..a8d6452076f1 100644
--- a/include/asm-m32r/opsput/opsput_pld.h
+++ b/include/asm-m32r/opsput/opsput_pld.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm/opsput/opsput_pld.h 2 * include/asm-m32r/opsput/opsput_pld.h
3 * 3 *
4 * Definitions for Programable Logic Device(PLD) on OPSPUT board. 4 * Definitions for Programable Logic Device(PLD) on OPSPUT board.
5 * 5 *
diff --git a/include/asm-m68k/rtc.h b/include/asm-m68k/rtc.h
index 71406fc4e599..5d3e03859844 100644
--- a/include/asm-m68k/rtc.h
+++ b/include/asm-m68k/rtc.h
@@ -1,4 +1,4 @@
1/* asm-m68k/rtc.h 1/* include/asm-m68k/rtc.h
2 * 2 *
3 * Copyright Richard Zidlicky 3 * Copyright Richard Zidlicky
4 * implementation details for genrtc/q40rtc driver 4 * implementation details for genrtc/q40rtc driver
diff --git a/include/asm-m68knommu/processor.h b/include/asm-m68knommu/processor.h
index 9d3a1bf41231..91cba18acdd3 100644
--- a/include/asm-m68knommu/processor.h
+++ b/include/asm-m68knommu/processor.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-m68k/processor.h 2 * include/asm-m68knommu/processor.h
3 * 3 *
4 * Copyright (C) 1995 Hamish Macdonald 4 * Copyright (C) 1995 Hamish Macdonald
5 */ 5 */
diff --git a/include/asm-mips/tx4938/tx4938_mips.h b/include/asm-mips/tx4938/tx4938_mips.h
index cf89b205f103..5f8498fef005 100644
--- a/include/asm-mips/tx4938/tx4938_mips.h
+++ b/include/asm-mips/tx4938/tx4938_mips.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-mips/tx4938/tx4938_bitmask.h 2 * linux/include/asm-mips/tx4938/tx4938_mips.h
3 * Generic bitmask definitions 3 * Generic bitmask definitions
4 * 4 *
5 * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the 5 * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the
diff --git a/include/asm-parisc/rtc.h b/include/asm-parisc/rtc.h
index f3d3d6b110ba..f4ebff11dcbd 100644
--- a/include/asm-parisc/rtc.h
+++ b/include/asm-parisc/rtc.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * inclue/asm-parisc/rtc.h 2 * include/asm-parisc/rtc.h
3 * 3 *
4 * Copyright 2002 Randolph CHung <tausq@debian.org> 4 * Copyright 2002 Randolph CHung <tausq@debian.org>
5 * 5 *
diff --git a/include/asm-powerpc/ipic.h b/include/asm-powerpc/ipic.h
index 53079ec3a515..1ce09a35906e 100644
--- a/include/asm-powerpc/ipic.h
+++ b/include/asm-powerpc/ipic.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-ppc/ipic.h 2 * include/asm-powerpc/ipic.h
3 * 3 *
4 * IPIC external definitions and structure. 4 * IPIC external definitions and structure.
5 * 5 *
diff --git a/include/asm-ppc/mv64x60_defs.h b/include/asm-ppc/mv64x60_defs.h
index f8f7f16b9b53..5b0704a3e6ea 100644
--- a/include/asm-ppc/mv64x60_defs.h
+++ b/include/asm-ppc/mv64x60_defs.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-ppc/gt64260_defs.h 2 * include/asm-ppc/mv64x60_defs.h
3 * 3 *
4 * Register definitions for the Marvell/Galileo GT64260, MV64360, etc. 4 * Register definitions for the Marvell/Galileo GT64260, MV64360, etc.
5 * host bridges. 5 * host bridges.
diff --git a/include/asm-ppc/rheap.h b/include/asm-ppc/rheap.h
index 65b93225a778..39a10d862244 100644
--- a/include/asm-ppc/rheap.h
+++ b/include/asm-ppc/rheap.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-ppc/rheap.c 2 * include/asm-ppc/rheap.h
3 * 3 *
4 * Header file for the implementation of a remote heap. 4 * Header file for the implementation of a remote heap.
5 * 5 *
diff --git a/include/asm-ppc/rtc.h b/include/asm-ppc/rtc.h
index 05fbf912ab4d..6025b46d0a2a 100644
--- a/include/asm-ppc/rtc.h
+++ b/include/asm-ppc/rtc.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * inclue/asm-ppc/rtc.h 2 * include/asm-ppc/rtc.h
3 * 3 *
4 * Author: Tom Rini <trini@mvista.com> 4 * Author: Tom Rini <trini@mvista.com>
5 * 5 *
diff --git a/include/asm-s390/qdio.h b/include/asm-s390/qdio.h
index a2f37a9353d3..7189c79bc673 100644
--- a/include/asm-s390/qdio.h
+++ b/include/asm-s390/qdio.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm/qdio.h 2 * linux/include/asm-s390/qdio.h
3 * 3 *
4 * Linux for S/390 QDIO base support, Hipersocket base support 4 * Linux for S/390 QDIO base support, Hipersocket base support
5 * version 2 5 * version 2
diff --git a/include/asm-sh/bigsur/io.h b/include/asm-sh/bigsur/io.h
index 939735ee8dc5..1470ac8d4a39 100644
--- a/include/asm-sh/bigsur/io.h
+++ b/include/asm-sh/bigsur/io.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-sh/io_bigsur.h 2 * include/asm-sh/bigsur/io.h
3 * 3 *
4 * By Dustin McIntire (dustin@sensoria.com) (c)2001 4 * By Dustin McIntire (dustin@sensoria.com) (c)2001
5 * Derived from io_hd64465.h, which bore the message: 5 * Derived from io_hd64465.h, which bore the message:
diff --git a/include/asm-sh/bigsur/serial.h b/include/asm-sh/bigsur/serial.h
index 7233af42f755..a08fa82fe45a 100644
--- a/include/asm-sh/bigsur/serial.h
+++ b/include/asm-sh/bigsur/serial.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-sh/serial-bigsur.h 2 * include/asm-sh/bigsur/serial.h
3 * 3 *
4 * Configuration details for Big Sur 16550 based serial ports 4 * Configuration details for Big Sur 16550 based serial ports
5 * i.e. HD64465, PCMCIA, etc. 5 * i.e. HD64465, PCMCIA, etc.
diff --git a/include/asm-sh/dreamcast/sysasic.h b/include/asm-sh/dreamcast/sysasic.h
index c8858537803c..7874e3dac736 100644
--- a/include/asm-sh/dreamcast/sysasic.h
+++ b/include/asm-sh/dreamcast/sysasic.h
@@ -1,4 +1,4 @@
1/* include/asm-sh/dc_sysasic.h 1/* include/asm-sh/dreamcast/sysasic.h
2 * 2 *
3 * Definitions for the Dreamcast System ASIC and related peripherals. 3 * Definitions for the Dreamcast System ASIC and related peripherals.
4 * 4 *
diff --git a/include/asm-sh/hd64465/io.h b/include/asm-sh/hd64465/io.h
index 1100bcf4968e..139f1472e5bb 100644
--- a/include/asm-sh/hd64465/io.h
+++ b/include/asm-sh/hd64465/io.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-sh/io_hd64465.h 2 * include/asm-sh/hd64465/io.h
3 * 3 *
4 * By Greg Banks <gbanks@pocketpenguins.com> 4 * By Greg Banks <gbanks@pocketpenguins.com>
5 * (c) 2000 PocketPenguins Inc. 5 * (c) 2000 PocketPenguins Inc.
diff --git a/include/asm-sh/mpc1211/io.h b/include/asm-sh/mpc1211/io.h
index eba8a0b5fd7b..6298370bec2d 100644
--- a/include/asm-sh/mpc1211/io.h
+++ b/include/asm-sh/mpc1211/io.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-sh/io_mpc1211.h 2 * include/asm-sh/mpc1211/io.h
3 * 3 *
4 * Copyright 2001 Saito.K & Jeanne 4 * Copyright 2001 Saito.K & Jeanne
5 * 5 *
diff --git a/include/asm-sh64/serial.h b/include/asm-sh64/serial.h
index 29c9be15112b..e8d7b3f2da57 100644
--- a/include/asm-sh64/serial.h
+++ b/include/asm-sh64/serial.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-sh/serial.h 2 * include/asm-sh64/serial.h
3 * 3 *
4 * Configuration details for 8250, 16450, 16550, etc. serial ports 4 * Configuration details for 8250, 16450, 16550, etc. serial ports
5 */ 5 */
diff --git a/include/asm-sparc/reg.h b/include/asm-sparc/reg.h
index ed60ebec5930..ea0a7e590bb3 100644
--- a/include/asm-sparc/reg.h
+++ b/include/asm-sparc/reg.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/asm-sparc/reg.h 2 * linux/include/asm-sparc/reg.h
3 * Layout of the registers as expected by gdb on the Sparc 3 * Layout of the registers as expected by gdb on the Sparc
4 * we should replace the user.h definitions with those in 4 * we should replace the user.h definitions with those in
5 * this file, we don't even use the other 5 * this file, we don't even use the other
diff --git a/include/asm-x86_64/cache.h b/include/asm-x86_64/cache.h
index ed8a9d25272d..052df758ae61 100644
--- a/include/asm-x86_64/cache.h
+++ b/include/asm-x86_64/cache.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-x8664/cache.h 2 * include/asm-x86_64/cache.h
3 */ 3 */
4#ifndef __ARCH_X8664_CACHE_H 4#ifndef __ARCH_X8664_CACHE_H
5#define __ARCH_X8664_CACHE_H 5#define __ARCH_X8664_CACHE_H
diff --git a/include/asm-xtensa/a.out.h b/include/asm-xtensa/a.out.h
index 3be701dfe098..ffc4dcfd6ac1 100644
--- a/include/asm-xtensa/a.out.h
+++ b/include/asm-xtensa/a.out.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-xtensa/addrspace.h 2 * include/asm-xtensa/a.out.h
3 * 3 *
4 * Dummy a.out file. Xtensa does not support the a.out format, but the kernel 4 * Dummy a.out file. Xtensa does not support the a.out format, but the kernel
5 * seems to depend on it. 5 * seems to depend on it.
diff --git a/include/asm-xtensa/cache.h b/include/asm-xtensa/cache.h
index 5aae3f12407c..1e79c0e27460 100644
--- a/include/asm-xtensa/cache.h
+++ b/include/asm-xtensa/cache.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-xtensa/cacheflush.h 2 * include/asm-xtensa/cache.h
3 * 3 *
4 * This file is subject to the terms and conditions of the GNU General Public 4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive 5 * License. See the file "COPYING" in the main directory of this archive
diff --git a/include/asm-xtensa/coprocessor.h b/include/asm-xtensa/coprocessor.h
index a91b96dc0efe..5093034723be 100644
--- a/include/asm-xtensa/coprocessor.h
+++ b/include/asm-xtensa/coprocessor.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-xtensa/cpextra.h 2 * include/asm-xtensa/coprocessor.h
3 * 3 *
4 * This file is subject to the terms and conditions of the GNU General Public 4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive 5 * License. See the file "COPYING" in the main directory of this archive
diff --git a/include/asm-xtensa/dma-mapping.h b/include/asm-xtensa/dma-mapping.h
index c425f10d086a..c39c91dfcc69 100644
--- a/include/asm-xtensa/dma-mapping.h
+++ b/include/asm-xtensa/dma-mapping.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-xtensa/dma_mapping.h 2 * include/asm-xtensa/dma-mapping.h
3 * 3 *
4 * This file is subject to the terms and conditions of the GNU General Public 4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive 5 * License. See the file "COPYING" in the main directory of this archive
diff --git a/include/asm-xtensa/ioctls.h b/include/asm-xtensa/ioctls.h
index 3b89a772d0a0..39e6f23921bb 100644
--- a/include/asm-xtensa/ioctls.h
+++ b/include/asm-xtensa/ioctls.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-xtensa/ioctl.h 2 * include/asm-xtensa/ioctls.h
3 * 3 *
4 * This file is subject to the terms and conditions of the GNU General Public 4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive 5 * License. See the file "COPYING" in the main directory of this archive
diff --git a/include/asm-xtensa/pgtable.h b/include/asm-xtensa/pgtable.h
index a47cc734c20c..b4318934b10d 100644
--- a/include/asm-xtensa/pgtable.h
+++ b/include/asm-xtensa/pgtable.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-xtensa/page.h 2 * linux/include/asm-xtensa/pgtable.h
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify 4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version2 as 5 * it under the terms of the GNU General Public License version2 as
diff --git a/include/asm-xtensa/siginfo.h b/include/asm-xtensa/siginfo.h
index 44f0ae77b539..6916248295df 100644
--- a/include/asm-xtensa/siginfo.h
+++ b/include/asm-xtensa/siginfo.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/asm-xtensa/processor.h 2 * include/asm-xtensa/siginfo.h
3 * 3 *
4 * This file is subject to the terms and conditions of the GNU General Public 4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive 5 * License. See the file "COPYING" in the main directory of this archive
diff --git a/include/linux/aio_abi.h b/include/linux/aio_abi.h
index 3466b1d0ffd2..e3ca0a485cc6 100644
--- a/include/linux/aio_abi.h
+++ b/include/linux/aio_abi.h
@@ -1,4 +1,4 @@
1/* linux/aio_abi.h 1/* include/linux/aio_abi.h
2 * 2 *
3 * Copyright 2000,2001,2002 Red Hat. 3 * Copyright 2000,2001,2002 Red Hat.
4 * 4 *
diff --git a/include/linux/awe_voice.h b/include/linux/awe_voice.h
index 4bf9f33048e2..bf33f17bea99 100644
--- a/include/linux/awe_voice.h
+++ b/include/linux/awe_voice.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/awe_voice.h 2 * include/linux/awe_voice.h
3 * 3 *
4 * Voice information definitions for the low level driver for the 4 * Voice information definitions for the low level driver for the
5 * AWE32/SB32/AWE64 wave table synth. 5 * AWE32/SB32/AWE64 wave table synth.
diff --git a/include/linux/harrier_defs.h b/include/linux/harrier_defs.h
index 685b252e16cc..efef11db790f 100644
--- a/include/linux/harrier_defs.h
+++ b/include/linux/harrier_defs.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * asm-ppc/harrier_defs.h 2 * include/linux/harrier_defs.h
3 * 3 *
4 * Definitions for Motorola MCG Harrier North Bridge & Memory controller 4 * Definitions for Motorola MCG Harrier North Bridge & Memory controller
5 * 5 *
diff --git a/include/linux/lockd/xdr4.h b/include/linux/lockd/xdr4.h
index cee36e7c0548..3cc1ae25009b 100644
--- a/include/linux/lockd/xdr4.h
+++ b/include/linux/lockd/xdr4.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/linux/lockd/xdr.h 2 * linux/include/linux/lockd/xdr4.h
3 * 3 *
4 * XDR types for the NLM protocol 4 * XDR types for the NLM protocol
5 * 5 *
diff --git a/include/linux/mtd/plat-ram.h b/include/linux/mtd/plat-ram.h
index 2332eda07e0e..9667863bd7e3 100644
--- a/include/linux/mtd/plat-ram.h
+++ b/include/linux/mtd/plat-ram.h
@@ -1,4 +1,4 @@
1/* linux/include/mtd/plat-ram.h 1/* linux/include/linux/mtd/plat-ram.h
2 * 2 *
3 * (c) 2004 Simtec Electronics 3 * (c) 2004 Simtec Electronics
4 * http://www.simtec.co.uk/products/SWLINUX/ 4 * http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/linux/nfsd/stats.h b/include/linux/nfsd/stats.h
index 28a82fdd922f..7678cfbe9960 100644
--- a/include/linux/nfsd/stats.h
+++ b/include/linux/nfsd/stats.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/nfsd/stats.h 2 * linux/include/linux/nfsd/stats.h
3 * 3 *
4 * Statistics for NFS server. 4 * Statistics for NFS server.
5 * 5 *
diff --git a/include/linux/nfsd/xdr.h b/include/linux/nfsd/xdr.h
index 3f4f7142bbe3..a38f9d776de9 100644
--- a/include/linux/nfsd/xdr.h
+++ b/include/linux/nfsd/xdr.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/inxlude/linux/nfsd/xdr.h 2 * linux/include/linux/nfsd/xdr.h
3 * 3 *
4 * XDR types for nfsd. This is mainly a typing exercise. 4 * XDR types for nfsd. This is mainly a typing exercise.
5 */ 5 */
diff --git a/include/linux/ppdev.h b/include/linux/ppdev.h
index f376a7598a78..dc18c5d23ebe 100644
--- a/include/linux/ppdev.h
+++ b/include/linux/ppdev.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/char/ppdev.h 2 * linux/include/linux/ppdev.h
3 * 3 *
4 * User-space parallel port device driver (header file). 4 * User-space parallel port device driver (header file).
5 * 5 *
diff --git a/include/linux/slab.h b/include/linux/slab.h
index a96fd9310d55..70be57d8ae0d 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/mm/slab.h 2 * linux/include/linux/slab.h
3 * Written by Mark Hemment, 1996. 3 * Written by Mark Hemment, 1996.
4 * (markhe@nextd.demon.co.uk) 4 * (markhe@nextd.demon.co.uk)
5 */ 5 */
diff --git a/include/linux/sunrpc/auth_gss.h b/include/linux/sunrpc/auth_gss.h
index 03084dc4bb6a..97b62e97dd8d 100644
--- a/include/linux/sunrpc/auth_gss.h
+++ b/include/linux/sunrpc/auth_gss.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/linux/auth_gss.h 2 * linux/include/linux/sunrpc/auth_gss.h
3 * 3 *
4 * Declarations for RPCSEC_GSS 4 * Declarations for RPCSEC_GSS
5 * 5 *
diff --git a/include/linux/sunrpc/gss_api.h b/include/linux/sunrpc/gss_api.h
index 6e112cc5cdda..5eca9e442051 100644
--- a/include/linux/sunrpc/gss_api.h
+++ b/include/linux/sunrpc/gss_api.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/linux/gss_api.h 2 * linux/include/linux/sunrpc/gss_api.h
3 * 3 *
4 * Somewhat simplified version of the gss api. 4 * Somewhat simplified version of the gss api.
5 * 5 *
diff --git a/include/linux/sunrpc/msg_prot.h b/include/linux/sunrpc/msg_prot.h
index d9f5934ac9fe..8d10d148834e 100644
--- a/include/linux/sunrpc/msg_prot.h
+++ b/include/linux/sunrpc/msg_prot.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/net/sunrpc/msg_prot.h 2 * linux/include/linux/sunrpc/msg_prot.h
3 * 3 *
4 * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de> 4 * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
5 */ 5 */
diff --git a/include/linux/sunrpc/svcauth_gss.h b/include/linux/sunrpc/svcauth_gss.h
index 3a2206f61de0..5a5db16ab660 100644
--- a/include/linux/sunrpc/svcauth_gss.h
+++ b/include/linux/sunrpc/svcauth_gss.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/linux/svcauth_gss.h 2 * linux/include/linux/sunrpc/svcauth_gss.h
3 * 3 *
4 * Bruce Fields <bfields@umich.edu> 4 * Bruce Fields <bfields@umich.edu>
5 * Copyright (c) 2002 The Regents of the Unviersity of Michigan 5 * Copyright (c) 2002 The Regents of the Unviersity of Michigan
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 4f4d98addb44..a341c8032866 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/linux/writeback.h. 2 * include/linux/writeback.h
3 */ 3 */
4#ifndef WRITEBACK_H 4#ifndef WRITEBACK_H
5#define WRITEBACK_H 5#define WRITEBACK_H
diff --git a/include/video/s1d13xxxfb.h b/include/video/s1d13xxxfb.h
index f06cc88607f5..c99d261df8f7 100644
--- a/include/video/s1d13xxxfb.h
+++ b/include/video/s1d13xxxfb.h
@@ -1,4 +1,4 @@
1/* drivers/video/s1d3xxxfb.h 1/* include/video/s1d13xxxfb.h
2 * 2 *
3 * (c) 2004 Simtec Electronics 3 * (c) 2004 Simtec Electronics
4 * (c) 2005 Thibaut VARENE <varenet@parisc-linux.org> 4 * (c) 2005 Thibaut VARENE <varenet@parisc-linux.org>
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index c45ae86cec31..7c274002c9f5 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -2,7 +2,7 @@
2 * POSIX message queues filesystem for Linux. 2 * POSIX message queues filesystem for Linux.
3 * 3 *
4 * Copyright (C) 2003,2004 Krzysztof Benedyczak (golbi@mat.uni.torun.pl) 4 * Copyright (C) 2003,2004 Krzysztof Benedyczak (golbi@mat.uni.torun.pl)
5 * Michal Wronski (Michal.Wronski@motorola.com) 5 * Michal Wronski (michal.wronski@gmail.com)
6 * 6 *
7 * Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com) 7 * Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com)
8 * Lockless receive & send, fd based notify: 8 * Lockless receive & send, fd based notify:
diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 66cfb87646eb..0992616eeed6 100644
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/ipc/util.c 2 * linux/ipc/msgutil.c
3 * Copyright (C) 1999, 2004 Manfred Spraul 3 * Copyright (C) 1999, 2004 Manfred Spraul
4 * 4 *
5 * This file is released under GNU General Public Licence version 2 or 5 * This file is released under GNU General Public Licence version 2 or
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index e5ebcc1ec3a0..9cbb5d1be06f 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/kernel/posix_timers.c 2 * linux/kernel/posix-timers.c
3 * 3 *
4 * 4 *
5 * 2002-10-15 Posix Clocks & timers 5 * 2002-10-15 Posix Clocks & timers
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
index 4f2c4272d59c..23446e91cded 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
@@ -47,7 +47,7 @@
47 47
48MODULE_LICENSE("GPL"); 48MODULE_LICENSE("GPL");
49 49
50static int nreaders = -1; /* # reader threads, defaults to 4*ncpus */ 50static int nreaders = -1; /* # reader threads, defaults to 2*ncpus */
51static int stat_interval; /* Interval between stats, in seconds. */ 51static int stat_interval; /* Interval between stats, in seconds. */
52 /* Defaults to "only at end of test". */ 52 /* Defaults to "only at end of test". */
53static int verbose; /* Print more debug info. */ 53static int verbose; /* Print more debug info. */
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 835fe28b87a8..cfc737bffe6d 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -34,7 +34,7 @@
34 * possible cpu). 34 * possible cpu).
35 * 35 *
36 * The sequence counters are for flush_scheduled_work(). It wants to wait 36 * The sequence counters are for flush_scheduled_work(). It wants to wait
37 * until until all currently-scheduled works are completed, but it doesn't 37 * until all currently-scheduled works are completed, but it doesn't
38 * want to be livelocked by new, incoming ones. So it waits until 38 * want to be livelocked by new, incoming ones. So it waits until
39 * remove_sequence is >= the insert_sequence which pertained when 39 * remove_sequence is >= the insert_sequence which pertained when
40 * flush_scheduled_work() was called. 40 * flush_scheduled_work() was called.
diff --git a/lib/reed_solomon/reed_solomon.c b/lib/reed_solomon/reed_solomon.c
index 2cc11faa4ff1..a4b730a2180c 100644
--- a/lib/reed_solomon/reed_solomon.c
+++ b/lib/reed_solomon/reed_solomon.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * lib/reed_solomon/rslib.c 2 * lib/reed_solomon/reed_solomon.c
3 * 3 *
4 * Overview: 4 * Overview:
5 * Generic Reed Solomon encoder / decoder library 5 * Generic Reed Solomon encoder / decoder library
diff --git a/mm/Kconfig b/mm/Kconfig
index 5d88489ef2de..db7c55de92cd 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -92,7 +92,7 @@ config HAVE_MEMORY_PRESENT
92 92
93# 93#
94# SPARSEMEM_EXTREME (which is the default) does some bootmem 94# SPARSEMEM_EXTREME (which is the default) does some bootmem
95# allocations when memory_present() is called. If this can not 95# allocations when memory_present() is called. If this cannot
96# be done on your architecture, select this option. However, 96# be done on your architecture, select this option. However,
97# statically allocating the mem_section[] array can potentially 97# statically allocating the mem_section[] array can potentially
98# consume vast quantities of .bss, so be careful. 98# consume vast quantities of .bss, so be careful.
@@ -104,7 +104,7 @@ config SPARSEMEM_STATIC
104 def_bool n 104 def_bool n
105 105
106# 106#
107# Architectecture platforms which require a two level mem_section in SPARSEMEM 107# Architecture platforms which require a two level mem_section in SPARSEMEM
108# must select this option. This is usually for architecture platforms with 108# must select this option. This is usually for architecture platforms with
109# an extremely sparse physical address space. 109# an extremely sparse physical address space.
110# 110#
diff --git a/mm/nommu.c b/mm/nommu.c
index 365019599df8..8bdde9508f3b 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -221,7 +221,7 @@ long vwrite(char *buf, char *addr, unsigned long count)
221 * Allocate enough pages to cover @size from the page level 221 * Allocate enough pages to cover @size from the page level
222 * allocator and map them into continguos kernel virtual space. 222 * allocator and map them into continguos kernel virtual space.
223 * 223 *
224 * For tight cotrol over page level allocator and protection flags 224 * For tight control over page level allocator and protection flags
225 * use __vmalloc() instead. 225 * use __vmalloc() instead.
226 */ 226 */
227void *vmalloc(unsigned long size) 227void *vmalloc(unsigned long size)
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index c0d4ce144dec..a0f339057449 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * mm/page-writeback.c. 2 * mm/page-writeback.c
3 * 3 *
4 * Copyright (C) 2002, Linus Torvalds. 4 * Copyright (C) 2002, Linus Torvalds.
5 * 5 *
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 1ac191ce5641..750ab6ed13fc 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -503,7 +503,7 @@ EXPORT_SYMBOL(__vmalloc);
503 * Allocate enough pages to cover @size from the page level 503 * Allocate enough pages to cover @size from the page level
504 * allocator and map them into contiguous kernel virtual space. 504 * allocator and map them into contiguous kernel virtual space.
505 * 505 *
506 * For tight cotrol over page level allocator and protection flags 506 * For tight control over page level allocator and protection flags
507 * use __vmalloc() instead. 507 * use __vmalloc() instead.
508 */ 508 */
509void *vmalloc(unsigned long size) 509void *vmalloc(unsigned long size)
@@ -542,7 +542,7 @@ EXPORT_SYMBOL(vmalloc_user);
542 * Allocate enough pages to cover @size from the page level 542 * Allocate enough pages to cover @size from the page level
543 * allocator and map them into contiguous kernel virtual space. 543 * allocator and map them into contiguous kernel virtual space.
544 * 544 *
545 * For tight cotrol over page level allocator and protection flags 545 * For tight control over page level allocator and protection flags
546 * use __vmalloc() instead. 546 * use __vmalloc() instead.
547 */ 547 */
548void *vmalloc_node(unsigned long size, int node) 548void *vmalloc_node(unsigned long size, int node)
@@ -563,7 +563,7 @@ EXPORT_SYMBOL(vmalloc_node);
563 * the page level allocator and map them into contiguous and 563 * the page level allocator and map them into contiguous and
564 * executable kernel virtual space. 564 * executable kernel virtual space.
565 * 565 *
566 * For tight cotrol over page level allocator and protection flags 566 * For tight control over page level allocator and protection flags
567 * use __vmalloc() instead. 567 * use __vmalloc() instead.
568 */ 568 */
569 569
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 30af4a4dfcc8..d172a9804448 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -64,7 +64,7 @@ config ASK_IP_FIB_HASH
64config IP_FIB_TRIE 64config IP_FIB_TRIE
65 bool "FIB_TRIE" 65 bool "FIB_TRIE"
66 ---help--- 66 ---help---
67 Use new experimental LC-trie as FIB lookup algoritm. 67 Use new experimental LC-trie as FIB lookup algorithm.
68 This improves lookup performance if you have a large 68 This improves lookup performance if you have a large
69 number of routes. 69 number of routes.
70 70
@@ -526,7 +526,7 @@ config TCP_CONG_HYBLA
526 ---help--- 526 ---help---
527 TCP-Hybla is a sender-side only change that eliminates penalization of 527 TCP-Hybla is a sender-side only change that eliminates penalization of
528 long-RTT, large-bandwidth connections, like when satellite legs are 528 long-RTT, large-bandwidth connections, like when satellite legs are
529 involved, expecially when sharing a common bottleneck with normal 529 involved, especially when sharing a common bottleneck with normal
530 terrestrial connections. 530 terrestrial connections.
531 531
532config TCP_CONG_VEGAS 532config TCP_CONG_VEGAS
@@ -556,7 +556,7 @@ config TCP_CONG_LP
556 default n 556 default n
557 ---help--- 557 ---help---
558 TCP Low Priority (TCP-LP), a distributed algorithm whose goal is 558 TCP Low Priority (TCP-LP), a distributed algorithm whose goal is
559 to utiliza only the excess network bandwidth as compared to the 559 to utilize only the excess network bandwidth as compared to the
560 ``fair share`` of bandwidth as targeted by TCP. 560 ``fair share`` of bandwidth as targeted by TCP.
561 See http://www-ece.rice.edu/networks/TCP-LP/ 561 See http://www-ece.rice.edu/networks/TCP-LP/
562 562
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index cfe5c8474286..cfb5d3de9c84 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -1,4 +1,4 @@
1/* linux/net/inet/arp.c 1/* linux/net/ipv4/arp.c
2 * 2 *
3 * Version: $Id: arp.c,v 1.99 2001/08/30 22:55:42 davem Exp $ 3 * Version: $Id: arp.c,v 1.99 2001/08/30 22:55:42 davem Exp $
4 * 4 *
diff --git a/net/ipv4/ipvs/Kconfig b/net/ipv4/ipvs/Kconfig
index c9820bfc493a..891b9355cf96 100644
--- a/net/ipv4/ipvs/Kconfig
+++ b/net/ipv4/ipvs/Kconfig
@@ -81,7 +81,7 @@ config IP_VS_PROTO_ESP
81 bool "ESP load balancing support" 81 bool "ESP load balancing support"
82 depends on IP_VS 82 depends on IP_VS
83 ---help--- 83 ---help---
84 This option enables support for load balancing ESP (Encapsultion 84 This option enables support for load balancing ESP (Encapsulation
85 Security Payload) transport protocol. Say Y if unsure. 85 Security Payload) transport protocol. Say Y if unsure.
86 86
87config IP_VS_PROTO_AH 87config IP_VS_PROTO_AH
@@ -204,7 +204,7 @@ config IP_VS_SED
204 connections to the server with the shortest expected delay. The 204 connections to the server with the shortest expected delay. The
205 expected delay that the job will experience is (Ci + 1) / Ui if 205 expected delay that the job will experience is (Ci + 1) / Ui if
206 sent to the ith server, in which Ci is the number of connections 206 sent to the ith server, in which Ci is the number of connections
207 on the the ith server and Ui is the fixed service rate (weight) 207 on the ith server and Ui is the fixed service rate (weight)
208 of the ith server. 208 of the ith server.
209 209
210 If you want to compile it in kernel, say Y. To compile it as a 210 If you want to compile it in kernel, say Y. To compile it as a
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index a55b8ff70ded..d88c292f118c 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -373,7 +373,7 @@ config IP_NF_TARGET_ULOG
373 daemon using netlink multicast sockets; unlike the LOG target 373 daemon using netlink multicast sockets; unlike the LOG target
374 which can only be viewed through syslog. 374 which can only be viewed through syslog.
375 375
376 The apropriate userspace logging daemon (ulogd) may be obtained from 376 The appropriate userspace logging daemon (ulogd) may be obtained from
377 <http://www.gnumonks.org/projects/ulogd/> 377 <http://www.gnumonks.org/projects/ulogd/>
378 378
379 To compile it as a module, choose M here. If unsure, say N. 379 To compile it as a module, choose M here. If unsure, say N.
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index a6ed2d22a6e6..b36b9463f5a4 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/net/sunrpc/auth_gss.c 2 * linux/net/sunrpc/auth_gss/auth_gss.c
3 * 3 *
4 * RPCSEC_GSS client authentication. 4 * RPCSEC_GSS client authentication.
5 * 5 *
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index c9ca0c23bd91..00d1ad19b2cc 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -57,8 +57,8 @@ use strict;
57# other functions are ignored. 57# other functions are ignored.
58# 58#
59# -nofunction funcname 59# -nofunction funcname
60# If set, then only generate documentation for the other function(s). All 60# If set, then only generate documentation for the other function(s).
61# other functions are ignored. Cannot be used with -function together 61# Cannot be used together with -function
62# (yes, that's a bug -- perl hackers can fix it 8)) 62# (yes, that's a bug -- perl hackers can fix it 8))
63# 63#
64# c files - list of 'c' files to process 64# c files - list of 'c' files to process
diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
index 293dbd6246c1..23b51047494e 100644
--- a/security/selinux/Kconfig
+++ b/security/selinux/Kconfig
@@ -112,7 +112,7 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT
112 your distribution will provide these and enable the new controls 112 your distribution will provide these and enable the new controls
113 in the kernel they also distribute. 113 in the kernel they also distribute.
114 114
115 Note that this option can be overriden at boot with the 115 Note that this option can be overridden at boot with the
116 selinux_compat_net parameter, and after boot via 116 selinux_compat_net parameter, and after boot via
117 /selinux/compat_net. See Documentation/kernel-parameters.txt 117 /selinux/compat_net. See Documentation/kernel-parameters.txt
118 for details on this parameter. 118 for details on this parameter.
@@ -122,7 +122,7 @@ config SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT
122 well as any conntrack helpers for protocols which you 122 well as any conntrack helpers for protocols which you
123 wish to control. 123 wish to control.
124 124
125 If you are unsure what do do here, select N. 125 If you are unsure what to do here, select N.
126 126
127config SECURITY_SELINUX_POLICYDB_VERSION_MAX 127config SECURITY_SELINUX_POLICYDB_VERSION_MAX
128 bool "NSA SELinux maximum supported policy format version" 128 bool "NSA SELinux maximum supported policy format version"
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index f3b3530402cb..cc2b9ab7f4e5 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -643,7 +643,7 @@ config SOUND_PSS
643 command line. 643 command line.
644 644
645config PSS_MIXER 645config PSS_MIXER
646 bool "Enable PSS mixer (Beethoven ADSP-16 and other compatibile)" 646 bool "Enable PSS mixer (Beethoven ADSP-16 and other compatible)"
647 depends on SOUND_PSS 647 depends on SOUND_PSS
648 help 648 help
649 Answer Y for Beethoven ADSP-16. You may try to say Y also for other 649 Answer Y for Beethoven ADSP-16. You may try to say Y also for other
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 3b45e11e5303..f6b6b886c2ad 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/ad1848.c 2 * sound/oss/ad1848.c
3 * 3 *
4 * The low level driver for the AD1848/CS4248 codec chip which 4 * The low level driver for the AD1848/CS4248 codec chip which
5 * is used for example in the MS Sound System. 5 * is used for example in the MS Sound System.
diff --git a/sound/oss/ad1848_mixer.h b/sound/oss/ad1848_mixer.h
index f9231c6cd4e1..2cf719b5fbbc 100644
--- a/sound/oss/ad1848_mixer.h
+++ b/sound/oss/ad1848_mixer.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/ad1848_mixer.h 2 * sound/oss/ad1848_mixer.h
3 * 3 *
4 * Definitions for the mixer of AD1848 and compatible codecs. 4 * Definitions for the mixer of AD1848 and compatible codecs.
5 */ 5 */
diff --git a/sound/oss/adlib_card.c b/sound/oss/adlib_card.c
index 6414ceb8f072..c9a7c9b470de 100644
--- a/sound/oss/adlib_card.c
+++ b/sound/oss/adlib_card.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/adlib_card.c 2 * sound/oss/adlib_card.c
3 * 3 *
4 * Detection routine for the AdLib card. 4 * Detection routine for the AdLib card.
5 * 5 *
diff --git a/sound/oss/audio.c b/sound/oss/audio.c
index 22dd63c36816..89bd27a5e865 100644
--- a/sound/oss/audio.c
+++ b/sound/oss/audio.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/audio.c 2 * sound/oss/audio.c
3 * 3 *
4 * Device file manager for /dev/audio 4 * Device file manager for /dev/audio
5 */ 5 */
diff --git a/sound/oss/awe_hw.h b/sound/oss/awe_hw.h
index 7e403ad68152..ab00c3c67e4e 100644
--- a/sound/oss/awe_hw.h
+++ b/sound/oss/awe_hw.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/awe_hw.h 2 * sound/oss/awe_hw.h
3 * 3 *
4 * Access routines and definitions for the low level driver for the 4 * Access routines and definitions for the low level driver for the
5 * Creative AWE32/SB32/AWE64 wave table synth. 5 * Creative AWE32/SB32/AWE64 wave table synth.
diff --git a/sound/oss/awe_wave.c b/sound/oss/awe_wave.c
index d1a0eb294d6f..01c592cee045 100644
--- a/sound/oss/awe_wave.c
+++ b/sound/oss/awe_wave.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/awe_wave.c 2 * sound/oss/awe_wave.c
3 * 3 *
4 * The low level driver for the AWE32/SB32/AWE64 wave table synth. 4 * The low level driver for the AWE32/SB32/AWE64 wave table synth.
5 * version 0.4.4; Jan. 4, 2000 5 * version 0.4.4; Jan. 4, 2000
diff --git a/sound/oss/awe_wave.h b/sound/oss/awe_wave.h
index a3aa018118bd..fe584810608f 100644
--- a/sound/oss/awe_wave.h
+++ b/sound/oss/awe_wave.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/awe_config.h 2 * sound/oss/awe_wave.h
3 * 3 *
4 * Configuration of AWE32/SB32/AWE64 wave table synth driver. 4 * Configuration of AWE32/SB32/AWE64 wave table synth driver.
5 * version 0.4.4; Jan. 4, 2000 5 * version 0.4.4; Jan. 4, 2000
diff --git a/sound/oss/dev_table.c b/sound/oss/dev_table.c
index f65a90469d8a..fb64279f3935 100644
--- a/sound/oss/dev_table.c
+++ b/sound/oss/dev_table.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/dev_table.c 2 * sound/oss/dev_table.c
3 * 3 *
4 * Device call tables. 4 * Device call tables.
5 * 5 *
diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c
index 15ce7119c5f4..6c1cf74b78c5 100644
--- a/sound/oss/dmabuf.c
+++ b/sound/oss/dmabuf.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/dmabuf.c 2 * sound/oss/dmabuf.c
3 * 3 *
4 * The DMA buffer manager for digitized voice applications 4 * The DMA buffer manager for digitized voice applications
5 */ 5 */
diff --git a/sound/oss/gus_card.c b/sound/oss/gus_card.c
index dbb29771e2bb..a3d6ae33fe8b 100644
--- a/sound/oss/gus_card.c
+++ b/sound/oss/gus_card.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/gus_card.c 2 * sound/oss/gus_card.c
3 * 3 *
4 * Detection routine for the Gravis Ultrasound. 4 * Detection routine for the Gravis Ultrasound.
5 * 5 *
diff --git a/sound/oss/gus_midi.c b/sound/oss/gus_midi.c
index b48f57c24e48..d1997a417ad0 100644
--- a/sound/oss/gus_midi.c
+++ b/sound/oss/gus_midi.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/gus2_midi.c 2 * sound/oss/gus_midi.c
3 * 3 *
4 * The low level driver for the GUS Midi Interface. 4 * The low level driver for the GUS Midi Interface.
5 * 5 *
diff --git a/sound/oss/gus_wave.c b/sound/oss/gus_wave.c
index 942d5186580d..597db7aee632 100644
--- a/sound/oss/gus_wave.c
+++ b/sound/oss/gus_wave.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/gus_wave.c 2 * sound/oss/gus_wave.c
3 * 3 *
4 * Driver for the Gravis UltraSound wave table synth. 4 * Driver for the Gravis UltraSound wave table synth.
5 * 5 *
diff --git a/sound/oss/harmony.c b/sound/oss/harmony.c
index 591683c55f27..6601b284f03a 100644
--- a/sound/oss/harmony.c
+++ b/sound/oss/harmony.c
@@ -1,5 +1,5 @@
1/* 1/*
2 drivers/sound/harmony.c 2 sound/oss/harmony.c
3 3
4 This is a sound driver for ASP's and Lasi's Harmony sound chip 4 This is a sound driver for ASP's and Lasi's Harmony sound chip
5 and is unlikely to be used for anything other than on a HP PA-RISC. 5 and is unlikely to be used for anything other than on a HP PA-RISC.
diff --git a/sound/oss/ics2101.c b/sound/oss/ics2101.c
index d5f3be8550f3..45918df150b3 100644
--- a/sound/oss/ics2101.c
+++ b/sound/oss/ics2101.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/ics2101.c 2 * sound/oss/ics2101.c
3 * 3 *
4 * Driver for the ICS2101 mixer of GUS v3.7. 4 * Driver for the ICS2101 mixer of GUS v3.7.
5 * 5 *
diff --git a/sound/oss/iwmem.h b/sound/oss/iwmem.h
index 84745fbcabcb..48d333c7302b 100644
--- a/sound/oss/iwmem.h
+++ b/sound/oss/iwmem.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/iwmem.h 2 * sound/oss/iwmem.h
3 * 3 *
4 * DRAM size encoding table for AMD Interwave chip. 4 * DRAM size encoding table for AMD Interwave chip.
5 */ 5 */
diff --git a/sound/oss/maui.c b/sound/oss/maui.c
index 05cf194eda6b..317f22589a05 100644
--- a/sound/oss/maui.c
+++ b/sound/oss/maui.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/maui.c 2 * sound/oss/maui.c
3 * 3 *
4 * The low level driver for Turtle Beach Maui and Tropez. 4 * The low level driver for Turtle Beach Maui and Tropez.
5 * 5 *
diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c
index 972edc62afd1..d2ab5c08b616 100644
--- a/sound/oss/midi_synth.c
+++ b/sound/oss/midi_synth.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/midi_synth.c 2 * sound/oss/midi_synth.c
3 * 3 *
4 * High level midi sequencer manager for dumb MIDI interfaces. 4 * High level midi sequencer manager for dumb MIDI interfaces.
5 */ 5 */
diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c
index 6982556ded56..c0e4bbc22c80 100644
--- a/sound/oss/midibuf.c
+++ b/sound/oss/midibuf.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/midibuf.c 2 * sound/oss/midibuf.c
3 * 3 *
4 * Device file manager for /dev/midi# 4 * Device file manager for /dev/midi#
5 */ 5 */
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index 0aac54c68f01..321f4c4b5a7b 100644
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/mpu401.c 2 * sound/oss/mpu401.c
3 * 3 *
4 * The low level driver for Roland MPU-401 compatible Midi cards. 4 * The low level driver for Roland MPU-401 compatible Midi cards.
5 */ 5 */
diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c
index a31734b7842f..4799bc77f987 100644
--- a/sound/oss/opl3.c
+++ b/sound/oss/opl3.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/opl3.c 2 * sound/oss/opl3.c
3 * 3 *
4 * A low level driver for Yamaha YM3812 and OPL-3 -chips 4 * A low level driver for Yamaha YM3812 and OPL-3 -chips
5 * 5 *
diff --git a/sound/oss/opl3sa.c b/sound/oss/opl3sa.c
index fe4907c6e8fc..2535ed0b5fbf 100644
--- a/sound/oss/opl3sa.c
+++ b/sound/oss/opl3sa.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/opl3sa.c 2 * sound/oss/opl3sa.c
3 * 3 *
4 * Low level driver for Yamaha YMF701B aka OPL3-SA chip 4 * Low level driver for Yamaha YMF701B aka OPL3-SA chip
5 * 5 *
diff --git a/sound/oss/opl3sa2.c b/sound/oss/opl3sa2.c
index aec05a2bfc87..e20051f1be4d 100644
--- a/sound/oss/opl3sa2.c
+++ b/sound/oss/opl3sa2.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/opl3sa2.c 2 * sound/oss/opl3sa2.c
3 * 3 *
4 * A low level driver for Yamaha OPL3-SA2 and SA3 cards. 4 * A low level driver for Yamaha OPL3-SA2 and SA3 cards.
5 * NOTE: All traces of the name OPL3-SAx have now (December 2000) been 5 * NOTE: All traces of the name OPL3-SAx have now (December 2000) been
diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c
index 97666007b274..4ebb9638746e 100644
--- a/sound/oss/pas2_card.c
+++ b/sound/oss/pas2_card.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/pas2_card.c 2 * sound/oss/pas2_card.c
3 * 3 *
4 * Detection routine for the Pro Audio Spectrum cards. 4 * Detection routine for the Pro Audio Spectrum cards.
5 */ 5 */
diff --git a/sound/oss/pas2_midi.c b/sound/oss/pas2_midi.c
index 79d6a5827b6d..1122d10a20c3 100644
--- a/sound/oss/pas2_midi.c
+++ b/sound/oss/pas2_midi.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/pas2_midi.c 2 * sound/oss/pas2_midi.c
3 * 3 *
4 * The low level driver for the PAS Midi Interface. 4 * The low level driver for the PAS Midi Interface.
5 */ 5 */
diff --git a/sound/oss/pas2_mixer.c b/sound/oss/pas2_mixer.c
index 4aade5304587..a0bcb85c3904 100644
--- a/sound/oss/pas2_mixer.c
+++ b/sound/oss/pas2_mixer.c
@@ -1,6 +1,6 @@
1 1
2/* 2/*
3 * sound/pas2_mixer.c 3 * sound/oss/pas2_mixer.c
4 * 4 *
5 * Mixer routines for the Pro Audio Spectrum cards. 5 * Mixer routines for the Pro Audio Spectrum cards.
6 */ 6 */
diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 37ee234b587c..ece428b2ba9f 100644
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/pss.c 2 * sound/oss/pss.c
3 * 3 *
4 * The low level driver for the Personal Sound System (ECHO ESC614). 4 * The low level driver for the Personal Sound System (ECHO ESC614).
5 * 5 *
diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
index 75e54f6f638a..733b014ec7d1 100644
--- a/sound/oss/sb_audio.c
+++ b/sound/oss/sb_audio.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/sb_audio.c 2 * sound/oss/sb_audio.c
3 * 3 *
4 * Audio routines for Sound Blaster compatible cards. 4 * Audio routines for Sound Blaster compatible cards.
5 * 5 *
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 35bab6e2f998..bbe5b7596d0e 100644
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/sb_common.c 2 * sound/oss/sb_common.c
3 * 3 *
4 * Common routines for Sound Blaster compatible cards. 4 * Common routines for Sound Blaster compatible cards.
5 * 5 *
diff --git a/sound/oss/sb_midi.c b/sound/oss/sb_midi.c
index ed3bd0640ffd..2e3bc045caba 100644
--- a/sound/oss/sb_midi.c
+++ b/sound/oss/sb_midi.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/sb_dsp.c 2 * sound/oss/sb_midi.c
3 * 3 *
4 * The low level driver for the Sound Blaster DS chips. 4 * The low level driver for the Sound Blaster DS chips.
5 * 5 *
diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c
index ccb21d48d42c..238e2cf44b08 100644
--- a/sound/oss/sb_mixer.c
+++ b/sound/oss/sb_mixer.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/sb_mixer.c 2 * sound/oss/sb_mixer.c
3 * 3 *
4 * The low level mixer driver for the Sound Blaster compatible cards. 4 * The low level mixer driver for the Sound Blaster compatible cards.
5 */ 5 */
diff --git a/sound/oss/sb_mixer.h b/sound/oss/sb_mixer.h
index ab74426157ba..4b9425f085e3 100644
--- a/sound/oss/sb_mixer.h
+++ b/sound/oss/sb_mixer.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/sb_mixer.h 2 * sound/oss/sb_mixer.h
3 * 3 *
4 * Definitions for the SB Pro and SB16 mixers 4 * Definitions for the SB Pro and SB16 mixers
5 */ 5 */
diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index 6815c30e0bc1..0ce4e4ef6fe9 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/sequencer.c 2 * sound/oss/sequencer.c
3 * 3 *
4 * The sequencer personality manager. 4 * The sequencer personality manager.
5 */ 5 */
diff --git a/sound/oss/sgalaxy.c b/sound/oss/sgalaxy.c
index 3f32d4674371..0bcff6735319 100644
--- a/sound/oss/sgalaxy.c
+++ b/sound/oss/sgalaxy.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/sgalaxy.c 2 * sound/oss/sgalaxy.c
3 * 3 *
4 * Low level driver for Aztech Sound Galaxy cards. 4 * Low level driver for Aztech Sound Galaxy cards.
5 * Copyright 1998 Artur Skawina <skawina@geocities.com> 5 * Copyright 1998 Artur Skawina <skawina@geocities.com>
diff --git a/sound/oss/sound_timer.c b/sound/oss/sound_timer.c
index bc2777dd2ef9..146bf85de958 100644
--- a/sound/oss/sound_timer.c
+++ b/sound/oss/sound_timer.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/sound_timer.c 2 * sound/oss/sound_timer.c
3 */ 3 */
4/* 4/*
5 * Copyright (C) by Hannu Savolainen 1993-1997 5 * Copyright (C) by Hannu Savolainen 1993-1997
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index 0860d6789715..683dc00a8d2b 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/sound/soundcard.c 2 * linux/sound/oss/soundcard.c
3 * 3 *
4 * Sound card driver for Linux 4 * Sound card driver for Linux
5 * 5 *
diff --git a/sound/oss/sscape.c b/sound/oss/sscape.c
index 9ed5211c3168..51f2fa615413 100644
--- a/sound/oss/sscape.c
+++ b/sound/oss/sscape.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/sscape.c 2 * sound/oss/sscape.c
3 * 3 *
4 * Low level driver for Ensoniq SoundScape 4 * Low level driver for Ensoniq SoundScape
5 * 5 *
diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c
index c9d04518b172..107534477a2f 100644
--- a/sound/oss/sys_timer.c
+++ b/sound/oss/sys_timer.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/sys_timer.c 2 * sound/oss/sys_timer.c
3 * 3 *
4 * The default timer for the Level 2 sequencer interface 4 * The default timer for the Level 2 sequencer interface
5 * Uses the (1/HZ sec) timer of kernel. 5 * Uses the (1/HZ sec) timer of kernel.
diff --git a/sound/oss/trix.c b/sound/oss/trix.c
index d1f1f154dcce..e04169e8e3f8 100644
--- a/sound/oss/trix.c
+++ b/sound/oss/trix.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/trix.c 2 * sound/oss/trix.c
3 * 3 *
4 * Low level driver for the MediaTrix AudioTrix Pro 4 * Low level driver for the MediaTrix AudioTrix Pro
5 * (MT-0002-PC Control Chip) 5 * (MT-0002-PC Control Chip)
diff --git a/sound/oss/uart401.c b/sound/oss/uart401.c
index a3d75baf6df8..8e18b6e25818 100644
--- a/sound/oss/uart401.c
+++ b/sound/oss/uart401.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/uart401.c 2 * sound/oss/uart401.c
3 * 3 *
4 * MPU-401 UART driver (formerly uart401_midi.c) 4 * MPU-401 UART driver (formerly uart401_midi.c)
5 * 5 *
diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c
index 74ae75f9e2dc..501d3e654a67 100644
--- a/sound/oss/uart6850.c
+++ b/sound/oss/uart6850.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/uart6850.c 2 * sound/oss/uart6850.c
3 * 3 *
4 * 4 *
5 * Copyright (C) by Hannu Savolainen 1993-1997 5 * Copyright (C) by Hannu Savolainen 1993-1997
diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c
index a7ef04fab075..d952b2264da1 100644
--- a/sound/oss/v_midi.c
+++ b/sound/oss/v_midi.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/v_midi.c 2 * sound/oss/v_midi.c
3 * 3 *
4 * The low level driver for the Sound Blaster DS chips. 4 * The low level driver for the Sound Blaster DS chips.
5 * 5 *
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index 22d26624b34a..59a2f28eb5a5 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/sound/waveartist.c 2 * linux/sound/oss/waveartist.c
3 * 3 *
4 * The low level driver for the RWA010 Rockwell Wave Artist 4 * The low level driver for the RWA010 Rockwell Wave Artist
5 * codec chip used in the Rebel.com NetWinder. 5 * codec chip used in the Rebel.com NetWinder.
diff --git a/sound/oss/waveartist.h b/sound/oss/waveartist.h
index 2033fb87b247..dac4ca910d95 100644
--- a/sound/oss/waveartist.h
+++ b/sound/oss/waveartist.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/sound/waveartist.h 2 * linux/sound/oss/waveartist.h
3 * 3 *
4 * def file for Rockwell RWA010 chip set, as installed in Rebel.com NetWinder 4 * def file for Rockwell RWA010 chip set, as installed in Rebel.com NetWinder
5 */ 5 */
diff --git a/sound/oss/wf_midi.c b/sound/oss/wf_midi.c
index 3f3a390014ca..75c0c143a759 100644
--- a/sound/oss/wf_midi.c
+++ b/sound/oss/wf_midi.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * sound/wf_midi.c 2 * sound/oss/wf_midi.c
3 * 3 *
4 * The low level driver for the WaveFront ICS2115 MIDI interface(s) 4 * The low level driver for the WaveFront ICS2115 MIDI interface(s)
5 * Note that there is also an MPU-401 emulation (actually, a UART-401 5 * Note that there is also an MPU-401 emulation (actually, a UART-401