aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
commitc00046c279a2521075250fad682ca0acc10d4fd7 (patch)
tree78a7e9089c26f199ad9b0161bb564b7c1ca6daf9
parent9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff)
parent8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
-rw-r--r--CREDITS12
-rw-r--r--Documentation/DocBook/Makefile2
-rw-r--r--Documentation/DocBook/mtdnand.tmpl6
-rw-r--r--Documentation/SubmitChecklist2
-rw-r--r--Documentation/SubmittingDrivers3
-rw-r--r--Documentation/arm/Samsung-S3C24XX/DMA.txt18
-rw-r--r--Documentation/cdrom/cdrom-standard.tex2
-rw-r--r--Documentation/devices.txt2
-rw-r--r--Documentation/driver-model/devres.txt4
-rw-r--r--Documentation/fb/deferred_io.txt4
-rw-r--r--Documentation/filesystems/9p.txt2
-rw-r--r--Documentation/filesystems/Locking2
-rw-r--r--Documentation/filesystems/ext3.txt14
-rw-r--r--Documentation/filesystems/files.txt6
-rw-r--r--Documentation/filesystems/proc.txt7
-rw-r--r--Documentation/filesystems/sysfs.txt2
-rw-r--r--Documentation/filesystems/vfs.txt2
-rw-r--r--Documentation/i2c/i2c-protocol2
-rw-r--r--Documentation/ia64/err_inject.txt6
-rw-r--r--Documentation/input/atarikbd.txt8
-rw-r--r--Documentation/input/ff.txt2
-rw-r--r--Documentation/input/iforce-protocol.txt20
-rw-r--r--Documentation/input/input-programming.txt2
-rw-r--r--Documentation/isdn/CREDITS2
-rw-r--r--Documentation/isdn/README.concap2
-rw-r--r--Documentation/java.txt2
-rw-r--r--Documentation/kernel-docs.txt4
-rw-r--r--Documentation/kernel-parameters.txt41
-rw-r--r--Documentation/m68k/kernel-options.txt5
-rw-r--r--Documentation/mips/AU1xxx_IDE.README2
-rw-r--r--Documentation/mutex-design.txt4
-rw-r--r--Documentation/networking/bcm43xx.txt2
-rw-r--r--Documentation/networking/ip-sysctl.txt2
-rw-r--r--Documentation/networking/rxrpc.txt2
-rw-r--r--Documentation/networking/udplite.txt6
-rw-r--r--Documentation/power/swsusp-and-swap-files.txt2
-rw-r--r--Documentation/powerpc/eeh-pci-error-recovery.txt4
-rw-r--r--Documentation/powerpc/mpc52xx-device-tree-bindings.txt12
-rw-r--r--Documentation/scsi/aic79xx.txt2
-rw-r--r--Documentation/scsi/aic7xxx.txt6
-rw-r--r--Documentation/scsi/arcmsr_spec.txt2
-rw-r--r--Documentation/scsi/ibmmca.txt58
-rw-r--r--Documentation/sharedsubtree.txt1
-rw-r--r--Documentation/sound/alsa/soc/DAI.txt8
-rw-r--r--Documentation/sound/alsa/soc/clocking.txt10
-rw-r--r--Documentation/sound/alsa/soc/codec.txt6
-rw-r--r--Documentation/sound/alsa/soc/dapm.txt4
-rw-r--r--Documentation/sound/alsa/soc/overview.txt17
-rw-r--r--Documentation/sound/alsa/soc/platform.txt2
-rw-r--r--Documentation/sound/alsa/soc/pops_clicks.txt6
-rw-r--r--Documentation/spi/pxa2xx2
-rw-r--r--Documentation/thinkpad-acpi.txt4
-rw-r--r--Documentation/usb/usb-serial.txt2
-rw-r--r--arch/alpha/kernel/err_marvel.c2
-rw-r--r--arch/alpha/kernel/err_titan.c2
-rw-r--r--arch/alpha/kernel/osf_sys.c2
-rw-r--r--arch/alpha/kernel/smp.c1
-rw-r--r--arch/alpha/kernel/sys_alcor.c2
-rw-r--r--arch/alpha/kernel/sys_sio.c2
-rw-r--r--arch/alpha/lib/checksum.c2
-rw-r--r--arch/alpha/lib/csum_partial_copy.c2
-rw-r--r--arch/alpha/mm/init.c2
-rw-r--r--arch/alpha/oprofile/op_impl.h2
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/mach-at91/gpio.c2
-rw-r--r--arch/arm/mach-omap1/irq.c2
-rw-r--r--arch/arm/mach-omap2/timer-gp.c2
-rw-r--r--arch/arm/mach-s3c2410/clock.c2
-rw-r--r--arch/arm/mach-s3c2412/clock.c2
-rw-r--r--arch/arm/mach-s3c2443/clock.c2
-rw-r--r--arch/arm/nwfpe/fpopcode.h34
-rw-r--r--arch/arm/plat-omap/dma.c2
-rw-r--r--arch/arm/plat-omap/gpio.c2
-rw-r--r--arch/avr32/Kconfig2
-rw-r--r--arch/blackfin/Kconfig71
-rw-r--r--arch/cris/arch-v10/Kconfig2
-rw-r--r--arch/cris/arch-v10/boot/compressed/misc.c2
-rw-r--r--arch/cris/arch-v10/drivers/pcf8563.c2
-rw-r--r--arch/cris/arch-v10/kernel/debugport.c2
-rw-r--r--arch/cris/arch-v10/kernel/entry.S2
-rw-r--r--arch/cris/arch-v10/kernel/fasttimer.c2
-rw-r--r--arch/cris/arch-v10/kernel/irq.c2
-rw-r--r--arch/cris/arch-v10/kernel/kgdb.c2
-rw-r--r--arch/cris/arch-v10/kernel/process.c2
-rw-r--r--arch/cris/arch-v10/kernel/shadows.c2
-rw-r--r--arch/cris/arch-v10/lib/dram_init.S4
-rw-r--r--arch/cris/arch-v10/lib/string.c2
-rw-r--r--arch/cris/arch-v10/lib/usercopy.c6
-rw-r--r--arch/cris/arch-v32/boot/compressed/misc.c6
-rw-r--r--arch/cris/arch-v32/drivers/axisflashmap.c2
-rw-r--r--arch/cris/arch-v32/drivers/i2c.c2
-rw-r--r--arch/cris/arch-v32/drivers/nandflash.c2
-rw-r--r--arch/cris/arch-v32/drivers/pcf8563.c2
-rw-r--r--arch/cris/arch-v32/kernel/fasttimer.c2
-rw-r--r--arch/cris/arch-v32/kernel/irq.c8
-rw-r--r--arch/cris/arch-v32/kernel/process.c2
-rw-r--r--arch/cris/arch-v32/kernel/signal.c4
-rw-r--r--arch/cris/arch-v32/kernel/smp.c2
-rw-r--r--arch/cris/arch-v32/kernel/time.c2
-rw-r--r--arch/cris/arch-v32/kernel/traps.c2
-rw-r--r--arch/cris/arch-v32/lib/dram_init.S2
-rw-r--r--arch/cris/arch-v32/lib/string.c2
-rw-r--r--arch/cris/arch-v32/lib/usercopy.c6
-rw-r--r--arch/cris/arch-v32/mm/tlb.c6
-rw-r--r--arch/cris/kernel/irq.c8
-rw-r--r--arch/cris/mm/fault.c4
-rw-r--r--arch/cris/mm/init.c2
-rw-r--r--arch/cris/mm/tlb.c2
-rw-r--r--arch/frv/kernel/irq.c2
-rw-r--r--arch/frv/kernel/semaphore.c2
-rw-r--r--arch/frv/kernel/time.c4
-rw-r--r--arch/h8300/Kconfig.debug6
-rw-r--r--arch/h8300/kernel/irq.c2
-rw-r--r--arch/h8300/kernel/time.c2
-rw-r--r--arch/h8300/kernel/traps.c2
-rw-r--r--arch/h8300/platform/h8s/ints.c2
-rw-r--r--arch/h8300/platform/h8s/ints_h8s.c2
-rw-r--r--arch/i386/Kconfig4
-rw-r--r--arch/ia64/Kconfig8
-rw-r--r--arch/m32r/kernel/irq.c2
-rw-r--r--arch/m32r/kernel/signal.c2
-rw-r--r--arch/m32r/kernel/smp.c18
-rw-r--r--arch/m32r/kernel/smpboot.c6
-rw-r--r--arch/m32r/kernel/sys_m32r.c2
-rw-r--r--arch/m68k/amiga/pcmcia.c2
-rw-r--r--arch/m68k/ifpsp060/CHANGES2
-rw-r--r--arch/m68k/ifpsp060/MISC2
-rw-r--r--arch/m68k/ifpsp060/README2
-rw-r--r--arch/m68k/ifpsp060/TEST.DOC2
-rw-r--r--arch/m68k/ifpsp060/fplsp.doc2
-rw-r--r--arch/m68k/ifpsp060/fpsp.doc2
-rw-r--r--arch/m68k/ifpsp060/fskeleton.S2
-rw-r--r--arch/m68k/ifpsp060/ilsp.doc2
-rw-r--r--arch/m68k/ifpsp060/iskeleton.S2
-rw-r--r--arch/m68k/ifpsp060/isp.doc2
-rw-r--r--arch/m68k/ifpsp060/os.S2
-rw-r--r--arch/m68k/ifpsp060/src/fplsp.S2
-rw-r--r--arch/m68k/ifpsp060/src/fpsp.S2
-rw-r--r--arch/m68k/ifpsp060/src/ftest.S2
-rw-r--r--arch/m68k/ifpsp060/src/ilsp.S2
-rw-r--r--arch/m68k/ifpsp060/src/isp.S2
-rw-r--r--arch/m68k/ifpsp060/src/itest.S2
-rw-r--r--arch/m68k/ifpsp060/src/pfpsp.S2
-rw-r--r--arch/m68k/mac/config.c4
-rw-r--r--arch/m68k/mac/iop.c4
-rw-r--r--arch/m68k/mac/oss.c2
-rw-r--r--arch/m68k/mac/via.c2
-rw-r--r--arch/m68k/math-emu/fp_log.c2
-rw-r--r--arch/m68k/q40/q40ints.c4
-rw-r--r--arch/m68k/sun3/mmu_emu.c2
-rw-r--r--arch/m68k/tools/amiga/dmesg.c2
-rw-r--r--arch/m68knommu/platform/5307/pit.c2
-rw-r--r--arch/mips/Kconfig2
-rw-r--r--arch/mips/kernel/module.c2
-rw-r--r--arch/mips/pci/pci-excite.c2
-rw-r--r--arch/mips/sni/pcimt.c2
-rw-r--r--arch/powerpc/kernel/cpu_setup_6xx.S2
-rw-r--r--arch/powerpc/kernel/irq.c2
-rw-r--r--arch/powerpc/kernel/l2cr_6xx.S2
-rw-r--r--arch/powerpc/platforms/Kconfig2
-rw-r--r--arch/powerpc/platforms/cell/spufs/file.c2
-rw-r--r--arch/powerpc/platforms/celleb/scc_uhc.c2
-rw-r--r--arch/sh64/kernel/pci_sh5.c2
-rw-r--r--arch/um/Kconfig2
-rw-r--r--arch/um/drivers/line.c2
-rw-r--r--arch/um/drivers/null.c2
-rw-r--r--arch/um/drivers/stderr_console.c2
-rw-r--r--arch/um/kernel/gmon_syms.c4
-rw-r--r--arch/um/kernel/irq.c2
-rw-r--r--arch/um/kernel/ptrace.c2
-rw-r--r--arch/um/sys-i386/bug.c2
-rw-r--r--arch/um/sys-i386/tls.c2
-rw-r--r--arch/um/sys-x86_64/bug.c2
-rw-r--r--arch/v850/kernel/me2.c4
-rw-r--r--arch/v850/kernel/rte_mb_a_pci.c4
-rw-r--r--arch/x86/boot/compressed/misc_32.c4
-rw-r--r--arch/x86/boot/compressed/misc_64.c4
-rw-r--r--arch/x86/kernel/acpi/boot.c8
-rw-r--r--arch/x86/kernel/apic_32.c4
-rw-r--r--arch/x86/kernel/apm_32.c2
-rw-r--r--arch/x86/kernel/cpu/amd.c2
-rw-r--r--arch/x86/kernel/cpu/centaur.c4
-rw-r--r--arch/x86/kernel/cpu/common.c2
-rw-r--r--arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c2
-rw-r--r--arch/x86/kernel/cpu/cpufreq/gx-suspmod.c8
-rw-r--r--arch/x86/kernel/cpu/cpufreq/powernow-k6.c2
-rw-r--r--arch/x86/kernel/cpu/cpufreq/powernow-k8.c2
-rw-r--r--arch/x86/kernel/cpu/cpufreq/powernow-k8.h4
-rw-r--r--arch/x86/kernel/cpu/cyrix.c10
-rw-r--r--arch/x86/kernel/cpu/mtrr/cyrix.c4
-rw-r--r--arch/x86/kernel/cpu/mtrr/generic.c2
-rw-r--r--arch/x86/kernel/cpu/mtrr/main.c2
-rw-r--r--arch/x86/kernel/e820_32.c2
-rw-r--r--arch/x86/kernel/hpet.c2
-rw-r--r--arch/x86/kernel/i8253.c2
-rw-r--r--arch/x86/kernel/io_apic_32.c4
-rw-r--r--arch/x86/kernel/io_apic_64.c4
-rw-r--r--arch/x86/kernel/mce_64.c4
-rw-r--r--arch/x86/kernel/mpparse_32.c2
-rw-r--r--arch/x86/kernel/ptrace_32.c2
-rw-r--r--arch/x86/kernel/setup_32.c2
-rw-r--r--arch/x86/kernel/signal_32.c2
-rw-r--r--arch/x86/kernel/signal_64.c2
-rw-r--r--arch/x86/kernel/smp_32.c4
-rw-r--r--arch/x86/kernel/smpboot_32.c2
-rw-r--r--arch/x86/kernel/smpboot_64.c2
-rw-r--r--arch/x86/kernel/summit_32.c2
-rw-r--r--arch/x86/kernel/suspend_64.c2
-rw-r--r--arch/x86/kernel/traps_64.c2
-rw-r--r--arch/x86/kernel/tsc_32.c4
-rw-r--r--arch/x86/kernel/vsyscall_64.c2
-rw-r--r--arch/x86/mach-default/setup.c4
-rw-r--r--arch/x86/mach-generic/default.c2
-rw-r--r--arch/x86/mach-generic/probe.c2
-rw-r--r--arch/x86/mach-voyager/voyager_smp.c12
-rw-r--r--arch/x86/mach-voyager/voyager_thread.c2
-rw-r--r--arch/x86/mm/boot_ioremap_32.c2
-rw-r--r--arch/x86/mm/discontig_32.c2
-rw-r--r--arch/x86/mm/fault_32.c4
-rw-r--r--arch/x86/mm/fault_64.c4
-rw-r--r--arch/x86/mm/srat_64.c2
-rw-r--r--arch/x86/oprofile/op_x86_model.h2
-rw-r--r--arch/x86/pci/irq.c4
-rw-r--r--arch/xtensa/platform-iss/network.c2
-rw-r--r--block/elevator.c2
-rw-r--r--crypto/api.c2
-rw-r--r--crypto/fcrypt.c2
-rw-r--r--drivers/acpi/Kconfig2
-rw-r--r--drivers/ata/ahci.c2
-rw-r--r--drivers/ata/libata-sff.c2
-rw-r--r--drivers/ata/pata_cmd64x.c2
-rw-r--r--drivers/ata/pata_cs5530.c2
-rw-r--r--drivers/ata/pata_cs5535.c2
-rw-r--r--drivers/ata/pata_it821x.c4
-rw-r--r--drivers/ata/pata_mpiix.c2
-rw-r--r--drivers/ata/pata_ns87410.c2
-rw-r--r--drivers/ata/pata_oldpiix.c2
-rw-r--r--drivers/ata/pata_radisys.c2
-rw-r--r--drivers/ata/pata_sc1200.c2
-rw-r--r--drivers/ata/pata_sil680.c2
-rw-r--r--drivers/ata/pata_via.c2
-rw-r--r--drivers/atm/firestream.c2
-rw-r--r--drivers/block/Kconfig21
-rw-r--r--drivers/block/loop.c2
-rw-r--r--drivers/block/nbd.c1
-rw-r--r--drivers/block/rd.c2
-rw-r--r--drivers/char/cyclades.c4
-rw-r--r--drivers/char/drm/drm_hashtab.c2
-rw-r--r--drivers/char/drm/drm_hashtab.h2
-rw-r--r--drivers/char/drm/drm_mm.c2
-rw-r--r--drivers/char/drm/drm_pci.c4
-rw-r--r--drivers/char/drm/drm_sarea.h2
-rw-r--r--drivers/char/drm/drm_sman.c2
-rw-r--r--drivers/char/drm/drm_sman.h2
-rw-r--r--drivers/char/drm/r128_drv.h2
-rw-r--r--drivers/char/drm/radeon_irq.c2
-rw-r--r--drivers/char/drm/radeon_state.c2
-rw-r--r--drivers/char/drm/sis_mm.c2
-rw-r--r--drivers/char/drm/via_mm.c2
-rw-r--r--drivers/char/drm/via_verifier.h2
-rw-r--r--drivers/char/esp.c2
-rw-r--r--drivers/char/hw_random/omap-rng.c2
-rw-r--r--drivers/char/i8k.c14
-rw-r--r--drivers/char/n_tty.c4
-rw-r--r--drivers/char/rocket.c2
-rw-r--r--drivers/char/sonypi.c2
-rw-r--r--drivers/char/tty_io.c8
-rw-r--r--drivers/char/tty_ioctl.c2
-rw-r--r--drivers/firewire/fw-transaction.c2
-rw-r--r--drivers/hid/usbhid/hid-ff.c2
-rw-r--r--drivers/hwmon/gl520sm.c4
-rw-r--r--drivers/hwmon/sis5595.c2
-rw-r--r--drivers/hwmon/via686a.c4
-rw-r--r--drivers/i2c/algos/i2c-algo-bit.c2
-rw-r--r--drivers/i2c/algos/i2c-algo-pca.c2
-rw-r--r--drivers/i2c/algos/i2c-algo-pcf.c2
-rw-r--r--drivers/i2c/busses/Kconfig10
-rw-r--r--drivers/i2c/busses/i2c-elektor.c2
-rw-r--r--drivers/i2c/busses/i2c-hydra.c2
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c2
-rw-r--r--drivers/i2c/busses/i2c-omap.c2
-rw-r--r--drivers/i2c/busses/i2c-parport-light.c2
-rw-r--r--drivers/i2c/busses/i2c-parport.c2
-rw-r--r--drivers/i2c/busses/i2c-via.c4
-rw-r--r--drivers/i2c/busses/i2c-viapro.c2
-rw-r--r--drivers/i2c/i2c-core.c2
-rw-r--r--drivers/ide/ide-cd.c6
-rw-r--r--drivers/ide/ide-tape.c2
-rw-r--r--drivers/ide/legacy/q40ide.c2
-rw-r--r--drivers/ide/pci/it821x.c4
-rw-r--r--drivers/ide/pci/siimage.c2
-rw-r--r--drivers/input/fixp-arith.h2
-rw-r--r--drivers/input/joystick/db9.c2
-rw-r--r--drivers/input/joystick/iforce/Makefile2
-rw-r--r--drivers/input/keyboard/omap-keypad.c4
-rw-r--r--drivers/input/misc/Kconfig4
-rw-r--r--drivers/input/mouse/psmouse-base.c2
-rw-r--r--drivers/input/mouse/vsxxxaa.c2
-rw-r--r--drivers/isdn/act2000/act2000_isa.c2
-rw-r--r--drivers/isdn/hardware/eicon/capifunc.c4
-rw-r--r--drivers/isdn/hisax/amd7930_fn.c2
-rw-r--r--drivers/isdn/hisax/enternow_pci.c18
-rw-r--r--drivers/isdn/hisax/hfc_pci.c2
-rw-r--r--drivers/isdn/hisax/isdnhdlc.c4
-rw-r--r--drivers/isdn/hisax/isdnhdlc.h2
-rw-r--r--drivers/isdn/hisax/jade.c2
-rw-r--r--drivers/isdn/pcbit/capi.c4
-rw-r--r--drivers/leds/leds-s3c24xx.c2
-rw-r--r--drivers/macintosh/via-pmu.c2
-rw-r--r--drivers/md/dm-crypt.c2
-rw-r--r--drivers/md/raid1.c2
-rw-r--r--drivers/media/common/saa7146_hlp.c2
-rw-r--r--drivers/media/dvb/bt8xx/bt878.c2
-rw-r--r--drivers/media/dvb/cinergyT2/cinergyT2.c2
-rw-r--r--drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c26
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c2
-rw-r--r--drivers/media/video/meye.c2
-rw-r--r--drivers/media/video/meye.h2
-rw-r--r--drivers/media/video/saa5246a.c4
-rw-r--r--drivers/media/video/saa5249.c4
-rw-r--r--drivers/media/video/usbvideo/vicam.c2
-rw-r--r--drivers/media/video/v4l2-common.c2
-rw-r--r--drivers/message/i2o/README4
-rw-r--r--drivers/message/i2o/exec-osm.c4
-rw-r--r--drivers/message/i2o/i2o_config.c6
-rw-r--r--drivers/message/i2o/i2o_proc.c4
-rw-r--r--drivers/message/i2o/iop.c4
-rw-r--r--drivers/message/i2o/pci.c4
-rw-r--r--drivers/mfd/Kconfig4
-rw-r--r--drivers/misc/Kconfig4
-rw-r--r--drivers/misc/ibmasm/remote.c2
-rw-r--r--drivers/misc/sony-laptop.c4
-rw-r--r--drivers/mtd/maps/Kconfig10
-rw-r--r--drivers/net/8139too.c2
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/amd8111e.c2
-rw-r--r--drivers/net/ariadne.c2
-rw-r--r--drivers/net/ariadne.h2
-rw-r--r--drivers/net/au1000_eth.c2
-rw-r--r--drivers/net/bonding/bond_sysfs.c2
-rw-r--r--drivers/net/e100.c2
-rw-r--r--drivers/net/e1000/e1000_main.c2
-rw-r--r--drivers/net/fealnx.c1
-rw-r--r--drivers/net/hamradio/6pack.c2
-rw-r--r--drivers/net/hamradio/Kconfig2
-rw-r--r--drivers/net/irda/actisys-sir.c2
-rw-r--r--drivers/net/irda/actisys.c2
-rw-r--r--drivers/net/irda/donauboe.c2
-rw-r--r--drivers/net/irda/girbil-sir.c2
-rw-r--r--drivers/net/irda/girbil.c2
-rw-r--r--drivers/net/irda/irport.h2
-rw-r--r--drivers/net/irda/irtty-sir.c2
-rw-r--r--drivers/net/irda/nsc-ircc.c2
-rw-r--r--drivers/net/irda/nsc-ircc.h2
-rw-r--r--drivers/net/irda/tekram-sir.c2
-rw-r--r--drivers/net/irda/tekram.c2
-rw-r--r--drivers/net/irda/w83977af_ir.h2
-rw-r--r--drivers/net/natsemi.c2
-rw-r--r--drivers/net/smc911x.c2
-rw-r--r--drivers/net/spider_net.c2
-rw-r--r--drivers/net/tc35815.c4
-rw-r--r--drivers/net/tulip/winbond-840.c2
-rw-r--r--drivers/net/usb/Kconfig2
-rw-r--r--drivers/net/via-velocity.c2
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_xmit.h2
-rw-r--r--drivers/net/wireless/ipw2100.c4
-rw-r--r--drivers/net/wireless/ipw2200.c2
-rw-r--r--drivers/net/wireless/netwave_cs.c8
-rw-r--r--drivers/rtc/Kconfig2
-rw-r--r--drivers/s390/block/dasd_3990_erp.c4
-rw-r--r--drivers/s390/char/sclp_cpi.c2
-rw-r--r--drivers/s390/cio/cmf.c2
-rw-r--r--drivers/s390/net/ctcmain.c10
-rw-r--r--drivers/scsi/aacraid/aacraid.h2
-rw-r--r--drivers/scsi/aha152x.c6
-rw-r--r--drivers/scsi/aic7xxx/cam.h2
-rw-r--r--drivers/scsi/dc395x.c6
-rw-r--r--drivers/scsi/megaraid/megaraid_mbox.c2
-rw-r--r--drivers/scsi/qla4xxx/ql4_init.c2
-rw-r--r--drivers/scsi/sd.c2
-rw-r--r--drivers/scsi/sun3_NCR5380.c2
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_fw2.h2
-rw-r--r--drivers/scsi/wd33c93.h2
-rw-r--r--drivers/serial/Kconfig6
-rw-r--r--drivers/serial/s3c2410.c4
-rw-r--r--drivers/spi/mpc52xx_psc_spi.c2
-rw-r--r--drivers/usb/gadget/lh7a40x_udc.c2
-rw-r--r--drivers/usb/host/ehci-hub.c2
-rw-r--r--drivers/usb/host/sl811-hcd.c2
-rw-r--r--drivers/usb/image/Kconfig2
-rw-r--r--drivers/usb/misc/cytherm.c2
-rw-r--r--drivers/usb/misc/emi26.c4
-rw-r--r--drivers/usb/misc/emi62.c4
-rw-r--r--drivers/usb/serial/ChangeLog.history2
-rw-r--r--drivers/usb/serial/Kconfig2
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/ftdi_sio.h6
-rw-r--r--drivers/usb/serial/ipaq.c4
-rw-r--r--drivers/usb/storage/isd200.c2
-rw-r--r--drivers/usb/storage/unusual_devs.h4
-rw-r--r--drivers/video/Kconfig6
-rw-r--r--drivers/video/amifb.c14
-rw-r--r--drivers/video/aty/atyfb_base.c2
-rw-r--r--drivers/video/console/Kconfig2
-rw-r--r--drivers/video/intelfb/intelfbdrv.c2
-rw-r--r--drivers/video/intelfb/intelfbhw.c2
-rw-r--r--drivers/video/omap/Kconfig2
-rw-r--r--drivers/video/s3c2410fb.c4
-rw-r--r--drivers/video/vermilion/vermilion.c4
-rw-r--r--drivers/video/vermilion/vermilion.h2
-rw-r--r--drivers/watchdog/i6300esb.c6
-rw-r--r--drivers/watchdog/iTCO_vendor_support.c2
-rw-r--r--drivers/watchdog/w83697hf_wdt.c2
-rw-r--r--drivers/zorro/zorro.ids2
-rw-r--r--fs/binfmt_em86.c2
-rw-r--r--fs/binfmt_misc.c2
-rw-r--r--fs/binfmt_script.c2
-rw-r--r--fs/isofs/inode.c2
-rw-r--r--fs/jfs/jfs_dtree.c2
-rw-r--r--fs/nfs/nfsroot.c2
-rw-r--r--fs/ntfs/ChangeLog4
-rw-r--r--fs/ntfs/sysctl.c2
-rw-r--r--fs/ntfs/sysctl.h2
-rw-r--r--fs/ocfs2/dcache.c2
-rw-r--r--fs/reiserfs/super.c2
-rw-r--r--fs/super.c6
-rw-r--r--fs/sysfs/file.c2
-rw-r--r--include/asm-arm/arch-aaec2000/aaec2000.h4
-rw-r--r--include/asm-arm/dma-mapping.h2
-rw-r--r--include/asm-blackfin/system.h4
-rw-r--r--include/asm-h8300/system.h3
-rw-r--r--include/asm-m68knommu/system.h3
-rw-r--r--include/asm-mips/pci/bridge.h2
-rw-r--r--include/asm-powerpc/io.h2
-rw-r--r--include/asm-powerpc/paca.h2
-rw-r--r--include/asm-sh/se7751.h2
-rw-r--r--include/asm-sh/systemh7751.h2
-rw-r--r--include/asm-sh64/system.h3
-rw-r--r--include/asm-v850/system.h3
-rw-r--r--include/asm-x86/hpet.h6
-rw-r--r--include/linux/cdrom.h6
-rw-r--r--include/linux/crypto.h2
-rw-r--r--include/linux/fs.h2
-rw-r--r--include/linux/ipmi_smi.h2
-rw-r--r--include/linux/security.h17
-rw-r--r--include/net/irda/irttp.h4
-rw-r--r--init/main.c10
-rw-r--r--kernel/hrtimer.c4
-rw-r--r--kernel/panic.c2
-rw-r--r--kernel/power/snapshot.c9
-rw-r--r--kernel/sched.c5
-rw-r--r--kernel/taskstats.c2
-rw-r--r--lib/argv_split.c3
-rw-r--r--lib/kernel_lock.c2
-rw-r--r--lib/kobject_uevent.c2
-rw-r--r--mm/Kconfig2
-rw-r--r--mm/hugetlb.c2
-rw-r--r--mm/memory.c2
-rw-r--r--mm/memory_hotplug.c2
-rw-r--r--mm/mempool.c2
-rw-r--r--mm/migrate.c2
-rw-r--r--mm/nommu.c3
-rw-r--r--mm/page-writeback.c2
-rw-r--r--mm/page_alloc.c8
-rw-r--r--mm/prio_tree.c2
-rw-r--r--mm/slab.c6
-rw-r--r--mm/swap.c2
-rw-r--r--mm/vmalloc.c6
-rw-r--r--mm/vmscan.c2
-rw-r--r--net/9p/Kconfig2
-rw-r--r--net/ax25/ax25_ds_in.c2
-rw-r--r--net/ax25/ax25_ds_subr.c2
-rw-r--r--net/bluetooth/bnep/core.c2
-rw-r--r--net/bluetooth/bnep/netdev.c2
-rw-r--r--net/bridge/netfilter/ebtables.c2
-rw-r--r--net/core/pktgen.c2
-rw-r--r--net/ieee80211/ieee80211_wx.c2
-rw-r--r--net/ipv4/Kconfig2
-rw-r--r--net/irda/discovery.c2
-rw-r--r--net/irda/iriap.c2
-rw-r--r--net/irda/iriap_event.c2
-rw-r--r--net/irda/irias_object.c2
-rw-r--r--net/irda/irlan/irlan_client.c2
-rw-r--r--net/irda/irlan/irlan_client_event.c2
-rw-r--r--net/irda/irlan/irlan_common.c2
-rw-r--r--net/irda/irlan/irlan_eth.c2
-rw-r--r--net/irda/irlan/irlan_event.c2
-rw-r--r--net/irda/irlan/irlan_filter.c2
-rw-r--r--net/irda/irlan/irlan_provider.c2
-rw-r--r--net/irda/irlan/irlan_provider_event.c2
-rw-r--r--net/irda/irlap_event.c2
-rw-r--r--net/irda/irlap_frame.c2
-rw-r--r--net/irda/irlmp.c2
-rw-r--r--net/irda/irlmp_event.c2
-rw-r--r--net/irda/irlmp_frame.c2
-rw-r--r--net/irda/irmod.c2
-rw-r--r--net/irda/irqueue.c2
-rw-r--r--net/irda/irsysctl.c2
-rw-r--r--net/irda/irttp.c2
-rw-r--r--net/irda/timer.c2
-rw-r--r--net/irda/wrapper.c2
-rw-r--r--net/iucv/iucv.c2
-rw-r--r--net/netfilter/xt_CONNMARK.c2
-rw-r--r--net/netfilter/xt_connmark.c2
-rw-r--r--net/netfilter/xt_limit.c4
-rw-r--r--net/sched/em_meta.c2
-rw-r--r--sound/core/seq/seq_midi_emul.c8
-rw-r--r--sound/drivers/opl3/opl3_midi.c2
-rw-r--r--sound/isa/es18xx.c4
-rw-r--r--sound/mips/au1x00.c8
-rw-r--r--sound/pci/au88x0/au88x0.c2
-rw-r--r--sound/soc/soc-core.c2
-rw-r--r--sound/soc/soc-dapm.c2
-rw-r--r--sound/synth/emux/emux_synth.c2
515 files changed, 879 insertions, 943 deletions
diff --git a/CREDITS b/CREDITS
index 99566b1a6eeb..ee909f2cc49e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -959,7 +959,7 @@ S: 2037 Walnut #6
959S: Boulder, Colorado 80302 959S: Boulder, Colorado 80302
960S: USA 960S: USA
961 961
962N: Heiko Eissfeldt 962N: Heiko Eißfeldt
963E: heiko@colossus.escape.de heiko@unifix.de 963E: heiko@colossus.escape.de heiko@unifix.de
964D: verify_area stuff, generic SCSI fixes 964D: verify_area stuff, generic SCSI fixes
965D: SCSI Programming HOWTO 965D: SCSI Programming HOWTO
@@ -1988,8 +1988,8 @@ N: Volker Lendecke
1988E: vl@kki.org 1988E: vl@kki.org
1989D: Kernel smbfs (to mount WfW, NT and OS/2 network drives.) 1989D: Kernel smbfs (to mount WfW, NT and OS/2 network drives.)
1990D: NCP filesystem support (to mount NetWare volumes) 1990D: NCP filesystem support (to mount NetWare volumes)
1991S: Von Ossietzky Str. 12 1991S: Von-Ossietzky-Str. 12
1992S: 37085 Goettingen 1992S: 37085 Göttingen
1993S: Germany 1993S: Germany
1994 1994
1995N: Kevin Lentin 1995N: Kevin Lentin
@@ -2431,11 +2431,11 @@ S: 12725 SW Millikan Way, Suite 400
2431S: Beaverton, Oregon 97005 2431S: Beaverton, Oregon 97005
2432S: USA 2432S: USA
2433 2433
2434N: Eberhard Moenkeberg 2434N: Eberhard Mönkeberg
2435E: emoenke@gwdg.de 2435E: emoenke@gwdg.de
2436D: CDROM driver "sbpcd" (Matsushita/Panasonic/Soundblaster) 2436D: CDROM driver "sbpcd" (Matsushita/Panasonic/Soundblaster)
2437S: Ruhstrathoehe 2 b. 2437S: Ruhstrathöhe 2 b.
2438S: D-37085 Goettingen 2438S: D-37085 Göttingen
2439S: Germany 2439S: Germany
2440 2440
2441N: Thomas Molina 2441N: Thomas Molina
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 1a7f53068ec2..054a7ecf64c6 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -165,7 +165,7 @@ quiet_cmd_db2man = MAN $@
165 @touch $@ 165 @touch $@
166 166
167### 167###
168# Rules to generate postscripts and PNG imgages from .fig format files 168# Rules to generate postscripts and PNG images from .fig format files
169quiet_cmd_fig2eps = FIG2EPS $@ 169quiet_cmd_fig2eps = FIG2EPS $@
170 cmd_fig2eps = fig2dev -Leps $< $@ 170 cmd_fig2eps = fig2dev -Leps $< $@
171 171
diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl
index 6fbc41d98c1e..957cf5c26831 100644
--- a/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
@@ -282,7 +282,7 @@ int __init board_init (void)
282 goto out; 282 goto out;
283 } 283 }
284 284
285 /* map physical adress */ 285 /* map physical address */
286 baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024); 286 baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
287 if(!baseaddr){ 287 if(!baseaddr){
288 printk("Ioremap to access NAND chip failed\n"); 288 printk("Ioremap to access NAND chip failed\n");
@@ -306,7 +306,7 @@ int __init board_init (void)
306 this->dev_ready = board_dev_ready; 306 this->dev_ready = board_dev_ready;
307 this->eccmode = NAND_ECC_SOFT; 307 this->eccmode = NAND_ECC_SOFT;
308 308
309 /* Scan to find existance of the device */ 309 /* Scan to find existence of the device */
310 if (nand_scan (board_mtd, 1)) { 310 if (nand_scan (board_mtd, 1)) {
311 err = -ENXIO; 311 err = -ENXIO;
312 goto out_ior; 312 goto out_ior;
@@ -340,7 +340,7 @@ static void __exit board_cleanup (void)
340 /* Release resources, unregister device */ 340 /* Release resources, unregister device */
341 nand_release (board_mtd); 341 nand_release (board_mtd);
342 342
343 /* unmap physical adress */ 343 /* unmap physical address */
344 iounmap((void *)baseaddr); 344 iounmap((void *)baseaddr);
345 345
346 /* Free the MTD device structure */ 346 /* Free the MTD device structure */
diff --git a/Documentation/SubmitChecklist b/Documentation/SubmitChecklist
index 19e7f65c269f..34e06d2f194f 100644
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
@@ -67,7 +67,7 @@ kernel patches.
6720: Check that it all passes `make headers_check'. 6720: Check that it all passes `make headers_check'.
68 68
6921: Has been checked with injection of at least slab and page-allocation 6921: Has been checked with injection of at least slab and page-allocation
70 fauilures. See Documentation/fault-injection/. 70 failures. See Documentation/fault-injection/.
71 71
72 If the new code is substantial, addition of subsystem-specific fault 72 If the new code is substantial, addition of subsystem-specific fault
73 injection might be appropriate. 73 injection might be appropriate.
diff --git a/Documentation/SubmittingDrivers b/Documentation/SubmittingDrivers
index d7e26427e426..24f2eb40cae5 100644
--- a/Documentation/SubmittingDrivers
+++ b/Documentation/SubmittingDrivers
@@ -36,8 +36,7 @@ Linux 2.4:
36 If the code area has a general maintainer then please submit it to 36 If the code area has a general maintainer then please submit it to
37 the maintainer listed in MAINTAINERS in the kernel file. If the 37 the maintainer listed in MAINTAINERS in the kernel file. If the
38 maintainer does not respond or you cannot find the appropriate 38 maintainer does not respond or you cannot find the appropriate
39 maintainer then please contact Marcelo Tosatti 39 maintainer then please contact Willy Tarreau <w@1wt.eu>.
40 <marcelo.tosatti@cyclades.com>.
41 40
42Linux 2.6: 41Linux 2.6:
43 The same rules apply as 2.4 except that you should follow linux-kernel 42 The same rules apply as 2.4 except that you should follow linux-kernel
diff --git a/Documentation/arm/Samsung-S3C24XX/DMA.txt b/Documentation/arm/Samsung-S3C24XX/DMA.txt
index 37f4edcc5d87..3ed82383efea 100644
--- a/Documentation/arm/Samsung-S3C24XX/DMA.txt
+++ b/Documentation/arm/Samsung-S3C24XX/DMA.txt
@@ -5,7 +5,7 @@ Introduction
5------------ 5------------
6 6
7 The kernel provides an interface to manage DMA transfers 7 The kernel provides an interface to manage DMA transfers
8 using the DMA channels in the cpu, so that the central 8 using the DMA channels in the CPU, so that the central
9 duty of managing channel mappings, and programming the 9 duty of managing channel mappings, and programming the
10 channel generators is in one place. 10 channel generators is in one place.
11 11
@@ -17,24 +17,24 @@ DMA Channel Ordering
17 channels to all sources, which means that some devices 17 channels to all sources, which means that some devices
18 have a restricted number of channels that can be used. 18 have a restricted number of channels that can be used.
19 19
20 To allow flexibilty for each cpu type and board, the 20 To allow flexibility for each CPU type and board, the
21 dma code can be given an dma ordering structure which 21 DMA code can be given a DMA ordering structure which
22 allows the order of channel search to be specified, as 22 allows the order of channel search to be specified, as
23 well as allowing the prohibition of certain claims. 23 well as allowing the prohibition of certain claims.
24 24
25 struct s3c24xx_dma_order has a list of channels, and 25 struct s3c24xx_dma_order has a list of channels, and
26 each channel within has a slot for a list of dma 26 each channel within has a slot for a list of DMA
27 channel numbers. The slots are searched in order, for 27 channel numbers. The slots are searched in order for
28 the presence of a dma channel number with DMA_CH_VALID 28 the presence of a DMA channel number with DMA_CH_VALID
29 orred in. 29 or-ed in.
30 30
31 If the order has the flag DMA_CH_NEVER set, then after 31 If the order has the flag DMA_CH_NEVER set, then after
32 checking the channel list, the system will return no 32 checking the channel list, the system will return no
33 found channel, thus denying the request. 33 found channel, thus denying the request.
34 34
35 A board support file can call s3c24xx_dma_order_set() 35 A board support file can call s3c24xx_dma_order_set()
36 to register an complete ordering set. The routine will 36 to register a complete ordering set. The routine will
37 copy the data, so the original can be discared with 37 copy the data, so the original can be discarded with
38 __initdata. 38 __initdata.
39 39
40 40
diff --git a/Documentation/cdrom/cdrom-standard.tex b/Documentation/cdrom/cdrom-standard.tex
index 92f94e597582..c713aeb020c4 100644
--- a/Documentation/cdrom/cdrom-standard.tex
+++ b/Documentation/cdrom/cdrom-standard.tex
@@ -1009,7 +1009,7 @@ taken over the torch in maintaining \cdromc\ and integrating much
1009\cdrom-related code in the 2.1-kernel. Thanks to Scott Snyder and 1009\cdrom-related code in the 2.1-kernel. Thanks to Scott Snyder and
1010Gerd Knorr, who were the first to implement this interface for SCSI 1010Gerd Knorr, who were the first to implement this interface for SCSI
1011and IDE-CD drivers and added many ideas for extension of the data 1011and IDE-CD drivers and added many ideas for extension of the data
1012structures relative to kernel~2.0. Further thanks to Heiko Eissfeldt, 1012structures relative to kernel~2.0. Further thanks to Heiko Ei{\sz}feldt,
1013Thomas Quinot, Jon Tombs, Ken Pizzini, Eberhard M\"onkeberg and Andrew 1013Thomas Quinot, Jon Tombs, Ken Pizzini, Eberhard M\"onkeberg and Andrew
1014Kroll, the \linux\ \cdrom\ device driver developers who were kind 1014Kroll, the \linux\ \cdrom\ device driver developers who were kind
1015enough to give suggestions and criticisms during the writing. Finally 1015enough to give suggestions and criticisms during the writing. Finally
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 6c46730c631a..e6244cde26e9 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -2188,7 +2188,7 @@ Your cooperation is appreciated.
2188 2188
2189136-143 char Unix98 PTY slaves 2189136-143 char Unix98 PTY slaves
2190 0 = /dev/pts/0 First Unix98 pseudo-TTY 2190 0 = /dev/pts/0 First Unix98 pseudo-TTY
2191 1 = /dev/pts/1 Second Unix98 pesudo-TTY 2191 1 = /dev/pts/1 Second Unix98 pseudo-TTY
2192 ... 2192 ...
2193 2193
2194 These device nodes are automatically generated with 2194 These device nodes are automatically generated with
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt
index 8569072fa387..387b8a720f4a 100644
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@ -32,7 +32,7 @@ braindamaged document, if it's finally working, well, it's working.
32 32
33For one reason or another, low level drivers don't receive as much 33For one reason or another, low level drivers don't receive as much
34attention or testing as core code, and bugs on driver detach or 34attention or testing as core code, and bugs on driver detach or
35initilaization failure doesn't happen often enough to be noticeable. 35initialization failure don't happen often enough to be noticeable.
36Init failure path is worse because it's much less travelled while 36Init failure path is worse because it's much less travelled while
37needs to handle multiple entry points. 37needs to handle multiple entry points.
38 38
@@ -160,7 +160,7 @@ resources on failure. For example,
160 devres_release_group(dev, NULL); 160 devres_release_group(dev, NULL);
161 return err_code; 161 return err_code;
162 162
163As resource acquision failure usually means probe failure, constructs 163As resource acquisition failure usually means probe failure, constructs
164like above are usually useful in midlayer driver (e.g. libata core 164like above are usually useful in midlayer driver (e.g. libata core
165layer) where interface function shouldn't have side effect on failure. 165layer) where interface function shouldn't have side effect on failure.
166For LLDs, just returning error code suffices in most cases. 166For LLDs, just returning error code suffices in most cases.
diff --git a/Documentation/fb/deferred_io.txt b/Documentation/fb/deferred_io.txt
index 73cf9fb7cf60..63883a892120 100644
--- a/Documentation/fb/deferred_io.txt
+++ b/Documentation/fb/deferred_io.txt
@@ -3,7 +3,7 @@ Deferred IO
3 3
4Deferred IO is a way to delay and repurpose IO. It uses host memory as a 4Deferred IO is a way to delay and repurpose IO. It uses host memory as a
5buffer and the MMU pagefault as a pretrigger for when to perform the device 5buffer and the MMU pagefault as a pretrigger for when to perform the device
6IO. The following example may be a useful explaination of how one such setup 6IO. The following example may be a useful explanation of how one such setup
7works: 7works:
8 8
9- userspace app like Xfbdev mmaps framebuffer 9- userspace app like Xfbdev mmaps framebuffer
@@ -28,7 +28,7 @@ a relatively more expensive operation.
28 28
29For some types of nonvolatile high latency displays, the desired image is 29For some types of nonvolatile high latency displays, the desired image is
30the final image rather than the intermediate stages which is why it's okay 30the final image rather than the intermediate stages which is why it's okay
31to not update for each write that is occuring. 31to not update for each write that is occurring.
32 32
33It may be the case that this is useful in other scenarios as well. Paul Mundt 33It may be the case that this is useful in other scenarios as well. Paul Mundt
34has mentioned a case where it is beneficial to use the page count to decide 34has mentioned a case where it is beneficial to use the page count to decide
diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt
index d6fd6c6e4244..b90f537af35c 100644
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
@@ -54,7 +54,7 @@ OPTIONS
54 aname=name aname specifies the file tree to access when the server is 54 aname=name aname specifies the file tree to access when the server is
55 offering several exported file systems. 55 offering several exported file systems.
56 56
57 cache=mode specifies a cacheing policy. By default, no caches are used. 57 cache=mode specifies a caching policy. By default, no caches are used.
58 loose = no attempts are made at consistency, 58 loose = no attempts are made at consistency,
59 intended for exclusive, read-only mounts 59 intended for exclusive, read-only mounts
60 60
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index fe26cc978523..37c10cba7177 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -224,7 +224,7 @@ against the page the filesystem should redirty the page with
224redirty_page_for_writepage(), then unlock the page and return zero. 224redirty_page_for_writepage(), then unlock the page and return zero.
225This may also be done to avoid internal deadlocks, but rarely. 225This may also be done to avoid internal deadlocks, but rarely.
226 226
227If the filesytem is called for sync then it must wait on any 227If the filesystem is called for sync then it must wait on any
228in-progress I/O and then start new I/O. 228in-progress I/O and then start new I/O.
229 229
230The filesystem should unlock the page synchronously, before returning to the 230The filesystem should unlock the page synchronously, before returning to the
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt
index 4aecc9bdb273..b45f3c1b8b43 100644
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
@@ -130,12 +130,12 @@ Device layer.
130 130
131Journaling Block Device layer 131Journaling Block Device layer
132----------------------------- 132-----------------------------
133The Journaling Block Device layer (JBD) isn't ext3 specific. It was design to 133The Journaling Block Device layer (JBD) isn't ext3 specific. It was designed
134add journaling capabilities on a block device. The ext3 filesystem code will 134to add journaling capabilities to a block device. The ext3 filesystem code
135inform the JBD of modifications it is performing (called a transaction). The 135will inform the JBD of modifications it is performing (called a transaction).
136journal supports the transactions start and stop, and in case of crash, the 136The journal supports the transactions start and stop, and in case of a crash,
137journal can replayed the transactions to put the partition back in a 137the journal can replay the transactions to quickly put the partition back into
138consistent state fast. 138a consistent state.
139 139
140Handles represent a single atomic update to a filesystem. JBD can handle an 140Handles represent a single atomic update to a filesystem. JBD can handle an
141external journal on a block device. 141external journal on a block device.
@@ -164,7 +164,7 @@ written to the journal first, and then to its final location.
164In the event of a crash, the journal can be replayed, bringing both data and 164In the event of a crash, the journal can be replayed, bringing both data and
165metadata into a consistent state. This mode is the slowest except when data 165metadata into a consistent state. This mode is the slowest except when data
166needs to be read from and written to disk at the same time where it 166needs to be read from and written to disk at the same time where it
167outperforms all others modes. 167outperforms all other modes.
168 168
169Compatibility 169Compatibility
170------------- 170-------------
diff --git a/Documentation/filesystems/files.txt b/Documentation/filesystems/files.txt
index 133e213ebb72..bb0142f61084 100644
--- a/Documentation/filesystems/files.txt
+++ b/Documentation/filesystems/files.txt
@@ -76,13 +76,13 @@ the fdtable structure -
765. Handling of the file structures is special. Since the look-up 765. Handling of the file structures is special. Since the look-up
77 of the fd (fget()/fget_light()) are lock-free, it is possible 77 of the fd (fget()/fget_light()) are lock-free, it is possible
78 that look-up may race with the last put() operation on the 78 that look-up may race with the last put() operation on the
79 file structure. This is avoided using the rcuref APIs 79 file structure. This is avoided using atomic_inc_not_zero()
80 on ->f_count : 80 on ->f_count :
81 81
82 rcu_read_lock(); 82 rcu_read_lock();
83 file = fcheck_files(files, fd); 83 file = fcheck_files(files, fd);
84 if (file) { 84 if (file) {
85 if (rcuref_inc_lf(&file->f_count)) 85 if (atomic_inc_not_zero(&file->f_count))
86 *fput_needed = 1; 86 *fput_needed = 1;
87 else 87 else
88 /* Didn't get the reference, someone's freed */ 88 /* Didn't get the reference, someone's freed */
@@ -92,7 +92,7 @@ the fdtable structure -
92 .... 92 ....
93 return file; 93 return file;
94 94
95 rcuref_inc_lf() detects if refcounts is already zero or 95 atomic_inc_not_zero() detects if refcounts is already zero or
96 goes to zero during increment. If it does, we fail 96 goes to zero during increment. If it does, we fail
97 fget()/fget_light(). 97 fget()/fget_light().
98 98
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index e5c1df52a876..dec99455321f 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -813,9 +813,9 @@ Various pieces of information about kernel activity are available in the
813since the system first booted. For a quick look, simply cat the file: 813since the system first booted. For a quick look, simply cat the file:
814 814
815 > cat /proc/stat 815 > cat /proc/stat
816 cpu 2255 34 2290 22625563 6290 127 456 816 cpu 2255 34 2290 22625563 6290 127 456 0
817 cpu0 1132 34 1441 11311718 3675 127 438 817 cpu0 1132 34 1441 11311718 3675 127 438 0
818 cpu1 1123 0 849 11313845 2614 0 18 818 cpu1 1123 0 849 11313845 2614 0 18 0
819 intr 114930548 113199788 3 0 5 263 0 4 [... lots more numbers ...] 819 intr 114930548 113199788 3 0 5 263 0 4 [... lots more numbers ...]
820 ctxt 1990473 820 ctxt 1990473
821 btime 1062191376 821 btime 1062191376
@@ -835,6 +835,7 @@ second). The meanings of the columns are as follows, from left to right:
835- iowait: waiting for I/O to complete 835- iowait: waiting for I/O to complete
836- irq: servicing interrupts 836- irq: servicing interrupts
837- softirq: servicing softirqs 837- softirq: servicing softirqs
838- steal: involuntary wait
838 839
839The "intr" line gives counts of interrupts serviced since boot time, for each 840The "intr" line gives counts of interrupts serviced since boot time, for each
840of the possible system interrupts. The first column is the total of all 841of the possible system interrupts. The first column is the total of all
diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt
index 4b5ca26e5048..4598ef7b622b 100644
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
@@ -51,7 +51,7 @@ for the attributes, providing a means to read and write kernel
51attributes. 51attributes.
52 52
53Attributes should be ASCII text files, preferably with only one value 53Attributes should be ASCII text files, preferably with only one value
54per file. It is noted that it may not be efficient to contain only 54per file. It is noted that it may not be efficient to contain only one
55value per file, so it is socially acceptable to express an array of 55value per file, so it is socially acceptable to express an array of
56values of the same type. 56values of the same type.
57 57
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 6f8e16e3d6c0..9d019d35728f 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -706,7 +706,7 @@ struct address_space_operations {
706 wants to make it a free page. If ->releasepage succeeds, the 706 wants to make it a free page. If ->releasepage succeeds, the
707 page will be removed from the address_space and become free. 707 page will be removed from the address_space and become free.
708 708
709 The second case if when a request has been made to invalidate 709 The second case is when a request has been made to invalidate
710 some or all pages in an address_space. This can happen 710 some or all pages in an address_space. This can happen
711 through the fadvice(POSIX_FADV_DONTNEED) system call or by the 711 through the fadvice(POSIX_FADV_DONTNEED) system call or by the
712 filesystem explicitly requesting it as nfs and 9fs do (when 712 filesystem explicitly requesting it as nfs and 9fs do (when
diff --git a/Documentation/i2c/i2c-protocol b/Documentation/i2c/i2c-protocol
index 579b92d5f3a3..10518dd58814 100644
--- a/Documentation/i2c/i2c-protocol
+++ b/Documentation/i2c/i2c-protocol
@@ -68,7 +68,7 @@ We have found some I2C devices that needs the following modifications:
68 68
69 Flags I2C_M_IGNORE_NAK 69 Flags I2C_M_IGNORE_NAK
70 Normally message is interrupted immediately if there is [NA] from the 70 Normally message is interrupted immediately if there is [NA] from the
71 client. Setting this flag treats any [NA] as [A], and all of 71 client. Setting this flag treats any [NA] as [A], and all of
72 message is sent. 72 message is sent.
73 These messages may still fail to SCL lo->hi timeout. 73 These messages may still fail to SCL lo->hi timeout.
74 74
diff --git a/Documentation/ia64/err_inject.txt b/Documentation/ia64/err_inject.txt
index 6449a7090dbb..223e4f0582d0 100644
--- a/Documentation/ia64/err_inject.txt
+++ b/Documentation/ia64/err_inject.txt
@@ -21,10 +21,10 @@ software test suits to do stressful testing on IPF.
21 21
22Below is a sample application as part of the whole tool. The sample 22Below is a sample application as part of the whole tool. The sample
23can be used as a working test tool. Or it can be expanded to include 23can be used as a working test tool. Or it can be expanded to include
24more features. It also can be a integrated into a libary or other user 24more features. It also can be a integrated into a library or other user
25application to have more thorough test. 25application to have more thorough test.
26 26
27The sample application takes err.conf as error configuation input. Gcc 27The sample application takes err.conf as error configuration input. GCC
28compiles the code. After you install err_inject driver, you can run 28compiles the code. After you install err_inject driver, you can run
29this sample application to inject errors. 29this sample application to inject errors.
30 30
@@ -809,7 +809,7 @@ int err_inj()
809 } 809 }
810 810
811 /* Create semaphore: If one_lock, one semaphore for all processors. 811 /* Create semaphore: If one_lock, one semaphore for all processors.
812 Otherwise, one sempaphore for each processor. */ 812 Otherwise, one semaphore for each processor. */
813 if (one_lock) { 813 if (one_lock) {
814 if (create_sem(0)) { 814 if (create_sem(0)) {
815 printf("Can not create semaphore...exit\n"); 815 printf("Can not create semaphore...exit\n");
diff --git a/Documentation/input/atarikbd.txt b/Documentation/input/atarikbd.txt
index ab050621e20f..f3a3ba8847ba 100644
--- a/Documentation/input/atarikbd.txt
+++ b/Documentation/input/atarikbd.txt
@@ -170,7 +170,7 @@ major controller faults (ROM checksum and RAM test) and such things as stuck
170keys. Any keys down at power-up are presumed to be stuck, and their BREAK 170keys. Any keys down at power-up are presumed to be stuck, and their BREAK
171(sic) code is returned (which without the preceding MAKE code is a flag for a 171(sic) code is returned (which without the preceding MAKE code is a flag for a
172keyboard error). If the controller self-test completes without error, the code 172keyboard error). If the controller self-test completes without error, the code
1730xF0 is returned. (This code will be used to indicate the version/rlease of 1730xF0 is returned. (This code will be used to indicate the version/release of
174the ikbd controller. The first release of the ikbd is version 0xF0, should 174the ikbd controller. The first release of the ikbd is version 0xF0, should
175there be a second release it will be 0xF1, and so on.) 175there be a second release it will be 0xF1, and so on.)
176The ikbd defaults to a mouse position reporting with threshold of 1 unit in 176The ikbd defaults to a mouse position reporting with threshold of 1 unit in
@@ -413,7 +413,7 @@ INTERROGATION MODE.
413 %nnnnmmmm ; where m is JOYSTICK1 state 413 %nnnnmmmm ; where m is JOYSTICK1 state
414 ; and n is JOYSTICK0 state 414 ; and n is JOYSTICK0 state
415 415
416Sets the ikbd to do nothing but monitor the serial command lne, maintain the 416Sets the ikbd to do nothing but monitor the serial command line, maintain the
417time-of-day clock, and monitor the joystick. The rate sets the interval 417time-of-day clock, and monitor the joystick. The rate sets the interval
418between joystick samples. 418between joystick samples.
419N.B. The user should not set the rate higher than the serial communications 419N.B. The user should not set the rate higher than the serial communications
@@ -446,10 +446,10 @@ The sample interval should be as constant as possible.
446 ; until vertical cursor key is generated before RY 446 ; until vertical cursor key is generated before RY
447 ; has elapsed 447 ; has elapsed
448 VX ; length (in tenths of seconds) of joystick closure 448 VX ; length (in tenths of seconds) of joystick closure
449 ; until horizontal cursor keystokes are generated 449 ; until horizontal cursor keystrokes are generated
450 ; after RX has elapsed 450 ; after RX has elapsed
451 VY ; length (in tenths of seconds) of joystick closure 451 VY ; length (in tenths of seconds) of joystick closure
452 ; until vertical cursor keystokes are generated 452 ; until vertical cursor keystrokes are generated
453 ; after RY has elapsed 453 ; after RY has elapsed
454 454
455In this mode, joystick 0 is scanned in a way that simulates cursor keystrokes. 455In this mode, joystick 0 is scanned in a way that simulates cursor keystrokes.
diff --git a/Documentation/input/ff.txt b/Documentation/input/ff.txt
index 085eb15b45b7..ded4d5f53109 100644
--- a/Documentation/input/ff.txt
+++ b/Documentation/input/ff.txt
@@ -1,5 +1,5 @@
1Force feedback for Linux. 1Force feedback for Linux.
2By Johann Deneux <deneux@ifrance.com> on 2001/04/22. 2By Johann Deneux <johann.deneux@gmail.com> on 2001/04/22.
3Updated by Anssi Hannula <anssi.hannula@gmail.com> on 2006/04/09. 3Updated by Anssi Hannula <anssi.hannula@gmail.com> on 2006/04/09.
4You may redistribute this file. Please remember to include shape.fig and 4You may redistribute this file. Please remember to include shape.fig and
5interactive.fig as well. 5interactive.fig as well.
diff --git a/Documentation/input/iforce-protocol.txt b/Documentation/input/iforce-protocol.txt
index 8777d2d321e3..3ac92413c874 100644
--- a/Documentation/input/iforce-protocol.txt
+++ b/Documentation/input/iforce-protocol.txt
@@ -4,10 +4,10 @@ specify force effects to I-Force 2.0 devices. None of this information comes
4from Immerse. That's why you should not trust what is written in this 4from Immerse. That's why you should not trust what is written in this
5document. This document is intended to help understanding the protocol. 5document. This document is intended to help understanding the protocol.
6This is not a reference. Comments and corrections are welcome. To contact me, 6This is not a reference. Comments and corrections are welcome. To contact me,
7send an email to: deneux@ifrance.com 7send an email to: johann.deneux@gmail.com
8 8
9** WARNING ** 9** WARNING **
10I may not be held responsible for any dammage or harm caused if you try to 10I shall not be held responsible for any damage or harm caused if you try to
11send data to your I-Force device based on what you read in this document. 11send data to your I-Force device based on what you read in this document.
12 12
13** Preliminary Notes: 13** Preliminary Notes:
@@ -151,13 +151,13 @@ OP= ff
151Query command. Length varies according to the query type. 151Query command. Length varies according to the query type.
152The general format of this packet is: 152The general format of this packet is:
153ff 01 QUERY [INDEX] CHECKSUM 153ff 01 QUERY [INDEX] CHECKSUM
154reponses are of the same form: 154responses are of the same form:
155FF LEN QUERY VALUE_QUERIED CHECKSUM2 155FF LEN QUERY VALUE_QUERIED CHECKSUM2
156where LEN = 1 + length(VALUE_QUERIED) 156where LEN = 1 + length(VALUE_QUERIED)
157 157
158**** Query ram size **** 158**** Query ram size ****
159QUERY = 42 ('B'uffer size) 159QUERY = 42 ('B'uffer size)
160The device should reply with the same packet plus two additionnal bytes 160The device should reply with the same packet plus two additional bytes
161containing the size of the memory: 161containing the size of the memory:
162ff 03 42 03 e8 CS would mean that the device has 1000 bytes of ram available. 162ff 03 42 03 e8 CS would mean that the device has 1000 bytes of ram available.
163 163
@@ -234,19 +234,23 @@ is the amount of memory apparently needed for every set of parameters:
234 234
235** Appendix: How to study the protocol ? ** 235** Appendix: How to study the protocol ? **
236 236
2371. Generate effects using the force editor provided with the DirectX SDK, or use Immersion Studio (freely available at their web site in the developer section: www.immersion.com) 2371. Generate effects using the force editor provided with the DirectX SDK, or
2382. Start a soft spying RS232 or USB (depending on where you connected your joystick/wheel). I used ComPortSpy from fCoder (alpha version!) 238use Immersion Studio (freely available at their web site in the developer section:
239www.immersion.com)
2402. Start a soft spying RS232 or USB (depending on where you connected your
241joystick/wheel). I used ComPortSpy from fCoder (alpha version!)
2393. Play the effect, and watch what happens on the spy screen. 2423. Play the effect, and watch what happens on the spy screen.
240 243
241A few words about ComPortSpy: 244A few words about ComPortSpy:
242At first glance, this soft seems, hum, well... buggy. In fact, data appear with a few seconds latency. Personnaly, I restart it every time I play an effect. 245At first glance, this software seems, hum, well... buggy. In fact, data appear with a
246few seconds latency. Personally, I restart it every time I play an effect.
243Remember it's free (as in free beer) and alpha! 247Remember it's free (as in free beer) and alpha!
244 248
245** URLS ** 249** URLS **
246Check www.immerse.com for Immersion Studio, and www.fcoder.com for ComPortSpy. 250Check www.immerse.com for Immersion Studio, and www.fcoder.com for ComPortSpy.
247 251
248** Author of this document ** 252** Author of this document **
249Johann Deneux <deneux@ifrance.com> 253Johann Deneux <johann.deneux@gmail.com>
250Home page at http://www.esil.univ-mrs.fr/~jdeneux/projects/ff/ 254Home page at http://www.esil.univ-mrs.fr/~jdeneux/projects/ff/
251 255
252Additions by Vojtech Pavlik. 256Additions by Vojtech Pavlik.
diff --git a/Documentation/input/input-programming.txt b/Documentation/input/input-programming.txt
index 4d932dc66098..47fc86830cd7 100644
--- a/Documentation/input/input-programming.txt
+++ b/Documentation/input/input-programming.txt
@@ -79,7 +79,7 @@ In the _init function, which is called either upon module load or when
79booting the kernel, it grabs the required resources (it should also check 79booting the kernel, it grabs the required resources (it should also check
80for the presence of the device). 80for the presence of the device).
81 81
82Then it allocates a new input device structure with input_aloocate_device() 82Then it allocates a new input device structure with input_allocate_device()
83and sets up input bitfields. This way the device driver tells the other 83and sets up input bitfields. This way the device driver tells the other
84parts of the input systems what it is - what events can be generated or 84parts of the input systems what it is - what events can be generated or
85accepted by this input device. Our example device can only generate EV_KEY 85accepted by this input device. Our example device can only generate EV_KEY
diff --git a/Documentation/isdn/CREDITS b/Documentation/isdn/CREDITS
index 7c17c837064f..8cac6c2f23ee 100644
--- a/Documentation/isdn/CREDITS
+++ b/Documentation/isdn/CREDITS
@@ -40,7 +40,7 @@ Andreas Kool (akool@Kool.f.EUnet.de)
40Pedro Roque Marques (roque@di.fc.ul.pt) 40Pedro Roque Marques (roque@di.fc.ul.pt)
41 For lot of new ideas and the pcbit driver. 41 For lot of new ideas and the pcbit driver.
42 42
43Eberhard Moenkeberg (emoenke@gwdg.de) 43Eberhard Mönkeberg (emoenke@gwdg.de)
44 For testing and help to get into kernel. 44 For testing and help to get into kernel.
45 45
46Thomas Neumann (tn@ruhr.de) 46Thomas Neumann (tn@ruhr.de)
diff --git a/Documentation/isdn/README.concap b/Documentation/isdn/README.concap
index 2f114babe4b6..a76d74845a4c 100644
--- a/Documentation/isdn/README.concap
+++ b/Documentation/isdn/README.concap
@@ -111,7 +111,7 @@ struct concap_proto_ops{
111 struct concap_proto * (*proto_new) (void); 111 struct concap_proto * (*proto_new) (void);
112 112
113 /* delete encapsulation protocol instance and free all its resources. 113 /* delete encapsulation protocol instance and free all its resources.
114 cprot may no loger be referenced after calling this */ 114 cprot may no longer be referenced after calling this */
115 void (*proto_del)(struct concap_proto *cprot); 115 void (*proto_del)(struct concap_proto *cprot);
116 116
117 /* initialize the protocol's data. To be called at interface startup 117 /* initialize the protocol's data. To be called at interface startup
diff --git a/Documentation/java.txt b/Documentation/java.txt
index 3cce3fbb6644..e6a723281547 100644
--- a/Documentation/java.txt
+++ b/Documentation/java.txt
@@ -37,7 +37,7 @@ other program after you have done the following:
37 or the following, if you want to be more selective: 37 or the following, if you want to be more selective:
38 ':Applet:M::<!--applet::/usr/bin/appletviewer:' 38 ':Applet:M::<!--applet::/usr/bin/appletviewer:'
39 39
40 Of cause you have to fix the path names. Given path/file names in this 40 Of course you have to fix the path names. The path/file names given in this
41 document match the Debian 2.1 system. (i.e. jdk installed in /usr, 41 document match the Debian 2.1 system. (i.e. jdk installed in /usr,
42 custom wrappers from this document in /usr/local) 42 custom wrappers from this document in /usr/local)
43 43
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt
index d9e3b199929b..5a4ef48224ae 100644
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
@@ -76,9 +76,9 @@
76 * Title: "Conceptual Architecture of the Linux Kernel" 76 * Title: "Conceptual Architecture of the Linux Kernel"
77 Author: Ivan T. Bowman. 77 Author: Ivan T. Bowman.
78 URL: http://plg.uwaterloo.ca/~itbowman/papers/CS746G-a1.html 78 URL: http://plg.uwaterloo.ca/~itbowman/papers/CS746G-a1.html
79 Keywords: conceptual software arquitecture, extracted design, 79 Keywords: conceptual software architecture, extracted design,
80 reverse engineering, system structure. 80 reverse engineering, system structure.
81 Description: Conceptual software arquitecture of the Linux kernel, 81 Description: Conceptual software architecture of the Linux kernel,
82 automatically extracted from the source code. Very detailed. Good 82 automatically extracted from the source code. Very detailed. Good
83 figures. Gives good overall kernel understanding. 83 figures. Gives good overall kernel understanding.
84 84
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 7bf6bd2f530b..6accd360da73 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -222,9 +222,6 @@ and is between 256 and 4096 characters. It is defined in the file
222 Warning: Many of these options can produce a lot of 222 Warning: Many of these options can produce a lot of
223 output and make your system unusable. Be very careful. 223 output and make your system unusable. Be very careful.
224 224
225
226 acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT
227
228 acpi_pm_good [X86-32,X86-64] 225 acpi_pm_good [X86-32,X86-64]
229 Override the pmtimer bug detection: force the kernel 226 Override the pmtimer bug detection: force the kernel
230 to assume that this machine's pmtimer latches its value 227 to assume that this machine's pmtimer latches its value
@@ -297,9 +294,6 @@ and is between 256 and 4096 characters. It is defined in the file
297 apm= [APM] Advanced Power Management 294 apm= [APM] Advanced Power Management
298 See header of arch/i386/kernel/apm.c. 295 See header of arch/i386/kernel/apm.c.
299 296
300 applicom= [HW]
301 Format: <mem>,<irq>
302
303 arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards 297 arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards
304 Format: <io>,<irq>,<nodeID> 298 Format: <io>,<irq>,<nodeID>
305 299
@@ -345,12 +339,6 @@ and is between 256 and 4096 characters. It is defined in the file
345 Format: <io>,<irq>,<mode> 339 Format: <io>,<irq>,<mode>
346 See header of drivers/net/hamradio/baycom_ser_hdx.c. 340 See header of drivers/net/hamradio/baycom_ser_hdx.c.
347 341
348 blkmtd_device= [HW,MTD]
349 blkmtd_erasesz=
350 blkmtd_ro=
351 blkmtd_bs=
352 blkmtd_count=
353
354 boot_delay= Milliseconds to delay each printk during boot. 342 boot_delay= Milliseconds to delay each printk during boot.
355 Values larger than 10 seconds (10000) are changed to 343 Values larger than 10 seconds (10000) are changed to
356 no delay (0). 344 no delay (0).
@@ -515,8 +503,6 @@ and is between 256 and 4096 characters. It is defined in the file
515 cs89x0_media= [HW,NET] 503 cs89x0_media= [HW,NET]
516 Format: { rj45 | aui | bnc } 504 Format: { rj45 | aui | bnc }
517 505
518 cyclades= [HW,SERIAL] Cyclades multi-serial port adapter.
519
520 dasd= [HW,NET] 506 dasd= [HW,NET]
521 See header of drivers/s390/block/dasd_devmap.c. 507 See header of drivers/s390/block/dasd_devmap.c.
522 508
@@ -574,10 +560,6 @@ and is between 256 and 4096 characters. It is defined in the file
574 See drivers/char/README.epca and 560 See drivers/char/README.epca and
575 Documentation/digiepca.txt. 561 Documentation/digiepca.txt.
576 562
577 dmascc= [HW,AX25,SERIAL] AX.25 Z80SCC driver with DMA
578 support available.
579 Format: <io_dev0>[,<io_dev1>[,..<io_dev32>]]
580
581 dmasound= [HW,OSS] Sound subsystem buffers 563 dmasound= [HW,OSS] Sound subsystem buffers
582 564
583 dscc4.setup= [NET] 565 dscc4.setup= [NET]
@@ -608,17 +590,10 @@ and is between 256 and 4096 characters. It is defined in the file
608 0: polling mode 590 0: polling mode
609 non-0: interrupt mode (default) 591 non-0: interrupt mode (default)
610 592
611 eda= [HW,PS2]
612
613 edb= [HW,PS2]
614
615 edd= [EDD] 593 edd= [EDD]
616 Format: {"of[f]" | "sk[ipmbr]"} 594 Format: {"of[f]" | "sk[ipmbr]"}
617 See comment in arch/i386/boot/edd.S 595 See comment in arch/i386/boot/edd.S
618 596
619 eicon= [HW,ISDN]
620 Format: <id>,<membase>,<irq>
621
622 eisa_irq_edge= [PARISC,HW] 597 eisa_irq_edge= [PARISC,HW]
623 See header of drivers/parisc/eisa.c. 598 See header of drivers/parisc/eisa.c.
624 599
@@ -894,9 +869,6 @@ and is between 256 and 4096 characters. It is defined in the file
894 lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer in 869 lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer in
895 C2 power state. 870 C2 power state.
896 871
897 lasi= [HW,SCSI] PARISC LASI driver for the 53c700 chip
898 Format: addr:<io>,irq:<irq>
899
900 libata.noacpi [LIBATA] Disables use of ACPI in libata suspend/resume 872 libata.noacpi [LIBATA] Disables use of ACPI in libata suspend/resume
901 when set. 873 when set.
902 Format: <int> 874 Format: <int>
@@ -1144,9 +1116,6 @@ and is between 256 and 4096 characters. It is defined in the file
1144 noapic [SMP,APIC] Tells the kernel to not make use of any 1116 noapic [SMP,APIC] Tells the kernel to not make use of any
1145 IOAPICs that may be present in the system. 1117 IOAPICs that may be present in the system.
1146 1118
1147 noasync [HW,M68K] Disables async and sync negotiation for
1148 all devices.
1149
1150 nobats [PPC] Do not use BATs for mapping kernel lowmem 1119 nobats [PPC] Do not use BATs for mapping kernel lowmem
1151 on "Classic" PPC cores. 1120 on "Classic" PPC cores.
1152 1121
@@ -1458,6 +1427,7 @@ and is between 256 and 4096 characters. It is defined in the file
1458 Param: <number> - step/bucket size as a power of 2 for 1427 Param: <number> - step/bucket size as a power of 2 for
1459 statistical time based profiling. 1428 statistical time based profiling.
1460 Param: "sleep" - profile D-state sleeping (millisecs) 1429 Param: "sleep" - profile D-state sleeping (millisecs)
1430 Param: "kvm" - profile VM exits.
1461 1431
1462 processor.max_cstate= [HW,ACPI] 1432 processor.max_cstate= [HW,ACPI]
1463 Limit processor to maximum C-state 1433 Limit processor to maximum C-state
@@ -1584,9 +1554,6 @@ and is between 256 and 4096 characters. It is defined in the file
1584 sa1100ir [NET] 1554 sa1100ir [NET]
1585 See drivers/net/irda/sa1100_ir.c. 1555 See drivers/net/irda/sa1100_ir.c.
1586 1556
1587 sb= [HW,OSS]
1588 Format: <io>,<irq>,<dma>,<dma2>
1589
1590 sbni= [NET] Granch SBNI12 leased line adapter 1557 sbni= [NET] Granch SBNI12 leased line adapter
1591 1558
1592 sc1200wdt= [HW,WDT] SC1200 WDT (watchdog) driver 1559 sc1200wdt= [HW,WDT] SC1200 WDT (watchdog) driver
@@ -1630,8 +1597,6 @@ and is between 256 and 4096 characters. It is defined in the file
1630 1597
1631 serialnumber [BUGS=X86-32] 1598 serialnumber [BUGS=X86-32]
1632 1599
1633 sg_def_reserved_size= [SCSI]
1634
1635 shapers= [NET] 1600 shapers= [NET]
1636 Maximal number of shapers. 1601 Maximal number of shapers.
1637 1602
@@ -2022,10 +1987,6 @@ and is between 256 and 4096 characters. It is defined in the file
2022 norandmaps Don't use address space randomization 1987 norandmaps Don't use address space randomization
2023 Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space 1988 Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space
2024 1989
2025 unwind_debug=N N > 0 will enable dwarf2 unwinder debugging
2026 This is useful to get more information why
2027 you got a "dwarf2 unwinder stuck"
2028
2029______________________________________________________________________ 1990______________________________________________________________________
2030 1991
2031TODO: 1992TODO:
diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt
index 8a523f6af48a..248589e8bcf5 100644
--- a/Documentation/m68k/kernel-options.txt
+++ b/Documentation/m68k/kernel-options.txt
@@ -890,10 +890,7 @@ Syntax: nosync:0
8905.5.2) noasync 8905.5.2) noasync
891-------------- 891--------------
892 892
893Syntax: noasync:0 893[OBSOLETE, REMOVED]
894
895 Disables async and sync negotiation for all devices. Any value
896 after the colon is acceptable (and has the same effect).
897 894
8985.5.3) nodisconnect 8955.5.3) nodisconnect
899------------------- 896-------------------
diff --git a/Documentation/mips/AU1xxx_IDE.README b/Documentation/mips/AU1xxx_IDE.README
index afb31c141d9d..5c8334123f4f 100644
--- a/Documentation/mips/AU1xxx_IDE.README
+++ b/Documentation/mips/AU1xxx_IDE.README
@@ -59,7 +59,7 @@ Four configs variables are introduced:
59 CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA - enable the PIO+DBDMA mode 59 CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA - enable the PIO+DBDMA mode
60 CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA - enable the MWDMA mode 60 CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA - enable the MWDMA mode
61 CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON - set Burstable FIFO in DBDMA 61 CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON - set Burstable FIFO in DBDMA
62 controler 62 controller
63 CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ - maximum transfer size 63 CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ - maximum transfer size
64 per descriptor 64 per descriptor
65 65
diff --git a/Documentation/mutex-design.txt b/Documentation/mutex-design.txt
index 51f935191ae5..aa60d1f627e5 100644
--- a/Documentation/mutex-design.txt
+++ b/Documentation/mutex-design.txt
@@ -133,4 +133,6 @@ the APIs of 'struct mutex' have been streamlined:
133 int mutex_trylock(struct mutex *lock); 133 int mutex_trylock(struct mutex *lock);
134 void mutex_unlock(struct mutex *lock); 134 void mutex_unlock(struct mutex *lock);
135 int mutex_is_locked(struct mutex *lock); 135 int mutex_is_locked(struct mutex *lock);
136 136 void mutex_lock_nested(struct mutex *lock, unsigned int subclass);
137 int mutex_lock_interruptible_nested(struct mutex *lock,
138 unsigned int subclass);
diff --git a/Documentation/networking/bcm43xx.txt b/Documentation/networking/bcm43xx.txt
index a136721499bf..d602c8d6ff3e 100644
--- a/Documentation/networking/bcm43xx.txt
+++ b/Documentation/networking/bcm43xx.txt
@@ -37,7 +37,7 @@ all, distributions. There is, however, additional software that is
37required. The firmware used by the chip is the intellectual property 37required. The firmware used by the chip is the intellectual property
38of Broadcom and they have not given the bcm43xx team redistribution 38of Broadcom and they have not given the bcm43xx team redistribution
39rights to this firmware. Since we cannot legally redistribute 39rights to this firmware. Since we cannot legally redistribute
40the firwmare we cannot include it with the driver. Furthermore, it 40the firmware we cannot include it with the driver. Furthermore, it
41cannot be placed in the downloadable archives of any distributing 41cannot be placed in the downloadable archives of any distributing
42organization; therefore, the user is responsible for obtaining the 42organization; therefore, the user is responsible for obtaining the
43firmware and placing it in the appropriate location so that the driver 43firmware and placing it in the appropriate location so that the driver
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 6ae2feff3087..747a5d15d529 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -293,7 +293,7 @@ tcp_no_metrics_save - BOOLEAN
293 when the connection closes, so that connections established in the 293 when the connection closes, so that connections established in the
294 near future can use these to set initial conditions. Usually, this 294 near future can use these to set initial conditions. Usually, this
295 increases overall performance, but may sometimes cause performance 295 increases overall performance, but may sometimes cause performance
296 degredation. If set, TCP will not cache metrics on closing 296 degradation. If set, TCP will not cache metrics on closing
297 connections. 297 connections.
298 298
299tcp_orphan_retries - INTEGER 299tcp_orphan_retries - INTEGER
diff --git a/Documentation/networking/rxrpc.txt b/Documentation/networking/rxrpc.txt
index c36b64b0020f..c3669a3fb4af 100644
--- a/Documentation/networking/rxrpc.txt
+++ b/Documentation/networking/rxrpc.txt
@@ -689,7 +689,7 @@ such as the AFS filesystem. This permits such a utility to:
689 buffers manipulated directly. 689 buffers manipulated directly.
690 690
691To use the RxRPC facility, a kernel utility must still open an AF_RXRPC socket, 691To use the RxRPC facility, a kernel utility must still open an AF_RXRPC socket,
692bind an addess as appropriate and listen if it's to be a server socket, but 692bind an address as appropriate and listen if it's to be a server socket, but
693then it passes this to the kernel interface functions. 693then it passes this to the kernel interface functions.
694 694
695The kernel interface functions are as follows: 695The kernel interface functions are as follows:
diff --git a/Documentation/networking/udplite.txt b/Documentation/networking/udplite.txt
index 6be09ba24a36..b6409cab075c 100644
--- a/Documentation/networking/udplite.txt
+++ b/Documentation/networking/udplite.txt
@@ -12,7 +12,7 @@
12 For in-depth information, you can consult: 12 For in-depth information, you can consult:
13 13
14 o The UDP-Lite Homepage: http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/ 14 o The UDP-Lite Homepage: http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/
15 Fom here you can also download some example application source code. 15 From here you can also download some example application source code.
16 16
17 o The UDP-Lite HOWTO on 17 o The UDP-Lite HOWTO on
18 http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/files/UDP-Lite-HOWTO.txt 18 http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/files/UDP-Lite-HOWTO.txt
@@ -223,7 +223,7 @@
223 While it is important that such cases are dealt with correctly, they 223 While it is important that such cases are dealt with correctly, they
224 are (annoyingly) rare: UDP-Lite is designed for optimising multimedia 224 are (annoyingly) rare: UDP-Lite is designed for optimising multimedia
225 performance over wireless (or generally noisy) links and thus smaller 225 performance over wireless (or generally noisy) links and thus smaller
226 coverage lenghts are likely to be expected. 226 coverage lengths are likely to be expected.
227 227
228 228
229 V) UDP-LITE RUNTIME STATISTICS AND THEIR MEANING 229 V) UDP-LITE RUNTIME STATISTICS AND THEIR MEANING
@@ -259,7 +259,7 @@
259 VI) IPTABLES 259 VI) IPTABLES
260 260
261 There is packet match support for UDP-Lite as well as support for the LOG target. 261 There is packet match support for UDP-Lite as well as support for the LOG target.
262 If you copy and paste the following line into /etc/protcols, 262 If you copy and paste the following line into /etc/protocols,
263 263
264 udplite 136 UDP-Lite # UDP-Lite [RFC 3828] 264 udplite 136 UDP-Lite # UDP-Lite [RFC 3828]
265 265
diff --git a/Documentation/power/swsusp-and-swap-files.txt b/Documentation/power/swsusp-and-swap-files.txt
index 06f911a5f885..f281886de490 100644
--- a/Documentation/power/swsusp-and-swap-files.txt
+++ b/Documentation/power/swsusp-and-swap-files.txt
@@ -39,7 +39,7 @@ resume=<swap_file_partition> resume_offset=<swap_file_offset>
39where <swap_file_partition> is the partition on which the swap file is located 39where <swap_file_partition> is the partition on which the swap file is located
40and <swap_file_offset> is the offset of the swap header determined by the 40and <swap_file_offset> is the offset of the swap header determined by the
41application in 2) (of course, this step may be carried out automatically 41application in 2) (of course, this step may be carried out automatically
42by the same application that determies the swap file's header offset using the 42by the same application that determines the swap file's header offset using the
43FIBMAP ioctl) 43FIBMAP ioctl)
44 44
45OR 45OR
diff --git a/Documentation/powerpc/eeh-pci-error-recovery.txt b/Documentation/powerpc/eeh-pci-error-recovery.txt
index 4530d1bf0286..df7afe43d462 100644
--- a/Documentation/powerpc/eeh-pci-error-recovery.txt
+++ b/Documentation/powerpc/eeh-pci-error-recovery.txt
@@ -36,8 +36,8 @@ Causes of EEH Errors
36EEH was originally designed to guard against hardware failure, such 36EEH was originally designed to guard against hardware failure, such
37as PCI cards dying from heat, humidity, dust, vibration and bad 37as PCI cards dying from heat, humidity, dust, vibration and bad
38electrical connections. The vast majority of EEH errors seen in 38electrical connections. The vast majority of EEH errors seen in
39"real life" are due to eithr poorly seated PCI cards, or, 39"real life" are due to either poorly seated PCI cards, or,
40unfortunately quite commonly, due device driver bugs, device firmware 40unfortunately quite commonly, due to device driver bugs, device firmware
41bugs, and sometimes PCI card hardware bugs. 41bugs, and sometimes PCI card hardware bugs.
42 42
43The most common software bug, is one that causes the device to 43The most common software bug, is one that causes the device to
diff --git a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
index e59fcbbe338c..5f7d536cb0c6 100644
--- a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
+++ b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
@@ -17,12 +17,12 @@ passed by the boot loader to the kernel at boot time. The device tree
17describes what devices are present on the board and how they are 17describes what devices are present on the board and how they are
18connected. The device tree can either be passed as a binary blob (as 18connected. The device tree can either be passed as a binary blob (as
19described in Documentation/powerpc/booting-without-of.txt), or passed 19described in Documentation/powerpc/booting-without-of.txt), or passed
20by Open Firmare (IEEE 1275) compatible firmware using an OF compatible 20by Open Firmware (IEEE 1275) compatible firmware using an OF compatible
21client interface API. 21client interface API.
22 22
23This document specifies the requirements on the device-tree for mpc5200 23This document specifies the requirements on the device-tree for mpc5200
24based boards. These requirements are above and beyond the details 24based boards. These requirements are above and beyond the details
25specified in either the OpenFirmware spec or booting-without-of.txt 25specified in either the Open Firmware spec or booting-without-of.txt
26 26
27All new mpc5200-based boards are expected to match this document. In 27All new mpc5200-based boards are expected to match this document. In
28cases where this document is not sufficient to support a new board port, 28cases where this document is not sufficient to support a new board port,
@@ -73,8 +73,8 @@ match on the compatible list; the 'most compatible' driver should be
73selected. 73selected.
74 74
75The split between the MPC5200 and the MPC5200B leaves a bit of a 75The split between the MPC5200 and the MPC5200B leaves a bit of a
76connundrum. How should the compatible property be set up to provide 76conundrum. How should the compatible property be set up to provide
77maximum compatability information; but still acurately describe the 77maximum compatibility information; but still accurately describe the
78chip? For the MPC5200; the answer is easy. Most of the SoC devices 78chip? For the MPC5200; the answer is easy. Most of the SoC devices
79originally appeared on the MPC5200. Since they didn't exist anywhere 79originally appeared on the MPC5200. Since they didn't exist anywhere
80else; the 5200 compatible properties will contain only one item; 80else; the 5200 compatible properties will contain only one item;
@@ -84,7 +84,7 @@ The 5200B is almost the same as the 5200, but not quite. It fixes
84silicon bugs and it adds a small number of enhancements. Most of the 84silicon bugs and it adds a small number of enhancements. Most of the
85devices either provide exactly the same interface as on the 5200. A few 85devices either provide exactly the same interface as on the 5200. A few
86devices have extra functions but still have a backwards compatible mode. 86devices have extra functions but still have a backwards compatible mode.
87To express this infomation as completely as possible, 5200B device trees 87To express this information as completely as possible, 5200B device trees
88should have two items in the compatible list; 88should have two items in the compatible list;
89"mpc5200b-<device>\0mpc5200-<device>". It is *strongly* recommended 89"mpc5200b-<device>\0mpc5200-<device>". It is *strongly* recommended
90that 5200B device trees follow this convention (instead of only listing 90that 5200B device trees follow this convention (instead of only listing
@@ -199,7 +199,7 @@ ethernet@<addr> network mpc5200-fec MPC5200 ethernet device
199ata@<addr> ata mpc5200-ata IDE ATA interface 199ata@<addr> ata mpc5200-ata IDE ATA interface
200i2c@<addr> i2c mpc5200-i2c I2C controller 200i2c@<addr> i2c mpc5200-i2c I2C controller
201usb@<addr> usb-ohci-be mpc5200-ohci,ohci-be USB controller 201usb@<addr> usb-ohci-be mpc5200-ohci,ohci-be USB controller
202xlb@<addr> xlb mpc5200-xlb XLB arbritrator 202xlb@<addr> xlb mpc5200-xlb XLB arbitrator
203 203
204Important child node properties 204Important child node properties
205name type description 205name type description
diff --git a/Documentation/scsi/aic79xx.txt b/Documentation/scsi/aic79xx.txt
index 6aa9a891f3d0..683ccae00ad4 100644
--- a/Documentation/scsi/aic79xx.txt
+++ b/Documentation/scsi/aic79xx.txt
@@ -120,7 +120,7 @@ The following information is available in this file:
120 list size to avoid SCSI malloc pool fragmentation. 120 list size to avoid SCSI malloc pool fragmentation.
121 - Cleanup channel display in our /proc output. 121 - Cleanup channel display in our /proc output.
122 - Workaround duplicate device entries in the mid-layer 122 - Workaround duplicate device entries in the mid-layer
123 devlice list during add-single-device. 123 device list during add-single-device.
124 124
125 1.3.6 (March 28th, 2003) 125 1.3.6 (March 28th, 2003)
126 - Correct a double free in the Domain Validation code. 126 - Correct a double free in the Domain Validation code.
diff --git a/Documentation/scsi/aic7xxx.txt b/Documentation/scsi/aic7xxx.txt
index 5f34d2ba69b4..b7e238cbb5a7 100644
--- a/Documentation/scsi/aic7xxx.txt
+++ b/Documentation/scsi/aic7xxx.txt
@@ -159,7 +159,7 @@ The following information is available in this file:
159 - Add support for 2.5.X's scsi_report_device_reset(). 159 - Add support for 2.5.X's scsi_report_device_reset().
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 introduced in 6.2.29 that
163 could cause 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.
@@ -264,7 +264,7 @@ The following information is available in this file:
264 Option: tag_info:{{value[,value...]}[,{value[,value...]}...]} 264 Option: tag_info:{{value[,value...]}[,{value[,value...]}...]}
265 Definition: Set the per-target tagged queue depth on a 265 Definition: Set the per-target tagged queue depth on a
266 per controller basis. Both controllers and targets 266 per controller basis. Both controllers and targets
267 may be ommitted indicating that they should retain 267 may be omitted indicating that they should retain
268 the default tag depth. 268 the default tag depth.
269 Examples: tag_info:{{16,32,32,64,8,8,,32,32,32,32,32,32,32,32,32} 269 Examples: tag_info:{{16,32,32,64,8,8,,32,32,32,32,32,32,32,32,32}
270 On Controller 0 270 On Controller 0
@@ -290,7 +290,7 @@ The following information is available in this file:
290 ----------------------------------------------------------------- 290 -----------------------------------------------------------------
291 Option: dv: {value[,value...]} 291 Option: dv: {value[,value...]}
292 Definition: Set Domain Validation Policy on a per-controller basis. 292 Definition: Set Domain Validation Policy on a per-controller basis.
293 Controllers may be ommitted indicating that 293 Controllers may be omitted indicating that
294 they should retain the default read streaming setting. 294 they should retain the default read streaming setting.
295 Example: dv:{-1,0,,1,1,0} 295 Example: dv:{-1,0,,1,1,0}
296 On Controller 0 leave DV at its default setting. 296 On Controller 0 leave DV at its default setting.
diff --git a/Documentation/scsi/arcmsr_spec.txt b/Documentation/scsi/arcmsr_spec.txt
index 5e0042340fd3..45d9482c1517 100644
--- a/Documentation/scsi/arcmsr_spec.txt
+++ b/Documentation/scsi/arcmsr_spec.txt
@@ -3,7 +3,7 @@
3******************************************************************************* 3*******************************************************************************
4** Usage of IOP331 adapter 4** Usage of IOP331 adapter
5** (All In/Out is in IOP331's view) 5** (All In/Out is in IOP331's view)
6** 1. Message 0 --> InitThread message and retrun code 6** 1. Message 0 --> InitThread message and return code
7** 2. Doorbell is used for RS-232 emulation 7** 2. Doorbell is used for RS-232 emulation
8** inDoorBell : bit0 -- data in ready 8** inDoorBell : bit0 -- data in ready
9** (DRIVER DATA WRITE OK) 9** (DRIVER DATA WRITE OK)
diff --git a/Documentation/scsi/ibmmca.txt b/Documentation/scsi/ibmmca.txt
index a08e225653d6..a810421f1fb3 100644
--- a/Documentation/scsi/ibmmca.txt
+++ b/Documentation/scsi/ibmmca.txt
@@ -21,7 +21,7 @@
21 versions older than 4.0 do not work with kernels 2.4.0 or later! If you 21 versions older than 4.0 do not work with kernels 2.4.0 or later! If you
22 try to compile your kernel with the wrong driver source, the 22 try to compile your kernel with the wrong driver source, the
23 compilation is aborted and you get a corresponding error message. This is 23 compilation is aborted and you get a corresponding error message. This is
24 no bug in the driver. It prevents you from using the wrong sourcecode 24 no bug in the driver; it prevents you from using the wrong source code
25 with the wrong kernel version. 25 with the wrong kernel version.
26 26
27 Authors of this Driver 27 Authors of this Driver
@@ -58,7 +58,7 @@
58 5 Users' Manual 58 5 Users' Manual
59 5.1 Commandline Parameters 59 5.1 Commandline Parameters
60 5.2 Troubleshooting 60 5.2 Troubleshooting
61 5.3 Bugreports 61 5.3 Bug reports
62 5.4 Support WWW-page 62 5.4 Support WWW-page
63 6 References 63 6 References
64 7 Credits to 64 7 Credits to
@@ -71,13 +71,13 @@
71 71
72 1 Abstract 72 1 Abstract
73 ---------- 73 ----------
74 This README-file describes the IBM SCSI-subsystem low level driver for 74 This README-file describes the IBM SCSI-subsystem low level driver for
75 Linux. The descriptions which were formerly kept in the source-code have 75 Linux. The descriptions which were formerly kept in the source code have
76 been taken out to this file to easify the codes' readability. The driver 76 been taken out of this file to simplify the codes readability. The driver
77 description has been updated, as most of the former description was already 77 description has been updated, as most of the former description was already
78 quite outdated. The history of the driver development is also kept inside 78 quite outdated. The history of the driver development is also kept inside
79 here. Multiple historical developments have been summarized to shorten the 79 here. Multiple historical developments have been summarized to shorten the
80 textsize a bit. At the end of this file you can find a small manual for 80 text size a bit. At the end of this file you can find a small manual for
81 this driver and hints to get it running on your machine. 81 this driver and hints to get it running on your machine.
82 82
83 2 Driver Description 83 2 Driver Description
@@ -186,7 +186,7 @@
186 between 0 and 7). The IBM SCSI-2 F/W adapter offers this on up to two 186 between 0 and 7). The IBM SCSI-2 F/W adapter offers this on up to two
187 busses and provides support for 30 logical devices at the same time, where 187 busses and provides support for 30 logical devices at the same time, where
188 in wide-addressing mode you can have 16 puns with 32 luns on each device. 188 in wide-addressing mode you can have 16 puns with 32 luns on each device.
189 This section dexribes you the handling of devices on non-F/W adapters. 189 This section describes the handling of devices on non-F/W adapters.
190 Just imagine, that you can have 16 * 32 = 512 devices on a F/W adapter 190 Just imagine, that you can have 16 * 32 = 512 devices on a F/W adapter
191 which means a lot of possible devices for such a small machine. 191 which means a lot of possible devices for such a small machine.
192 192
@@ -209,10 +209,10 @@
209 -------------------------------------------------------- 209 --------------------------------------------------------
210 One consequence of information hiding is that the real (pun,lun) 210 One consequence of information hiding is that the real (pun,lun)
211 numbers are also hidden. The two possibilities to get around this problem 211 numbers are also hidden. The two possibilities to get around this problem
212 is to offer fake pun/lun combinations to the operating system or to 212 are to offer fake pun/lun combinations to the operating system or to
213 delete the whole mapping of the adapter and to reassign the ldns, using 213 delete the whole mapping of the adapter and to reassign the ldns, using
214 the immediate assign command of the SCSI-subsystem for probing through 214 the immediate assign command of the SCSI-subsystem for probing through
215 all possible pun/lun combinations. a ldn is a "logical device number" 215 all possible pun/lun combinations. An ldn is a "logical device number"
216 which is used by IBM SCSI-subsystems to access some valid SCSI-device. 216 which is used by IBM SCSI-subsystems to access some valid SCSI-device.
217 At the beginning of the development of this driver, the following approach 217 At the beginning of the development of this driver, the following approach
218 was used: 218 was used:
@@ -251,9 +251,9 @@
251 lun>0 or to non-existing devices, in order to satisfy the subsystem, if 251 lun>0 or to non-existing devices, in order to satisfy the subsystem, if
252 there are less than 15 SCSI-devices connected. In the case of more than 15 252 there are less than 15 SCSI-devices connected. In the case of more than 15
253 devices, the dynamical mapping goes active. If the get_scsi[][] reports a 253 devices, the dynamical mapping goes active. If the get_scsi[][] reports a
254 device to be existant, but it has no ldn assigned, it gets a ldn out of 7 254 device to be existent, but it has no ldn assigned, it gets an 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
@@ -551,7 +551,7 @@
551 than devices are available, they are assigned to non existing pun,lun 551 than devices are available, they are assigned to non existing pun,lun
552 combinations to satisfy the adapter. With this, the dynamical mapping 552 combinations to satisfy the adapter. With this, the dynamical mapping
553 was possible to implement. (For further info see the text in the 553 was possible to implement. (For further info see the text in the
554 source-code and in the description below. Read the description 554 source code and in the description below. Read the description
555 below BEFORE installing this driver on your system!) 555 below BEFORE installing this driver on your system!)
556 2) Changed the name IBMMCA_DRIVER_VERSION to IBMMCA_SCSI_DRIVER_VERSION. 556 2) Changed the name IBMMCA_DRIVER_VERSION to IBMMCA_SCSI_DRIVER_VERSION.
557 3) The LED-display shows on PS/2-95 no longer the ldn, but the SCSI-ID 557 3) The LED-display shows on PS/2-95 no longer the ldn, but the SCSI-ID
@@ -762,9 +762,9 @@
762 - Michael Lang 762 - Michael Lang
763 763
764 Apr 23, 2000 (v3.2pre1) 764 Apr 23, 2000 (v3.2pre1)
765 1) During a very long time, I collected a huge amount of bugreports from 765 1) During a very long time, I collected a huge amount of bug reports from
766 various people, trying really quite different things on their SCSI- 766 various people, trying really quite different things on their SCSI-
767 PS/2s. Today, all these bugreports are taken into account and should be 767 PS/2s. Today, all these bug reports are taken into account and should be
768 mostly solved. The major topics were: 768 mostly solved. The major topics were:
769 - Driver crashes during boottime by no obvious reason. 769 - Driver crashes during boottime by no obvious reason.
770 - Driver panics while the midlevel-SCSI-driver is trying to inquire 770 - Driver panics while the midlevel-SCSI-driver is trying to inquire
@@ -819,7 +819,7 @@
819 - Michael Lang 819 - Michael Lang
820 820
821 July 17, 2000 (v3.2pre8) 821 July 17, 2000 (v3.2pre8)
822 A long period of collecting bugreports from all corners of the world 822 A long period of collecting bug reports from all corners of the world
823 now lead to the following corrections to the code: 823 now lead to the following corrections to the code:
824 1) SCSI-2 F/W support crashed with a COMMAND ERROR. The reason for this 824 1) SCSI-2 F/W support crashed with a COMMAND ERROR. The reason for this
825 was that it is possible to disable Fast-SCSI for the external bus. 825 was that it is possible to disable Fast-SCSI for the external bus.
@@ -873,7 +873,7 @@
873 July 26, 2000 (v3.2pre11) 873 July 26, 2000 (v3.2pre11)
874 1) I passed a horrible weekend getting mad with NMIs on kernel 2.2.14 and 874 1) I passed a horrible weekend getting mad with NMIs on kernel 2.2.14 and
875 a model 9595. Asking around in the community, nobody except of me has 875 a model 9595. Asking around in the community, nobody except of me has
876 seen such errors. Weired, but I am trying to recompile everything on 876 seen such errors. Weird, but I am trying to recompile everything on
877 the model 9595. Maybe, as I use a specially modified gcc, that could 877 the model 9595. Maybe, as I use a specially modified gcc, that could
878 cause problems. But, it was not the reason. The true background was, 878 cause problems. But, it was not the reason. The true background was,
879 that the kernel was compiled for i386 and the 9595 has a 486DX-2. 879 that the kernel was compiled for i386 and the 9595 has a 486DX-2.
@@ -886,7 +886,7 @@
886 alive rotator during boottime. This makes sense, when no monitor is 886 alive rotator during boottime. This makes sense, when no monitor is
887 connected to the system. You can get rid of all display activity, if 887 connected to the system. You can get rid of all display activity, if
888 you do not use any parameter or just ibmmcascsi=activity, for the 888 you do not use any parameter or just ibmmcascsi=activity, for the
889 harddrive activity LED, existant on all PS/2, except models 8595-XXX. 889 harddrive activity LED, existent on all PS/2, except models 8595-XXX.
890 If no monitor is available, please use ibmmcascsi=display, which works 890 If no monitor is available, please use ibmmcascsi=display, which works
891 fine together with the linuxinfo utility for the LED-panel. 891 fine together with the linuxinfo utility for the LED-panel.
892 - Michael Lang 892 - Michael Lang
@@ -1115,7 +1115,7 @@
1115 If this really happens, do also send e-mail to the maintainer, as 1115 If this really happens, do also send e-mail to the maintainer, as
1116 forced detection should be never necessary. Forced detection is in 1116 forced detection should be never necessary. Forced detection is in
1117 principal some flaw of the driver adapter detection and goes into 1117 principal some flaw of the driver adapter detection and goes into
1118 bugreports. 1118 bug reports.
1119 Q: The driver screws up, if it starts to probe SCSI-devices, is there 1119 Q: The driver screws up, if it starts to probe SCSI-devices, is there
1120 some way out of it? 1120 some way out of it?
1121 A: Yes, that was some recognition problem of the correct SCSI-adapter 1121 A: Yes, that was some recognition problem of the correct SCSI-adapter
@@ -1172,7 +1172,7 @@
1172 recommended version is 3.2 or later. Here, the F/W support is in 1172 recommended version is 3.2 or later. Here, the F/W support is in
1173 a stable and reliable condition. Wide-addressing is in addition 1173 a stable and reliable condition. Wide-addressing is in addition
1174 supported. 1174 supported.
1175 Q: I get a Ooops message and something like "killing interrupt". 1175 Q: I get an Oops message and something like "killing interrupt".
1176 A: The reason for this is that the IBM SCSI-subsystem only sends a 1176 A: The reason for this is that the IBM SCSI-subsystem only sends a
1177 termination status back, if some error appeared. In former releases 1177 termination status back, if some error appeared. In former releases
1178 of the driver, it was not checked, if the termination status block 1178 of the driver, it was not checked, if the termination status block
@@ -1213,21 +1213,21 @@
1213 problem. Not yet tried, but guessing that it could work. To get this, 1213 problem. Not yet tried, but guessing that it could work. To get this,
1214 set unchecked_isa_dma argument of ibmmca.h from 0 to 1. 1214 set unchecked_isa_dma argument of ibmmca.h from 0 to 1.
1215 1215
1216 5.3 Bugreports 1216 5.3 Bug reports
1217 -------------- 1217 --------------
1218 If you really find bugs in the sourcecode or the driver will successfully 1218 If you really find bugs in the source code or the driver will successfully
1219 refuse to work on your machine, you should send a bug report to me. The 1219 refuse to work on your machine, you should send a bug report to me. The
1220 best for this is to follow the instructions on the WWW-page for this 1220 best for this is to follow the instructions on the WWW-page for this
1221 driver. Fill out the bug-report form, placed on the WWW-page and ship it, 1221 driver. Fill out the bug-report form, placed on the WWW-page and ship it,
1222 so the bugs can be taken into account with maximum efforts. But, please 1222 so the bugs can be taken into account with maximum efforts. But, please
1223 do not send bug reports about this driver to Linus Torvalds or Leonard 1223 do not send bug reports about this driver to Linus Torvalds or Leonard
1224 Zubkoff, as Linus is burried in E-Mail and Leonard is supervising all 1224 Zubkoff, as Linus is buried in E-Mail and Leonard is supervising all
1225 SCSI-drivers and won't have the time left to look inside every single 1225 SCSI-drivers and won't have the time left to look inside every single
1226 driver to fix a bug and especially DO NOT send modified code to Linus 1226 driver to fix a bug and especially DO NOT send modified code to Linus
1227 Torvalds or Alan J. Cox which has not been checked here!!! They are both 1227 Torvalds or Alan J. Cox which has not been checked here!!! They are both
1228 quite burried in E-mail (as me, sometimes, too) and one should first check 1228 quite buried in E-mail (as me, sometimes, too) and one should first check
1229 for problems on my local teststand. Recently, I got a lot of 1229 for problems on my local teststand. Recently, I got a lot of
1230 bugreports for errors in the ibmmca.c code, which I could not imagine, but 1230 bug reports for errors in the ibmmca.c code, which I could not imagine, but
1231 a look inside some Linux-distribution showed me quite often some modified 1231 a look inside some Linux-distribution showed me quite often some modified
1232 code, which did no longer work on most other machines than the one of the 1232 code, which did no longer work on most other machines than the one of the
1233 modifier. Ok, so now that there is maintenance service available for this 1233 modifier. Ok, so now that there is maintenance service available for this
@@ -1261,7 +1261,7 @@
1261 some e-mail directly, but at least with the same information as required by 1261 some e-mail directly, but at least with the same information as required by
1262 the formular. 1262 the formular.
1263 1263
1264 If you have extensive bugreports, including Ooops messages and 1264 If you have extensive bug reports, including Oops messages and
1265 screen-shots, please feel free to send it directly to the address 1265 screen-shots, please feel free to send it directly to the address
1266 of the maintainer, too. The current address of the maintainer is: 1266 of the maintainer, too. The current address of the maintainer is:
1267 1267
@@ -1318,7 +1318,7 @@
1318 detailed bug reports and ideas for this driver (and his 1318 detailed bug reports and ideas for this driver (and his
1319 patience ;-)). 1319 patience ;-)).
1320 Alan J. Cox 1320 Alan J. Cox
1321 for his bugreports and his bold activities in cross-checking 1321 for his bug reports and his bold activities in cross-checking
1322 the driver-code with his teststand. 1322 the driver-code with his teststand.
1323 1323
1324 7.2 Sponsors & Supporters 1324 7.2 Sponsors & Supporters
diff --git a/Documentation/sharedsubtree.txt b/Documentation/sharedsubtree.txt
index ccf1cebe744f..736540045dc7 100644
--- a/Documentation/sharedsubtree.txt
+++ b/Documentation/sharedsubtree.txt
@@ -153,6 +153,7 @@ replicas continue to be exactly same.
153 #include <stdio.h> 153 #include <stdio.h>
154 #include <stdlib.h> 154 #include <stdlib.h>
155 #include <unistd.h> 155 #include <unistd.h>
156 #include <string.h>
156 #include <sys/mount.h> 157 #include <sys/mount.h>
157 #include <sys/fsuid.h> 158 #include <sys/fsuid.h>
158 159
diff --git a/Documentation/sound/alsa/soc/DAI.txt b/Documentation/sound/alsa/soc/DAI.txt
index 58cbfd01ea8f..3feeb9ecdec4 100644
--- a/Documentation/sound/alsa/soc/DAI.txt
+++ b/Documentation/sound/alsa/soc/DAI.txt
@@ -20,12 +20,12 @@ I2S
20=== 20===
21 21
22 I2S is a common 4 wire DAI used in HiFi, STB and portable devices. The Tx and 22 I2S is a common 4 wire DAI used in HiFi, STB and portable devices. The Tx and
23Rx lines are used for audio transmision, whilst the bit clock (BCLK) and 23Rx lines are used for audio transmission, whilst the bit clock (BCLK) and
24left/right clock (LRC) synchronise the link. I2S is flexible in that either the 24left/right clock (LRC) synchronise the link. I2S is flexible in that either the
25controller or CODEC can drive (master) the BCLK and LRC clock lines. Bit clock 25controller or CODEC can drive (master) the BCLK and LRC clock lines. Bit clock
26usually varies depending on the sample rate and the master system clock 26usually varies depending on the sample rate and the master system clock
27(SYSCLK). LRCLK is the same as the sample rate. A few devices support separate 27(SYSCLK). LRCLK is the same as the sample rate. A few devices support separate
28ADC and DAC LRCLK's, this allows for similtanious capture and playback at 28ADC and DAC LRCLK's, this allows for simultaneous capture and playback at
29different sample rates. 29different sample rates.
30 30
31I2S has several different operating modes:- 31I2S has several different operating modes:-
@@ -41,12 +41,12 @@ I2S has several different operating modes:-
41PCM 41PCM
42=== 42===
43 43
44PCM is another 4 wire interface, very similar to I2S, that can support a more 44PCM is another 4 wire interface, very similar to I2S, which can support a more
45flexible protocol. It has bit clock (BCLK) and sync (SYNC) lines that are used 45flexible protocol. It has bit clock (BCLK) and sync (SYNC) lines that are used
46to synchronise the link whilst the Tx and Rx lines are used to transmit and 46to synchronise the link whilst the Tx and Rx lines are used to transmit and
47receive the audio data. Bit clock usually varies depending on sample rate 47receive the audio data. Bit clock usually varies depending on sample rate
48whilst sync runs at the sample rate. PCM also supports Time Division 48whilst sync runs at the sample rate. PCM also supports Time Division
49Multiplexing (TDM) in that several devices can use the bus similtaniuosly (This 49Multiplexing (TDM) in that several devices can use the bus simultaneously (this
50is sometimes referred to as network mode). 50is sometimes referred to as network mode).
51 51
52Common PCM operating modes:- 52Common PCM operating modes:-
diff --git a/Documentation/sound/alsa/soc/clocking.txt b/Documentation/sound/alsa/soc/clocking.txt
index e93960d53a1e..14930887c25f 100644
--- a/Documentation/sound/alsa/soc/clocking.txt
+++ b/Documentation/sound/alsa/soc/clocking.txt
@@ -2,20 +2,20 @@ Audio Clocking
2============== 2==============
3 3
4This text describes the audio clocking terms in ASoC and digital audio in 4This text describes the audio clocking terms in ASoC and digital audio in
5general. Note: Audio clocking can be complex ! 5general. Note: Audio clocking can be complex!
6 6
7 7
8Master Clock 8Master Clock
9------------ 9------------
10 10
11Every audio subsystem is driven by a master clock (sometimes refered to as MCLK 11Every audio subsystem is driven by a master clock (sometimes referred to as MCLK
12or SYSCLK). This audio master clock can be derived from a number of sources 12or SYSCLK). This audio master clock can be derived from a number of sources
13(e.g. crystal, PLL, CPU clock) and is responsible for producing the correct 13(e.g. crystal, PLL, CPU clock) and is responsible for producing the correct
14audio playback and capture sample rates. 14audio playback and capture sample rates.
15 15
16Some master clocks (e.g. PLL's and CPU based clocks) are configuarble in that 16Some master clocks (e.g. PLL's and CPU based clocks) are configurable in that
17their speed can be altered by software (depending on the system use and to save 17their speed can be altered by software (depending on the system use and to save
18power). Other master clocks are fixed at at set frequency (i.e. crystals). 18power). Other master clocks are fixed at a set frequency (i.e. crystals).
19 19
20 20
21DAI Clocks 21DAI Clocks
@@ -44,7 +44,7 @@ This relationship depends on the codec or SoC CPU in particular. In general
44it's best to configure BCLK to the lowest possible speed (depending on your 44it's best to configure BCLK to the lowest possible speed (depending on your
45rate, number of channels and wordsize) to save on power. 45rate, number of channels and wordsize) to save on power.
46 46
47It's also desireable to use the codec (if possible) to drive (or master) the 47It's also desirable to use the codec (if possible) to drive (or master) the
48audio clocks as it's usually gives more accurate sample rates than the CPU. 48audio clocks as it's usually gives more accurate sample rates than the CPU.
49 49
50 50
diff --git a/Documentation/sound/alsa/soc/codec.txt b/Documentation/sound/alsa/soc/codec.txt
index 48983c75aad9..1e766ad0ebd1 100644
--- a/Documentation/sound/alsa/soc/codec.txt
+++ b/Documentation/sound/alsa/soc/codec.txt
@@ -19,7 +19,7 @@ Optionally, codec drivers can also provide:-
19 6) DAPM event handler. 19 6) DAPM event handler.
20 7) DAC Digital mute control. 20 7) DAC Digital mute control.
21 21
22It's probably best to use this guide in conjuction with the existing codec 22It's probably best to use this guide in conjunction with the existing codec
23driver code in sound/soc/codecs/ 23driver code in sound/soc/codecs/
24 24
25ASoC Codec driver breakdown 25ASoC Codec driver breakdown
@@ -28,7 +28,7 @@ ASoC Codec driver breakdown
281 - Codec DAI and PCM configuration 281 - Codec DAI and PCM configuration
29----------------------------------- 29-----------------------------------
30Each codec driver must have a struct snd_soc_codec_dai to define it's DAI and 30Each codec driver must have a struct snd_soc_codec_dai to define it's DAI and
31PCM's capablities and operations. This struct is exported so that it can be 31PCM's capabilities and operations. This struct is exported so that it can be
32registered with the core by your machine driver. 32registered with the core by your machine driver.
33 33
34e.g. 34e.g.
@@ -67,7 +67,7 @@ EXPORT_SYMBOL_GPL(wm8731_dai);
67 67
682 - Codec control IO 682 - Codec control IO
69-------------------- 69--------------------
70The codec can ususally be controlled via an I2C or SPI style interface (AC97 70The codec can usually be controlled via an I2C or SPI style interface (AC97
71combines control with data in the DAI). The codec drivers will have to provide 71combines control with data in the DAI). The codec drivers will have to provide
72functions to read and write the codec registers along with supplying a register 72functions to read and write the codec registers along with supplying a register
73cache:- 73cache:-
diff --git a/Documentation/sound/alsa/soc/dapm.txt b/Documentation/sound/alsa/soc/dapm.txt
index c11877f5b4a1..ab0766fd7869 100644
--- a/Documentation/sound/alsa/soc/dapm.txt
+++ b/Documentation/sound/alsa/soc/dapm.txt
@@ -11,7 +11,7 @@ other PM systems.
11 11
12DAPM is also completely transparent to all user space applications as all power 12DAPM is also completely transparent to all user space applications as all power
13switching is done within the ASoC core. No code changes or recompiling are 13switching is done within the ASoC core. No code changes or recompiling are
14required for user space applications. DAPM makes power switching descisions based 14required for user space applications. DAPM makes power switching decisions based
15upon any audio stream (capture/playback) activity and audio mixer settings 15upon any audio stream (capture/playback) activity and audio mixer settings
16within the device. 16within the device.
17 17
@@ -38,7 +38,7 @@ There are 4 power domains within DAPM
38 Enabled and disabled when stream playback/capture is started and 38 Enabled and disabled when stream playback/capture is started and
39 stopped respectively. e.g. aplay, arecord. 39 stopped respectively. e.g. aplay, arecord.
40 40
41All DAPM power switching descisons are made automatically by consulting an audio 41All DAPM power switching decisions are made automatically by consulting an audio
42routing map of the whole machine. This map is specific to each machine and 42routing map of the whole machine. This map is specific to each machine and
43consists of the interconnections between every audio component (including 43consists of the interconnections between every audio component (including
44internal codec components). All audio components that effect power are called 44internal codec components). All audio components that effect power are called
diff --git a/Documentation/sound/alsa/soc/overview.txt b/Documentation/sound/alsa/soc/overview.txt
index 753c5cc5984a..c47ce9530677 100644
--- a/Documentation/sound/alsa/soc/overview.txt
+++ b/Documentation/sound/alsa/soc/overview.txt
@@ -2,18 +2,19 @@ ALSA SoC Layer
2============== 2==============
3 3
4The overall project goal of the ALSA System on Chip (ASoC) layer is to provide 4The overall project goal of the ALSA System on Chip (ASoC) layer is to provide
5better ALSA support for embedded system on chip procesors (e.g. pxa2xx, au1x00, 5better ALSA support for embedded system-on-chip processors (e.g. pxa2xx, au1x00,
6iMX, etc) and portable audio codecs. Currently there is some support in the 6iMX, etc) and portable audio codecs. Currently there is some support in the
7kernel for SoC audio, however it has some limitations:- 7kernel for SoC audio, however it has some limitations:-
8 8
9 * Currently, codec drivers are often tightly coupled to the underlying SoC 9 * Currently, codec drivers are often tightly coupled to the underlying SoC
10 cpu. This is not ideal and leads to code duplication i.e. Linux now has 4 10 CPU. This is not ideal and leads to code duplication i.e. Linux now has 4
11 different wm8731 drivers for 4 different SoC platforms. 11 different wm8731 drivers for 4 different SoC platforms.
12 12
13 * There is no standard method to signal user initiated audio events. 13 * There is no standard method to signal user initiated audio events (e.g.
14 e.g. Headphone/Mic insertion, Headphone/Mic detection after an insertion 14 Headphone/Mic insertion, Headphone/Mic detection after an insertion
15 event. These are quite common events on portable devices and ofter require 15 event). These are quite common events on portable devices and often require
16 machine specific code to re route audio, enable amps etc after such an event. 16 machine specific code to re-route audio, enable amps, etc., after such an
17 event.
17 18
18 * Current drivers tend to power up the entire codec when playing 19 * Current drivers tend to power up the entire codec when playing
19 (or recording) audio. This is fine for a PC, but tends to waste a lot of 20 (or recording) audio. This is fine for a PC, but tends to waste a lot of
@@ -44,7 +45,7 @@ features :-
44 signals the codec when to change power states. 45 signals the codec when to change power states.
45 46
46 * Machine specific controls: Allow machines to add controls to the sound card 47 * Machine specific controls: Allow machines to add controls to the sound card
47 e.g. volume control for speaker amp. 48 (e.g. volume control for speaker amp).
48 49
49To achieve all this, ASoC basically splits an embedded audio system into 3 50To achieve all this, ASoC basically splits an embedded audio system into 3
50components :- 51components :-
@@ -57,7 +58,7 @@ components :-
57 interface drivers (e.g. I2S, AC97, PCM) for that platform. 58 interface drivers (e.g. I2S, AC97, PCM) for that platform.
58 59
59 * Machine driver: The machine driver handles any machine specific controls and 60 * Machine driver: The machine driver handles any machine specific controls and
60 audio events. i.e. turing on an amp at start of playback. 61 audio events (e.g. turning on an amp at start of playback).
61 62
62 63
63Documentation 64Documentation
diff --git a/Documentation/sound/alsa/soc/platform.txt b/Documentation/sound/alsa/soc/platform.txt
index e95b16d5a53b..d4678b4dc6c6 100644
--- a/Documentation/sound/alsa/soc/platform.txt
+++ b/Documentation/sound/alsa/soc/platform.txt
@@ -20,7 +20,7 @@ struct snd_soc_ops {
20 int (*trigger)(struct snd_pcm_substream *, int); 20 int (*trigger)(struct snd_pcm_substream *, int);
21}; 21};
22 22
23The platform driver exports it's DMA functionailty via struct snd_soc_platform:- 23The platform driver exports its DMA functionality via struct snd_soc_platform:-
24 24
25struct snd_soc_platform { 25struct snd_soc_platform {
26 char *name; 26 char *name;
diff --git a/Documentation/sound/alsa/soc/pops_clicks.txt b/Documentation/sound/alsa/soc/pops_clicks.txt
index 2cf7ee5b3d74..3371bd9d7cfa 100644
--- a/Documentation/sound/alsa/soc/pops_clicks.txt
+++ b/Documentation/sound/alsa/soc/pops_clicks.txt
@@ -2,7 +2,7 @@ Audio Pops and Clicks
2===================== 2=====================
3 3
4Pops and clicks are unwanted audio artifacts caused by the powering up and down 4Pops and clicks are unwanted audio artifacts caused by the powering up and down
5of components within the audio subsystem. This is noticable on PC's when an 5of components within the audio subsystem. This is noticeable on PCs when an
6audio module is either loaded or unloaded (at module load time the sound card is 6audio module is either loaded or unloaded (at module load time the sound card is
7powered up and causes a popping noise on the speakers). 7powered up and causes a popping noise on the speakers).
8 8
@@ -16,7 +16,7 @@ Minimising Playback Pops and Clicks
16=================================== 16===================================
17 17
18Playback pops in portable audio subsystems cannot be completely eliminated atm, 18Playback pops in portable audio subsystems cannot be completely eliminated atm,
19however future audio codec hardware will have better pop and click supression. 19however future audio codec hardware will have better pop and click suppression.
20Pops can be reduced within playback by powering the audio components in a 20Pops can be reduced within playback by powering the audio components in a
21specific order. This order is different for startup and shutdown and follows 21specific order. This order is different for startup and shutdown and follows
22some basic rules:- 22some basic rules:-
@@ -33,7 +33,7 @@ Minimising Capture Pops and Clicks
33================================== 33==================================
34 34
35Capture artifacts are somewhat easier to get rid as we can delay activating the 35Capture artifacts are somewhat easier to get rid as we can delay activating the
36ADC until all the pops have occured. This follows similar power rules to 36ADC until all the pops have occurred. This follows similar power rules to
37playback in that components are powered in a sequence depending upon stream 37playback in that components are powered in a sequence depending upon stream
38startup or shutdown. 38startup or shutdown.
39 39
diff --git a/Documentation/spi/pxa2xx b/Documentation/spi/pxa2xx
index 215e3b8e7266..f3853cc37bde 100644
--- a/Documentation/spi/pxa2xx
+++ b/Documentation/spi/pxa2xx
@@ -1,4 +1,4 @@
1PXA2xx SPI on SSP driver HOWTO 1PXA2xx SPI on SSP driver HOWTO
2=================================================== 2===================================================
3This a mini howto on the pxa2xx_spi driver. The driver turns a PXA2xx 3This a mini howto on the pxa2xx_spi driver. The driver turns a PXA2xx
4synchronous serial port into a SPI master controller 4synchronous serial port into a SPI master controller
diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt
index 3b95bbacc775..ec499265deca 100644
--- a/Documentation/thinkpad-acpi.txt
+++ b/Documentation/thinkpad-acpi.txt
@@ -1035,7 +1035,7 @@ enable it if necessary to avoid overheating.
1035 1035
1036An enabled fan in level "auto" may stop spinning if the EC decides the 1036An enabled fan in level "auto" may stop spinning if the EC decides the
1037ThinkPad is cool enough and doesn't need the extra airflow. This is 1037ThinkPad is cool enough and doesn't need the extra airflow. This is
1038normal, and the EC will spin the fan up if the varios thermal readings 1038normal, and the EC will spin the fan up if the various thermal readings
1039rise too much. 1039rise too much.
1040 1040
1041On the X40, this seems to depend on the CPU and HDD temperatures. 1041On the X40, this seems to depend on the CPU and HDD temperatures.
@@ -1203,7 +1203,7 @@ for example:
1203Enabling debugging output 1203Enabling debugging output
1204------------------------- 1204-------------------------
1205 1205
1206The module takes a debug paramater which can be used to selectively 1206The module takes a debug parameter which can be used to selectively
1207enable various classes of debugging output, for example: 1207enable various classes of debugging output, for example:
1208 1208
1209 modprobe ibm_acpi debug=0xffff 1209 modprobe ibm_acpi debug=0xffff
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index 4e0b62b8566f..8b077e43eee7 100644
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -338,7 +338,7 @@ MCT USB Single Port Serial Adapter U232
338 This driver is for the MCT USB-RS232 Converter (25 pin, Model No. 338 This driver is for the MCT USB-RS232 Converter (25 pin, Model No.
339 U232-P25) from Magic Control Technology Corp. (there is also a 9 pin 339 U232-P25) from Magic Control Technology Corp. (there is also a 9 pin
340 Model No. U232-P9). More information about this device can be found at 340 Model No. U232-P9). More information about this device can be found at
341 the manufacture's web-site: http://www.mct.com.tw. 341 the manufacturer's web-site: http://www.mct.com.tw.
342 342
343 The driver is generally working, though it still needs some more testing. 343 The driver is generally working, though it still needs some more testing.
344 It is derived from the Belkin USB Serial Adapter F5U103 driver and its 344 It is derived from the Belkin USB Serial Adapter F5U103 driver and its
diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c
index f2956ac8dccc..497877bf2012 100644
--- a/arch/alpha/kernel/err_marvel.c
+++ b/arch/alpha/kernel/err_marvel.c
@@ -1082,7 +1082,7 @@ marvel_machine_check(u64 vector, u64 la_ptr)
1082 } 1082 }
1083 1083
1084 /* 1084 /*
1085 * A system event or error has occured, handle it here. 1085 * A system event or error has occurred, handle it here.
1086 * 1086 *
1087 * Any errors in the logout frame have already been cleared by the 1087 * Any errors in the logout frame have already been cleared by the
1088 * PALcode, so just parse it. 1088 * PALcode, so just parse it.
diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c
index 543d96d7fa2b..6f3867877d9e 100644
--- a/arch/alpha/kernel/err_titan.c
+++ b/arch/alpha/kernel/err_titan.c
@@ -591,7 +591,7 @@ privateer_process_680_frame(struct el_common *mchk_header, int print)
591 (struct el_PRIVATEER_envdata_mcheck *) 591 (struct el_PRIVATEER_envdata_mcheck *)
592 ((unsigned long)mchk_header + mchk_header->sys_offset); 592 ((unsigned long)mchk_header + mchk_header->sys_offset);
593 593
594 /* TODO - catagorize errors, for now, no error */ 594 /* TODO - categorize errors, for now, no error */
595 595
596 if (!print) 596 if (!print)
597 return status; 597 return status;
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index ce857158c1ea..6413c5f23226 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -715,7 +715,7 @@ osf_setsysinfo(unsigned long op, void __user *buffer, unsigned long nbytes,
715 /* 715 /*
716 * Alpha Architecture Handbook 4.7.7.3: 716 * Alpha Architecture Handbook 4.7.7.3:
717 * To be fully IEEE compiant, we must track the current IEEE 717 * To be fully IEEE compiant, we must track the current IEEE
718 * exception state in software, because spurrious bits can be 718 * exception state in software, because spurious bits can be
719 * set in the trap shadow of a software-complete insn. 719 * set in the trap shadow of a software-complete insn.
720 */ 720 */
721 721
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index ad176441be55..f4ab233201b2 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -439,7 +439,6 @@ setup_smp(void)
439 ((char *)cpubase + i*hwrpb->processor_size); 439 ((char *)cpubase + i*hwrpb->processor_size);
440 if ((cpu->flags & 0x1cc) == 0x1cc) { 440 if ((cpu->flags & 0x1cc) == 0x1cc) {
441 smp_num_probed++; 441 smp_num_probed++;
442 /* Assume here that "whami" == index */
443 cpu_set(i, cpu_present_map); 442 cpu_set(i, cpu_present_map);
444 cpu->pal_revision = boot_cpu_palrev; 443 cpu->pal_revision = boot_cpu_palrev;
445 } 444 }
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index 49bedfbbd31b..d187d01d2a17 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -138,7 +138,7 @@ alcor_init_irq(void)
138 138
139 for (i = 16; i < 48; ++i) { 139 for (i = 16; i < 48; ++i) {
140 /* On Alcor, at least, lines 20..30 are not connected 140 /* On Alcor, at least, lines 20..30 are not connected
141 and can generate spurrious interrupts if we turn them 141 and can generate spurious interrupts if we turn them
142 on while IRQ probing. */ 142 on while IRQ probing. */
143 if (i >= 16+20 && i <= 16+30) 143 if (i >= 16+20 && i <= 16+30)
144 continue; 144 continue;
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c
index 14b5a753aba5..ee7b9009ebb4 100644
--- a/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
@@ -78,7 +78,7 @@ alphabook1_init_arch(void)
78 * example, sound boards seem to like using IRQ 9. 78 * example, sound boards seem to like using IRQ 9.
79 * 79 *
80 * This is NOT how we should do it. PIRQ0-X should have 80 * This is NOT how we should do it. PIRQ0-X should have
81 * their own IRQ's, the way intel uses the IO-APIC irq's. 81 * their own IRQs, the way intel uses the IO-APIC IRQs.
82 */ 82 */
83 83
84static void __init 84static void __init
diff --git a/arch/alpha/lib/checksum.c b/arch/alpha/lib/checksum.c
index 8698e0746f9f..199f6efa83fa 100644
--- a/arch/alpha/lib/checksum.c
+++ b/arch/alpha/lib/checksum.c
@@ -5,7 +5,7 @@
5 * in an architecture-specific manner due to speed.. 5 * in an architecture-specific manner due to speed..
6 * Comments in other versions indicate that the algorithms are from RFC1071 6 * Comments in other versions indicate that the algorithms are from RFC1071
7 * 7 *
8 * accellerated versions (and 21264 assembly versions ) contributed by 8 * accelerated versions (and 21264 assembly versions ) contributed by
9 * Rick Gorton <rick.gorton@alpha-processor.com> 9 * Rick Gorton <rick.gorton@alpha-processor.com>
10 */ 10 */
11 11
diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index 4ca75c74ce90..40736da9bea8 100644
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -2,7 +2,7 @@
2 * csum_partial_copy - do IP checksumming and copy 2 * csum_partial_copy - do IP checksumming and copy
3 * 3 *
4 * (C) Copyright 1996 Linus Torvalds 4 * (C) Copyright 1996 Linus Torvalds
5 * accellerated versions (and 21264 assembly versions ) contributed by 5 * accelerated versions (and 21264 assembly versions ) contributed by
6 * Rick Gorton <rick.gorton@alpha-processor.com> 6 * Rick Gorton <rick.gorton@alpha-processor.com>
7 * 7 *
8 * Don't look at this too closely - you'll go mad. The things 8 * Don't look at this too closely - you'll go mad. The things
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 5e6da47779a4..40c15e7301de 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -235,7 +235,7 @@ callback_init(void * kernel_end)
235 unsigned long pfn = crb->map[i].pa >> PAGE_SHIFT; 235 unsigned long pfn = crb->map[i].pa >> PAGE_SHIFT;
236 crb->map[i].va = vaddr; 236 crb->map[i].va = vaddr;
237 for (j = 0; j < crb->map[i].count; ++j) { 237 for (j = 0; j < crb->map[i].count; ++j) {
238 /* Newer console's (especially on larger 238 /* Newer consoles (especially on larger
239 systems) may require more pages of 239 systems) may require more pages of
240 PTEs. Grab additional pages as needed. */ 240 PTEs. Grab additional pages as needed. */
241 if (pmd != pmd_offset(pgd, vaddr)) { 241 if (pmd != pmd_offset(pgd, vaddr)) {
diff --git a/arch/alpha/oprofile/op_impl.h b/arch/alpha/oprofile/op_impl.h
index 6b97893c1a80..b2b87ae9a353 100644
--- a/arch/alpha/oprofile/op_impl.h
+++ b/arch/alpha/oprofile/op_impl.h
@@ -38,7 +38,7 @@ struct op_register_config {
38 unsigned long need_reset; 38 unsigned long need_reset;
39}; 39};
40 40
41/* Per-architecture configury and hooks. */ 41/* Per-architecture configuration and hooks. */
42struct op_axp_model { 42struct op_axp_model {
43 void (*reg_setup) (struct op_register_config *, 43 void (*reg_setup) (struct op_register_config *,
44 struct op_counter_config *, 44 struct op_counter_config *,
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4cee938df01e..a0cdaafa115b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -851,7 +851,7 @@ config KEXEC
851 help 851 help
852 kexec is a system call that implements the ability to shutdown your 852 kexec is a system call that implements the ability to shutdown your
853 current kernel, and to start another kernel. It is like a reboot 853 current kernel, and to start another kernel. It is like a reboot
854 but it is indepedent of the system firmware. And like a reboot 854 but it is independent of the system firmware. And like a reboot
855 you can start any kernel with it, not just Linux. 855 you can start any kernel with it, not just Linux.
856 856
857 It is an ongoing process to be certain the hardware in a machine 857 It is an ongoing process to be certain the hardware in a machine
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c
index ba4a1bb3ee40..aa2d365c93fb 100644
--- a/arch/arm/mach-at91/gpio.c
+++ b/arch/arm/mach-at91/gpio.c
@@ -439,7 +439,7 @@ void __init at91_gpio_irq_setup(void)
439 for (i = 0; i < 32; i++, pin++) { 439 for (i = 0; i < 32; i++, pin++) {
440 /* 440 /*
441 * Can use the "simple" and not "edge" handler since it's 441 * Can use the "simple" and not "edge" handler since it's
442 * shorter, and the AIC handles interupts sanely. 442 * shorter, and the AIC handles interrupts sanely.
443 */ 443 */
444 set_irq_chip(pin, &gpio_irqchip); 444 set_irq_chip(pin, &gpio_irqchip);
445 set_irq_handler(pin, handle_simple_irq); 445 set_irq_handler(pin, handle_simple_irq);
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index 0733078940fa..1da9d59a0347 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -5,7 +5,7 @@
5 * 5 *
6 * Copyright (C) 2004 Nokia Corporation 6 * Copyright (C) 2004 Nokia Corporation
7 * Written by Tony Lindgren <tony@atomide.com> 7 * Written by Tony Lindgren <tony@atomide.com>
8 * Major cleanups by Juha Yrjölä <juha.yrjola@nokia.com> 8 * Major cleanups by Juha Yrjölä <juha.yrjola@nokia.com>
9 * 9 *
10 * Completely re-written to support various OMAP chips with bank specific 10 * Completely re-written to support various OMAP chips with bank specific
11 * interrupt handlers. 11 * interrupt handlers.
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 62e801ef9ad9..8d322c20ccae 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -5,7 +5,7 @@
5 * 5 *
6 * Copyright (C) 2005 Nokia Corporation 6 * Copyright (C) 2005 Nokia Corporation
7 * Author: Paul Mundt <paul.mundt@nokia.com> 7 * Author: Paul Mundt <paul.mundt@nokia.com>
8 * Juha Yrjölä <juha.yrjola@nokia.com> 8 * Juha Yrjölä <juha.yrjola@nokia.com>
9 * OMAP Dual-mode timer framework support by Timo Teras 9 * OMAP Dual-mode timer framework support by Timo Teras
10 * 10 *
11 * Some parts based off of TI's 24xx code: 11 * Some parts based off of TI's 24xx code:
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c
index cab9d6265e9e..2bfaa6102025 100644
--- a/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
@@ -238,7 +238,7 @@ int __init s3c2410_baseclk_add(void)
238 } 238 }
239 239
240 /* We must be careful disabling the clocks we are not intending to 240 /* We must be careful disabling the clocks we are not intending to
241 * be using at boot time, as subsytems such as the LCD which do 241 * be using at boot time, as subsystems such as the LCD which do
242 * their own DMA requests to the bus can cause the system to lockup 242 * their own DMA requests to the bus can cause the system to lockup
243 * if they where in the middle of requesting bus access. 243 * if they where in the middle of requesting bus access.
244 * 244 *
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c
index 8543dd6df391..458993601897 100644
--- a/arch/arm/mach-s3c2412/clock.c
+++ b/arch/arm/mach-s3c2412/clock.c
@@ -689,7 +689,7 @@ int __init s3c2412_baseclk_add(void)
689 } 689 }
690 690
691 /* We must be careful disabling the clocks we are not intending to 691 /* We must be careful disabling the clocks we are not intending to
692 * be using at boot time, as subsytems such as the LCD which do 692 * be using at boot time, as subsystems such as the LCD which do
693 * their own DMA requests to the bus can cause the system to lockup 693 * their own DMA requests to the bus can cause the system to lockup
694 * if they where in the middle of requesting bus access. 694 * if they where in the middle of requesting bus access.
695 * 695 *
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c
index 58402948c47c..b42f956738d0 100644
--- a/arch/arm/mach-s3c2443/clock.c
+++ b/arch/arm/mach-s3c2443/clock.c
@@ -1005,7 +1005,7 @@ void __init s3c2443_init_clocks(int xtal)
1005 } 1005 }
1006 1006
1007 /* We must be careful disabling the clocks we are not intending to 1007 /* We must be careful disabling the clocks we are not intending to
1008 * be using at boot time, as subsytems such as the LCD which do 1008 * be using at boot time, as subsystems such as the LCD which do
1009 * their own DMA requests to the bus can cause the system to lockup 1009 * their own DMA requests to the bus can cause the system to lockup
1010 * if they where in the middle of requesting bus access. 1010 * if they where in the middle of requesting bus access.
1011 * 1011 *
diff --git a/arch/arm/nwfpe/fpopcode.h b/arch/arm/nwfpe/fpopcode.h
index 0090b19bbe61..786e4c96156d 100644
--- a/arch/arm/nwfpe/fpopcode.h
+++ b/arch/arm/nwfpe/fpopcode.h
@@ -78,11 +78,11 @@ TABLE 1
78+-------------------------+---+---+---------+---------+ 78+-------------------------+---+---+---------+---------+
79| Precision | u | v | FPSR.EP | length | 79| Precision | u | v | FPSR.EP | length |
80+-------------------------+---+---+---------+---------+ 80+-------------------------+---+---+---------+---------+
81| Single | 0 ü 0 | x | 1 words | 81| Single | 0 | 0 | x | 1 words |
82| Double | 1 ü 1 | x | 2 words | 82| Double | 1 | 1 | x | 2 words |
83| Extended | 1 ü 1 | x | 3 words | 83| Extended | 1 | 1 | x | 3 words |
84| Packed decimal | 1 ü 1 | 0 | 3 words | 84| Packed decimal | 1 | 1 | 0 | 3 words |
85| Expanded packed decimal | 1 ü 1 | 1 | 4 words | 85| Expanded packed decimal | 1 | 1 | 1 | 4 words |
86+-------------------------+---+---+---------+---------+ 86+-------------------------+---+---+---------+---------+
87Note: x = don't care 87Note: x = don't care
88*/ 88*/
@@ -92,10 +92,10 @@ TABLE 2
92+---+---+---------------------------------+ 92+---+---+---------------------------------+
93| w | x | Number of registers to transfer | 93| w | x | Number of registers to transfer |
94+---+---+---------------------------------+ 94+---+---+---------------------------------+
95| 0 ü 1 | 1 | 95| 0 | 1 | 1 |
96| 1 ü 0 | 2 | 96| 1 | 0 | 2 |
97| 1 ü 1 | 3 | 97| 1 | 1 | 3 |
98| 0 ü 0 | 4 | 98| 0 | 0 | 4 |
99+---+---+---------------------------------+ 99+---+---+---------------------------------+
100*/ 100*/
101 101
@@ -156,10 +156,10 @@ TABLE 5
156+-------------------------+---+---+ 156+-------------------------+---+---+
157| Rounding Precision | e | f | 157| Rounding Precision | e | f |
158+-------------------------+---+---+ 158+-------------------------+---+---+
159| IEEE Single precision | 0 ü 0 | 159| IEEE Single precision | 0 | 0 |
160| IEEE Double precision | 0 ü 1 | 160| IEEE Double precision | 0 | 1 |
161| IEEE Extended precision | 1 ü 0 | 161| IEEE Extended precision | 1 | 0 |
162| undefined (trap) | 1 ü 1 | 162| undefined (trap) | 1 | 1 |
163+-------------------------+---+---+ 163+-------------------------+---+---+
164*/ 164*/
165 165
@@ -168,10 +168,10 @@ TABLE 5
168+---------------------------------+---+---+ 168+---------------------------------+---+---+
169| Rounding Mode | g | h | 169| Rounding Mode | g | h |
170+---------------------------------+---+---+ 170+---------------------------------+---+---+
171| Round to nearest (default) | 0 ü 0 | 171| Round to nearest (default) | 0 | 0 |
172| Round toward plus infinity | 0 ü 1 | 172| Round toward plus infinity | 0 | 1 |
173| Round toward negative infinity | 1 ü 0 | 173| Round toward negative infinity | 1 | 0 |
174| Round toward zero | 1 ü 1 | 174| Round toward zero | 1 | 1 |
175+---------------------------------+---+---+ 175+---------------------------------+---+---+
176*/ 176*/
177 177
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 05a38498cbe0..dcbba07cf98a 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2,7 +2,7 @@
2 * linux/arch/arm/plat-omap/dma.c 2 * linux/arch/arm/plat-omap/dma.c
3 * 3 *
4 * Copyright (C) 2003 Nokia Corporation 4 * Copyright (C) 2003 Nokia Corporation
5 * Author: Juha Yrjölä <juha.yrjola@nokia.com> 5 * Author: Juha Yrjölä <juha.yrjola@nokia.com>
6 * DMA channel linking for 1610 by Samuel Ortiz <samuel.ortiz@nokia.com> 6 * DMA channel linking for 1610 by Samuel Ortiz <samuel.ortiz@nokia.com>
7 * Graphics DMA and LCD DMA graphics tranformations 7 * Graphics DMA and LCD DMA graphics tranformations
8 * by Imre Deak <imre.deak@nokia.com> 8 * by Imre Deak <imre.deak@nokia.com>
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 337455dfe64d..6097753394ad 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -4,7 +4,7 @@
4 * Support functions for OMAP GPIO 4 * Support functions for OMAP GPIO
5 * 5 *
6 * Copyright (C) 2003-2005 Nokia Corporation 6 * Copyright (C) 2003-2005 Nokia Corporation
7 * Written by Juha Yrjölä <juha.yrjola@nokia.com> 7 * Written by Juha Yrjölä <juha.yrjola@nokia.com>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License version 2 as 10 * it under the terms of the GNU General Public License version 2 as
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index d12346aaa88b..bbecbd8469b5 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -189,7 +189,7 @@ config CMDLINE
189 189
190endmenu 190endmenu
191 191
192menu "Power managment options" 192menu "Power management options"
193 193
194menu "CPU Frequency scaling" 194menu "CPU Frequency scaling"
195 195
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 4c5ca9d5e40f..ad28dc76fc97 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -613,85 +613,86 @@ config I_ENTRY_L1
613 bool "Locate interrupt entry code in L1 Memory" 613 bool "Locate interrupt entry code in L1 Memory"
614 default y 614 default y
615 help 615 help
616 If enabled interrupt entry code (STORE/RESTORE CONTEXT) is linked 616 If enabled, interrupt entry code (STORE/RESTORE CONTEXT) is linked
617 into L1 instruction memory.(less latency) 617 into L1 instruction memory. (less latency)
618 618
619config EXCPT_IRQ_SYSC_L1 619config EXCPT_IRQ_SYSC_L1
620 bool "Locate entire ASM lowlevel excepetion / interrupt - Syscall and CPLB handler code in L1 Memory" 620 bool "Locate entire ASM lowlevel exception / interrupt - Syscall and CPLB handler code in L1 Memory"
621 default y 621 default y
622 help 622 help
623 If enabled entire ASM lowlevel exception and interrupt entry code (STORE/RESTORE CONTEXT) is linked 623 If enabled, the entire ASM lowlevel exception and interrupt entry code
624 into L1 instruction memory.(less latency) 624 (STORE/RESTORE CONTEXT) is linked into L1 instruction memory.
625 (less latency)
625 626
626config DO_IRQ_L1 627config DO_IRQ_L1
627 bool "Locate frequently called do_irq dispatcher function in L1 Memory" 628 bool "Locate frequently called do_irq dispatcher function in L1 Memory"
628 default y 629 default y
629 help 630 help
630 If enabled frequently called do_irq dispatcher function is linked 631 If enabled, the frequently called do_irq dispatcher function is linked
631 into L1 instruction memory.(less latency) 632 into L1 instruction memory. (less latency)
632 633
633config CORE_TIMER_IRQ_L1 634config CORE_TIMER_IRQ_L1
634 bool "Locate frequently called timer_interrupt() function in L1 Memory" 635 bool "Locate frequently called timer_interrupt() function in L1 Memory"
635 default y 636 default y
636 help 637 help
637 If enabled frequently called timer_interrupt() function is linked 638 If enabled, the frequently called timer_interrupt() function is linked
638 into L1 instruction memory.(less latency) 639 into L1 instruction memory. (less latency)
639 640
640config IDLE_L1 641config IDLE_L1
641 bool "Locate frequently idle function in L1 Memory" 642 bool "Locate frequently idle function in L1 Memory"
642 default y 643 default y
643 help 644 help
644 If enabled frequently called idle function is linked 645 If enabled, the frequently called idle function is linked
645 into L1 instruction memory.(less latency) 646 into L1 instruction memory. (less latency)
646 647
647config SCHEDULE_L1 648config SCHEDULE_L1
648 bool "Locate kernel schedule function in L1 Memory" 649 bool "Locate kernel schedule function in L1 Memory"
649 default y 650 default y
650 help 651 help
651 If enabled frequently called kernel schedule is linked 652 If enabled, the frequently called kernel schedule is linked
652 into L1 instruction memory.(less latency) 653 into L1 instruction memory. (less latency)
653 654
654config ARITHMETIC_OPS_L1 655config ARITHMETIC_OPS_L1
655 bool "Locate kernel owned arithmetic functions in L1 Memory" 656 bool "Locate kernel owned arithmetic functions in L1 Memory"
656 default y 657 default y
657 help 658 help
658 If enabled arithmetic functions are linked 659 If enabled, arithmetic functions are linked
659 into L1 instruction memory.(less latency) 660 into L1 instruction memory. (less latency)
660 661
661config ACCESS_OK_L1 662config ACCESS_OK_L1
662 bool "Locate access_ok function in L1 Memory" 663 bool "Locate access_ok function in L1 Memory"
663 default y 664 default y
664 help 665 help
665 If enabled access_ok function is linked 666 If enabled, the access_ok function is linked
666 into L1 instruction memory.(less latency) 667 into L1 instruction memory. (less latency)
667 668
668config MEMSET_L1 669config MEMSET_L1
669 bool "Locate memset function in L1 Memory" 670 bool "Locate memset function in L1 Memory"
670 default y 671 default y
671 help 672 help
672 If enabled memset function is linked 673 If enabled, the memset function is linked
673 into L1 instruction memory.(less latency) 674 into L1 instruction memory. (less latency)
674 675
675config MEMCPY_L1 676config MEMCPY_L1
676 bool "Locate memcpy function in L1 Memory" 677 bool "Locate memcpy function in L1 Memory"
677 default y 678 default y
678 help 679 help
679 If enabled memcpy function is linked 680 If enabled, the memcpy function is linked
680 into L1 instruction memory.(less latency) 681 into L1 instruction memory. (less latency)
681 682
682config SYS_BFIN_SPINLOCK_L1 683config SYS_BFIN_SPINLOCK_L1
683 bool "Locate sys_bfin_spinlock function in L1 Memory" 684 bool "Locate sys_bfin_spinlock function in L1 Memory"
684 default y 685 default y
685 help 686 help
686 If enabled sys_bfin_spinlock function is linked 687 If enabled, sys_bfin_spinlock function is linked
687 into L1 instruction memory.(less latency) 688 into L1 instruction memory. (less latency)
688 689
689config IP_CHECKSUM_L1 690config IP_CHECKSUM_L1
690 bool "Locate IP Checksum function in L1 Memory" 691 bool "Locate IP Checksum function in L1 Memory"
691 default n 692 default n
692 help 693 help
693 If enabled IP Checksum function is linked 694 If enabled, the IP Checksum function is linked
694 into L1 instruction memory.(less latency) 695 into L1 instruction memory. (less latency)
695 696
696config CACHELINE_ALIGNED_L1 697config CACHELINE_ALIGNED_L1
697 bool "Locate cacheline_aligned data to L1 Data Memory" 698 bool "Locate cacheline_aligned data to L1 Data Memory"
@@ -699,24 +700,24 @@ config CACHELINE_ALIGNED_L1
699 default n if BF54x 700 default n if BF54x
700 depends on !BF531 701 depends on !BF531
701 help 702 help
702 If enabled cacheline_anligned data is linked 703 If enabled, cacheline_anligned data is linked
703 into L1 data memory.(less latency) 704 into L1 data memory. (less latency)
704 705
705config SYSCALL_TAB_L1 706config SYSCALL_TAB_L1
706 bool "Locate Syscall Table L1 Data Memory" 707 bool "Locate Syscall Table L1 Data Memory"
707 default n 708 default n
708 depends on !BF531 709 depends on !BF531
709 help 710 help
710 If enabled the Syscall LUT is linked 711 If enabled, the Syscall LUT is linked
711 into L1 data memory.(less latency) 712 into L1 data memory. (less latency)
712 713
713config CPLB_SWITCH_TAB_L1 714config CPLB_SWITCH_TAB_L1
714 bool "Locate CPLB Switch Tables L1 Data Memory" 715 bool "Locate CPLB Switch Tables L1 Data Memory"
715 default n 716 default n
716 depends on !BF531 717 depends on !BF531
717 help 718 help
718 If enabled the CPLB Switch Tables are linked 719 If enabled, the CPLB Switch Tables are linked
719 into L1 data memory.(less latency) 720 into L1 data memory. (less latency)
720 721
721endmenu 722endmenu
722 723
@@ -1029,13 +1030,13 @@ config DEBUG_HWERR
1029 from. 1030 from.
1030 1031
1031config DEBUG_ICACHE_CHECK 1032config DEBUG_ICACHE_CHECK
1032 bool "Check Instruction cache coherancy" 1033 bool "Check Instruction cache coherency"
1033 depends on DEBUG_KERNEL 1034 depends on DEBUG_KERNEL
1034 depends on DEBUG_HWERR 1035 depends on DEBUG_HWERR
1035 help 1036 help
1036 Say Y here if you are getting wierd unexplained errors. This will 1037 Say Y here if you are getting weird unexplained errors. This will
1037 ensure that icache is what SDRAM says it should be, by doing a 1038 ensure that icache is what SDRAM says it should be by doing a
1038 byte wise comparision between SDRAM and instruction cache. This 1039 byte wise comparison between SDRAM and instruction cache. This
1039 also relocates the irq_panic() function to L1 memory, (which is 1040 also relocates the irq_panic() function to L1 memory, (which is
1040 un-cached). 1041 un-cached).
1041 1042
diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig
index c7ea9efd0104..f1ce6f64401d 100644
--- a/arch/cris/arch-v10/Kconfig
+++ b/arch/cris/arch-v10/Kconfig
@@ -182,7 +182,7 @@ config ETRAX_LED7G
182 set this to same as CONFIG_ETRAX_LED1G (normally 2). 182 set this to same as CONFIG_ETRAX_LED1G (normally 2).
183 183
184config ETRAX_LED8Y 184config ETRAX_LED8Y
185 int "Eigth yellow LED bit" 185 int "Eighth yellow LED bit"
186 depends on ETRAX_CSP0_LEDS 186 depends on ETRAX_CSP0_LEDS
187 default "2" 187 default "2"
188 help 188 help
diff --git a/arch/cris/arch-v10/boot/compressed/misc.c b/arch/cris/arch-v10/boot/compressed/misc.c
index ffb8d21b2f83..e205d2e7e089 100644
--- a/arch/cris/arch-v10/boot/compressed/misc.c
+++ b/arch/cris/arch-v10/boot/compressed/misc.c
@@ -8,7 +8,7 @@
8 * 8 *
9 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 9 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
10 * puts by Nick Holloway 1993, better puts by Martin Mares 1995 10 * puts by Nick Holloway 1993, better puts by Martin Mares 1995
11 * adoptation for Linux/CRIS Axis Communications AB, 1999 11 * adaptation for Linux/CRIS Axis Communications AB, 1999
12 * 12 *
13 */ 13 */
14 14
diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c
index 1de0026bb94e..c263b8232dbc 100644
--- a/arch/cris/arch-v10/drivers/pcf8563.c
+++ b/arch/cris/arch-v10/drivers/pcf8563.c
@@ -4,7 +4,7 @@
4 * From Phillips' datasheet: 4 * From Phillips' datasheet:
5 * 5 *
6 * The PCF8563 is a CMOS real-time clock/calendar optimized for low power 6 * The PCF8563 is a CMOS real-time clock/calendar optimized for low power
7 * consumption. A programmable clock output, interupt output and voltage 7 * consumption. A programmable clock output, interrupt output and voltage
8 * low detector are also provided. All address and data are transferred 8 * low detector are also provided. All address and data are transferred
9 * serially via two-line bidirectional I2C-bus. Maximum bus speed is 9 * serially via two-line bidirectional I2C-bus. Maximum bus speed is
10 * 400 kbits/s. The built-in word address register is incremented 10 * 400 kbits/s. The built-in word address register is incremented
diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c
index 2b536ca6f444..93679a48c791 100644
--- a/arch/cris/arch-v10/kernel/debugport.c
+++ b/arch/cris/arch-v10/kernel/debugport.c
@@ -83,7 +83,7 @@
83 * 83 *
84 * Revision 1.4 2002/11/19 14:35:24 starvik 84 * Revision 1.4 2002/11/19 14:35:24 starvik
85 * Changes from linux 2.4 85 * Changes from linux 2.4
86 * Changed struct initializer syntax to the currently prefered notation 86 * Changed struct initializer syntax to the currently preferred notation
87 * 87 *
88 * Revision 1.3 2002/11/06 09:47:03 starvik 88 * Revision 1.3 2002/11/06 09:47:03 starvik
89 * Modified for new interrupt macros 89 * Modified for new interrupt macros
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S
index ae45d4522e65..c5844cb70f09 100644
--- a/arch/cris/arch-v10/kernel/entry.S
+++ b/arch/cris/arch-v10/kernel/entry.S
@@ -97,7 +97,7 @@
97 * 97 *
98 * Revision 1.36 2001/11/22 13:36:36 bjornw 98 * Revision 1.36 2001/11/22 13:36:36 bjornw
99 * * In ret_from_intr, check regs->dccr for usermode reentrance instead of 99 * * In ret_from_intr, check regs->dccr for usermode reentrance instead of
100 * DCCR explicitely (because the latter might not reflect current reality) 100 * DCCR explicitly (because the latter might not reflect current reality)
101 * * In mmu_bus_fault, set $r9 _after_ calling the C-code instead of before 101 * * In mmu_bus_fault, set $r9 _after_ calling the C-code instead of before
102 * since $r9 is call-clobbered and is potentially needed afterwards 102 * since $r9 is call-clobbered and is potentially needed afterwards
103 * 103 *
diff --git a/arch/cris/arch-v10/kernel/fasttimer.c b/arch/cris/arch-v10/kernel/fasttimer.c
index 8cbdf594b369..d3ea052e5ee1 100644
--- a/arch/cris/arch-v10/kernel/fasttimer.c
+++ b/arch/cris/arch-v10/kernel/fasttimer.c
@@ -84,7 +84,7 @@
84 * with time based on jiffies and *R_TIMER0_DATA, uses a table 84 * with time based on jiffies and *R_TIMER0_DATA, uses a table
85 * for fast conversion of timer value to microseconds. 85 * for fast conversion of timer value to microseconds.
86 * (Much faster the standard do_gettimeofday() and we don't really 86 * (Much faster the standard do_gettimeofday() and we don't really
87 * wan't to use the true time - we wan't the "uptime" so timers don't screw up 87 * want to use the true time - we want the "uptime" so timers don't screw up
88 * when we change the time. 88 * when we change the time.
89 * TODO: Add efficient support for continuous timers as well. 89 * TODO: Add efficient support for continuous timers as well.
90 * 90 *
diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c
index 96094cbf1255..845c95f6e871 100644
--- a/arch/cris/arch-v10/kernel/irq.c
+++ b/arch/cris/arch-v10/kernel/irq.c
@@ -169,7 +169,7 @@ init_IRQ(void)
169 for (i = 0; i < 256; i++) 169 for (i = 0; i < 256; i++)
170 etrax_irv->v[i] = weird_irq; 170 etrax_irv->v[i] = weird_irq;
171 171
172 /* Initialize IRQ handler descriptiors. */ 172 /* Initialize IRQ handler descriptors. */
173 for(i = 2; i < NR_IRQS; i++) { 173 for(i = 2; i < NR_IRQS; i++) {
174 irq_desc[i].chip = &crisv10_irq_type; 174 irq_desc[i].chip = &crisv10_irq_type;
175 set_int_vector(i, interrupt[i]); 175 set_int_vector(i, interrupt[i]);
diff --git a/arch/cris/arch-v10/kernel/kgdb.c b/arch/cris/arch-v10/kernel/kgdb.c
index 07628a13c6c4..77f4b1423725 100644
--- a/arch/cris/arch-v10/kernel/kgdb.c
+++ b/arch/cris/arch-v10/kernel/kgdb.c
@@ -959,7 +959,7 @@ stub_is_stopped(int sigval)
959 959
960 /* Send register contents. We probably only need to send the 960 /* Send register contents. We probably only need to send the
961 * PC, frame pointer and stack pointer here. Other registers will be 961 * PC, frame pointer and stack pointer here. Other registers will be
962 * explicitely asked for. But for now, send all. 962 * explicitly asked for. But for now, send all.
963 */ 963 */
964 964
965 for (regno = R0; regno <= USP; regno++) { 965 for (regno = R0; regno <= USP; regno++) {
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c
index b6831ceb6a62..1a3760c94f85 100644
--- a/arch/cris/arch-v10/kernel/process.c
+++ b/arch/cris/arch-v10/kernel/process.c
@@ -64,7 +64,7 @@ void hard_reset_now (void)
64#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM) 64#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
65 cause_of_death = 0xbedead; 65 cause_of_death = 0xbedead;
66#else 66#else
67 /* Since we dont plan to keep on reseting the watchdog, 67 /* Since we dont plan to keep on resetting the watchdog,
68 the key can be arbitrary hence three */ 68 the key can be arbitrary hence three */
69 *R_WATCHDOG = IO_FIELD(R_WATCHDOG, key, 3) | 69 *R_WATCHDOG = IO_FIELD(R_WATCHDOG, key, 3) |
70 IO_STATE(R_WATCHDOG, enable, start); 70 IO_STATE(R_WATCHDOG, enable, start);
diff --git a/arch/cris/arch-v10/kernel/shadows.c b/arch/cris/arch-v10/kernel/shadows.c
index 38fd44dfbc5b..326178aef6ee 100644
--- a/arch/cris/arch-v10/kernel/shadows.c
+++ b/arch/cris/arch-v10/kernel/shadows.c
@@ -20,7 +20,7 @@ unsigned long r_timer_ctrl_shadow;
20 * These are only usable if there actually IS a latch connected 20 * These are only usable if there actually IS a latch connected
21 * to the corresponding external chip-select pin. 21 * to the corresponding external chip-select pin.
22 * 22 *
23 * A common usage is that CSP0 controls LED's and CSP4 video chips. 23 * A common usage is that CSP0 controls LEDs and CSP4 video chips.
24 */ 24 */
25 25
26unsigned long port_cse1_shadow; 26unsigned long port_cse1_shadow;
diff --git a/arch/cris/arch-v10/lib/dram_init.S b/arch/cris/arch-v10/lib/dram_init.S
index 9cf83932cd5d..6a6bdfd6984d 100644
--- a/arch/cris/arch-v10/lib/dram_init.S
+++ b/arch/cris/arch-v10/lib/dram_init.S
@@ -40,7 +40,7 @@
40 * Copy warning from head.S about r8 and r9 40 * Copy warning from head.S about r8 and r9
41 * 41 *
42 * Revision 1.7 2001/04/18 12:05:39 bjornw 42 * Revision 1.7 2001/04/18 12:05:39 bjornw
43 * Fixed comments, and explicitely include config.h to be sure its there 43 * Fixed comments, and explicitly include config.h to be sure its there
44 * 44 *
45 * Revision 1.6 2001/04/10 06:20:16 starvik 45 * Revision 1.6 2001/04/10 06:20:16 starvik
46 * Delay should be 200us, not 200ns 46 * Delay should be 200us, not 200ns
@@ -66,7 +66,7 @@
66 */ 66 */
67 67
68/* Just to be certain the config file is included, we include it here 68/* Just to be certain the config file is included, we include it here
69 * explicitely instead of depending on it being included in the file that 69 * explicitly instead of depending on it being included in the file that
70 * uses this code. 70 * uses this code.
71 */ 71 */
72 72
diff --git a/arch/cris/arch-v10/lib/string.c b/arch/cris/arch-v10/lib/string.c
index 8ffde4901b57..15d6662b03b1 100644
--- a/arch/cris/arch-v10/lib/string.c
+++ b/arch/cris/arch-v10/lib/string.c
@@ -41,7 +41,7 @@ void *memcpy(void *pdst,
41 Make sure the compiler is able to make something useful of this. 41 Make sure the compiler is able to make something useful of this.
42 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 42 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
43 43
44 If gcc was allright, it really would need no temporaries, and no 44 If gcc was alright, it really would need no temporaries, and no
45 stack space to save stuff on. */ 45 stack space to save stuff on. */
46 46
47 register void *return_dst __asm__ ("r10") = pdst; 47 register void *return_dst __asm__ ("r10") = pdst;
diff --git a/arch/cris/arch-v10/lib/usercopy.c b/arch/cris/arch-v10/lib/usercopy.c
index 43778d53c254..a12c708afc9a 100644
--- a/arch/cris/arch-v10/lib/usercopy.c
+++ b/arch/cris/arch-v10/lib/usercopy.c
@@ -38,7 +38,7 @@ __copy_user (void __user *pdst, const void *psrc, unsigned long pn)
38 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 38 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
39 39
40 FIXME: Comment for old gcc version. Check. 40 FIXME: Comment for old gcc version. Check.
41 If gcc was allright, it really would need no temporaries, and no 41 If gcc was alright, it really would need no temporaries, and no
42 stack space to save stuff on. */ 42 stack space to save stuff on. */
43 43
44 register char *dst __asm__ ("r13") = pdst; 44 register char *dst __asm__ ("r13") = pdst;
@@ -200,7 +200,7 @@ __copy_user_zeroing (void __user *pdst, const void *psrc, unsigned long pn)
200 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 200 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
201 201
202 FIXME: Comment for old gcc version. Check. 202 FIXME: Comment for old gcc version. Check.
203 If gcc was allright, it really would need no temporaries, and no 203 If gcc was alright, it really would need no temporaries, and no
204 stack space to save stuff on. */ 204 stack space to save stuff on. */
205 205
206 register char *dst __asm__ ("r13") = pdst; 206 register char *dst __asm__ ("r13") = pdst;
@@ -380,7 +380,7 @@ __do_clear_user (void __user *pto, unsigned long pn)
380 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 380 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
381 381
382 FIXME: Comment for old gcc version. Check. 382 FIXME: Comment for old gcc version. Check.
383 If gcc was allright, it really would need no temporaries, and no 383 If gcc was alright, it really would need no temporaries, and no
384 stack space to save stuff on. */ 384 stack space to save stuff on. */
385 385
386 register char *dst __asm__ ("r13") = pto; 386 register char *dst __asm__ ("r13") = pto;
diff --git a/arch/cris/arch-v32/boot/compressed/misc.c b/arch/cris/arch-v32/boot/compressed/misc.c
index 11902697196d..0169ba1ca9c9 100644
--- a/arch/cris/arch-v32/boot/compressed/misc.c
+++ b/arch/cris/arch-v32/boot/compressed/misc.c
@@ -8,7 +8,7 @@
8 * 8 *
9 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994 9 * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
10 * puts by Nick Holloway 1993, better puts by Martin Mares 1995 10 * puts by Nick Holloway 1993, better puts by Martin Mares 1995
11 * adoptation for Linux/CRIS Axis Communications AB, 1999 11 * adaptation for Linux/CRIS Axis Communications AB, 1999
12 * 12 *
13 */ 13 */
14 14
@@ -151,7 +151,7 @@ serout(const char *s, reg_scope_instances regi_ser)
151 do { 151 do {
152 rs = REG_RD(ser, regi_ser, rs_stat_din); 152 rs = REG_RD(ser, regi_ser, rs_stat_din);
153 } 153 }
154 while (!rs.tr_rdy);/* Wait for tranceiver. */ 154 while (!rs.tr_rdy);/* Wait for transceiver. */
155 155
156 REG_WR(ser, regi_ser, rw_dout, dout); 156 REG_WR(ser, regi_ser, rw_dout, dout);
157} 157}
@@ -264,7 +264,7 @@ serial_setup(reg_scope_instances regi_ser)
264 tr_ctrl.stop_bits = 1; /* 2 stop bits. */ 264 tr_ctrl.stop_bits = 1; /* 2 stop bits. */
265 265
266 /* 266 /*
267 * The baudrate setup is a bit fishy, but in the end the tranceiver is 267 * The baudrate setup is a bit fishy, but in the end the transceiver is
268 * set to 4800 and the receiver to 115200. The magic value is 268 * set to 4800 and the receiver to 115200. The magic value is
269 * 29.493 MHz. 269 * 29.493 MHz.
270 */ 270 */
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 5180d45412fc..3ec12ea44e8e 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -205,7 +205,7 @@ static struct mtd_info *probe_cs(struct map_info *map_cs)
205/* 205/*
206 * Probe each chip select individually for flash chips. If there are chips on 206 * Probe each chip select individually for flash chips. If there are chips on
207 * both cse0 and cse1, the mtd_info structs will be concatenated to one struct 207 * both cse0 and cse1, the mtd_info structs will be concatenated to one struct
208 * so that MTD partitions can cross chip boundries. 208 * so that MTD partitions can cross chip boundaries.
209 * 209 *
210 * The only known restriction to how you can mount your chips is that each 210 * The only known restriction to how you can mount your chips is that each
211 * chip select must hold similar flash chips. But you need external hardware 211 * chip select must hold similar flash chips. But you need external hardware
diff --git a/arch/cris/arch-v32/drivers/i2c.c b/arch/cris/arch-v32/drivers/i2c.c
index e12f6cc6f4a2..f1edd2e359b2 100644
--- a/arch/cris/arch-v32/drivers/i2c.c
+++ b/arch/cris/arch-v32/drivers/i2c.c
@@ -275,7 +275,7 @@ i2c_getack(void)
275 ack = 0; 275 ack = 0;
276 i2c_delay(CLOCK_HIGH_TIME/2); 276 i2c_delay(CLOCK_HIGH_TIME/2);
277 if(!ack){ 277 if(!ack){
278 if(!i2c_getbit()) /* receiver pulld SDA low */ 278 if(!i2c_getbit()) /* receiver pulled SDA low */
279 ack = 1; 279 ack = 1;
280 i2c_delay(CLOCK_HIGH_TIME/2); 280 i2c_delay(CLOCK_HIGH_TIME/2);
281 } 281 }
diff --git a/arch/cris/arch-v32/drivers/nandflash.c b/arch/cris/arch-v32/drivers/nandflash.c
index 93ddea4d9564..5ce015c6bb0d 100644
--- a/arch/cris/arch-v32/drivers/nandflash.c
+++ b/arch/cris/arch-v32/drivers/nandflash.c
@@ -138,7 +138,7 @@ struct mtd_info* __init crisv32_nand_flash_probe (void)
138 /* Enable the following for a flash based bad block table */ 138 /* Enable the following for a flash based bad block table */
139 this->options = NAND_USE_FLASH_BBT; 139 this->options = NAND_USE_FLASH_BBT;
140 140
141 /* Scan to find existance of the device */ 141 /* Scan to find existence of the device */
142 if (nand_scan (crisv32_mtd, 1)) { 142 if (nand_scan (crisv32_mtd, 1)) {
143 err = -ENXIO; 143 err = -ENXIO;
144 goto out_ior; 144 goto out_ior;
diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c
index da479a14f836..6dbd700d3d66 100644
--- a/arch/cris/arch-v32/drivers/pcf8563.c
+++ b/arch/cris/arch-v32/drivers/pcf8563.c
@@ -4,7 +4,7 @@
4 * From Phillips' datasheet: 4 * From Phillips' datasheet:
5 * 5 *
6 * The PCF8563 is a CMOS real-time clock/calendar optimized for low power 6 * The PCF8563 is a CMOS real-time clock/calendar optimized for low power
7 * consumption. A programmable clock output, interupt output and voltage 7 * consumption. A programmable clock output, interrupt output and voltage
8 * low detector are also provided. All address and data are transferred 8 * low detector are also provided. All address and data are transferred
9 * serially via two-line bidirectional I2C-bus. Maximum bus speed is 9 * serially via two-line bidirectional I2C-bus. Maximum bus speed is
10 * 400 kbits/s. The built-in word address register is incremented 10 * 400 kbits/s. The built-in word address register is incremented
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c
index 79e1e4c2ca1d..b40551f9f40d 100644
--- a/arch/cris/arch-v32/kernel/fasttimer.c
+++ b/arch/cris/arch-v32/kernel/fasttimer.c
@@ -97,7 +97,7 @@
97 * with time based on jiffies and *R_TIMER0_DATA, uses a table 97 * with time based on jiffies and *R_TIMER0_DATA, uses a table
98 * for fast conversion of timer value to microseconds. 98 * for fast conversion of timer value to microseconds.
99 * (Much faster the standard do_gettimeofday() and we don't really 99 * (Much faster the standard do_gettimeofday() and we don't really
100 * wan't to use the true time - we wan't the "uptime" so timers don't screw up 100 * want to use the true time - we want the "uptime" so timers don't screw up
101 * when we change the time. 101 * when we change the time.
102 * TODO: Add efficient support for continuous timers as well. 102 * TODO: Add efficient support for continuous timers as well.
103 * 103 *
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index cc361bf578ae..a9acaa270243 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -140,7 +140,7 @@ block_irq(int irq, int cpu)
140 spin_lock_irqsave(&irq_lock, flags); 140 spin_lock_irqsave(&irq_lock, flags);
141 intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask); 141 intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask);
142 142
143 /* Remember; 1 let thru, 0 block. */ 143 /* Remember; 1 let through, 0 block. */
144 intr_mask &= ~(1 << (irq - FIRST_IRQ)); 144 intr_mask &= ~(1 << (irq - FIRST_IRQ));
145 145
146 REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask); 146 REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask);
@@ -156,7 +156,7 @@ unblock_irq(int irq, int cpu)
156 spin_lock_irqsave(&irq_lock, flags); 156 spin_lock_irqsave(&irq_lock, flags);
157 intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask); 157 intr_mask = REG_RD_INT(intr_vect, irq_regs[cpu], rw_mask);
158 158
159 /* Remember; 1 let thru, 0 block. */ 159 /* Remember; 1 let through, 0 block. */
160 intr_mask |= (1 << (irq - FIRST_IRQ)); 160 intr_mask |= (1 << (irq - FIRST_IRQ));
161 161
162 REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask); 162 REG_WR_INT(intr_vect, irq_regs[cpu], rw_mask, intr_mask);
@@ -308,7 +308,7 @@ crisv32_do_multiple(struct pt_regs* regs)
308 */ 308 */
309 irq_enter(); 309 irq_enter();
310 310
311 /* Get which IRQs that happend. */ 311 /* Get which IRQs that happened. */
312 masked = REG_RD_INT(intr_vect, irq_regs[cpu], r_masked_vect); 312 masked = REG_RD_INT(intr_vect, irq_regs[cpu], r_masked_vect);
313 313
314 /* Calculate new IRQ mask with these IRQs disabled. */ 314 /* Calculate new IRQ mask with these IRQs disabled. */
@@ -366,7 +366,7 @@ init_IRQ(void)
366 for (i = 0; i < 256; i++) 366 for (i = 0; i < 256; i++)
367 etrax_irv->v[i] = weird_irq; 367 etrax_irv->v[i] = weird_irq;
368 368
369 /* Point all IRQ's to bad handlers. */ 369 /* Point all IRQs to bad handlers. */
370 for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) { 370 for (i = FIRST_IRQ, j = 0; j < NR_IRQS; i++, j++) {
371 irq_desc[j].chip = &crisv32_irq_type; 371 irq_desc[j].chip = &crisv32_irq_type;
372 set_exception_vector(i, interrupt[j]); 372 set_exception_vector(i, interrupt[j]);
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 6326351af252..b72a15580dc7 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -162,7 +162,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
162 /* Put the switch stack right below the pt_regs. */ 162 /* Put the switch stack right below the pt_regs. */
163 swstack = ((struct switch_stack *) childregs) - 1; 163 swstack = ((struct switch_stack *) childregs) - 1;
164 164
165 /* Paramater to ret_from_sys_call. 0 is don't restart the syscall. */ 165 /* Parameter to ret_from_sys_call. 0 is don't restart the syscall. */
166 swstack->r9 = 0; 166 swstack->r9 = 0;
167 167
168 /* 168 /*
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index 7cd6ac803409..024cc6901974 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -347,7 +347,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
347/* Grab and setup a signal frame. 347/* Grab and setup a signal frame.
348 * 348 *
349 * Basically a lot of state-info is stacked, and arranged for the 349 * Basically a lot of state-info is stacked, and arranged for the
350 * user-mode program to return to the kernel using either a trampiline 350 * user-mode program to return to the kernel using either a trampoline
351 * which performs the syscall sigreturn(), or a provided user-mode 351 * which performs the syscall sigreturn(), or a provided user-mode
352 * trampoline. 352 * trampoline.
353 */ 353 */
@@ -641,7 +641,7 @@ ugdb_trap_user(struct thread_info *ti, int sig)
641 user_regs(ti)->spc = 0; 641 user_regs(ti)->spc = 0;
642 } 642 }
643 /* FIXME: Filter out false h/w breakpoint hits (i.e. EDA 643 /* FIXME: Filter out false h/w breakpoint hits (i.e. EDA
644 not withing any configured h/w breakpoint range). Synchronize with 644 not within any configured h/w breakpoint range). Synchronize with
645 what already exists for kernel debugging. */ 645 what already exists for kernel debugging. */
646 if (((user_regs(ti)->exs & 0xff00) >> 8) == BREAK_8_INTR_VECT) { 646 if (((user_regs(ti)->exs & 0xff00) >> 8) == BREAK_8_INTR_VECT) {
647 /* Break 8: subtract 2 from ERP unless in a delay slot. */ 647 /* Break 8: subtract 2 from ERP unless in a delay slot. */
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index 697494bc2de1..171c96e0a5d3 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -142,7 +142,7 @@ smp_boot_one_cpu(int cpuid)
142 return -1; 142 return -1;
143} 143}
144 144
145/* Secondary CPUs starts uing C here. Here we need to setup CPU 145/* Secondary CPUs starts using C here. Here we need to setup CPU
146 * specific stuff such as the local timer and the MMU. */ 146 * specific stuff such as the local timer and the MMU. */
147void __init smp_callin(void) 147void __init smp_callin(void)
148{ 148{
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c
index be0a01657d4f..2f7e8e200f2c 100644
--- a/arch/cris/arch-v32/kernel/time.c
+++ b/arch/cris/arch-v32/kernel/time.c
@@ -99,7 +99,7 @@ unsigned long do_slow_gettimeoffset(void)
99/* From timer MDS describing the hardware watchdog: 99/* From timer MDS describing the hardware watchdog:
100 * 4.3.1 Watchdog Operation 100 * 4.3.1 Watchdog Operation
101 * The watchdog timer is an 8-bit timer with a configurable start value. 101 * The watchdog timer is an 8-bit timer with a configurable start value.
102 * Once started the whatchdog counts downwards with a frequency of 763 Hz 102 * Once started the watchdog counts downwards with a frequency of 763 Hz
103 * (100/131072 MHz). When the watchdog counts down to 1, it generates an 103 * (100/131072 MHz). When the watchdog counts down to 1, it generates an
104 * NMI (Non Maskable Interrupt), and when it counts down to 0, it resets the 104 * NMI (Non Maskable Interrupt), and when it counts down to 0, it resets the
105 * chip. 105 * chip.
diff --git a/arch/cris/arch-v32/kernel/traps.c b/arch/cris/arch-v32/kernel/traps.c
index 2462b1ef1fbb..17fd3dbd1c80 100644
--- a/arch/cris/arch-v32/kernel/traps.c
+++ b/arch/cris/arch-v32/kernel/traps.c
@@ -105,7 +105,7 @@ bad_value:
105 105
106/* 106/*
107 * This gets called from entry.S when the watchdog has bitten. Show something 107 * This gets called from entry.S when the watchdog has bitten. Show something
108 * similiar to an Oops dump, and if the kernel if configured to be a nice doggy; 108 * similar to an Oops dump, and if the kernel is configured to be a nice doggy;
109 * halt instead of reboot. 109 * halt instead of reboot.
110 */ 110 */
111void 111void
diff --git a/arch/cris/arch-v32/lib/dram_init.S b/arch/cris/arch-v32/lib/dram_init.S
index 158b3dbb4d9d..218fbe259ee5 100644
--- a/arch/cris/arch-v32/lib/dram_init.S
+++ b/arch/cris/arch-v32/lib/dram_init.S
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14/* Just to be certain the config file is included, we include it here 14/* Just to be certain the config file is included, we include it here
15 * explicitely instead of depending on it being included in the file that 15 * explicitly instead of depending on it being included in the file that
16 * uses this code. 16 * uses this code.
17 */ 17 */
18 18
diff --git a/arch/cris/arch-v32/lib/string.c b/arch/cris/arch-v32/lib/string.c
index 98e282ac824a..6740b2cebae5 100644
--- a/arch/cris/arch-v32/lib/string.c
+++ b/arch/cris/arch-v32/lib/string.c
@@ -41,7 +41,7 @@ void *memcpy(void *pdst,
41 Make sure the compiler is able to make something useful of this. 41 Make sure the compiler is able to make something useful of this.
42 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 42 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
43 43
44 If gcc was allright, it really would need no temporaries, and no 44 If gcc was alright, it really would need no temporaries, and no
45 stack space to save stuff on. */ 45 stack space to save stuff on. */
46 46
47 register void *return_dst __asm__ ("r10") = pdst; 47 register void *return_dst __asm__ ("r10") = pdst;
diff --git a/arch/cris/arch-v32/lib/usercopy.c b/arch/cris/arch-v32/lib/usercopy.c
index f0b08460c1be..04d0cf35a276 100644
--- a/arch/cris/arch-v32/lib/usercopy.c
+++ b/arch/cris/arch-v32/lib/usercopy.c
@@ -34,7 +34,7 @@ __copy_user (void __user *pdst, const void *psrc, unsigned long pn)
34 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 34 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
35 35
36 FIXME: Comment for old gcc version. Check. 36 FIXME: Comment for old gcc version. Check.
37 If gcc was allright, it really would need no temporaries, and no 37 If gcc was alright, it really would need no temporaries, and no
38 stack space to save stuff on. */ 38 stack space to save stuff on. */
39 39
40 register char *dst __asm__ ("r13") = pdst; 40 register char *dst __asm__ ("r13") = pdst;
@@ -168,7 +168,7 @@ __copy_user_zeroing (void __user *pdst, const void *psrc, unsigned long pn)
168 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 168 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
169 169
170 FIXME: Comment for old gcc version. Check. 170 FIXME: Comment for old gcc version. Check.
171 If gcc was allright, it really would need no temporaries, and no 171 If gcc was alright, it really would need no temporaries, and no
172 stack space to save stuff on. */ 172 stack space to save stuff on. */
173 173
174 register char *dst __asm__ ("r13") = pdst; 174 register char *dst __asm__ ("r13") = pdst;
@@ -332,7 +332,7 @@ __do_clear_user (void __user *pto, unsigned long pn)
332 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop). 332 As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
333 333
334 FIXME: Comment for old gcc version. Check. 334 FIXME: Comment for old gcc version. Check.
335 If gcc was allright, it really would need no temporaries, and no 335 If gcc was alright, it really would need no temporaries, and no
336 stack space to save stuff on. */ 336 stack space to save stuff on. */
337 337
338 register char *dst __asm__ ("r13") = pto; 338 register char *dst __asm__ ("r13") = pto;
diff --git a/arch/cris/arch-v32/mm/tlb.c b/arch/cris/arch-v32/mm/tlb.c
index c2d12e9c40d7..a076ef6e9389 100644
--- a/arch/cris/arch-v32/mm/tlb.c
+++ b/arch/cris/arch-v32/mm/tlb.c
@@ -30,8 +30,8 @@ do { \
30 * The TLB can host up to 256 different mm contexts at the same time. The running 30 * The TLB can host up to 256 different mm contexts at the same time. The running
31 * context is found in the PID register. Each TLB entry contains a page_id that 31 * context is found in the PID register. Each TLB entry contains a page_id that
32 * has to match the PID register to give a hit. page_id_map keeps track of which 32 * has to match the PID register to give a hit. page_id_map keeps track of which
33 * mm's is assigned to which page_id's, making sure it's known when to 33 * mm is assigned to which page_id, making sure it's known when to invalidate TLB
34 * invalidate TLB entries. 34 * entries.
35 * 35 *
36 * The last page_id is never running, it is used as an invalid page_id so that 36 * The last page_id is never running, it is used as an invalid page_id so that
37 * it's possible to make TLB entries that will nerver match. 37 * it's possible to make TLB entries that will nerver match.
@@ -188,7 +188,7 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
188 spin_unlock(&mmu_context_lock); 188 spin_unlock(&mmu_context_lock);
189 189
190 /* 190 /*
191 * Remember the pgd for the fault handlers. Keep a seperate copy of it 191 * Remember the pgd for the fault handlers. Keep a separate copy of it
192 * because current and active_mm might be invalid at points where 192 * because current and active_mm might be invalid at points where
193 * there's still a need to derefer the pgd. 193 * there's still a need to derefer the pgd.
194 */ 194 */
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c
index 903ea62c6e21..5c27ff86121b 100644
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
@@ -7,7 +7,7 @@
7 * Authors: Bjorn Wesen (bjornw@axis.com) 7 * Authors: Bjorn Wesen (bjornw@axis.com)
8 * 8 *
9 * This file contains the code used by various IRQ handling routines: 9 * This file contains the code used by various IRQ handling routines:
10 * asking for different IRQ's should be done through these routines 10 * asking for different IRQs should be done through these routines
11 * instead of just grabbing them. Thus setups with different IRQ numbers 11 * instead of just grabbing them. Thus setups with different IRQ numbers
12 * shouldn't result in any weird surprises, and installing new handlers 12 * shouldn't result in any weird surprises, and installing new handlers
13 * should be easier. 13 * should be easier.
@@ -15,7 +15,7 @@
15 */ 15 */
16 16
17/* 17/*
18 * IRQ's are in fact implemented a bit like signal handlers for the kernel. 18 * IRQs are in fact implemented a bit like signal handlers for the kernel.
19 * Naturally it's not a 1:1 relation, but there are similarities. 19 * Naturally it's not a 1:1 relation, but there are similarities.
20 */ 20 */
21 21
@@ -83,9 +83,9 @@ skip:
83 83
84 84
85/* called by the assembler IRQ entry functions defined in irq.h 85/* called by the assembler IRQ entry functions defined in irq.h
86 * to dispatch the interrupts to registred handlers 86 * to dispatch the interrupts to registered handlers
87 * interrupts are disabled upon entry - depending on if the 87 * interrupts are disabled upon entry - depending on if the
88 * interrupt was registred with IRQF_DISABLED or not, interrupts 88 * interrupt was registered with IRQF_DISABLED or not, interrupts
89 * are re-enabled or not. 89 * are re-enabled or not.
90 */ 90 */
91 91
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 8aab81430695..3034f3ff950c 100644
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -13,7 +13,7 @@
13 * Fixed warning. 13 * Fixed warning.
14 * 14 *
15 * Revision 1.18 2005/01/12 08:10:14 starvik 15 * Revision 1.18 2005/01/12 08:10:14 starvik
16 * Readded the change of frametype when handling kernel page fault fixup 16 * Re-added the change of frametype when handling kernel page fault fixup
17 * for v10. This is necessary to avoid that the CPU remakes the faulting 17 * for v10. This is necessary to avoid that the CPU remakes the faulting
18 * access. 18 * access.
19 * 19 *
@@ -49,7 +49,7 @@
49 * 49 *
50 * Revision 1.8 2003/07/04 13:02:48 tobiasa 50 * Revision 1.8 2003/07/04 13:02:48 tobiasa
51 * Moved code snippet from arch/cris/mm/fault.c that searches for fixup code 51 * Moved code snippet from arch/cris/mm/fault.c that searches for fixup code
52 * to seperate function in arch-specific files. 52 * to separate function in arch-specific files.
53 * 53 *
54 * Revision 1.7 2003/01/22 06:48:38 starvik 54 * Revision 1.7 2003/01/22 06:48:38 starvik
55 * Fixed warnings issued by GCC 3.2.1 55 * Fixed warnings issued by GCC 3.2.1
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c
index b7842ff213a6..0c833d176226 100644
--- a/arch/cris/mm/init.c
+++ b/arch/cris/mm/init.c
@@ -8,7 +8,7 @@
8 * 8 *
9 * $Log: init.c,v $ 9 * $Log: init.c,v $
10 * Revision 1.11 2004/05/28 09:28:56 starvik 10 * Revision 1.11 2004/05/28 09:28:56 starvik
11 * Calculation of loops_per_usec moved because initalization order has changed 11 * Calculation of loops_per_usec moved because initialization order has changed
12 * in Linux 2.6. 12 * in Linux 2.6.
13 * 13 *
14 * Revision 1.10 2004/05/14 07:58:05 starvik 14 * Revision 1.10 2004/05/14 07:58:05 starvik
diff --git a/arch/cris/mm/tlb.c b/arch/cris/mm/tlb.c
index c4a98e2e529e..b7f8de576777 100644
--- a/arch/cris/mm/tlb.c
+++ b/arch/cris/mm/tlb.c
@@ -16,7 +16,7 @@
16/* The TLB can host up to 64 different mm contexts at the same time. 16/* The TLB can host up to 64 different mm contexts at the same time.
17 * The running context is R_MMU_CONTEXT, and each TLB entry contains a 17 * The running context is R_MMU_CONTEXT, and each TLB entry contains a
18 * page_id that has to match to give a hit. In page_id_map, we keep track 18 * page_id that has to match to give a hit. In page_id_map, we keep track
19 * of which mm's we have assigned which page_id's, so that we know when 19 * of which mm we have assigned to which page_id, so that we know when
20 * to invalidate TLB entries. 20 * to invalidate TLB entries.
21 * 21 *
22 * The last page_id is never running - it is used as an invalid page_id 22 * The last page_id is never running - it is used as an invalid page_id
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index 7ddb69089ed4..73abae767fdc 100644
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
@@ -134,7 +134,7 @@ static struct irq_chip frv_cpu_pic = {
134}; 134};
135 135
136/* 136/*
137 * handles all normal device IRQ's 137 * handles all normal device IRQs
138 * - registers are referred to by the __frame variable (GR28) 138 * - registers are referred to by the __frame variable (GR28)
139 * - IRQ distribution is complicated in this arch because of the many PICs, the 139 * - IRQ distribution is complicated in this arch because of the many PICs, the
140 * way they work and the way they cascade 140 * way they work and the way they cascade
diff --git a/arch/frv/kernel/semaphore.c b/arch/frv/kernel/semaphore.c
index 8e182ced1a0f..7ee3a147b471 100644
--- a/arch/frv/kernel/semaphore.c
+++ b/arch/frv/kernel/semaphore.c
@@ -139,7 +139,7 @@ void __up(struct semaphore *sem)
139 waiter = list_entry(sem->wait_list.next, struct sem_waiter, list); 139 waiter = list_entry(sem->wait_list.next, struct sem_waiter, list);
140 140
141 /* We must be careful not to touch 'waiter' after we set ->task = NULL. 141 /* We must be careful not to touch 'waiter' after we set ->task = NULL.
142 * It is an allocated on the waiter's stack and may become invalid at 142 * It is allocated on the waiter's stack and may become invalid at
143 * any time after that point (due to a wakeup from another source). 143 * any time after that point (due to a wakeup from another source).
144 */ 144 */
145 list_del_init(&waiter->list); 145 list_del_init(&waiter->list);
diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c
index e83e0bccfab9..925fb0199a0f 100644
--- a/arch/frv/kernel/time.c
+++ b/arch/frv/kernel/time.c
@@ -66,7 +66,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy)
66 /* 66 /*
67 * Here we are in the timer irq handler. We just have irqs locally 67 * Here we are in the timer irq handler. We just have irqs locally
68 * disabled but we don't know if the timer_bh is running on the other 68 * disabled but we don't know if the timer_bh is running on the other
69 * CPU. We need to avoid to SMP race with it. NOTE: we don' t need 69 * CPU. We need to avoid to SMP race with it. NOTE: we don't need
70 * the irq version of write_lock because as just said we have irq 70 * the irq version of write_lock because as just said we have irq
71 * locally disabled. -arca 71 * locally disabled. -arca
72 */ 72 */
@@ -126,7 +126,7 @@ void time_init(void)
126 126
127 /* FIX by dqg : Set to zero for platforms that don't have tod */ 127 /* FIX by dqg : Set to zero for platforms that don't have tod */
128 /* without this time is undefined and can overflow time_t, causing */ 128 /* without this time is undefined and can overflow time_t, causing */
129 /* very stange errors */ 129 /* very strange errors */
130 year = 1980; 130 year = 1980;
131 mon = day = 1; 131 mon = day = 1;
132 hour = min = sec = 0; 132 hour = min = sec = 0;
diff --git a/arch/h8300/Kconfig.debug b/arch/h8300/Kconfig.debug
index 996d97e953b0..ee671c3f2c74 100644
--- a/arch/h8300/Kconfig.debug
+++ b/arch/h8300/Kconfig.debug
@@ -42,16 +42,16 @@ config SH_STANDARD_BIOS
42 Require eCos/RedBoot 42 Require eCos/RedBoot
43 43
44config DEFAULT_CMDLINE 44config DEFAULT_CMDLINE
45 bool "Use buildin commandline" 45 bool "Use builtin commandline"
46 default n 46 default n
47 help 47 help
48 buildin kernel commandline enabled. 48 builtin kernel commandline enabled.
49 49
50config KERNEL_COMMAND 50config KERNEL_COMMAND
51 string "Buildin commmand string" 51 string "Buildin commmand string"
52 depends on DEFAULT_CMDLINE 52 depends on DEFAULT_CMDLINE
53 help 53 help
54 buildin kernel commandline strings. 54 builtin kernel commandline strings.
55 55
56config BLKDEV_RESERVE 56config BLKDEV_RESERVE
57 bool "BLKDEV Reserved Memory" 57 bool "BLKDEV Reserved Memory"
diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c
index 43d21e93f41f..8dec4dd57b4e 100644
--- a/arch/h8300/kernel/irq.c
+++ b/arch/h8300/kernel/irq.c
@@ -68,7 +68,7 @@ static void h8300_shutdown_irq(unsigned int irq)
68} 68}
69 69
70/* 70/*
71 * h8300 interrupt controler implementation 71 * h8300 interrupt controller implementation
72 */ 72 */
73struct irq_chip h8300irq_chip = { 73struct irq_chip h8300irq_chip = {
74 .name = "H8300-INTC", 74 .name = "H8300-INTC",
diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c
index 330638220a2e..e37c835e67cf 100644
--- a/arch/h8300/kernel/time.c
+++ b/arch/h8300/kernel/time.c
@@ -53,7 +53,7 @@ void time_init(void)
53 53
54 /* FIX by dqg : Set to zero for platforms that don't have tod */ 54 /* FIX by dqg : Set to zero for platforms that don't have tod */
55 /* without this time is undefined and can overflow time_t, causing */ 55 /* without this time is undefined and can overflow time_t, causing */
56 /* very stange errors */ 56 /* very strange errors */
57 year = 1980; 57 year = 1980;
58 mon = day = 1; 58 mon = day = 1;
59 hour = min = sec = 0; 59 hour = min = sec = 0;
diff --git a/arch/h8300/kernel/traps.c b/arch/h8300/kernel/traps.c
index f97183011c2c..f8f7d7ea97f1 100644
--- a/arch/h8300/kernel/traps.c
+++ b/arch/h8300/kernel/traps.c
@@ -5,7 +5,7 @@
5 * Cloned from Linux/m68k. 5 * Cloned from Linux/m68k.
6 * 6 *
7 * No original Copyright holder listed, 7 * No original Copyright holder listed,
8 * Probabily original (C) Roman Zippel (assigned DJD, 1999) 8 * Probable original (C) Roman Zippel (assigned DJD, 1999)
9 * 9 *
10 * Copyright 1999-2000 D. Jeff Dionne, <jeff@rt-control.com> 10 * Copyright 1999-2000 D. Jeff Dionne, <jeff@rt-control.com>
11 * 11 *
diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c
index a71d6e2a3919..551fd5f30d82 100644
--- a/arch/h8300/platform/h8s/ints.c
+++ b/arch/h8300/platform/h8s/ints.c
@@ -179,7 +179,7 @@ int request_irq(unsigned int irq,
179 if (use_kmalloc) 179 if (use_kmalloc)
180 irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC); 180 irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
181 else { 181 else {
182 /* use bootmem allocater */ 182 /* use bootmem allocator */
183 irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t)); 183 irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
184 irq_handle = (irq_handler_t *)((unsigned long)irq_handle | 0x80000000); 184 irq_handle = (irq_handler_t *)((unsigned long)irq_handle | 0x80000000);
185 } 185 }
diff --git a/arch/h8300/platform/h8s/ints_h8s.c b/arch/h8300/platform/h8s/ints_h8s.c
index 93395d2a8a07..faa8a459d952 100644
--- a/arch/h8300/platform/h8s/ints_h8s.c
+++ b/arch/h8300/platform/h8s/ints_h8s.c
@@ -63,7 +63,7 @@ static const struct irq_pins irq_assign_table1[16]={
63 {H8300_GPIO_P2,H8300_GPIO_B6},{H8300_GPIO_P2,H8300_GPIO_B7}, 63 {H8300_GPIO_P2,H8300_GPIO_B6},{H8300_GPIO_P2,H8300_GPIO_B7},
64}; 64};
65 65
66/* IRQ to GPIO pinno transrate */ 66/* IRQ to GPIO pin translation */
67#define IRQ_GPIO_MAP(irqbit,irq,port,bit) \ 67#define IRQ_GPIO_MAP(irqbit,irq,port,bit) \
68do { \ 68do { \
69 if (*(volatile unsigned short *)ITSR & irqbit) { \ 69 if (*(volatile unsigned short *)ITSR & irqbit) { \
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index d1bedbf9deb8..f6e44fc5283c 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -392,7 +392,7 @@ config X86_MCE_NONFATAL
392 will look at the machine check registers to see if anything happened. 392 will look at the machine check registers to see if anything happened.
393 Non-fatal problems automatically get corrected (but still logged). 393 Non-fatal problems automatically get corrected (but still logged).
394 Disable this if you don't want to see these messages. 394 Disable this if you don't want to see these messages.
395 Seeing the messages this option prints out may be indicative of dying hardware, 395 Seeing the messages this option prints out may be indicative of dying
396 or out-of-spec (ie, overclocked) hardware. 396 or out-of-spec (ie, overclocked) hardware.
397 This option only does something on certain CPUs. 397 This option only does something on certain CPUs.
398 (AMD Athlon/Duron and Intel Pentium 4) 398 (AMD Athlon/Duron and Intel Pentium 4)
@@ -631,7 +631,7 @@ config NUMA
631 default n if X86_PC 631 default n if X86_PC
632 default y if (X86_NUMAQ || X86_SUMMIT) 632 default y if (X86_NUMAQ || X86_SUMMIT)
633 help 633 help
634 NUMA support for i386. This is currently high experimental 634 NUMA support for i386. This is currently highly experimental
635 and should be only used for kernel development. It might also 635 and should be only used for kernel development. It might also
636 cause boot failures. 636 cause boot failures.
637 637
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index c89108e9770d..bef47725d4ad 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -452,9 +452,9 @@ config IA64_PALINFO
452config IA64_MC_ERR_INJECT 452config IA64_MC_ERR_INJECT
453 tristate "MC error injection support" 453 tristate "MC error injection support"
454 help 454 help
455 Selets whether support for MC error injection. By enabling the 455 Adds support for MC error injection. If enabled, the kernel
456 support, kernel provide sysfs interface for user application to 456 will provide a sysfs interface for user applications to
457 call MC error injection PAL procedure to inject various errors. 457 call MC error injection PAL procedures to inject various errors.
458 This is a useful tool for MCA testing. 458 This is a useful tool for MCA testing.
459 459
460 If you're unsure, do not select this option. 460 If you're unsure, do not select this option.
@@ -491,7 +491,7 @@ config KEXEC
491 but it is independent of the system firmware. And like a reboot 491 but it is independent of the system firmware. And like a reboot
492 you can start any kernel with it, not just Linux. 492 you can start any kernel with it, not just Linux.
493 493
494 The name comes from the similiarity to the exec system call. 494 The name comes from the similarity to the exec system call.
495 495
496 It is an ongoing process to be certain the hardware in a machine 496 It is an ongoing process to be certain the hardware in a machine
497 is properly shutdown, so do not be surprised if this code does not 497 is properly shutdown, so do not be surprised if this code does not
diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c
index f8d8650383e0..d0c5b0b7da2f 100644
--- a/arch/m32r/kernel/irq.c
+++ b/arch/m32r/kernel/irq.c
@@ -71,7 +71,7 @@ skip:
71} 71}
72 72
73/* 73/*
74 * do_IRQ handles all normal device IRQ's (the special 74 * do_IRQ handles all normal device IRQs (the special
75 * SMP cross-CPU interrupts have their own specific 75 * SMP cross-CPU interrupts have their own specific
76 * handlers). 76 * handlers).
77 */ 77 */
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c
index 916faf6070af..a753d79c4e89 100644
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
@@ -358,7 +358,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
358 358
359 signr = get_signal_to_deliver(&info, &ka, regs, NULL); 359 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
360 if (signr > 0) { 360 if (signr > 0) {
361 /* Reenable any watchpoints before delivering the 361 /* Re-enable any watchpoints before delivering the
362 * signal to user space. The processor register will 362 * signal to user space. The processor register will
363 * have been cleared if the watchpoint triggered 363 * have been cleared if the watchpoint triggered
364 * inside the kernel. 364 * inside the kernel.
diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c
index 360129174b2b..c837bc13b015 100644
--- a/arch/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
@@ -202,7 +202,7 @@ void smp_flush_cache_all_interrupt(void)
202} 202}
203 203
204/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 204/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
205/* TLB flush request Routins */ 205/* TLB flush request Routines */
206/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 206/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
207 207
208/*==========================================================================* 208/*==========================================================================*
@@ -378,7 +378,7 @@ void smp_flush_tlb_page(struct vm_area_struct *vma, unsigned long va)
378 * Name: flush_tlb_others 378 * Name: flush_tlb_others
379 * 379 *
380 * Description: This routine requests other CPU to execute flush TLB. 380 * Description: This routine requests other CPU to execute flush TLB.
381 * 1.Setup parmeters. 381 * 1.Setup parameters.
382 * 2.Send 'INVALIDATE_TLB_IPI' to other CPU. 382 * 2.Send 'INVALIDATE_TLB_IPI' to other CPU.
383 * Request other CPU to execute 'smp_invalidate_interrupt()'. 383 * Request other CPU to execute 'smp_invalidate_interrupt()'.
384 * 3.Wait for other CPUs operation finished. 384 * 3.Wait for other CPUs operation finished.
@@ -502,7 +502,7 @@ void smp_invalidate_interrupt(void)
502} 502}
503 503
504/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 504/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
505/* Stop CPU request Routins */ 505/* Stop CPU request Routines */
506/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 506/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
507 507
508/*==========================================================================* 508/*==========================================================================*
@@ -566,7 +566,7 @@ static void stop_this_cpu(void *dummy)
566} 566}
567 567
568/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 568/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
569/* Call function Routins */ 569/* Call function Routines */
570/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 570/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
571 571
572/*==========================================================================* 572/*==========================================================================*
@@ -690,7 +690,7 @@ void smp_call_function_interrupt(void)
690} 690}
691 691
692/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 692/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
693/* Timer Routins */ 693/* Timer Routines */
694/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 694/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
695 695
696/*==========================================================================* 696/*==========================================================================*
@@ -802,7 +802,7 @@ void smp_local_timer_interrupt(void)
802} 802}
803 803
804/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 804/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
805/* Send IPI Routins */ 805/* Send IPI Routines */
806/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 806/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
807 807
808/*==========================================================================* 808/*==========================================================================*
@@ -814,7 +814,7 @@ void smp_local_timer_interrupt(void)
814 * 814 *
815 * Arguments: ipi_num - Number of IPI 815 * Arguments: ipi_num - Number of IPI
816 * try - 0 : Send IPI certainly. 816 * try - 0 : Send IPI certainly.
817 * !0 : The following IPI is not sended when Target CPU 817 * !0 : The following IPI is not sent when Target CPU
818 * has not received the before IPI. 818 * has not received the before IPI.
819 * 819 *
820 * Returns: void (cannot fail) 820 * Returns: void (cannot fail)
@@ -844,7 +844,7 @@ void send_IPI_allbutself(int ipi_num, int try)
844 * Arguments: cpu_mask - Bitmap of target CPUs logical ID 844 * Arguments: cpu_mask - Bitmap of target CPUs logical ID
845 * ipi_num - Number of IPI 845 * ipi_num - Number of IPI
846 * try - 0 : Send IPI certainly. 846 * try - 0 : Send IPI certainly.
847 * !0 : The following IPI is not sended when Target CPU 847 * !0 : The following IPI is not sent when Target CPU
848 * has not received the before IPI. 848 * has not received the before IPI.
849 * 849 *
850 * Returns: void (cannot fail) 850 * Returns: void (cannot fail)
@@ -885,7 +885,7 @@ static void send_IPI_mask(cpumask_t cpumask, int ipi_num, int try)
885 * Arguments: cpu_mask - Bitmap of target CPUs physical ID 885 * Arguments: cpu_mask - Bitmap of target CPUs physical ID
886 * ipi_num - Number of IPI 886 * ipi_num - Number of IPI
887 * try - 0 : Send IPI certainly. 887 * try - 0 : Send IPI certainly.
888 * !0 : The following IPI is not sended when Target CPU 888 * !0 : The following IPI is not sent when Target CPU
889 * has not received the before IPI. 889 * has not received the before IPI.
890 * 890 *
891 * Returns: IPICRi regster value. 891 * Returns: IPICRi regster value.
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index 9dae410014d8..0e383da158e9 100644
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -133,7 +133,7 @@ static void map_cpu_to_physid(int, int);
133static void unmap_cpu_to_physid(int, int); 133static void unmap_cpu_to_physid(int, int);
134 134
135/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 135/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
136/* Boot up APs Routins : BSP */ 136/* Boot up APs Routines : BSP */
137/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 137/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
138void __devinit smp_prepare_boot_cpu(void) 138void __devinit smp_prepare_boot_cpu(void)
139{ 139{
@@ -404,7 +404,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
404} 404}
405 405
406/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 406/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
407/* Activate a secondary processor Routins */ 407/* Activate a secondary processor Routines */
408/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 408/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
409 409
410/*==========================================================================* 410/*==========================================================================*
@@ -509,7 +509,7 @@ static void __init smp_online(void)
509} 509}
510 510
511/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 511/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
512/* Boot up CPUs common Routins */ 512/* Boot up CPUs common Routines */
513/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ 513/*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/
514static void __init show_mp_info(int nr_cpu) 514static void __init show_mp_info(int nr_cpu)
515{ 515{
diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c
index 0fc2efec18f6..6d7a80fdad48 100644
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
@@ -214,7 +214,7 @@ asmlinkage int sys_uname(struct old_utsname __user * name)
214 214
215asmlinkage int sys_cacheflush(void *addr, int bytes, int cache) 215asmlinkage int sys_cacheflush(void *addr, int bytes, int cache)
216{ 216{
217 /* This should flush more selectivly ... */ 217 /* This should flush more selectively ... */
218 _flush_cache_all(); 218 _flush_cache_all();
219 return 0; 219 return 0;
220} 220}
diff --git a/arch/m68k/amiga/pcmcia.c b/arch/m68k/amiga/pcmcia.c
index fc57c6e72acf..186662ca1a89 100644
--- a/arch/m68k/amiga/pcmcia.c
+++ b/arch/m68k/amiga/pcmcia.c
@@ -33,7 +33,7 @@ void pcmcia_reset(void)
33 33
34 34
35/* copy a tuple, including tuple header. return nb bytes copied */ 35/* copy a tuple, including tuple header. return nb bytes copied */
36/* be carefull as this may trigger a GAYLE_IRQ_WR interrupt ! */ 36/* be careful as this may trigger a GAYLE_IRQ_WR interrupt ! */
37 37
38int pcmcia_copy_tuple(unsigned char tuple_id, void *tuple, int max_len) 38int pcmcia_copy_tuple(unsigned char tuple_id, void *tuple, int max_len)
39{ 39{
diff --git a/arch/m68k/ifpsp060/CHANGES b/arch/m68k/ifpsp060/CHANGES
index c1e712dfc2e7..ba96596910fd 100644
--- a/arch/m68k/ifpsp060/CHANGES
+++ b/arch/m68k/ifpsp060/CHANGES
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/MISC b/arch/m68k/ifpsp060/MISC
index b7e644b94ae2..1a63913daa16 100644
--- a/arch/m68k/ifpsp060/MISC
+++ b/arch/m68k/ifpsp060/MISC
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/README b/arch/m68k/ifpsp060/README
index e3bced429bd3..f6f8f5c59419 100644
--- a/arch/m68k/ifpsp060/README
+++ b/arch/m68k/ifpsp060/README
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/TEST.DOC b/arch/m68k/ifpsp060/TEST.DOC
index 5e5900cb2dc4..1ba3aef1500f 100644
--- a/arch/m68k/ifpsp060/TEST.DOC
+++ b/arch/m68k/ifpsp060/TEST.DOC
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/fplsp.doc b/arch/m68k/ifpsp060/fplsp.doc
index fb637c436762..89730a934c5e 100644
--- a/arch/m68k/ifpsp060/fplsp.doc
+++ b/arch/m68k/ifpsp060/fplsp.doc
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/fpsp.doc b/arch/m68k/ifpsp060/fpsp.doc
index 408315209e62..23d513f72ed9 100644
--- a/arch/m68k/ifpsp060/fpsp.doc
+++ b/arch/m68k/ifpsp060/fpsp.doc
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/fskeleton.S b/arch/m68k/ifpsp060/fskeleton.S
index a45a4ff9d2af..0a1ae4f44130 100644
--- a/arch/m68k/ifpsp060/fskeleton.S
+++ b/arch/m68k/ifpsp060/fskeleton.S
@@ -4,7 +4,7 @@
4|M68060 Software Package 4|M68060 Software Package
5|Production Release P1.00 -- October 10, 1994 5|Production Release P1.00 -- October 10, 1994
6| 6|
7|M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7|M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8| 8|
9|THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9|THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10|To the maximum extent permitted by applicable law, 10|To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/ilsp.doc b/arch/m68k/ifpsp060/ilsp.doc
index f6fae6d900ae..4e6292f095aa 100644
--- a/arch/m68k/ifpsp060/ilsp.doc
+++ b/arch/m68k/ifpsp060/ilsp.doc
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/iskeleton.S b/arch/m68k/ifpsp060/iskeleton.S
index b2dbdf5ee309..91a9c65fee8a 100644
--- a/arch/m68k/ifpsp060/iskeleton.S
+++ b/arch/m68k/ifpsp060/iskeleton.S
@@ -4,7 +4,7 @@
4|M68060 Software Package 4|M68060 Software Package
5|Production Release P1.00 -- October 10, 1994 5|Production Release P1.00 -- October 10, 1994
6| 6|
7|M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7|M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8| 8|
9|THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9|THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10|To the maximum extent permitted by applicable law, 10|To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/isp.doc b/arch/m68k/ifpsp060/isp.doc
index 5a90fded3f0b..9dadd727fc50 100644
--- a/arch/m68k/ifpsp060/isp.doc
+++ b/arch/m68k/ifpsp060/isp.doc
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S
index aa4df87a6c42..7a0d6e428066 100644
--- a/arch/m68k/ifpsp060/os.S
+++ b/arch/m68k/ifpsp060/os.S
@@ -4,7 +4,7 @@
4|M68060 Software Package 4|M68060 Software Package
5|Production Release P1.00 -- October 10, 1994 5|Production Release P1.00 -- October 10, 1994
6| 6|
7|M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7|M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8| 8|
9|THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9|THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10|To the maximum extent permitted by applicable law, 10|To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/fplsp.S b/arch/m68k/ifpsp060/src/fplsp.S
index fdb79b927ef1..3b7ea2dc9f1b 100644
--- a/arch/m68k/ifpsp060/src/fplsp.S
+++ b/arch/m68k/ifpsp060/src/fplsp.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/fpsp.S b/arch/m68k/ifpsp060/src/fpsp.S
index 3b597a9bbf43..6c1a9a217887 100644
--- a/arch/m68k/ifpsp060/src/fpsp.S
+++ b/arch/m68k/ifpsp060/src/fpsp.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/ftest.S b/arch/m68k/ifpsp060/src/ftest.S
index 2edcbae0fd53..1f947915d81e 100644
--- a/arch/m68k/ifpsp060/src/ftest.S
+++ b/arch/m68k/ifpsp060/src/ftest.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/ilsp.S b/arch/m68k/ifpsp060/src/ilsp.S
index afa7422cddb5..970abaf3303e 100644
--- a/arch/m68k/ifpsp060/src/ilsp.S
+++ b/arch/m68k/ifpsp060/src/ilsp.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/isp.S b/arch/m68k/ifpsp060/src/isp.S
index b269091d9df6..6dccda766e22 100644
--- a/arch/m68k/ifpsp060/src/isp.S
+++ b/arch/m68k/ifpsp060/src/isp.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/itest.S b/arch/m68k/ifpsp060/src/itest.S
index ba4a30cbcbea..beca47e7d514 100644
--- a/arch/m68k/ifpsp060/src/itest.S
+++ b/arch/m68k/ifpsp060/src/itest.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/pfpsp.S b/arch/m68k/ifpsp060/src/pfpsp.S
index 0c997c436beb..51b9f7d879dd 100644
--- a/arch/m68k/ifpsp060/src/pfpsp.S
+++ b/arch/m68k/ifpsp060/src/pfpsp.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright © 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 8547dbc5e8d7..01b468b9392e 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -284,7 +284,7 @@ static struct mac_model mac_data_table[] = {
284 }, 284 },
285 285
286 /* 286 /*
287 * Weirdified MacII hardware - all subtley different. Gee thanks 287 * Weirdified MacII hardware - all subtly different. Gee thanks
288 * Apple. All these boxes seem to have VIA2 in a different place to 288 * Apple. All these boxes seem to have VIA2 in a different place to
289 * the MacII (+1A000 rather than +4000) 289 * the MacII (+1A000 rather than +4000)
290 * CSA: see http://developer.apple.com/technotes/hw/hw_09.html 290 * CSA: see http://developer.apple.com/technotes/hw/hw_09.html
@@ -707,7 +707,7 @@ static struct mac_model mac_data_table[] = {
707 * All of these probably have onboard SONIC in the Dock which 707 * All of these probably have onboard SONIC in the Dock which
708 * means we'll have to probe for it eventually. 708 * means we'll have to probe for it eventually.
709 * 709 *
710 * Are these reallly MAC_VIA_IIci? The developer notes for the 710 * Are these really MAC_VIA_IIci? The developer notes for the
711 * Duos show pretty much the same custom parts as in most of 711 * Duos show pretty much the same custom parts as in most of
712 * the other PowerBooks which would imply MAC_VIA_QUADRA. 712 * the other PowerBooks which would imply MAC_VIA_QUADRA.
713 */ 713 */
diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c
index 0cea21f58192..5b2799eb96a6 100644
--- a/arch/m68k/mac/iop.c
+++ b/arch/m68k/mac/iop.c
@@ -100,7 +100,7 @@
100 * finished; this function moves the message state to MSG_COMPLETE and signals 100 * finished; this function moves the message state to MSG_COMPLETE and signals
101 * the IOP. This two-step process is provided to allow the handler to defer 101 * the IOP. This two-step process is provided to allow the handler to defer
102 * message processing to a bottom-half handler if the processing will take 102 * message processing to a bottom-half handler if the processing will take
103 * a signifigant amount of time (handlers are called at interrupt time so they 103 * a significant amount of time (handlers are called at interrupt time so they
104 * should execute quickly.) 104 * should execute quickly.)
105 */ 105 */
106 106
@@ -120,7 +120,7 @@
120 120
121/*#define DEBUG_IOP*/ 121/*#define DEBUG_IOP*/
122 122
123/* Set to nonezero if the IOPs are present. Set by iop_init() */ 123/* Set to non-zero if the IOPs are present. Set by iop_init() */
124 124
125int iop_scc_present,iop_ism_present; 125int iop_scc_present,iop_ism_present;
126 126
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index d7be16917efd..50603d3dce84 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -8,7 +8,7 @@
8 * 8 *
9 * 990502 (jmt) - Major rewrite for new interrupt architecture as well as some 9 * 990502 (jmt) - Major rewrite for new interrupt architecture as well as some
10 * recent insights into OSS operational details. 10 * recent insights into OSS operational details.
11 * 990610 (jmt) - Now taking fulll advantage of the OSS. Interrupts are mapped 11 * 990610 (jmt) - Now taking full advantage of the OSS. Interrupts are mapped
12 * to mostly match the A/UX interrupt scheme supported on the 12 * to mostly match the A/UX interrupt scheme supported on the
13 * VIA side. Also added support for enabling the ISM irq again 13 * VIA side. Also added support for enabling the ISM irq again
14 * since we now have a functional IOP manager. 14 * since we now have a functional IOP manager.
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index d5cac72eb3db..8df270e950fa 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * 6522 Versatile Interface Adapter (VIA) 2 * 6522 Versatile Interface Adapter (VIA)
3 * 3 *
4 * There are two of these on the Mac II. Some IRQ's are vectored 4 * There are two of these on the Mac II. Some IRQs are vectored
5 * via them as are assorted bits and bobs - eg RTC, ADB. 5 * via them as are assorted bits and bobs - eg RTC, ADB.
6 * 6 *
7 * CSA: Motorola seems to have removed documentation on the 6522 from 7 * CSA: Motorola seems to have removed documentation on the 6522 from
diff --git a/arch/m68k/math-emu/fp_log.c b/arch/m68k/math-emu/fp_log.c
index 87b4f0158560..b1033ae0d6f0 100644
--- a/arch/m68k/math-emu/fp_log.c
+++ b/arch/m68k/math-emu/fp_log.c
@@ -65,7 +65,7 @@ fp_fsqrt(struct fp_ext *dest, struct fp_ext *src)
65 fp_copy_ext(&src2, dest); 65 fp_copy_ext(&src2, dest);
66 66
67 /* 67 /*
68 * The taylor row arround a for sqrt(x) is: 68 * The taylor row around a for sqrt(x) is:
69 * sqrt(x) = sqrt(a) + 1/(2*sqrt(a))*(x-a) + R 69 * sqrt(x) = sqrt(a) + 1/(2*sqrt(a))*(x-a) + R
70 * With a=1 this gives: 70 * With a=1 this gives:
71 * sqrt(x) = 1 + 1/2*(x-1) 71 * sqrt(x) = 1 + 1/2*(x-1)
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c
index ad3ed1fb8879..46161cef08b9 100644
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
@@ -184,7 +184,7 @@ static struct IRQ_TABLE eirqs[] = {
184}; 184};
185 185
186/* complain only this many times about spurious ints : */ 186/* complain only this many times about spurious ints : */
187static int ccleirq=60; /* ISA dev IRQ's*/ 187static int ccleirq=60; /* ISA dev IRQs*/
188/*static int cclirq=60;*/ /* internal */ 188/*static int cclirq=60;*/ /* internal */
189 189
190/* FIXME: add shared ints,mask,unmask,probing.... */ 190/* FIXME: add shared ints,mask,unmask,probing.... */
@@ -234,7 +234,7 @@ static void q40_irq_handler(unsigned int irq, struct pt_regs *fp)
234 * There is a little mess wrt which IRQ really caused this irq request. The 234 * There is a little mess wrt which IRQ really caused this irq request. The
235 * main problem is that IIRQ_REG and EIRQ_REG reflect the state when they 235 * main problem is that IIRQ_REG and EIRQ_REG reflect the state when they
236 * are read - which is long after the request came in. In theory IRQs should 236 * are read - which is long after the request came in. In theory IRQs should
237 * not just go away but they occassionally do 237 * not just go away but they occasionally do
238 */ 238 */
239 if (irq > 4 && irq <= 15 && mext_disabled) { 239 if (irq > 4 && irq <= 15 && mext_disabled) {
240 /*aliased_irq++;*/ 240 /*aliased_irq++;*/
diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c
index 7a0e3a220687..fb0f6a20cc3c 100644
--- a/arch/m68k/sun3/mmu_emu.c
+++ b/arch/m68k/sun3/mmu_emu.c
@@ -239,7 +239,7 @@ void clear_context(unsigned long context)
239/* gets an empty context. if full, kills the next context listed to 239/* gets an empty context. if full, kills the next context listed to
240 die first */ 240 die first */
241/* This context invalidation scheme is, well, totally arbitrary, I'm 241/* This context invalidation scheme is, well, totally arbitrary, I'm
242 sure it could be much more intellegent... but it gets the job done 242 sure it could be much more intelligent... but it gets the job done
243 for now without much overhead in making it's decision. */ 243 for now without much overhead in making it's decision. */
244/* todo: come up with optimized scheme for flushing contexts */ 244/* todo: come up with optimized scheme for flushing contexts */
245unsigned long get_free_context(struct mm_struct *mm) 245unsigned long get_free_context(struct mm_struct *mm)
diff --git a/arch/m68k/tools/amiga/dmesg.c b/arch/m68k/tools/amiga/dmesg.c
index e892748e7386..7340f5b6cf6d 100644
--- a/arch/m68k/tools/amiga/dmesg.c
+++ b/arch/m68k/tools/amiga/dmesg.c
@@ -3,7 +3,7 @@
3 * in Chip RAM with the kernel command 3 * in Chip RAM with the kernel command
4 * line option `debug=mem'. 4 * line option `debug=mem'.
5 * 5 *
6 * © Copyright 1996 by Geert Uytterhoeven <geert@linux-m68k.org> 6 * © Copyright 1996 by Geert Uytterhoeven <geert@linux-m68k.org>
7 * 7 *
8 * 8 *
9 * Usage: 9 * Usage:
diff --git a/arch/m68knommu/platform/5307/pit.c b/arch/m68knommu/platform/5307/pit.c
index e53c446d10e4..f18352fa35a6 100644
--- a/arch/m68knommu/platform/5307/pit.c
+++ b/arch/m68knommu/platform/5307/pit.c
@@ -83,7 +83,7 @@ unsigned long coldfire_pit_offset(void)
83 83
84 /* 84 /*
85 * If we are still in the first half of the upcount and a 85 * If we are still in the first half of the upcount and a
86 * timer interupt is pending, then add on a ticks worth of time. 86 * timer interrupt is pending, then add on a ticks worth of time.
87 */ 87 */
88 offset = ((pmr - pcntr) * (1000000 / HZ)) / pmr; 88 offset = ((pmr - pcntr) * (1000000 / HZ)) / pmr;
89 if ((offset < (1000000 / HZ / 2)) && (*ipr & MCFPIT_IMR_IBIT)) 89 if ((offset < (1000000 / HZ / 2)) && (*ipr & MCFPIT_IMR_IBIT))
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4dc142d394a3..3ecff5e9e4f3 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1812,7 +1812,7 @@ config KEXEC
1812 but it is independent of the system firmware. And like a reboot 1812 but it is independent of the system firmware. And like a reboot
1813 you can start any kernel with it, not just Linux. 1813 you can start any kernel with it, not just Linux.
1814 1814
1815 The name comes from the similiarity to the exec system call. 1815 The name comes from the similarity to the exec system call.
1816 1816
1817 It is an ongoing process to be certain the hardware in a machine 1817 It is an ongoing process to be certain the hardware in a machine
1818 is properly shutdown, so do not be surprised if this code does not 1818 is properly shutdown, so do not be surprised if this code does not
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
index cb0801437b66..e7ed0ac48537 100644
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -381,7 +381,7 @@ const struct exception_table_entry *search_module_dbetables(unsigned long addr)
381 return e; 381 return e;
382} 382}
383 383
384/* Put in dbe list if neccessary. */ 384/* Put in dbe list if necessary. */
385int module_finalize(const Elf_Ehdr *hdr, 385int module_finalize(const Elf_Ehdr *hdr,
386 const Elf_Shdr *sechdrs, 386 const Elf_Shdr *sechdrs,
387 struct module *me) 387 struct module *me)
diff --git a/arch/mips/pci/pci-excite.c b/arch/mips/pci/pci-excite.c
index 3c86c77cb74f..8a56876afcc6 100644
--- a/arch/mips/pci/pci-excite.c
+++ b/arch/mips/pci/pci-excite.c
@@ -131,7 +131,7 @@ static int __init basler_excite_pci_setup(void)
131 ocd_writel(0x00000000, bar + 0x100); 131 ocd_writel(0x00000000, bar + 0x100);
132 } 132 }
133 133
134 /* Finally, enable the PCI interupt */ 134 /* Finally, enable the PCI interrupt */
135#if USB_IRQ > 7 135#if USB_IRQ > 7
136 set_c0_intcontrol(1 << USB_IRQ); 136 set_c0_intcontrol(1 << USB_IRQ);
137#else 137#else
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c
index 39bb15f1f2a6..4df070f2ff5d 100644
--- a/arch/mips/sni/pcimt.c
+++ b/arch/mips/sni/pcimt.c
@@ -246,7 +246,7 @@ static void pcimt_hwint1(void)
246 /* 246 /*
247 * Note: ASIC PCI's builtin interrupt achknowledge feature is 247 * Note: ASIC PCI's builtin interrupt achknowledge feature is
248 * broken. Using it may result in loss of some or all i8259 248 * broken. Using it may result in loss of some or all i8259
249 * interupts, so don't use PCIMT_INT_ACKNOWLEDGE ... 249 * interrupts, so don't use PCIMT_INT_ACKNOWLEDGE ...
250 */ 250 */
251 irq = i8259_irq(); 251 irq = i8259_irq();
252 if (unlikely(irq < 0)) 252 if (unlikely(irq < 0))
diff --git a/arch/powerpc/kernel/cpu_setup_6xx.S b/arch/powerpc/kernel/cpu_setup_6xx.S
index 8b4a4ee85eca..f1ee0b3f78f2 100644
--- a/arch/powerpc/kernel/cpu_setup_6xx.S
+++ b/arch/powerpc/kernel/cpu_setup_6xx.S
@@ -113,7 +113,7 @@ setup_604_hid0:
113 * around #3 and with the same fix we use. We may want to 113 * around #3 and with the same fix we use. We may want to
114 * check if the CPU is using 60x bus mode in which case 114 * check if the CPU is using 60x bus mode in which case
115 * the workaround for errata #4 is useless. Also, we may 115 * the workaround for errata #4 is useless. Also, we may
116 * want to explicitely clear HID0_NOPDST as this is not 116 * want to explicitly clear HID0_NOPDST as this is not
117 * needed once we have applied workaround #5 (though it's 117 * needed once we have applied workaround #5 (though it's
118 * not set by Apple's firmware at least). 118 * not set by Apple's firmware at least).
119 */ 119 */
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 2250f9e6c5ca..b0e5deb4274f 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -491,7 +491,7 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
491 491
492 /* Legacy flags are left to default at this point, 492 /* Legacy flags are left to default at this point,
493 * one can then use irq_create_mapping() to 493 * one can then use irq_create_mapping() to
494 * explicitely change them 494 * explicitly change them
495 */ 495 */
496 ops->map(host, i, i); 496 ops->map(host, i, i);
497 } 497 }
diff --git a/arch/powerpc/kernel/l2cr_6xx.S b/arch/powerpc/kernel/l2cr_6xx.S
index 858f28ac8a06..2a2f3c3f6d80 100644
--- a/arch/powerpc/kernel/l2cr_6xx.S
+++ b/arch/powerpc/kernel/l2cr_6xx.S
@@ -1,6 +1,6 @@
1/* 1/*
2 L2CR functions 2 L2CR functions
3 Copyright © 1997-1998 by PowerLogix R & D, Inc. 3 Copyright © 1997-1998 by PowerLogix R & D, Inc.
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 229d355ed86a..ea22cad2cd0a 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -120,7 +120,7 @@ config PPC_PMI
120 depends on PPC_IBM_CELL_BLADE 120 depends on PPC_IBM_CELL_BLADE
121 help 121 help
122 PMI (Platform Management Interrupt) is a way to 122 PMI (Platform Management Interrupt) is a way to
123 communicate with the BMC (Baseboard Mangement Controller). 123 communicate with the BMC (Baseboard Management Controller).
124 It is used in some IBM Cell blades. 124 It is used in some IBM Cell blades.
125 default m 125 default m
126 126
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index d72b16d6816e..d9e56a503795 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -748,7 +748,7 @@ static ssize_t spufs_wbox_write(struct file *file, const char __user *buf,
748 if (count) 748 if (count)
749 goto out; 749 goto out;
750 750
751 /* write aѕ much as possible */ 751 /* write as much as possible */
752 for (count = 4, udata++; (count + 4) <= len; count += 4, udata++) { 752 for (count = 4, udata++; (count + 4) <= len; count += 4, udata++) {
753 int ret; 753 int ret;
754 ret = __get_user(wbox_data, udata); 754 ret = __get_user(wbox_data, udata);
diff --git a/arch/powerpc/platforms/celleb/scc_uhc.c b/arch/powerpc/platforms/celleb/scc_uhc.c
index a7c548bde2e3..b59c38a06e3e 100644
--- a/arch/powerpc/platforms/celleb/scc_uhc.c
+++ b/arch/powerpc/platforms/celleb/scc_uhc.c
@@ -36,7 +36,7 @@ static inline int uhc_clkctrl_ready(u32 val)
36} 36}
37 37
38/* 38/*
39 * UHC(usb host controler) enable function. 39 * UHC(usb host controller) enable function.
40 * affect to both of OHCI and EHCI core module. 40 * affect to both of OHCI and EHCI core module.
41 */ 41 */
42static void enable_scc_uhc(struct pci_dev *dev) 42static void enable_scc_uhc(struct pci_dev *dev)
diff --git a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c
index 388bb711f1b0..b4d9534d2b0e 100644
--- a/arch/sh64/kernel/pci_sh5.c
+++ b/arch/sh64/kernel/pci_sh5.c
@@ -480,7 +480,7 @@ static int __init pcibios_init(void)
480 return -EINVAL; 480 return -EINVAL;
481 } 481 }
482 482
483 /* The pci subsytem needs to know where memory is and how much 483 /* The pci subsystem needs to know where memory is and how much
484 * of it there is. I've simply made these globals. A better mechanism 484 * of it there is. I've simply made these globals. A better mechanism
485 * is probably needed. 485 * is probably needed.
486 */ 486 */
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index d8925d285573..dd1689b814cb 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -3,7 +3,7 @@ config DEFCONFIG_LIST
3 option defconfig_list 3 option defconfig_list
4 default "arch/$ARCH/defconfig" 4 default "arch/$ARCH/defconfig"
5 5
6# UML uses the generic IRQ sugsystem 6# UML uses the generic IRQ subsystem
7config GENERIC_HARDIRQS 7config GENERIC_HARDIRQS
8 bool 8 bool
9 default y 9 default y
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 76fe0b0da996..83bf15a3dda8 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -35,7 +35,7 @@ static void line_timer_cb(struct work_struct *work)
35/* 35/*
36 * Returns the free space inside the ring buffer of this line. 36 * Returns the free space inside the ring buffer of this line.
37 * 37 *
38 * Should be called while holding line->lock (this does not modify datas). 38 * Should be called while holding line->lock (this does not modify data).
39 */ 39 */
40static int write_room(struct line *line) 40static int write_room(struct line *line)
41{ 41{
diff --git a/arch/um/drivers/null.c b/arch/um/drivers/null.c
index 21ad3d7932b3..2b45a1446c86 100644
--- a/arch/um/drivers/null.c
+++ b/arch/um/drivers/null.c
@@ -9,7 +9,7 @@
9#include "chan_user.h" 9#include "chan_user.h"
10#include "os.h" 10#include "os.h"
11 11
12/* This address is used only as a unique identifer */ 12/* This address is used only as a unique identifier */
13static int null_chan; 13static int null_chan;
14 14
15static void *null_init(char *str, int device, const struct chan_opts *opts) 15static void *null_init(char *str, int device, const struct chan_opts *opts)
diff --git a/arch/um/drivers/stderr_console.c b/arch/um/drivers/stderr_console.c
index 4739dd527b43..d07a97f8b994 100644
--- a/arch/um/drivers/stderr_console.c
+++ b/arch/um/drivers/stderr_console.c
@@ -8,7 +8,7 @@
8/* trivial console driver -- simply dump everything to stderr */ 8/* trivial console driver -- simply dump everything to stderr */
9 9
10/* 10/*
11 * Don't register by default -- as this registeres very early in the 11 * Don't register by default -- as this registers very early in the
12 * boot process it becomes the default console. 12 * boot process it becomes the default console.
13 * 13 *
14 * Initialized at init time. 14 * Initialized at init time.
diff --git a/arch/um/kernel/gmon_syms.c b/arch/um/kernel/gmon_syms.c
index 13aa115cd1b4..734f873cab12 100644
--- a/arch/um/kernel/gmon_syms.c
+++ b/arch/um/kernel/gmon_syms.c
@@ -12,8 +12,8 @@ EXPORT_SYMBOL(__bb_init_func);
12 * versions in libgcov. 12 * versions in libgcov.
13 * 13 *
14 * Since SuSE backported the fix, we cannot handle it depending on GCC version. 14 * Since SuSE backported the fix, we cannot handle it depending on GCC version.
15 * So, unconditinally export it. But also give it a weak declaration, which will 15 * So, unconditionally export it. But also give it a weak declaration, which will
16 * be overriden by any other one. 16 * be overridden by any other one.
17 */ 17 */
18 18
19extern void __gcov_init(void *) __attribute__((weak)); 19extern void __gcov_init(void *) __attribute__((weak));
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 277fce17b088..70c2d625b070 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -326,7 +326,7 @@ int deactivate_all_fds(void)
326} 326}
327 327
328/* 328/*
329 * do_IRQ handles all normal device IRQ's (the special 329 * do_IRQ handles all normal device IRQs (the special
330 * SMP cross-CPU interrupts have their own specific 330 * SMP cross-CPU interrupts have their own specific
331 * handlers). 331 * handlers).
332 */ 332 */
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index a0eba0833068..47b57b497d55 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -237,7 +237,7 @@ void send_sigtrap(struct task_struct *tsk, struct uml_pt_regs *regs,
237 /* User-mode eip? */ 237 /* User-mode eip? */
238 info.si_addr = UPT_IS_USER(regs) ? (void __user *) UPT_IP(regs) : NULL; 238 info.si_addr = UPT_IS_USER(regs) ? (void __user *) UPT_IP(regs) : NULL;
239 239
240 /* Send us the fakey SIGTRAP */ 240 /* Send us the fake SIGTRAP */
241 force_sig_info(SIGTRAP, &info, tsk); 241 force_sig_info(SIGTRAP, &info, tsk);
242} 242}
243 243
diff --git a/arch/um/sys-i386/bug.c b/arch/um/sys-i386/bug.c
index 200c8ba2879b..a4360b5207db 100644
--- a/arch/um/sys-i386/bug.c
+++ b/arch/um/sys-i386/bug.c
@@ -6,7 +6,7 @@
6#include <linux/uaccess.h> 6#include <linux/uaccess.h>
7 7
8/* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because 8/* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because
9 * that's not relevent in skas mode. 9 * that's not relevant in skas mode.
10 */ 10 */
11 11
12int is_valid_bugaddr(unsigned long eip) 12int is_valid_bugaddr(unsigned long eip)
diff --git a/arch/um/sys-i386/tls.c b/arch/um/sys-i386/tls.c
index b02266ab5c55..fcaff86b000c 100644
--- a/arch/um/sys-i386/tls.c
+++ b/arch/um/sys-i386/tls.c
@@ -45,7 +45,7 @@ int do_get_thread_area(struct user_desc *info)
45 * XXX: Consider leaving one free slot for glibc usage at first place. This must 45 * XXX: Consider leaving one free slot for glibc usage at first place. This must
46 * be done here (and by changing GDT_ENTRY_TLS_* macros) and nowhere else. 46 * be done here (and by changing GDT_ENTRY_TLS_* macros) and nowhere else.
47 * 47 *
48 * Also, this must be tested when compiling in SKAS mode with dinamic linking 48 * Also, this must be tested when compiling in SKAS mode with dynamic linking
49 * and running against NPTL. 49 * and running against NPTL.
50 */ 50 */
51static int get_free_idx(struct task_struct* task) 51static int get_free_idx(struct task_struct* task)
diff --git a/arch/um/sys-x86_64/bug.c b/arch/um/sys-x86_64/bug.c
index 200c8ba2879b..a4360b5207db 100644
--- a/arch/um/sys-x86_64/bug.c
+++ b/arch/um/sys-x86_64/bug.c
@@ -6,7 +6,7 @@
6#include <linux/uaccess.h> 6#include <linux/uaccess.h>
7 7
8/* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because 8/* Mostly copied from i386/x86_86 - eliminated the eip < PAGE_OFFSET because
9 * that's not relevent in skas mode. 9 * that's not relevant in skas mode.
10 */ 10 */
11 11
12int is_valid_bugaddr(unsigned long eip) 12int is_valid_bugaddr(unsigned long eip)
diff --git a/arch/v850/kernel/me2.c b/arch/v850/kernel/me2.c
index 38be5c194f6b..007115dc9ce0 100644
--- a/arch/v850/kernel/me2.c
+++ b/arch/v850/kernel/me2.c
@@ -58,13 +58,13 @@ void __init me2_init_irqs (void)
58void me2_uart_pre_configure (unsigned chan, unsigned cflags, unsigned baud) 58void me2_uart_pre_configure (unsigned chan, unsigned cflags, unsigned baud)
59{ 59{
60 if (chan == 0) { 60 if (chan == 0) {
61 /* Specify that the relevent pins on the chip should do 61 /* Specify that the relevant pins on the chip should do
62 serial I/O, not direct I/O. */ 62 serial I/O, not direct I/O. */
63 ME2_PORT1_PMC |= 0xC; 63 ME2_PORT1_PMC |= 0xC;
64 /* Specify that we're using the UART, not the CSI device. */ 64 /* Specify that we're using the UART, not the CSI device. */
65 ME2_PORT1_PFC |= 0xC; 65 ME2_PORT1_PFC |= 0xC;
66 } else if (chan == 1) { 66 } else if (chan == 1) {
67 /* Specify that the relevent pins on the chip should do 67 /* Specify that the relevant pins on the chip should do
68 serial I/O, not direct I/O. */ 68 serial I/O, not direct I/O. */
69 ME2_PORT2_PMC |= 0x6; 69 ME2_PORT2_PMC |= 0x6;
70 /* Specify that we're using the UART, not the CSI device. */ 70 /* Specify that we're using the UART, not the CSI device. */
diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c
index 35a4bd5515cb..7165478824e7 100644
--- a/arch/v850/kernel/rte_mb_a_pci.c
+++ b/arch/v850/kernel/rte_mb_a_pci.c
@@ -179,7 +179,7 @@ static int __devinit pcibios_init (void)
179 default uses. */ 179 default uses. */
180 180
181 /* Significant address bits used for decoding PCI GCS5 space 181 /* Significant address bits used for decoding PCI GCS5 space
182 accessess. */ 182 accesses. */
183 MB_A_PCI_DMRR = ~(MB_A_PCI_MEM_SIZE - 1); 183 MB_A_PCI_DMRR = ~(MB_A_PCI_MEM_SIZE - 1);
184 184
185 /* I don't understand this, but the SolutionGear example code 185 /* I don't understand this, but the SolutionGear example code
@@ -775,7 +775,7 @@ pci_alloc_consistent (struct pci_dev *pdev, size_t size, dma_addr_t *dma_addr)
775/* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must 775/* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must
776 be values that were returned from pci_alloc_consistent. SIZE must be 776 be values that were returned from pci_alloc_consistent. SIZE must be
777 the same as what as passed into pci_alloc_consistent. References to 777 the same as what as passed into pci_alloc_consistent. References to
778 the memory and mappings assosciated with CPU_ADDR or DMA_ADDR past 778 the memory and mappings associated with CPU_ADDR or DMA_ADDR past
779 this call are illegal. */ 779 this call are illegal. */
780void 780void
781pci_free_consistent (struct pci_dev *pdev, size_t size, void *cpu_addr, 781pci_free_consistent (struct pci_dev *pdev, size_t size, void *cpu_addr,
diff --git a/arch/x86/boot/compressed/misc_32.c b/arch/x86/boot/compressed/misc_32.c
index b28505c544c9..1dc1e19c0a9f 100644
--- a/arch/x86/boot/compressed/misc_32.c
+++ b/arch/x86/boot/compressed/misc_32.c
@@ -25,7 +25,7 @@
25 25
26/* 26/*
27 * Getting to provable safe in place decompression is hard. 27 * Getting to provable safe in place decompression is hard.
28 * Worst case behaviours need to be analized. 28 * Worst case behaviours need to be analyzed.
29 * Background information: 29 * Background information:
30 * 30 *
31 * The file layout is: 31 * The file layout is:
@@ -94,7 +94,7 @@
94 * Adding 32768 instead of 32767 just makes for round numbers. 94 * Adding 32768 instead of 32767 just makes for round numbers.
95 * Adding the decompressor_size is necessary as it musht live after all 95 * Adding the decompressor_size is necessary as it musht live after all
96 * of the data as well. Last I measured the decompressor is about 14K. 96 * of the data as well. Last I measured the decompressor is about 14K.
97 * 10K of actuall data and 4K of bss. 97 * 10K of actual data and 4K of bss.
98 * 98 *
99 */ 99 */
100 100
diff --git a/arch/x86/boot/compressed/misc_64.c b/arch/x86/boot/compressed/misc_64.c
index f932b0e89096..6ea015aa65e4 100644
--- a/arch/x86/boot/compressed/misc_64.c
+++ b/arch/x86/boot/compressed/misc_64.c
@@ -25,7 +25,7 @@
25 25
26/* 26/*
27 * Getting to provable safe in place decompression is hard. 27 * Getting to provable safe in place decompression is hard.
28 * Worst case behaviours need to be analized. 28 * Worst case behaviours need to be analyzed.
29 * Background information: 29 * Background information:
30 * 30 *
31 * The file layout is: 31 * The file layout is:
@@ -94,7 +94,7 @@
94 * Adding 32768 instead of 32767 just makes for round numbers. 94 * Adding 32768 instead of 32767 just makes for round numbers.
95 * Adding the decompressor_size is necessary as it musht live after all 95 * Adding the decompressor_size is necessary as it musht live after all
96 * of the data as well. Last I measured the decompressor is about 14K. 96 * of the data as well. Last I measured the decompressor is about 14K.
97 * 10K of actuall data and 4K of bss. 97 * 10K of actual data and 4K of bss.
98 * 98 *
99 */ 99 */
100 100
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index f28b2e251b1d..289247d974c6 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -99,7 +99,7 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
99 99
100/* 100/*
101 * The default interrupt routing model is PIC (8259). This gets 101 * The default interrupt routing model is PIC (8259). This gets
102 * overriden if IOAPICs are enumerated (below). 102 * overridden if IOAPICs are enumerated (below).
103 */ 103 */
104enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC; 104enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC;
105 105
@@ -414,8 +414,8 @@ acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end
414 * 414 *
415 * Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers 415 * Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers
416 * for the 8259 PIC. bit[n] = 1 means irq[n] is Level, otherwise Edge. 416 * for the 8259 PIC. bit[n] = 1 means irq[n] is Level, otherwise Edge.
417 * ECLR1 is IRQ's 0-7 (IRQ 0, 1, 2 must be 0) 417 * ECLR1 is IRQs 0-7 (IRQ 0, 1, 2 must be 0)
418 * ECLR2 is IRQ's 8-15 (IRQ 8, 13 must be 0) 418 * ECLR2 is IRQs 8-15 (IRQ 8, 13 must be 0)
419 */ 419 */
420 420
421void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) 421void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
@@ -427,7 +427,7 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
427 old = inb(0x4d0) | (inb(0x4d1) << 8); 427 old = inb(0x4d0) | (inb(0x4d1) << 8);
428 428
429 /* 429 /*
430 * If we use ACPI to set PCI irq's, then we should clear ELCR 430 * If we use ACPI to set PCI IRQs, then we should clear ELCR
431 * since we will set it correctly as we enable the PCI irq 431 * since we will set it correctly as we enable the PCI irq
432 * routing. 432 * routing.
433 */ 433 */
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 793341fffc81..08b07c176962 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -947,7 +947,7 @@ void __devinit setup_local_APIC(void)
947 * Set up LVT0, LVT1: 947 * Set up LVT0, LVT1:
948 * 948 *
949 * set up through-local-APIC on the BP's LINT0. This is not 949 * set up through-local-APIC on the BP's LINT0. This is not
950 * strictly necessery in pure symmetric-IO mode, but sometimes 950 * strictly necessary in pure symmetric-IO mode, but sometimes
951 * we delegate interrupts to the 8259A. 951 * we delegate interrupts to the 8259A.
952 */ 952 */
953 /* 953 /*
@@ -998,7 +998,7 @@ void __devinit setup_local_APIC(void)
998 } else { 998 } else {
999 if (esr_disable) 999 if (esr_disable)
1000 /* 1000 /*
1001 * Something untraceble is creating bad interrupts on 1001 * Something untraceable is creating bad interrupts on
1002 * secondary quads ... for the moment, just leave the 1002 * secondary quads ... for the moment, just leave the
1003 * ESR disabled - we can't do anything useful with the 1003 * ESR disabled - we can't do anything useful with the
1004 * errors anyway - mbligh 1004 * errors anyway - mbligh
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 32f2365c26ed..17089a041028 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -57,7 +57,7 @@
57 * screen-blanking and gpm (Stephen Rothwell); Linux 1.99.4 57 * screen-blanking and gpm (Stephen Rothwell); Linux 1.99.4
58 * 1.2a:Simple change to stop mysterious bug reports with SMP also added 58 * 1.2a:Simple change to stop mysterious bug reports with SMP also added
59 * levels to the printk calls. APM is not defined for SMP machines. 59 * levels to the printk calls. APM is not defined for SMP machines.
60 * The new replacment for it is, but Linux doesn't yet support this. 60 * The new replacement for it is, but Linux doesn't yet support this.
61 * Alan Cox Linux 2.1.55 61 * Alan Cox Linux 2.1.55
62 * 1.3: Set up a valid data descriptor 0x40 for buggy BIOS's 62 * 1.3: Set up a valid data descriptor 0x40 for buggy BIOS's
63 * 1.4: Upgraded to support APM 1.2. Integrated ThinkPad suspend patch by 63 * 1.4: Upgraded to support APM 1.2. Integrated ThinkPad suspend patch by
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 5f8af875f457..1ff88c7f45cf 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -266,7 +266,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
266#ifdef CONFIG_X86_HT 266#ifdef CONFIG_X86_HT
267 /* 267 /*
268 * On a AMD multi core setup the lower bits of the APIC id 268 * On a AMD multi core setup the lower bits of the APIC id
269 * distingush the cores. 269 * distinguish the cores.
270 */ 270 */
271 if (c->x86_max_cores > 1) { 271 if (c->x86_max_cores > 1) {
272 int cpu = smp_processor_id(); 272 int cpu = smp_processor_id();
diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
index 473eac883c7b..9681fa15ddf0 100644
--- a/arch/x86/kernel/cpu/centaur.c
+++ b/arch/x86/kernel/cpu/centaur.c
@@ -53,7 +53,7 @@ static u32 __cpuinit ramtop(void) /* 16388 */
53 continue; 53 continue;
54 /* 54 /*
55 * Don't MCR over reserved space. Ignore the ISA hole 55 * Don't MCR over reserved space. Ignore the ISA hole
56 * we frob around that catastrophy already 56 * we frob around that catastrophe already
57 */ 57 */
58 58
59 if (e820.map[i].type == E820_RESERVED) 59 if (e820.map[i].type == E820_RESERVED)
@@ -287,7 +287,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c)
287 c->x86_capability[5] = cpuid_edx(0xC0000001); 287 c->x86_capability[5] = cpuid_edx(0xC0000001);
288 } 288 }
289 289
290 /* Cyrix III family needs CX8 & PGE explicity enabled. */ 290 /* Cyrix III family needs CX8 & PGE explicitly enabled. */
291 if (c->x86_model >=6 && c->x86_model <= 9) { 291 if (c->x86_model >=6 && c->x86_model <= 9) {
292 rdmsr (MSR_VIA_FCR, lo, hi); 292 rdmsr (MSR_VIA_FCR, lo, hi);
293 lo |= (1<<1 | 1<<7); 293 lo |= (1<<1 | 1<<7);
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d506201d397c..e2fcf2051bdb 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -207,7 +207,7 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c, int early)
207 207
208static int __init x86_fxsr_setup(char * s) 208static int __init x86_fxsr_setup(char * s)
209{ 209{
210 /* Tell all the other CPU's to not use it... */ 210 /* Tell all the other CPUs to not use it... */
211 disable_x86_fxsr = 1; 211 disable_x86_fxsr = 1;
212 212
213 /* 213 /*
diff --git a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
index 32f0bda3fc95..f03e9153618e 100644
--- a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
+++ b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
@@ -260,7 +260,7 @@ static int nforce2_target(struct cpufreq_policy *policy,
260 260
261 freqs.old = nforce2_get(policy->cpu); 261 freqs.old = nforce2_get(policy->cpu);
262 freqs.new = target_fsb * fid * 100; 262 freqs.new = target_fsb * fid * 100;
263 freqs.cpu = 0; /* Only one CPU on nForce2 plattforms */ 263 freqs.cpu = 0; /* Only one CPU on nForce2 platforms */
264 264
265 if (freqs.old == freqs.new) 265 if (freqs.old == freqs.new)
266 return 0; 266 return 0;
diff --git a/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c b/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
index ed2bda127c44..2ed7db2fd257 100644
--- a/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
@@ -12,12 +12,12 @@
12 * of any nature resulting due to the use of this software. This 12 * of any nature resulting due to the use of this software. This
13 * software is provided AS-IS with no warranties. 13 * software is provided AS-IS with no warranties.
14 * 14 *
15 * Theoritical note: 15 * Theoretical note:
16 * 16 *
17 * (see Geode(tm) CS5530 manual (rev.4.1) page.56) 17 * (see Geode(tm) CS5530 manual (rev.4.1) page.56)
18 * 18 *
19 * CPU frequency control on NatSemi Geode GX1/GXLV processor and CS55x0 19 * CPU frequency control on NatSemi Geode GX1/GXLV processor and CS55x0
20 * are based on Suspend Moduration. 20 * are based on Suspend Modulation.
21 * 21 *
22 * Suspend Modulation works by asserting and de-asserting the SUSP# pin 22 * Suspend Modulation works by asserting and de-asserting the SUSP# pin
23 * to CPU(GX1/GXLV) for configurable durations. When asserting SUSP# 23 * to CPU(GX1/GXLV) for configurable durations. When asserting SUSP#
@@ -101,11 +101,11 @@
101 101
102/* SUSCFG bits */ 102/* SUSCFG bits */
103#define SUSMOD (1<<0) /* enable/disable suspend modulation */ 103#define SUSMOD (1<<0) /* enable/disable suspend modulation */
104/* the belows support only with cs5530 (after rev.1.2)/cs5530A */ 104/* the below is supported only with cs5530 (after rev.1.2)/cs5530A */
105#define SMISPDUP (1<<1) /* select how SMI re-enable suspend modulation: */ 105#define SMISPDUP (1<<1) /* select how SMI re-enable suspend modulation: */
106 /* IRQTC timer or read SMI speedup disable reg.(F1BAR[08-09h]) */ 106 /* IRQTC timer or read SMI speedup disable reg.(F1BAR[08-09h]) */
107#define SUSCFG (1<<2) /* enable powering down a GXLV processor. "Special 3Volt Suspend" mode */ 107#define SUSCFG (1<<2) /* enable powering down a GXLV processor. "Special 3Volt Suspend" mode */
108/* the belows support only with cs5530A */ 108/* the below is supported only with cs5530A */
109#define PWRSVE_ISA (1<<3) /* stop ISA clock */ 109#define PWRSVE_ISA (1<<3) /* stop ISA clock */
110#define PWRSVE (1<<4) /* active idle */ 110#define PWRSVE (1<<4) /* active idle */
111 111
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
index 42405b4e34ed..eb9b62b0830c 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * This file was based upon code in Powertweak Linux (http://powertweak.sf.net) 2 * This file was based upon code in Powertweak Linux (http://powertweak.sf.net)
3 * (C) 2000-2003 Dave Jones, Arjan van de Ven, Janne Pänkälä, Dominik Brodowski. 3 * (C) 2000-2003 Dave Jones, Arjan van de Ven, Janne Pänkälä, Dominik Brodowski.
4 * 4 *
5 * Licensed under the terms of the GNU GPL License version 2. 5 * Licensed under the terms of the GNU GPL License version 2.
6 * 6 *
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index c06ac680c9ca..9c36a53676b7 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -168,7 +168,7 @@ static void count_off_irt(struct powernow_k8_data *data)
168 return; 168 return;
169} 169}
170 170
171/* the voltage stabalization time */ 171/* the voltage stabilization time */
172static void count_off_vst(struct powernow_k8_data *data) 172static void count_off_vst(struct powernow_k8_data *data)
173{ 173{
174 udelay(data->vstable * VST_UNITS_20US); 174 udelay(data->vstable * VST_UNITS_20US);
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
index b06c812208ca..7c4f6e0faed4 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
@@ -148,10 +148,10 @@ struct powernow_k8_data {
148#define PLL_LOCK_CONVERSION (1000/5) /* ms to ns, then divide by clock period */ 148#define PLL_LOCK_CONVERSION (1000/5) /* ms to ns, then divide by clock period */
149 149
150#define MAXIMUM_VID_STEPS 1 /* Current cpus only allow a single step of 25mV */ 150#define MAXIMUM_VID_STEPS 1 /* Current cpus only allow a single step of 25mV */
151#define VST_UNITS_20US 20 /* Voltage Stabalization Time is in units of 20us */ 151#define VST_UNITS_20US 20 /* Voltage Stabilization Time is in units of 20us */
152 152
153/* 153/*
154 * Most values of interest are enocoded in a single field of the _PSS 154 * Most values of interest are encoded in a single field of the _PSS
155 * entries: the "control" value. 155 * entries: the "control" value.
156 */ 156 */
157 157
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index 122d2d75aa9f..88d66fb8411d 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -93,7 +93,7 @@ static void __cpuinit check_cx686_slop(struct cpuinfo_x86 *c)
93 93
94 local_irq_save(flags); 94 local_irq_save(flags);
95 ccr3 = getCx86(CX86_CCR3); 95 ccr3 = getCx86(CX86_CCR3);
96 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ 96 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
97 ccr5 = getCx86(CX86_CCR5); 97 ccr5 = getCx86(CX86_CCR5);
98 if (ccr5 & 2) 98 if (ccr5 & 2)
99 setCx86(CX86_CCR5, ccr5 & 0xfd); /* reset SLOP */ 99 setCx86(CX86_CCR5, ccr5 & 0xfd); /* reset SLOP */
@@ -115,9 +115,9 @@ static void __cpuinit set_cx86_reorder(void)
115 115
116 printk(KERN_INFO "Enable Memory access reorder on Cyrix/NSC processor.\n"); 116 printk(KERN_INFO "Enable Memory access reorder on Cyrix/NSC processor.\n");
117 ccr3 = getCx86(CX86_CCR3); 117 ccr3 = getCx86(CX86_CCR3);
118 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN  */ 118 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
119 119
120 /* Load/Store Serialize to mem access disable (=reorder it)  */ 120 /* Load/Store Serialize to mem access disable (=reorder it) */
121 setCx86(CX86_PCR0, getCx86(CX86_PCR0) & ~0x80); 121 setCx86(CX86_PCR0, getCx86(CX86_PCR0) & ~0x80);
122 /* set load/store serialize from 1GB to 4GB */ 122 /* set load/store serialize from 1GB to 4GB */
123 ccr3 |= 0xe0; 123 ccr3 |= 0xe0;
@@ -146,7 +146,7 @@ static void __cpuinit set_cx86_inc(void)
146 printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n"); 146 printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n");
147 147
148 ccr3 = getCx86(CX86_CCR3); 148 ccr3 = getCx86(CX86_CCR3);
149 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN  */ 149 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
150 /* PCR1 -- Performance Control */ 150 /* PCR1 -- Performance Control */
151 /* Incrementor on, whatever that is */ 151 /* Incrementor on, whatever that is */
152 setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02); 152 setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02);
@@ -256,7 +256,7 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)
256 u32 vendor, device; 256 u32 vendor, device;
257 /* It isn't really a PCI quirk directly, but the cure is the 257 /* It isn't really a PCI quirk directly, but the cure is the
258 same. The MediaGX has deep magic SMM stuff that handles the 258 same. The MediaGX has deep magic SMM stuff that handles the
259 SB emulation. It thows away the fifo on disable_dma() which 259 SB emulation. It throws away the fifo on disable_dma() which
260 is wrong and ruins the audio. 260 is wrong and ruins the audio.
261 261
262 Bug2: VSA1 has a wrap bug so that using maximum sized DMA 262 Bug2: VSA1 has a wrap bug so that using maximum sized DMA
diff --git a/arch/x86/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c
index 2287d4863a8a..9964be3de2b7 100644
--- a/arch/x86/kernel/cpu/mtrr/cyrix.c
+++ b/arch/x86/kernel/cpu/mtrr/cyrix.c
@@ -147,10 +147,10 @@ static void prepare_set(void)
147 write_cr0(cr0); 147 write_cr0(cr0);
148 wbinvd(); 148 wbinvd();
149 149
150 /* Cyrix ARRs - everything else were excluded at the top */ 150 /* Cyrix ARRs - everything else was excluded at the top */
151 ccr3 = getCx86(CX86_CCR3); 151 ccr3 = getCx86(CX86_CCR3);
152 152
153 /* Cyrix ARRs - everything else were excluded at the top */ 153 /* Cyrix ARRs - everything else was excluded at the top */
154 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); 154 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10);
155 155
156} 156}
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 56f64e34829f..992f08dfbb6c 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -182,7 +182,7 @@ static inline void k8_enable_fixed_iorrs(void)
182 182
183/** 183/**
184 * Checks and updates an fixed-range MTRR if it differs from the value it 184 * Checks and updates an fixed-range MTRR if it differs from the value it
185 * should have. If K8 extenstions are wanted, update the K8 SYSCFG MSR also. 185 * should have. If K8 extentions are wanted, update the K8 SYSCFG MSR also.
186 * see AMD publication no. 24593, chapter 7.8.1, page 233 for more information 186 * see AMD publication no. 24593, chapter 7.8.1, page 233 for more information
187 * \param msr MSR address of the MTTR which should be checked and updated 187 * \param msr MSR address of the MTTR which should be checked and updated
188 * \param changed pointer which indicates whether the MTRR needed to be changed 188 * \param changed pointer which indicates whether the MTRR needed to be changed
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 5e4be30ff903..9abbdf7562c5 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -748,7 +748,7 @@ static int __init mtrr_init_finialize(void)
748 if (use_intel()) 748 if (use_intel())
749 mtrr_state_warn(); 749 mtrr_state_warn();
750 else { 750 else {
751 /* The CPUs haven't MTRR and seemes not support SMP. They have 751 /* The CPUs haven't MTRR and seem to not support SMP. They have
752 * specific drivers, we use a tricky method to support 752 * specific drivers, we use a tricky method to support
753 * suspend/resume for them. 753 * suspend/resume for them.
754 * TBD: is there any system with such CPU which supports 754 * TBD: is there any system with such CPU which supports
diff --git a/arch/x86/kernel/e820_32.c b/arch/x86/kernel/e820_32.c
index d58039e8de74..58fd54eb5577 100644
--- a/arch/x86/kernel/e820_32.c
+++ b/arch/x86/kernel/e820_32.c
@@ -706,7 +706,7 @@ void __init e820_register_memory(void)
706 int i; 706 int i;
707 707
708 /* 708 /*
709 * Search for the bigest gap in the low 32 bits of the e820 709 * Search for the biggest gap in the low 32 bits of the e820
710 * memory space. 710 * memory space.
711 */ 711 */
712 last = 0x100000000ull; 712 last = 0x100000000ull;
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 22d8f00c80dc..53303f2e5475 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -353,7 +353,7 @@ static int hpet_clocksource_register(void)
353 * 353 *
354 * hpet period is in femto seconds per cycle 354 * hpet period is in femto seconds per cycle
355 * so we need to convert this to ns/cyc units 355 * so we need to convert this to ns/cyc units
356 * aproximated by mult/2^shift 356 * approximated by mult/2^shift
357 * 357 *
358 * fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift 358 * fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift
359 * fsec/cyc * 1ns/1000000fsec * 2^shift = mult 359 * fsec/cyc * 1ns/1000000fsec * 2^shift = mult
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c
index 5cc8841ca2c6..a42c80745325 100644
--- a/arch/x86/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
@@ -86,7 +86,7 @@ static int pit_next_event(unsigned long delta, struct clock_event_device *evt)
86 * On UP the PIT can serve all of the possible timer functions. On SMP systems 86 * On UP the PIT can serve all of the possible timer functions. On SMP systems
87 * it can be solely used for the global tick. 87 * it can be solely used for the global tick.
88 * 88 *
89 * The profiling and update capabilites are switched off once the local apic is 89 * The profiling and update capabilities are switched off once the local apic is
90 * registered. This mechanism replaces the previous #ifdef LOCAL_APIC - 90 * registered. This mechanism replaces the previous #ifdef LOCAL_APIC -
91 * !using_apic_timer decisions in do_timer_interrupt_hook() 91 * !using_apic_timer decisions in do_timer_interrupt_hook()
92 */ 92 */
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index 0c55e9d86f69..f35c6eb33da9 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -584,7 +584,7 @@ tryanotherirq:
584 584
585 imbalance = move_this_load; 585 imbalance = move_this_load;
586 586
587 /* For physical_balance case, we accumlated both load 587 /* For physical_balance case, we accumulated both load
588 * values in the one of the siblings cpu_irq[], 588 * values in the one of the siblings cpu_irq[],
589 * to use the same code for physical and logical processors 589 * to use the same code for physical and logical processors
590 * as much as possible. 590 * as much as possible.
@@ -2475,7 +2475,7 @@ void destroy_irq(unsigned int irq)
2475} 2475}
2476 2476
2477/* 2477/*
2478 * MSI mesage composition 2478 * MSI message composition
2479 */ 2479 */
2480#ifdef CONFIG_PCI_MSI 2480#ifdef CONFIG_PCI_MSI
2481static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg) 2481static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg)
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index 1c2c7bf6a9d3..b3c2d268d708 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1770,7 +1770,7 @@ __setup("no_timer_check", notimercheck);
1770 1770
1771/* 1771/*
1772 * 1772 *
1773 * IRQ's that are handled by the PIC in the MPS IOAPIC case. 1773 * IRQs that are handled by the PIC in the MPS IOAPIC case.
1774 * - IRQ2 is the cascade IRQ, and cannot be a io-apic IRQ. 1774 * - IRQ2 is the cascade IRQ, and cannot be a io-apic IRQ.
1775 * Linux doesn't really care, as it's not actually used 1775 * Linux doesn't really care, as it's not actually used
1776 * for any interrupt handling anyway. 1776 * for any interrupt handling anyway.
@@ -1921,7 +1921,7 @@ void destroy_irq(unsigned int irq)
1921} 1921}
1922 1922
1923/* 1923/*
1924 * MSI mesage composition 1924 * MSI message composition
1925 */ 1925 */
1926#ifdef CONFIG_PCI_MSI 1926#ifdef CONFIG_PCI_MSI
1927static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg) 1927static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg)
diff --git a/arch/x86/kernel/mce_64.c b/arch/x86/kernel/mce_64.c
index 2cf20de5beca..07bbfe7aa7f7 100644
--- a/arch/x86/kernel/mce_64.c
+++ b/arch/x86/kernel/mce_64.c
@@ -320,7 +320,7 @@ void do_machine_check(struct pt_regs * regs, long error_code)
320#ifdef CONFIG_X86_MCE_INTEL 320#ifdef CONFIG_X86_MCE_INTEL
321/*** 321/***
322 * mce_log_therm_throt_event - Logs the thermal throttling event to mcelog 322 * mce_log_therm_throt_event - Logs the thermal throttling event to mcelog
323 * @cpu: The CPU on which the event occured. 323 * @cpu: The CPU on which the event occurred.
324 * @status: Event status information 324 * @status: Event status information
325 * 325 *
326 * This function should be called by the thermal interrupt after the 326 * This function should be called by the thermal interrupt after the
@@ -688,7 +688,7 @@ static int __init mcheck_disable(char *str)
688 return 1; 688 return 1;
689} 689}
690 690
691/* mce=off disables machine check. Note you can reenable it later 691/* mce=off disables machine check. Note you can re-enable it later
692 using sysfs. 692 using sysfs.
693 mce=TOLERANCELEVEL (number, see above) 693 mce=TOLERANCELEVEL (number, see above)
694 mce=bootlog Log MCEs from before booting. Disabled by default on AMD. 694 mce=bootlog Log MCEs from before booting. Disabled by default on AMD.
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 13abb4ebfb79..7a05a7f6099a 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -1001,7 +1001,7 @@ void __init mp_config_acpi_legacy_irqs (void)
1001 1001
1002 /* 1002 /*
1003 * Use the default configuration for the IRQs 0-15. Unless 1003 * Use the default configuration for the IRQs 0-15. Unless
1004 * overriden by (MADT) interrupt source override entries. 1004 * overridden by (MADT) interrupt source override entries.
1005 */ 1005 */
1006 for (i = 0; i < 16; i++) { 1006 for (i = 0; i < 16; i++) {
1007 int idx; 1007 int idx;
diff --git a/arch/x86/kernel/ptrace_32.c b/arch/x86/kernel/ptrace_32.c
index 99102ec5fade..ff5431cc03ee 100644
--- a/arch/x86/kernel/ptrace_32.c
+++ b/arch/x86/kernel/ptrace_32.c
@@ -632,7 +632,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)
632 /* User-mode eip? */ 632 /* User-mode eip? */
633 info.si_addr = user_mode_vm(regs) ? (void __user *) regs->eip : NULL; 633 info.si_addr = user_mode_vm(regs) ? (void __user *) regs->eip : NULL;
634 634
635 /* Send us the fakey SIGTRAP */ 635 /* Send us the fake SIGTRAP */
636 force_sig_info(SIGTRAP, &info, tsk); 636 force_sig_info(SIGTRAP, &info, tsk);
637} 637}
638 638
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index e4f199124761..ba2e165a8a0f 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -624,7 +624,7 @@ void __init setup_arch(char **cmdline_p)
624 /* 624 /*
625 * NOTE: before this point _nobody_ is allowed to allocate 625 * NOTE: before this point _nobody_ is allowed to allocate
626 * any memory using the bootmem allocator. Although the 626 * any memory using the bootmem allocator. Although the
627 * alloctor is now initialised only the first 8Mb of the kernel 627 * allocator is now initialised only the first 8Mb of the kernel
628 * virtual address space has been mapped. All allocations before 628 * virtual address space has been mapped. All allocations before
629 * paging_init() has completed must use the alloc_bootmem_low_pages() 629 * paging_init() has completed must use the alloc_bootmem_low_pages()
630 * variant (which allocates DMA'able memory) and care must be taken 630 * variant (which allocates DMA'able memory) and care must be taken
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index 6dc394b87255..9bdd83022f5f 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -594,7 +594,7 @@ static void fastcall do_signal(struct pt_regs *regs)
594 594
595 signr = get_signal_to_deliver(&info, &ka, regs, NULL); 595 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
596 if (signr > 0) { 596 if (signr > 0) {
597 /* Reenable any watchpoints before delivering the 597 /* Re-enable any watchpoints before delivering the
598 * signal to user space. The processor register will 598 * signal to user space. The processor register will
599 * have been cleared if the watchpoint triggered 599 * have been cleared if the watchpoint triggered
600 * inside the kernel. 600 * inside the kernel.
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index 683802bec419..ab086b0357fc 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -410,7 +410,7 @@ static void do_signal(struct pt_regs *regs)
410 410
411 signr = get_signal_to_deliver(&info, &ka, regs, NULL); 411 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
412 if (signr > 0) { 412 if (signr > 0) {
413 /* Reenable any watchpoints before delivering the 413 /* Re-enable any watchpoints before delivering the
414 * signal to user space. The processor register will 414 * signal to user space. The processor register will
415 * have been cleared if the watchpoint triggered 415 * have been cleared if the watchpoint triggered
416 * inside the kernel. 416 * inside the kernel.
diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
index 2621ca3b2e4d..f32115308399 100644
--- a/arch/x86/kernel/smp_32.c
+++ b/arch/x86/kernel/smp_32.c
@@ -69,7 +69,7 @@
69 * 69 *
70 * B stepping CPUs may hang. There are hardware work arounds 70 * B stepping CPUs may hang. There are hardware work arounds
71 * for this. We warn about it in case your board doesn't have the work 71 * for this. We warn about it in case your board doesn't have the work
72 * arounds. Basically thats so I can tell anyone with a B stepping 72 * arounds. Basically that's so I can tell anyone with a B stepping
73 * CPU and SMP problems "tough". 73 * CPU and SMP problems "tough".
74 * 74 *
75 * Specific items [From Pentium Processor Specification Update] 75 * Specific items [From Pentium Processor Specification Update]
@@ -273,7 +273,7 @@ void leave_mm(unsigned long cpu)
273 * 1a1) cpu_clear(cpu, old_mm->cpu_vm_mask); 273 * 1a1) cpu_clear(cpu, old_mm->cpu_vm_mask);
274 * Stop ipi delivery for the old mm. This is not synchronized with 274 * Stop ipi delivery for the old mm. This is not synchronized with
275 * the other cpus, but smp_invalidate_interrupt ignore flush ipis 275 * the other cpus, but smp_invalidate_interrupt ignore flush ipis
276 * for the wrong mm, and in the worst case we perform a superflous 276 * for the wrong mm, and in the worst case we perform a superfluous
277 * tlb flush. 277 * tlb flush.
278 * 1a2) set cpu_tlbstate to TLBSTATE_OK 278 * 1a2) set cpu_tlbstate to TLBSTATE_OK
279 * Now the smp_invalidate_interrupt won't call leave_mm if cpu0 279 * Now the smp_invalidate_interrupt won't call leave_mm if cpu0
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index 7b8fdfa169dd..ef0f34ede1ab 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -421,7 +421,7 @@ static void __cpuinit start_secondary(void *unused)
421 /* 421 /*
422 * We need to hold call_lock, so there is no inconsistency 422 * We need to hold call_lock, so there is no inconsistency
423 * between the time smp_call_function() determines number of 423 * between the time smp_call_function() determines number of
424 * IPI receipients, and the time when the determination is made 424 * IPI recipients, and the time when the determination is made
425 * for which cpus receive the IPI. Holding this 425 * for which cpus receive the IPI. Holding this
426 * lock helps us to not include this cpu in a currently in progress 426 * lock helps us to not include this cpu in a currently in progress
427 * smp_call_function(). 427 * smp_call_function().
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index fd1fff6a35a2..b7e768dd87c9 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -351,7 +351,7 @@ void __cpuinit start_secondary(void)
351 /* 351 /*
352 * We need to hold call_lock, so there is no inconsistency 352 * We need to hold call_lock, so there is no inconsistency
353 * between the time smp_call_function() determines number of 353 * between the time smp_call_function() determines number of
354 * IPI receipients, and the time when the determination is made 354 * IPI recipients, and the time when the determination is made
355 * for which cpus receive the IPI in genapic_flat.c. Holding this 355 * for which cpus receive the IPI in genapic_flat.c. Holding this
356 * lock helps us to not include this cpu in a currently in progress 356 * lock helps us to not include this cpu in a currently in progress
357 * smp_call_function(). 357 * smp_call_function().
diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c
index 91c7acc8d999..72f463401592 100644
--- a/arch/x86/kernel/summit_32.c
+++ b/arch/x86/kernel/summit_32.c
@@ -64,7 +64,7 @@ static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
64 64
65 switch (rio_devs[wpeg_num]->type){ 65 switch (rio_devs[wpeg_num]->type){
66 case CompatWPEG: 66 case CompatWPEG:
67 /* The Compatability Winnipeg controls the 2 legacy buses, 67 /* The Compatibility Winnipeg controls the 2 legacy buses,
68 * the 66MHz PCI bus [2 slots] and the 2 "extra" buses in case 68 * the 66MHz PCI bus [2 slots] and the 2 "extra" buses in case
69 * a PCI-PCI bridge card is used in either slot: total 5 buses. 69 * a PCI-PCI bridge card is used in either slot: total 5 buses.
70 */ 70 */
diff --git a/arch/x86/kernel/suspend_64.c b/arch/x86/kernel/suspend_64.c
index 622bb0268284..bc9f59c246fd 100644
--- a/arch/x86/kernel/suspend_64.c
+++ b/arch/x86/kernel/suspend_64.c
@@ -124,7 +124,7 @@ void fix_processor_context(void)
124 int cpu = smp_processor_id(); 124 int cpu = smp_processor_id();
125 struct tss_struct *t = &per_cpu(init_tss, cpu); 125 struct tss_struct *t = &per_cpu(init_tss, cpu);
126 126
127 set_tss_desc(cpu,t); /* This just modifies memory; should not be neccessary. But... This is neccessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ 127 set_tss_desc(cpu,t); /* This just modifies memory; should not be necessary. But... This is necessary, because 386 hardware has concept of busy TSS or some similar stupidity. */
128 128
129 cpu_gdt(cpu)[GDT_ENTRY_TSS].type = 9; 129 cpu_gdt(cpu)[GDT_ENTRY_TSS].type = 9;
130 130
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index df690c3fa458..d0c2bc7ab2ec 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -201,7 +201,7 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
201#define MSG(txt) ops->warning(data, txt) 201#define MSG(txt) ops->warning(data, txt)
202 202
203/* 203/*
204 * x86-64 can have upto three kernel stacks: 204 * x86-64 can have up to three kernel stacks:
205 * process stack 205 * process stack
206 * interrupt stack 206 * interrupt stack
207 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack 207 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
index b8a7cf671432..d78444c788a3 100644
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@ -59,7 +59,7 @@ int check_tsc_unstable(void)
59} 59}
60EXPORT_SYMBOL_GPL(check_tsc_unstable); 60EXPORT_SYMBOL_GPL(check_tsc_unstable);
61 61
62/* Accellerators for sched_clock() 62/* Accelerators for sched_clock()
63 * convert from cycles(64bits) => nanoseconds (64bits) 63 * convert from cycles(64bits) => nanoseconds (64bits)
64 * basic equation: 64 * basic equation:
65 * ns = cycles / (freq / ns_per_sec) 65 * ns = cycles / (freq / ns_per_sec)
@@ -74,7 +74,7 @@ EXPORT_SYMBOL_GPL(check_tsc_unstable);
74 * And since SC is a constant power of two, we can convert the div 74 * And since SC is a constant power of two, we can convert the div
75 * into a shift. 75 * into a shift.
76 * 76 *
77 * We can use khz divisor instead of mhz to keep a better percision, since 77 * We can use khz divisor instead of mhz to keep a better precision, since
78 * cyc2ns_scale is limited to 10^6 * 2^10, which fits in 32 bits. 78 * cyc2ns_scale is limited to 10^6 * 2^10, which fits in 32 bits.
79 * (mathieu.desnoyers@polymtl.ca) 79 * (mathieu.desnoyers@polymtl.ca)
80 * 80 *
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 78f2250963ae..ad4005c6d4a1 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -53,7 +53,7 @@
53/* 53/*
54 * vsyscall_gtod_data contains data that is : 54 * vsyscall_gtod_data contains data that is :
55 * - readonly from vsyscalls 55 * - readonly from vsyscalls
56 * - writen by timer interrupt or systcl (/proc/sys/kernel/vsyscall64) 56 * - written by timer interrupt or systcl (/proc/sys/kernel/vsyscall64)
57 * Try to keep this structure as small as possible to avoid cache line ping pongs 57 * Try to keep this structure as small as possible to avoid cache line ping pongs
58 */ 58 */
59int __vgetcpu_mode __section_vgetcpu_mode; 59int __vgetcpu_mode __section_vgetcpu_mode;
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c
index 3f08010f3517..0c28a071824c 100644
--- a/arch/x86/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
@@ -108,7 +108,7 @@ void __init time_init_hook(void)
108 * mca_nmi_hook - hook into MCA specific NMI chain 108 * mca_nmi_hook - hook into MCA specific NMI chain
109 * 109 *
110 * Description: 110 * Description:
111 * The MCA (Microchannel Arcitecture) has an NMI chain for NMI sources 111 * The MCA (Microchannel Architecture) has an NMI chain for NMI sources
112 * along the MCA bus. Use this to hook into that chain if you will need 112 * along the MCA bus. Use this to hook into that chain if you will need
113 * it. 113 * it.
114 **/ 114 **/
@@ -131,7 +131,7 @@ static __init int no_ipi_broadcast(char *str)
131 return 1; 131 return 1;
132} 132}
133 133
134__setup("no_ipi_broadcast", no_ipi_broadcast); 134__setup("no_ipi_broadcast=", no_ipi_broadcast);
135 135
136static int __init print_ipi_mode(void) 136static int __init print_ipi_mode(void)
137{ 137{
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 8685208d8512..1af0cc7648f0 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Default generic APIC driver. This handles upto 8 CPUs. 2 * Default generic APIC driver. This handles up to 8 CPUs.
3 */ 3 */
4#define APIC_DEFINITION 1 4#define APIC_DEFINITION 1
5#include <linux/threads.h> 5#include <linux/threads.h>
diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
index 4121d1551800..f410d3cb5659 100644
--- a/arch/x86/mach-generic/probe.c
+++ b/arch/x86/mach-generic/probe.c
@@ -56,7 +56,7 @@ void __init generic_bigsmp_probe(void)
56 /* 56 /*
57 * This routine is used to switch to bigsmp mode when 57 * This routine is used to switch to bigsmp mode when
58 * - There is no apic= option specified by the user 58 * - There is no apic= option specified by the user
59 * - generic_apic_probe() has choosen apic_default as the sub_arch 59 * - generic_apic_probe() has chosen apic_default as the sub_arch
60 * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support 60 * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support
61 */ 61 */
62 62
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
index f93a730b44d0..361ac5107b33 100644
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@ -389,7 +389,7 @@ find_smp_config(void)
389 389
390 /* The boot CPU must be extended */ 390 /* The boot CPU must be extended */
391 voyager_extended_vic_processors = 1<<boot_cpu_id; 391 voyager_extended_vic_processors = 1<<boot_cpu_id;
392 /* initially, all of the first 8 cpu's can boot */ 392 /* initially, all of the first 8 CPUs can boot */
393 voyager_allowed_boot_processors = 0xff; 393 voyager_allowed_boot_processors = 0xff;
394 /* set up everything for just this CPU, we can alter 394 /* set up everything for just this CPU, we can alter
395 * this as we start the other CPUs later */ 395 * this as we start the other CPUs later */
@@ -1010,7 +1010,7 @@ static struct call_data_struct * call_data;
1010 1010
1011/* execute a thread on a new CPU. The function to be called must be 1011/* execute a thread on a new CPU. The function to be called must be
1012 * previously set up. This is used to schedule a function for 1012 * previously set up. This is used to schedule a function for
1013 * execution on all CPU's - set up the function then broadcast a 1013 * execution on all CPUs - set up the function then broadcast a
1014 * function_interrupt CPI to come here on each CPU */ 1014 * function_interrupt CPI to come here on each CPU */
1015static void 1015static void
1016smp_call_function_interrupt(void) 1016smp_call_function_interrupt(void)
@@ -1095,7 +1095,7 @@ voyager_smp_call_function_mask (cpumask_t cpumask,
1095 * CPI here. We don't use this actually for counting so losing 1095 * CPI here. We don't use this actually for counting so losing
1096 * ticks doesn't matter 1096 * ticks doesn't matter
1097 * 1097 *
1098 * FIXME: For those CPU's which actually have a local APIC, we could 1098 * FIXME: For those CPUs which actually have a local APIC, we could
1099 * try to use it to trigger this interrupt instead of having to 1099 * try to use it to trigger this interrupt instead of having to
1100 * broadcast the timer tick. Unfortunately, all my pentium DYADs have 1100 * broadcast the timer tick. Unfortunately, all my pentium DYADs have
1101 * no local APIC, so I can't do this 1101 * no local APIC, so I can't do this
@@ -1287,7 +1287,7 @@ smp_local_timer_interrupt(void)
1287 1287
1288 /* 1288 /*
1289 * We take the 'long' return path, and there every subsystem 1289 * We take the 'long' return path, and there every subsystem
1290 * grabs the apropriate locks (kernel lock/ irq lock). 1290 * grabs the appropriate locks (kernel lock/ irq lock).
1291 * 1291 *
1292 * we might want to decouple profiling from the 'long path', 1292 * we might want to decouple profiling from the 'long path',
1293 * and do the profiling totally in assembly. 1293 * and do the profiling totally in assembly.
@@ -1759,7 +1759,7 @@ set_vic_irq_affinity(unsigned int irq, cpumask_t mask)
1759 real_mask = cpus_addr(mask)[0] & voyager_extended_vic_processors; 1759 real_mask = cpus_addr(mask)[0] & voyager_extended_vic_processors;
1760 1760
1761 if(cpus_addr(mask)[0] == 0) 1761 if(cpus_addr(mask)[0] == 0)
1762 /* can't have no cpu's to accept the interrupt -- extremely 1762 /* can't have no CPUs to accept the interrupt -- extremely
1763 * bad things will happen */ 1763 * bad things will happen */
1764 return; 1764 return;
1765 1765
@@ -1791,7 +1791,7 @@ set_vic_irq_affinity(unsigned int irq, cpumask_t mask)
1791 } 1791 }
1792 /* this is magic, we now have the correct affinity maps, so 1792 /* this is magic, we now have the correct affinity maps, so
1793 * enable the interrupt. This will send an enable CPI to 1793 * enable the interrupt. This will send an enable CPI to
1794 * those cpu's who need to enable it in their local masks, 1794 * those CPUs who need to enable it in their local masks,
1795 * causing them to correct for the new affinity . If the 1795 * causing them to correct for the new affinity . If the
1796 * interrupt is currently globally disabled, it will simply be 1796 * interrupt is currently globally disabled, it will simply be
1797 * disabled again as it comes in (voyager lazy disable). If 1797 * disabled again as it comes in (voyager lazy disable). If
diff --git a/arch/x86/mach-voyager/voyager_thread.c b/arch/x86/mach-voyager/voyager_thread.c
index f9d595338159..50f9366c411e 100644
--- a/arch/x86/mach-voyager/voyager_thread.c
+++ b/arch/x86/mach-voyager/voyager_thread.c
@@ -64,7 +64,7 @@ check_from_kernel(void)
64{ 64{
65 if(voyager_status.switch_off) { 65 if(voyager_status.switch_off) {
66 66
67 /* FIXME: This should be configureable via proc */ 67 /* FIXME: This should be configurable via proc */
68 execute("umask 600; echo 0 > /etc/initrunlvl; kill -HUP 1"); 68 execute("umask 600; echo 0 > /etc/initrunlvl; kill -HUP 1");
69 } else if(voyager_status.power_fail) { 69 } else if(voyager_status.power_fail) {
70 VDEBUG(("Voyager daemon detected AC power failure\n")); 70 VDEBUG(("Voyager daemon detected AC power failure\n"));
diff --git a/arch/x86/mm/boot_ioremap_32.c b/arch/x86/mm/boot_ioremap_32.c
index 4de95a17a7d4..f14da2a53ece 100644
--- a/arch/x86/mm/boot_ioremap_32.c
+++ b/arch/x86/mm/boot_ioremap_32.c
@@ -10,7 +10,7 @@
10 10
11/* 11/*
12 * We need to use the 2-level pagetable functions, but CONFIG_X86_PAE 12 * We need to use the 2-level pagetable functions, but CONFIG_X86_PAE
13 * keeps that from happenning. If anyone has a better way, I'm listening. 13 * keeps that from happening. If anyone has a better way, I'm listening.
14 * 14 *
15 * boot_pte_t is defined only if this all works correctly 15 * boot_pte_t is defined only if this all works correctly
16 */ 16 */
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index 13893772cc48..fe608a45ffb6 100644
--- a/arch/x86/mm/discontig_32.c
+++ b/arch/x86/mm/discontig_32.c
@@ -273,7 +273,7 @@ unsigned long __init setup_memory(void)
273 * When mapping a NUMA machine we allocate the node_mem_map arrays 273 * When mapping a NUMA machine we allocate the node_mem_map arrays
274 * from node local memory. They are then mapped directly into KVA 274 * from node local memory. They are then mapped directly into KVA
275 * between zone normal and vmalloc space. Calculate the size of 275 * between zone normal and vmalloc space. Calculate the size of
276 * this space and use it to adjust the boundry between ZONE_NORMAL 276 * this space and use it to adjust the boundary between ZONE_NORMAL
277 * and ZONE_HIGHMEM. 277 * and ZONE_HIGHMEM.
278 */ 278 */
279 find_max_pfn(); 279 find_max_pfn();
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index b695d70e998c..503dfc05111b 100644
--- a/arch/x86/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
@@ -354,7 +354,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,
354 354
355 /* When running in the kernel we expect faults to occur only to 355 /* When running in the kernel we expect faults to occur only to
356 * addresses in user space. All other faults represent errors in the 356 * addresses in user space. All other faults represent errors in the
357 * kernel and should generate an OOPS. Unfortunatly, in the case of an 357 * kernel and should generate an OOPS. Unfortunately, in the case of an
358 * erroneous fault occurring in a code path which already holds mmap_sem 358 * erroneous fault occurring in a code path which already holds mmap_sem
359 * we will deadlock attempting to validate the fault against the 359 * we will deadlock attempting to validate the fault against the
360 * address space. Luckily the kernel only validly references user 360 * address space. Luckily the kernel only validly references user
@@ -362,7 +362,7 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,
362 * exceptions table. 362 * exceptions table.
363 * 363 *
364 * As the vast majority of faults will be valid we will only perform 364 * As the vast majority of faults will be valid we will only perform
365 * the source reference check when there is a possibilty of a deadlock. 365 * the source reference check when there is a possibility of a deadlock.
366 * Attempt to lock the address space, if we cannot we then validate the 366 * Attempt to lock the address space, if we cannot we then validate the
367 * source. If this is invalid we can skip the address space check, 367 * source. If this is invalid we can skip the address space check,
368 * thus avoiding the deadlock. 368 * thus avoiding the deadlock.
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c
index 00be7f0a71b2..644b4f7ece10 100644
--- a/arch/x86/mm/fault_64.c
+++ b/arch/x86/mm/fault_64.c
@@ -373,7 +373,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
373 again: 373 again:
374 /* When running in the kernel we expect faults to occur only to 374 /* When running in the kernel we expect faults to occur only to
375 * addresses in user space. All other faults represent errors in the 375 * addresses in user space. All other faults represent errors in the
376 * kernel and should generate an OOPS. Unfortunatly, in the case of an 376 * kernel and should generate an OOPS. Unfortunately, in the case of an
377 * erroneous fault occurring in a code path which already holds mmap_sem 377 * erroneous fault occurring in a code path which already holds mmap_sem
378 * we will deadlock attempting to validate the fault against the 378 * we will deadlock attempting to validate the fault against the
379 * address space. Luckily the kernel only validly references user 379 * address space. Luckily the kernel only validly references user
@@ -381,7 +381,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
381 * exceptions table. 381 * exceptions table.
382 * 382 *
383 * As the vast majority of faults will be valid we will only perform 383 * As the vast majority of faults will be valid we will only perform
384 * the source reference check when there is a possibilty of a deadlock. 384 * the source reference check when there is a possibility of a deadlock.
385 * Attempt to lock the address space, if we cannot we then validate the 385 * Attempt to lock the address space, if we cannot we then validate the
386 * source. If this is invalid we can skip the address space check, 386 * source. If this is invalid we can skip the address space check,
387 * thus avoiding the deadlock. 387 * thus avoiding the deadlock.
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index 56089ccc3949..ea85172fc0cc 100644
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -218,7 +218,7 @@ static inline int save_add_info(void) {return 0;}
218/* 218/*
219 * Update nodes_add and decide if to include add are in the zone. 219 * Update nodes_add and decide if to include add are in the zone.
220 * Both SPARSE and RESERVE need nodes_add infomation. 220 * Both SPARSE and RESERVE need nodes_add infomation.
221 * This code supports one contigious hot add area per node. 221 * This code supports one contiguous hot add area per node.
222 */ 222 */
223static int reserve_hotadd(int node, unsigned long start, unsigned long end) 223static int reserve_hotadd(int node, unsigned long start, unsigned long end)
224{ 224{
diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
index abb1aa95b979..45b605fa71d0 100644
--- a/arch/x86/oprofile/op_x86_model.h
+++ b/arch/x86/oprofile/op_x86_model.h
@@ -29,7 +29,7 @@ struct op_msrs {
29struct pt_regs; 29struct pt_regs;
30 30
31/* The model vtable abstracts the differences between 31/* The model vtable abstracts the differences between
32 * various x86 CPU model's perfctr support. 32 * various x86 CPU models' perfctr support.
33 */ 33 */
34struct op_x86_model_spec { 34struct op_x86_model_spec {
35 unsigned int const num_counters; 35 unsigned int const num_counters;
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index c52150fdf82b..88d8f5c0ecb5 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -169,7 +169,7 @@ void eisa_set_level_irq(unsigned int irq)
169} 169}
170 170
171/* 171/*
172 * Common IRQ routing practice: nybbles in config space, 172 * Common IRQ routing practice: nibbles in config space,
173 * offset by some magic constant. 173 * offset by some magic constant.
174 */ 174 */
175static unsigned int read_config_nybble(struct pci_dev *router, unsigned offset, unsigned nr) 175static unsigned int read_config_nybble(struct pci_dev *router, unsigned offset, unsigned nr)
@@ -585,7 +585,7 @@ static __init int via_router_probe(struct irq_router *r,
585 /* FIXME: We should move some of the quirk fixup stuff here */ 585 /* FIXME: We should move some of the quirk fixup stuff here */
586 586
587 /* 587 /*
588 * work arounds for some buggy BIOSes 588 * workarounds for some buggy BIOSes
589 */ 589 */
590 if (device == PCI_DEVICE_ID_VIA_82C586_0) { 590 if (device == PCI_DEVICE_ID_VIA_82C586_0) {
591 switch(router->device) { 591 switch(router->device) {
diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c
index f09962fa98c0..b61fb36674e7 100644
--- a/arch/xtensa/platform-iss/network.c
+++ b/arch/xtensa/platform-iss/network.c
@@ -798,7 +798,7 @@ static int iss_net_setup(char *str)
798 798
799#undef ERR 799#undef ERR
800 800
801__setup("eth", iss_net_setup); 801__setup("eth=", iss_net_setup);
802 802
803/* 803/*
804 * Initialize all ISS Ethernet devices previously registered in iss_net_setup. 804 * Initialize all ISS Ethernet devices previously registered in iss_net_setup.
diff --git a/block/elevator.c b/block/elevator.c
index 952aee04a68a..446aea2a3cfb 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -390,7 +390,7 @@ EXPORT_SYMBOL(elv_rb_find);
390 390
391/* 391/*
392 * Insert rq into dispatch queue of q. Queue lock must be held on 392 * Insert rq into dispatch queue of q. Queue lock must be held on
393 * entry. rq is sort insted into the dispatch queue. To be used by 393 * entry. rq is sort instead into the dispatch queue. To be used by
394 * specific elevators. 394 * specific elevators.
395 */ 395 */
396void elv_dispatch_sort(struct request_queue *q, struct request *rq) 396void elv_dispatch_sort(struct request_queue *q, struct request *rq)
diff --git a/crypto/api.c b/crypto/api.c
index 4ccc5af6c265..1f5c72477356 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -6,7 +6,7 @@
6 * Copyright (c) 2005 Herbert Xu <herbert@gondor.apana.org.au> 6 * Copyright (c) 2005 Herbert Xu <herbert@gondor.apana.org.au>
7 * 7 *
8 * Portions derived from Cryptoapi, by Alexander Kjeldaas <astor@fast.no> 8 * Portions derived from Cryptoapi, by Alexander Kjeldaas <astor@fast.no>
9 * and Nettle, by Niels Möller. 9 * and Nettle, by Niels Möller.
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify it 11 * This program is free software; you can redistribute it and/or modify it
12 * under the terms of the GNU General Public License as published by the Free 12 * under the terms of the GNU General Public License as published by the Free
diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c
index 9c2bb535b09a..d161949fdb94 100644
--- a/crypto/fcrypt.c
+++ b/crypto/fcrypt.c
@@ -10,7 +10,7 @@
10 * 10 *
11 * Based on code: 11 * Based on code:
12 * 12 *
13 * Copyright (c) 1995 - 2000 Kungliga Tekniska Högskolan 13 * Copyright (c) 1995 - 2000 Kungliga Tekniska Högskolan
14 * (Royal Institute of Technology, Stockholm, Sweden). 14 * (Royal Institute of Technology, Stockholm, Sweden).
15 * All rights reserved. 15 * All rights reserved.
16 * 16 *
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b83389145f28..5d0e26a5c34c 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -52,7 +52,7 @@ config ACPI_PROCFS
52 depends on PROC_FS 52 depends on PROC_FS
53 ---help--- 53 ---help---
54 For backwards compatibility, this option allows 54 For backwards compatibility, this option allows
55 depricated /proc/acpi/ files to exist, even when 55 deprecated /proc/acpi/ files to exist, even when
56 they have been replaced by functions in /sys. 56 they have been replaced by functions in /sys.
57 The deprecated files (and their replacements) include: 57 The deprecated files (and their replacements) include:
58 58
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 10bc3f64c453..47c806040524 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1479,7 +1479,7 @@ static void ahci_port_intr(struct ata_port *ap)
1479 return; 1479 return;
1480 } 1480 }
1481 1481
1482 /* hmmm... a spurious interupt */ 1482 /* hmmm... a spurious interrupt */
1483 1483
1484 /* if !NCQ, ignore. No modern ATA device has broken HSM 1484 /* if !NCQ, ignore. No modern ATA device has broken HSM
1485 * implementation for non-NCQ commands. 1485 * implementation for non-NCQ commands.
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index f9e4cd527942..8227c45109ec 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -856,7 +856,7 @@ err_out:
856 * @pdev: PCI device 856 * @pdev: PCI device
857 * 857 *
858 * Some PCI ATA devices report simplex mode but in fact can be told to 858 * Some PCI ATA devices report simplex mode but in fact can be told to
859 * enter non simplex mode. This implements the neccessary logic to 859 * enter non simplex mode. This implements the necessary logic to
860 * perform the task on such devices. Calling it on other devices will 860 * perform the task on such devices. Calling it on other devices will
861 * have -undefined- behaviour. 861 * have -undefined- behaviour.
862 */ 862 */
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index 9e412c26b2a3..7acbbd9ee469 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -215,7 +215,7 @@ static void cmd64x_set_dmamode(struct ata_port *ap, struct ata_device *adev)
215 regU &= ~(0x05 << adev->devno); 215 regU &= ~(0x05 << adev->devno);
216 216
217 if (adev->dma_mode >= XFER_UDMA_0) { 217 if (adev->dma_mode >= XFER_UDMA_0) {
218 /* Merge thge timing value */ 218 /* Merge the timing value */
219 regU |= udma_data[adev->dma_mode - XFER_UDMA_0] << shift; 219 regU |= udma_data[adev->dma_mode - XFER_UDMA_0] << shift;
220 /* Merge the control bits */ 220 /* Merge the control bits */
221 regU |= 1 << adev->devno; /* UDMA on */ 221 regU |= 1 << adev->devno; /* UDMA on */
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 57e827e4109e..e1818fdd9159 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -138,7 +138,7 @@ static void cs5530_set_dmamode(struct ata_port *ap, struct ata_device *adev)
138 * 138 *
139 * Called when the libata layer is about to issue a command. We wrap 139 * Called when the libata layer is about to issue a command. We wrap
140 * this interface so that we can load the correct ATA timings if 140 * this interface so that we can load the correct ATA timings if
141 * neccessary. Specifically we have a problem that there is only 141 * necessary. Specifically we have a problem that there is only
142 * one MWDMA/UDMA bit. 142 * one MWDMA/UDMA bit.
143 */ 143 */
144 144
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 3578593a882b..01324530d052 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -25,7 +25,7 @@
25 * Documentation: 25 * Documentation:
26 * Available from AMD web site. 26 * Available from AMD web site.
27 * TODO 27 * TODO
28 * Review errata to see if serializing is neccessary 28 * Review errata to see if serializing is necessary
29 */ 29 */
30 30
31#include <linux/kernel.h> 31#include <linux/kernel.h>
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 988ef736b936..ca9aae09daed 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -105,7 +105,7 @@ struct it821x_dev
105 105
106/* 106/*
107 * We allow users to force the card into non raid mode without 107 * We allow users to force the card into non raid mode without
108 * flashing the alternative BIOS. This is also neccessary right now 108 * flashing the alternative BIOS. This is also necessary right now
109 * for embedded platforms that cannot run a PC BIOS but are using this 109 * for embedded platforms that cannot run a PC BIOS but are using this
110 * device. 110 * device.
111 */ 111 */
@@ -383,7 +383,7 @@ static void it821x_passthru_bmdma_stop(struct ata_queued_cmd *qc)
383 * @ap: ATA port 383 * @ap: ATA port
384 * @device: Device number (not pointer) 384 * @device: Device number (not pointer)
385 * 385 *
386 * Device selection hook. If neccessary perform clock switching 386 * Device selection hook. If necessary perform clock switching
387 */ 387 */
388 388
389static void it821x_passthru_dev_select(struct ata_port *ap, 389static void it821x_passthru_dev_select(struct ata_port *ap,
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index d5483087a3fa..c0d9e0cf208c 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -129,7 +129,7 @@ static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev)
129 * 129 *
130 * Called when the libata layer is about to issue a command. We wrap 130 * Called when the libata layer is about to issue a command. We wrap
131 * this interface so that we can load the correct ATA timings if 131 * this interface so that we can load the correct ATA timings if
132 * neccessary. Our logic also clears TIME0/TIME1 for the other device so 132 * necessary. Our logic also clears TIME0/TIME1 for the other device so
133 * that, even if we get this wrong, cycles to the other device will 133 * that, even if we get this wrong, cycles to the other device will
134 * be made PIO0. 134 * be made PIO0.
135 */ 135 */
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 6e8e55745b7b..9fe66fd75017 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -124,7 +124,7 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev)
124 * 124 *
125 * Called when the libata layer is about to issue a command. We wrap 125 * Called when the libata layer is about to issue a command. We wrap
126 * this interface so that we can load the correct ATA timings if 126 * this interface so that we can load the correct ATA timings if
127 * neccessary. 127 * necessary.
128 */ 128 */
129 129
130static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc) 130static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc)
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index 3cd5eb2b6c91..44da09ace52c 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -200,7 +200,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
200 * 200 *
201 * Called when the libata layer is about to issue a command. We wrap 201 * Called when the libata layer is about to issue a command. We wrap
202 * this interface so that we can load the correct ATA timings if 202 * this interface so that we can load the correct ATA timings if
203 * neccessary. Our logic also clears TIME0/TIME1 for the other device so 203 * necessary. Our logic also clears TIME0/TIME1 for the other device so
204 * that, even if we get this wrong, cycles to the other device will 204 * that, even if we get this wrong, cycles to the other device will
205 * be made PIO0. 205 * be made PIO0.
206 */ 206 */
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index d5b76497f4a2..8109b08fc024 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -161,7 +161,7 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev)
161 * 161 *
162 * Called when the libata layer is about to issue a command. We wrap 162 * Called when the libata layer is about to issue a command. We wrap
163 * this interface so that we can load the correct ATA timings if 163 * this interface so that we can load the correct ATA timings if
164 * neccessary. Our logic also clears TIME0/TIME1 for the other device so 164 * necessary. Our logic also clears TIME0/TIME1 for the other device so
165 * that, even if we get this wrong, cycles to the other device will 165 * that, even if we get this wrong, cycles to the other device will
166 * be made PIO0. 166 * be made PIO0.
167 */ 167 */
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 21ebc485ca4b..725a8586cd6e 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -156,7 +156,7 @@ static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev)
156 * 156 *
157 * Called when the libata layer is about to issue a command. We wrap 157 * Called when the libata layer is about to issue a command. We wrap
158 * this interface so that we can load the correct ATA timings if 158 * this interface so that we can load the correct ATA timings if
159 * neccessary. Specifically we have a problem that there is only 159 * necessary. Specifically we have a problem that there is only
160 * one MWDMA/UDMA bit. 160 * one MWDMA/UDMA bit.
161 */ 161 */
162 162
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 4dc2e73298fd..5c1e9cb59ecb 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -16,7 +16,7 @@
16 * 16 *
17 * If you have strange problems with nVidia chipset systems please 17 * If you have strange problems with nVidia chipset systems please
18 * see the SI support documentation and update your system BIOS 18 * see the SI support documentation and update your system BIOS
19 * if neccessary 19 * if necessary
20 * 20 *
21 * TODO 21 * TODO
22 * If we know all our devices are LBA28 (or LBA28 sized) we could use 22 * If we know all our devices are LBA28 (or LBA28 sized) we could use
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 5d41b6612d7f..ea7a9a652e61 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -420,7 +420,7 @@ static struct ata_port_operations via_port_ops_noirq = {
420 * @pdev: PCI device 420 * @pdev: PCI device
421 * @flags: configuration flags 421 * @flags: configuration flags
422 * 422 *
423 * Set the FIFO properties for this device if neccessary. Used both on 423 * Set the FIFO properties for this device if necessary. Used both on
424 * set up and on and the resume path 424 * set up and on and the resume path
425 */ 425 */
426 426
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 94ebc9dc40fd..f8f7139c07c1 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1596,7 +1596,7 @@ static irqreturn_t fs_irq (int irq, void *dev_id)
1596 1596
1597 /* print the bits in the ISR register. */ 1597 /* print the bits in the ISR register. */
1598 if (fs_debug & FS_DEBUG_IRQ) { 1598 if (fs_debug & FS_DEBUG_IRQ) {
1599 /* The FS_DEBUG things are unneccesary here. But this way it is 1599 /* The FS_DEBUG things are unnecessary here. But this way it is
1600 clear for grep that these are debug prints. */ 1600 clear for grep that these are debug prints. */
1601 fs_dprintk (FS_DEBUG_IRQ, "IRQ status:"); 1601 fs_dprintk (FS_DEBUG_IRQ, "IRQ status:");
1602 for (i=0;i<27;i++) 1602 for (i=0;i<27;i++)
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index ca4d7f0d09b7..ce4b1e484e64 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -204,23 +204,6 @@ config BLK_DEV_COW_COMMON
204 bool 204 bool
205 default BLK_DEV_UBD 205 default BLK_DEV_UBD
206 206
207config MMAPPER
208 tristate "Example IO memory driver (BROKEN)"
209 depends on UML && BROKEN
210 ---help---
211 The User-Mode Linux port can provide support for IO Memory
212 emulation with this option. This allows a host file to be
213 specified as an I/O region on the kernel command line. That file
214 will be mapped into UML's kernel address space where a driver can
215 locate it and do whatever it wants with the memory, including
216 providing an interface to it for UML processes to use.
217
218 For more information, see
219 <http://user-mode-linux.sourceforge.net/iomem.html>.
220
221 If you'd like to be able to provide a simulated IO port space for
222 User-Mode Linux processes, say Y. If unsure, say N.
223
224config BLK_DEV_LOOP 207config BLK_DEV_LOOP
225 tristate "Loopback device support" 208 tristate "Loopback device support"
226 ---help--- 209 ---help---
@@ -351,7 +334,7 @@ config BLK_DEV_RAM_COUNT
351 default "16" 334 default "16"
352 depends on BLK_DEV_RAM 335 depends on BLK_DEV_RAM
353 help 336 help
354 The default value is 16 RAM disks. Change this if you know what 337 The default value is 16 RAM disks. Change this if you know what you
355 are doing. If you boot from a filesystem that needs to be extracted 338 are doing. If you boot from a filesystem that needs to be extracted
356 in memory, you will need at least one RAM disk (e.g. root on cramfs). 339 in memory, you will need at least one RAM disk (e.g. root on cramfs).
357 340
@@ -361,7 +344,7 @@ config BLK_DEV_RAM_SIZE
361 default "4096" 344 default "4096"
362 help 345 help
363 The default value is 4096 kilobytes. Only change this if you know 346 The default value is 4096 kilobytes. Only change this if you know
364 what are you doing. 347 what you are doing.
365 348
366config BLK_DEV_RAM_BLOCKSIZE 349config BLK_DEV_RAM_BLOCKSIZE
367 int "Default RAM disk block size (bytes)" 350 int "Default RAM disk block size (bytes)"
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 589cbbd9cd4f..56e23042728a 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -29,7 +29,7 @@
29 * 29 *
30 * Maximum number of loop devices when compiled-in now selectable by passing 30 * Maximum number of loop devices when compiled-in now selectable by passing
31 * max_loop=<1-255> to the kernel on boot. 31 * max_loop=<1-255> to the kernel on boot.
32 * Erik I. Bolsø, <eriki@himolde.no>, Oct 31, 1999 32 * Erik I. Bolsø, <eriki@himolde.no>, Oct 31, 1999
33 * 33 *
34 * Completely rewrite request handling to be make_request_fn style and 34 * Completely rewrite request handling to be make_request_fn style and
35 * non blocking, pushing work to a helper thread. Lots of fixes from 35 * non blocking, pushing work to a helper thread. Lots of fixes from
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index ac4a0cb217ab..6332acad078c 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -508,7 +508,6 @@ error_out:
508 nbd_end_request(req); 508 nbd_end_request(req);
509 spin_lock(q->queue_lock); 509 spin_lock(q->queue_lock);
510 } 510 }
511 return;
512} 511}
513 512
514static int nbd_ioctl(struct inode *inode, struct file *file, 513static int nbd_ioctl(struct inode *inode, struct file *file,
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 08176d23a46c..47f8ac6cce57 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -365,7 +365,7 @@ static int rd_open(struct inode *inode, struct file *filp)
365 /* 365 /*
366 * Deep badness. rd_blkdev_pagecache_IO() needs to allocate 366 * Deep badness. rd_blkdev_pagecache_IO() needs to allocate
367 * pagecache pages within a request_fn. We cannot recur back 367 * pagecache pages within a request_fn. We cannot recur back
368 * into the filesytem which is mounted atop the ramdisk, because 368 * into the filesystem which is mounted atop the ramdisk, because
369 * that would deadlock on fs locks. And we really don't want 369 * that would deadlock on fs locks. And we really don't want
370 * to reenter rd_blkdev_pagecache_IO when we're already within 370 * to reenter rd_blkdev_pagecache_IO when we're already within
371 * that function. 371 * that function.
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index d15234c5965e..d1bd0f08a331 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -359,7 +359,7 @@
359 * 359 *
360 * Revision 1.36.3.8 1996/06/07 16:29:00 bentson 360 * Revision 1.36.3.8 1996/06/07 16:29:00 bentson
361 * starting minor number at zero; added missing verify_area 361 * starting minor number at zero; added missing verify_area
362 * as noted by Heiko Eissfeldt <heiko@colossus.escape.de> 362 * as noted by Heiko Eißfeldt <heiko@colossus.escape.de>
363 * 363 *
364 * Revision 1.36.3.7 1996/04/19 21:06:18 bentson 364 * Revision 1.36.3.7 1996/04/19 21:06:18 bentson
365 * remove unneeded boot message & fix CLOCAL hardware flow 365 * remove unneeded boot message & fix CLOCAL hardware flow
@@ -727,8 +727,6 @@ static struct tty_driver *cy_serial_driver;
727 driver to probe addresses at a different address, add it to 727 driver to probe addresses at a different address, add it to
728 this table. If the driver is probing some other board and 728 this table. If the driver is probing some other board and
729 causing problems, remove the offending address from this table. 729 causing problems, remove the offending address from this table.
730 The cy_setup function extracts additional addresses from the
731 boot options line. The form is "cyclades=address,address..."
732*/ 730*/
733 731
734static unsigned int cy_isa_addresses[] = { 732static unsigned int cy_isa_addresses[] = {
diff --git a/drivers/char/drm/drm_hashtab.c b/drivers/char/drm/drm_hashtab.c
index 3ad319070704..4b8e7db5a232 100644
--- a/drivers/char/drm/drm_hashtab.c
+++ b/drivers/char/drm/drm_hashtab.c
@@ -29,7 +29,7 @@
29 * Simple open hash tab implementation. 29 * Simple open hash tab implementation.
30 * 30 *
31 * Authors: 31 * Authors:
32 * Thomas Hellström <thomas-at-tungstengraphics-dot-com> 32 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
33 */ 33 */
34 34
35#include "drmP.h" 35#include "drmP.h"
diff --git a/drivers/char/drm/drm_hashtab.h b/drivers/char/drm/drm_hashtab.h
index 0f1376774168..573e333ac457 100644
--- a/drivers/char/drm/drm_hashtab.h
+++ b/drivers/char/drm/drm_hashtab.h
@@ -29,7 +29,7 @@
29 * Simple open hash tab implementation. 29 * Simple open hash tab implementation.
30 * 30 *
31 * Authors: 31 * Authors:
32 * Thomas Hellström <thomas-at-tungstengraphics-dot-com> 32 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
33 */ 33 */
34 34
35#ifndef DRM_HASHTAB_H 35#ifndef DRM_HASHTAB_H
diff --git a/drivers/char/drm/drm_mm.c b/drivers/char/drm/drm_mm.c
index 3e6bc14f7441..86f4eb61a6a4 100644
--- a/drivers/char/drm/drm_mm.c
+++ b/drivers/char/drm/drm_mm.c
@@ -38,7 +38,7 @@
38 * Aligned allocations can also see improvement. 38 * Aligned allocations can also see improvement.
39 * 39 *
40 * Authors: 40 * Authors:
41 * Thomas Hellström <thomas-at-tungstengraphics-dot-com> 41 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
42 */ 42 */
43 43
44#include "drmP.h" 44#include "drmP.h"
diff --git a/drivers/char/drm/drm_pci.c b/drivers/char/drm/drm_pci.c
index e292bb0eaca2..b55d5bc6ea61 100644
--- a/drivers/char/drm/drm_pci.c
+++ b/drivers/char/drm/drm_pci.c
@@ -8,12 +8,12 @@
8 * \todo Implement the remaining ioctl's for the PCI pools. 8 * \todo Implement the remaining ioctl's for the PCI pools.
9 * \todo The wrappers here are so thin that they would be better off inlined.. 9 * \todo The wrappers here are so thin that they would be better off inlined..
10 * 10 *
11 * \author Jose Fonseca <jrfonseca@tungstengraphics.com> 11 * \author José Fonseca <jrfonseca@tungstengraphics.com>
12 * \author Leif Delgass <ldelgass@retinalburn.net> 12 * \author Leif Delgass <ldelgass@retinalburn.net>
13 */ 13 */
14 14
15/* 15/*
16 * Copyright 2003 Jos�Fonseca. 16 * Copyright 2003 José Fonseca.
17 * Copyright 2003 Leif Delgass. 17 * Copyright 2003 Leif Delgass.
18 * All Rights Reserved. 18 * All Rights Reserved.
19 * 19 *
diff --git a/drivers/char/drm/drm_sarea.h b/drivers/char/drm/drm_sarea.h
index f5466966081e..e040f47f369f 100644
--- a/drivers/char/drm/drm_sarea.h
+++ b/drivers/char/drm/drm_sarea.h
@@ -2,7 +2,7 @@
2 * \file drm_sarea.h 2 * \file drm_sarea.h
3 * \brief SAREA definitions 3 * \brief SAREA definitions
4 * 4 *
5 * \author Michel Dänzer <michel@daenzer.net> 5 * \author Michel Dänzer <michel@daenzer.net>
6 */ 6 */
7 7
8/* 8/*
diff --git a/drivers/char/drm/drm_sman.c b/drivers/char/drm/drm_sman.c
index 8421a93946d8..926f146390ce 100644
--- a/drivers/char/drm/drm_sman.c
+++ b/drivers/char/drm/drm_sman.c
@@ -33,7 +33,7 @@
33 * struct or a context identifier. 33 * struct or a context identifier.
34 * 34 *
35 * Authors: 35 * Authors:
36 * Thomas Hellström <thomas-at-tungstengraphics-dot-com> 36 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
37 */ 37 */
38 38
39#include "drm_sman.h" 39#include "drm_sman.h"
diff --git a/drivers/char/drm/drm_sman.h b/drivers/char/drm/drm_sman.h
index 39a39fefeef1..08ecf83ad5d4 100644
--- a/drivers/char/drm/drm_sman.h
+++ b/drivers/char/drm/drm_sman.h
@@ -33,7 +33,7 @@
33 * struct or a context identifier. 33 * struct or a context identifier.
34 * 34 *
35 * Authors: 35 * Authors:
36 * Thomas Hellström <thomas-at-tungstengraphics-dot-com> 36 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
37 */ 37 */
38 38
39#ifndef DRM_SMAN_H 39#ifndef DRM_SMAN_H
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h
index 250d2aa46581..5041bd8dbed8 100644
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/char/drm/r128_drv.h
@@ -29,7 +29,7 @@
29 * Rickard E. (Rik) Faith <faith@valinux.com> 29 * Rickard E. (Rik) Faith <faith@valinux.com>
30 * Kevin E. Martin <martin@valinux.com> 30 * Kevin E. Martin <martin@valinux.com>
31 * Gareth Hughes <gareth@valinux.com> 31 * Gareth Hughes <gareth@valinux.com>
32 * Michel D�zer <daenzerm@student.ethz.ch> 32 * Michel Dänzer <daenzerm@student.ethz.ch>
33 */ 33 */
34 34
35#ifndef __R128_DRV_H__ 35#ifndef __R128_DRV_H__
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index 2b2407ee490e..84f5bc36252b 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -27,7 +27,7 @@
27 * 27 *
28 * Authors: 28 * Authors:
29 * Keith Whitwell <keith@tungstengraphics.com> 29 * Keith Whitwell <keith@tungstengraphics.com>
30 * Michel D�zer <michel@daenzer.net> 30 * Michel Dänzer <michel@daenzer.net>
31 */ 31 */
32 32
33#include "drmP.h" 33#include "drmP.h"
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 69c9f2febf43..f824f2f5fdc2 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -3005,7 +3005,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
3005 /* 3005 /*
3006 * This ioctl() doesn't work on 64-bit platforms because hw_lock is a 3006 * This ioctl() doesn't work on 64-bit platforms because hw_lock is a
3007 * pointer which can't fit into an int-sized variable. According to 3007 * pointer which can't fit into an int-sized variable. According to
3008 * Michel Dänzer, the ioctl() is only used on embedded platforms, so 3008 * Michel Dänzer, the ioctl() is only used on embedded platforms, so
3009 * not supporting it shouldn't be a problem. If the same functionality 3009 * not supporting it shouldn't be a problem. If the same functionality
3010 * is needed on 64-bit platforms, a new ioctl() would have to be added, 3010 * is needed on 64-bit platforms, a new ioctl() would have to be added,
3011 * so backwards-compatibility for the embedded platforms can be 3011 * so backwards-compatibility for the embedded platforms can be
diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 8c66838ff515..6be1c5757580 100644
--- a/drivers/char/drm/sis_mm.c
+++ b/drivers/char/drm/sis_mm.c
@@ -28,7 +28,7 @@
28 28
29/* 29/*
30 * Authors: 30 * Authors:
31 * Thomas Hellström <thomas-at-tungstengraphics-dot-com> 31 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
32 */ 32 */
33 33
34#include "drmP.h" 34#include "drmP.h"
diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c
index 9afc1684348d..3ffbf8649833 100644
--- a/drivers/char/drm/via_mm.c
+++ b/drivers/char/drm/via_mm.c
@@ -22,7 +22,7 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24/* 24/*
25 * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com> 25 * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
26 */ 26 */
27 27
28#include "drmP.h" 28#include "drmP.h"
diff --git a/drivers/char/drm/via_verifier.h b/drivers/char/drm/via_verifier.h
index 28b50296a7bd..d6f8214b69f5 100644
--- a/drivers/char/drm/via_verifier.h
+++ b/drivers/char/drm/via_verifier.h
@@ -20,7 +20,7 @@
20 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21 * DEALINGS IN THE SOFTWARE. 21 * DEALINGS IN THE SOFTWARE.
22 * 22 *
23 * Author: Thomas Hellström 2004. 23 * Author: Thomas Hellström 2004.
24 */ 24 */
25 25
26#ifndef _VIA_VERIFIER_H_ 26#ifndef _VIA_VERIFIER_H_
diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index 0f8fb135da53..28607763ae64 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -19,7 +19,7 @@
19 * 19 *
20 * rs_set_termios fixed to look also for changes of the input 20 * rs_set_termios fixed to look also for changes of the input
21 * flags INPCK, BRKINT, PARMRK, IGNPAR and IGNBRK. 21 * flags INPCK, BRKINT, PARMRK, IGNPAR and IGNBRK.
22 * Bernd Anh�pl 05/17/96. 22 * Bernd Anhäupl 05/17/96.
23 * 23 *
24 * --- End of notices from serial.c --- 24 * --- End of notices from serial.c ---
25 * 25 *
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index e13dd1892bfd..3f35a1c562b1 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -10,7 +10,7 @@
10 * Mostly based on original driver: 10 * Mostly based on original driver:
11 * 11 *
12 * Copyright (C) 2005 Nokia Corporation 12 * Copyright (C) 2005 Nokia Corporation
13 * Author: Juha Yrj��<juha.yrjola@nokia.com> 13 * Author: Juha Yrjölä <juha.yrjola@nokia.com>
14 * 14 *
15 * This file is licensed under the terms of the GNU General Public 15 * This file is licensed under the terms of the GNU General Public
16 * License version 2. This program is licensed "as is" without any 16 * License version 2. This program is licensed "as is" without any
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index cd406416effd..30e564516422 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -371,14 +371,14 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
371 int fn_key, cpu_temp, ac_power; 371 int fn_key, cpu_temp, ac_power;
372 int left_fan, right_fan, left_speed, right_speed; 372 int left_fan, right_fan, left_speed, right_speed;
373 373
374 cpu_temp = i8k_get_temp(0); /* 11100 µs */ 374 cpu_temp = i8k_get_temp(0); /* 11100 µs */
375 left_fan = i8k_get_fan_status(I8K_FAN_LEFT); /* 580 µs */ 375 left_fan = i8k_get_fan_status(I8K_FAN_LEFT); /* 580 µs */
376 right_fan = i8k_get_fan_status(I8K_FAN_RIGHT); /* 580 µs */ 376 right_fan = i8k_get_fan_status(I8K_FAN_RIGHT); /* 580 µs */
377 left_speed = i8k_get_fan_speed(I8K_FAN_LEFT); /* 580 µs */ 377 left_speed = i8k_get_fan_speed(I8K_FAN_LEFT); /* 580 µs */
378 right_speed = i8k_get_fan_speed(I8K_FAN_RIGHT); /* 580 µs */ 378 right_speed = i8k_get_fan_speed(I8K_FAN_RIGHT); /* 580 µs */
379 fn_key = i8k_get_fn_status(); /* 750 µs */ 379 fn_key = i8k_get_fn_status(); /* 750 µs */
380 if (power_status) 380 if (power_status)
381 ac_power = i8k_get_power_status(); /* 14700 µs */ 381 ac_power = i8k_get_power_status(); /* 14700 µs */
382 else 382 else
383 ac_power = -1; 383 ac_power = -1;
384 384
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 038056911934..596c7173997b 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -437,7 +437,7 @@ static inline void finish_erasing(struct tty_struct *tty)
437 * @c: character input 437 * @c: character input
438 * @tty: terminal device 438 * @tty: terminal device
439 * 439 *
440 * Perform erase and neccessary output when an erase character is 440 * Perform erase and necessary output when an erase character is
441 * present in the stream from the driver layer. Handles the complexities 441 * present in the stream from the driver layer. Handles the complexities
442 * of UTF-8 multibyte symbols. 442 * of UTF-8 multibyte symbols.
443 */ 443 */
@@ -657,7 +657,7 @@ static inline void n_tty_receive_overrun(struct tty_struct *tty)
657 * @c: character 657 * @c: character
658 * 658 *
659 * Process a parity error and queue the right data to indicate 659 * Process a parity error and queue the right data to indicate
660 * the error case if neccessary. Locking as per n_tty_receive_buf. 660 * the error case if necessary. Locking as per n_tty_receive_buf.
661 */ 661 */
662static inline void n_tty_receive_parity_error(struct tty_struct *tty, 662static inline void n_tty_receive_parity_error(struct tty_struct *tty,
663 unsigned char c) 663 unsigned char c)
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 7e6a3a413bb2..d83419c3857e 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -563,7 +563,7 @@ static void rp_do_poll(unsigned long dummy)
563 /* Get a ptr to the board's control struct */ 563 /* Get a ptr to the board's control struct */
564 ctlp = sCtlNumToCtlPtr(ctrl); 564 ctlp = sCtlNumToCtlPtr(ctrl);
565 565
566 /* Get the interupt status from the board */ 566 /* Get the interrupt status from the board */
567#ifdef CONFIG_PCI 567#ifdef CONFIG_PCI
568 if (ctlp->BusType == isPCI) 568 if (ctlp->BusType == isPCI)
569 CtlMask = sPCIGetControllerIntStatus(ctlp); 569 CtlMask = sPCIGetControllerIntStatus(ctlp);
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 9782cb4d30dc..877e53dcb996 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -7,7 +7,7 @@
7 * 7 *
8 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> 8 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
9 * 9 *
10 * Copyright (C) 2001-2002 Alcôve <www.alcove.com> 10 * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
11 * 11 *
12 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> 12 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
13 * 13 *
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 13a53575a016..f36fecd3fd26 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -943,7 +943,7 @@ EXPORT_SYMBOL_GPL(tty_ldisc_deref);
943 * @tty: terminal to activate ldisc on 943 * @tty: terminal to activate ldisc on
944 * 944 *
945 * Set the TTY_LDISC flag when the line discipline can be called 945 * Set the TTY_LDISC flag when the line discipline can be called
946 * again. Do neccessary wakeups for existing sleepers. 946 * again. Do necessary wakeups for existing sleepers.
947 * 947 *
948 * Note: nobody should set this bit except via this function. Clearing 948 * Note: nobody should set this bit except via this function. Clearing
949 * directly is allowed. 949 * directly is allowed.
@@ -1504,7 +1504,7 @@ EXPORT_SYMBOL(tty_hangup);
1504 * 1504 *
1505 * The user has asked via system call for the terminal to be hung up. 1505 * The user has asked via system call for the terminal to be hung up.
1506 * We do this synchronously so that when the syscall returns the process 1506 * We do this synchronously so that when the syscall returns the process
1507 * is complete. That guarantee is neccessary for security reasons. 1507 * is complete. That guarantee is necessary for security reasons.
1508 */ 1508 */
1509 1509
1510void tty_vhangup(struct tty_struct * tty) 1510void tty_vhangup(struct tty_struct * tty)
@@ -1691,7 +1691,7 @@ EXPORT_SYMBOL(stop_tty);
1691 * @tty: tty to start 1691 * @tty: tty to start
1692 * 1692 *
1693 * Start a tty that has been stopped if at all possible. Perform 1693 * Start a tty that has been stopped if at all possible. Perform
1694 * any neccessary wakeups and propagate the TIOCPKT status. If this 1694 * any necessary wakeups and propagate the TIOCPKT status. If this
1695 * is the tty was previous stopped and is being started then the 1695 * is the tty was previous stopped and is being started then the
1696 * driver start method is invoked and the line discipline woken. 1696 * driver start method is invoked and the line discipline woken.
1697 * 1697 *
@@ -2877,7 +2877,7 @@ static int tty_fasync(int fd, struct file * filp, int on)
2877 * @tty: tty to fake input into 2877 * @tty: tty to fake input into
2878 * @p: pointer to character 2878 * @p: pointer to character
2879 * 2879 *
2880 * Fake input to a tty device. Does the neccessary locking and 2880 * Fake input to a tty device. Does the necessary locking and
2881 * input management. 2881 * input management.
2882 * 2882 *
2883 * FIXME: does not honour flow control ?? 2883 * FIXME: does not honour flow control ??
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 0def089cc1f2..7a003504c265 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -444,7 +444,7 @@ static void change_termios(struct tty_struct * tty, struct ktermios * new_termio
444 * @arg: user data 444 * @arg: user data
445 * @opt: option information 445 * @opt: option information
446 * 446 *
447 * Helper function to prepare termios data and run neccessary other 447 * Helper function to prepare termios data and run necessary other
448 * functions before using change_termios to do the actual changes. 448 * functions before using change_termios to do the actual changes.
449 * 449 *
450 * Locking: 450 * Locking:
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 9959b799dbe2..c00d4a9b39e5 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -228,7 +228,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
228 * 228 *
229 * @param card the card from which to send the request 229 * @param card the card from which to send the request
230 * @param tcode the tcode for this transaction. Do not use 230 * @param tcode the tcode for this transaction. Do not use
231 * TCODE_LOCK_REQUEST directly, insted use TCODE_LOCK_MASK_SWAP 231 * TCODE_LOCK_REQUEST directly, instead use TCODE_LOCK_MASK_SWAP
232 * etc. to specify tcode and ext_tcode. 232 * etc. to specify tcode and ext_tcode.
233 * @param node_id the destination node ID (bus ID and PHY ID concatenated) 233 * @param node_id the destination node ID (bus ID and PHY ID concatenated)
234 * @param generation the generation for which node_id is valid 234 * @param generation the generation for which node_id is valid
diff --git a/drivers/hid/usbhid/hid-ff.c b/drivers/hid/usbhid/hid-ff.c
index 22329feb3b5a..4c210e16b1b4 100644
--- a/drivers/hid/usbhid/hid-ff.c
+++ b/drivers/hid/usbhid/hid-ff.c
@@ -1,6 +1,4 @@
1/* 1/*
2 * $Id: hid-ff.c,v 1.2 2002/04/18 22:02:47 jdeneux Exp $
3 *
4 * Force feedback support for hid devices. 2 * Force feedback support for hid devices.
5 * Not all hid devices use the same protocol. For example, some use PID, 3 * Not all hid devices use the same protocol. For example, some use PID,
6 * other use their own proprietary procotol. 4 * other use their own proprietary procotol.
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index a3b56c816e11..2d39d8fc2389 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -2,7 +2,7 @@
2 gl520sm.c - Part of lm_sensors, Linux kernel modules for hardware 2 gl520sm.c - Part of lm_sensors, Linux kernel modules for hardware
3 monitoring 3 monitoring
4 Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>, 4 Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>,
5 Kyösti Mälkki <kmalkki@cc.hut.fi> 5 Kyösti Mälkki <kmalkki@cc.hut.fi>
6 Copyright (c) 2005 Maarten Deprez <maartendeprez@users.sourceforge.net> 6 Copyright (c) 2005 Maarten Deprez <maartendeprez@users.sourceforge.net>
7 7
8 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
@@ -805,7 +805,7 @@ static void __exit sensors_gl520sm_exit(void)
805 805
806 806
807MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, " 807MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
808 "Kyösti Mälkki <kmalkki@cc.hut.fi>, " 808 "Kyösti Mälkki <kmalkki@cc.hut.fi>, "
809 "Maarten Deprez <maartendeprez@users.sourceforge.net>"); 809 "Maarten Deprez <maartendeprez@users.sourceforge.net>");
810MODULE_DESCRIPTION("GL520SM driver"); 810MODULE_DESCRIPTION("GL520SM driver");
811MODULE_LICENSE("GPL"); 811MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 860b71ccbb86..7e2d9787babc 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -3,7 +3,7 @@
3 for hardware monitoring 3 for hardware monitoring
4 4
5 Copyright (C) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>, 5 Copyright (C) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>,
6 Kyösti Mälkki <kmalkki@cc.hut.fi>, and 6 Kyösti Mälkki <kmalkki@cc.hut.fi>, and
7 Mark D. Studebaker <mdsxyz123@yahoo.com> 7 Mark D. Studebaker <mdsxyz123@yahoo.com>
8 Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with 8 Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with
9 the help of Jean Delvare <khali@linux-fr.org> 9 the help of Jean Delvare <khali@linux-fr.org>
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 8f63dada6019..2635bba1e3fc 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -3,7 +3,7 @@
3 for hardware monitoring 3 for hardware monitoring
4 4
5 Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, 5 Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>,
6 Kyösti Mälkki <kmalkki@cc.hut.fi>, 6 Kyösti Mälkki <kmalkki@cc.hut.fi>,
7 Mark Studebaker <mdsxyz123@yahoo.com>, 7 Mark Studebaker <mdsxyz123@yahoo.com>,
8 and Bob Dougherty <bobd@stanford.edu> 8 and Bob Dougherty <bobd@stanford.edu>
9 (Some conversion-factor data were contributed by Jonathan Teh Soon Yew 9 (Some conversion-factor data were contributed by Jonathan Teh Soon Yew
@@ -866,7 +866,7 @@ static void __exit sm_via686a_exit(void)
866 } 866 }
867} 867}
868 868
869MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>, " 869MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>, "
870 "Mark Studebaker <mdsxyz123@yahoo.com> " 870 "Mark Studebaker <mdsxyz123@yahoo.com> "
871 "and Bob Dougherty <bobd@stanford.edu>"); 871 "and Bob Dougherty <bobd@stanford.edu>");
872MODULE_DESCRIPTION("VIA 686A Sensor device"); 872MODULE_DESCRIPTION("VIA 686A Sensor device");
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 7f0a0a62cf60..a37cb6b8593c 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -18,7 +18,7 @@
18 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 18 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
19/* ------------------------------------------------------------------------- */ 19/* ------------------------------------------------------------------------- */
20 20
21/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki 21/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki
22 <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */ 22 <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */
23 23
24#include <linux/kernel.h> 24#include <linux/kernel.h>
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index 36fdf971f080..2a16211f12e5 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -350,7 +350,7 @@ static int pca_init(struct i2c_algo_pca_data *adap)
350 pca_outw(adap, I2C_PCA_ADR, own << 1); 350 pca_outw(adap, I2C_PCA_ADR, own << 1);
351 351
352 pca_set_con(adap, I2C_PCA_CON_ENSIO | clock); 352 pca_set_con(adap, I2C_PCA_CON_ENSIO | clock);
353 udelay(500); /* 500 µs for oscilator to stabilise */ 353 udelay(500); /* 500 µs for oscilator to stabilise */
354 354
355 return 0; 355 return 0;
356} 356}
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index ecb2c2d7d540..ab2e6f3498b4 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -19,7 +19,7 @@
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
20/* ------------------------------------------------------------------------- */ 20/* ------------------------------------------------------------------------- */
21 21
22/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and 22/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
23 Frodo Looijaard <frodol@dds.nl> ,and also from Martin Bailey 23 Frodo Looijaard <frodol@dds.nl> ,and also from Martin Bailey
24 <mbailey@littlefeet-inc.com> */ 24 <mbailey@littlefeet-inc.com> */
25 25
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index de95c75efb41..c466c6cfc2e5 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -278,7 +278,7 @@ config I2C_IXP2000
278 depends on ARCH_IXP2000 278 depends on ARCH_IXP2000
279 select I2C_ALGOBIT 279 select I2C_ALGOBIT
280 help 280 help
281 Say Y here if you have an Intel IXP2000(2400, 2800, 2850) based 281 Say Y here if you have an Intel IXP2000 (2400, 2800, 2850) based
282 system and are using GPIO lines for an I2C bus. 282 system and are using GPIO lines for an I2C bus.
283 283
284 This support is also available as a module. If so, the module 284 This support is also available as a module. If so, the module
@@ -293,8 +293,8 @@ config I2C_POWERMAC
293 default y 293 default y
294 help 294 help
295 This exposes the various PowerMac i2c interfaces to the linux i2c 295 This exposes the various PowerMac i2c interfaces to the linux i2c
296 layer and to userland. It is used by various drivers on the powemac 296 layer and to userland. It is used by various drivers on the PowerMac
297 platform, thus should generally be enabled. 297 platform, and should generally be enabled.
298 298
299 This support is also available as a module. If so, the module 299 This support is also available as a module. If so, the module
300 will be called i2c-powermac. 300 will be called i2c-powermac.
@@ -438,12 +438,12 @@ config I2C_SIMTEC
438 tristate "Simtec Generic I2C interface" 438 tristate "Simtec Generic I2C interface"
439 select I2C_ALGOBIT 439 select I2C_ALGOBIT
440 help 440 help
441 If you say yes to this option, support will be inclyded for 441 If you say yes to this option, support will be included for
442 the Simtec Generic I2C interface. This driver is for the 442 the Simtec Generic I2C interface. This driver is for the
443 simple I2C bus used on newer Simtec products for general 443 simple I2C bus used on newer Simtec products for general
444 I2C, such as DDC on the Simtec BBD2016A. 444 I2C, such as DDC on the Simtec BBD2016A.
445 445
446 This driver can also be build as a module. If so, the module 446 This driver can also be built as a module. If so, the module
447 will be called i2c-simtec. 447 will be called i2c-simtec.
448 448
449config SCx200_I2C 449config SCx200_I2C
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 804f0a551c05..b7a9977b025f 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -19,7 +19,7 @@
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
20/* ------------------------------------------------------------------------- */ 20/* ------------------------------------------------------------------------- */
21 21
22/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even 22/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
23 Frodo Looijaard <frodol@dds.nl> */ 23 Frodo Looijaard <frodol@dds.nl> */
24 24
25/* Partialy rewriten by Oleg I. Vdovikin for mmapped support of 25/* Partialy rewriten by Oleg I. Vdovikin for mmapped support of
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c
index 9832f773651d..f9972f9651e4 100644
--- a/drivers/i2c/busses/i2c-hydra.c
+++ b/drivers/i2c/busses/i2c-hydra.c
@@ -7,7 +7,7 @@
7 Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org> 7 Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org>
8 8
9 Based on i2c Support for Via Technologies 82C586B South Bridge 9 Based on i2c Support for Via Technologies 82C586B South Bridge
10 Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi> 10 Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi>
11 11
12 This program is free software; you can redistribute it and/or modify 12 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 13 it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index e08bacadd6bc..9b43ff7270d0 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -18,7 +18,7 @@
18 * Copyright 1995-97 Simon G. Vogl 18 * Copyright 1995-97 Simon G. Vogl
19 * 1998-99 Hans Berglund 19 * 1998-99 Hans Berglund
20 * 20 *
21 * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> 21 * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>
22 * and even Frodo Looijaard <frodol@dds.nl> 22 * and even Frodo Looijaard <frodol@dds.nl>
23 * 23 *
24 * This program is free software; you can redistribute it and/or modify it 24 * This program is free software; you can redistribute it and/or modify it
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index e471e3bfdc1e..89a30028ddb6 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -8,7 +8,7 @@
8 * Tony Lindgren <tony@atomide.com> and Imre Deak <imre.deak@nokia.com> 8 * Tony Lindgren <tony@atomide.com> and Imre Deak <imre.deak@nokia.com>
9 * Copyright (C) 2005 Nokia Corporation 9 * Copyright (C) 2005 Nokia Corporation
10 * 10 *
11 * Cleaned up by Juha Yrjölä <juha.yrjola@nokia.com> 11 * Cleaned up by Juha Yrjölä <juha.yrjola@nokia.com>
12 * 12 *
13 * This program is free software; you can redistribute it and/or modify 13 * This program is free software; you can redistribute it and/or modify
14 * it under the terms of the GNU General Public License as published by 14 * it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index 49a95e2887bc..c6faf9bdad18 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -7,7 +7,7 @@
7 Copyright (C) 1995-2000 Simon G. Vogl 7 Copyright (C) 1995-2000 Simon G. Vogl
8 With some changes from: 8 With some changes from:
9 Frodo Looijaard <frodol@dds.nl> 9 Frodo Looijaard <frodol@dds.nl>
10 Kyösti Mälkki <kmalkki@cc.hut.fi> 10 Kyösti Mälkki <kmalkki@cc.hut.fi>
11 11
12 This program is free software; you can redistribute it and/or modify 12 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 13 it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 039a07fde908..59ba2086d2f9 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -7,7 +7,7 @@
7 Copyright (C) 1995-2000 Simon G. Vogl 7 Copyright (C) 1995-2000 Simon G. Vogl
8 With some changes from: 8 With some changes from:
9 Frodo Looijaard <frodol@dds.nl> 9 Frodo Looijaard <frodol@dds.nl>
10 Kyösti Mälkki <kmalkki@cc.hut.fi> 10 Kyösti Mälkki <kmalkki@cc.hut.fi>
11 11
12 This program is free software; you can redistribute it and/or modify 12 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 13 it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 81520868797b..61716f6b14dc 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -4,7 +4,7 @@
4 4
5 i2c Support for Via Technologies 82C586B South Bridge 5 i2c Support for Via Technologies 82C586B South Bridge
6 6
7 Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi> 7 Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi>
8 8
9 This program is free software; you can redistribute it and/or modify 9 This program is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by 10 it under the terms of the GNU General Public License as published by
@@ -176,7 +176,7 @@ static void __exit i2c_vt586b_exit(void)
176} 176}
177 177
178 178
179MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>"); 179MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>");
180MODULE_DESCRIPTION("i2c for Via vt82c586b southbridge"); 180MODULE_DESCRIPTION("i2c for Via vt82c586b southbridge");
181MODULE_LICENSE("GPL"); 181MODULE_LICENSE("GPL");
182 182
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index edc275002f80..c9ce77f13c0e 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -2,7 +2,7 @@
2 i2c-viapro.c - Part of lm_sensors, Linux kernel modules for hardware 2 i2c-viapro.c - Part of lm_sensors, Linux kernel modules for hardware
3 monitoring 3 monitoring
4 Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, 4 Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>,
5 Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>, 5 Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>,
6 Mark D. Studebaker <mdsxyz123@yahoo.com> 6 Mark D. Studebaker <mdsxyz123@yahoo.com>
7 Copyright (C) 2005 - 2007 Jean Delvare <khali@linux-fr.org> 7 Copyright (C) 2005 - 2007 Jean Delvare <khali@linux-fr.org>
8 8
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index e73d58c43f38..1a4e8dc03b36 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -17,7 +17,7 @@
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
18/* ------------------------------------------------------------------------- */ 18/* ------------------------------------------------------------------------- */
19 19
20/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>. 20/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
21 All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl> 21 All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
22 SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and 22 SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and
23 Jean Delvare <khali@linux-fr.org> */ 23 Jean Delvare <khali@linux-fr.org> */
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index ca843522f91d..57a5f63d6ae3 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -120,7 +120,7 @@
120 * Reformat to match kernel tabbing style. 120 * Reformat to match kernel tabbing style.
121 * Add CDROM_GET_UPC ioctl. 121 * Add CDROM_GET_UPC ioctl.
122 * 3.10 Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI. 122 * 3.10 Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI.
123 * 3.11 Apr 29, 1996 -- Patch from Heiko Eissfeldt <heiko@colossus.escape.de> 123 * 3.11 Apr 29, 1996 -- Patch from Heiko Eißfeldt <heiko@colossus.escape.de>
124 * to remove redundant verify_area calls. 124 * to remove redundant verify_area calls.
125 * 3.12 May 7, 1996 -- Rudimentary changer support. Based on patches 125 * 3.12 May 7, 1996 -- Rudimentary changer support. Based on patches
126 * from Gerhard Zuber <zuber@berlin.snafu.de>. 126 * from Gerhard Zuber <zuber@berlin.snafu.de>.
@@ -256,7 +256,7 @@
256 * - Minimize the TOC reading - only do it when we 256 * - Minimize the TOC reading - only do it when we
257 * know a media change has occurred. 257 * know a media change has occurred.
258 * - Moved all the CDROMREADx ioctls to the Uniform layer. 258 * - Moved all the CDROMREADx ioctls to the Uniform layer.
259 * - Heiko Eissfeldt <heiko@colossus.escape.de> supplied 259 * - Heiko Eißfeldt <heiko@colossus.escape.de> supplied
260 * some fixes for CDI. 260 * some fixes for CDI.
261 * - CD-ROM leaving door locked fix from Andries 261 * - CD-ROM leaving door locked fix from Andries
262 * Brouwer <Andries.Brouwer@cwi.nl> 262 * Brouwer <Andries.Brouwer@cwi.nl>
@@ -2341,7 +2341,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
2341 If we get an error for the regular case, we assume 2341 If we get an error for the regular case, we assume
2342 a CDI without additional audio tracks. In this case 2342 a CDI without additional audio tracks. In this case
2343 the readable TOC is empty (CDI tracks are not included) 2343 the readable TOC is empty (CDI tracks are not included)
2344 and only holds the Leadout entry. Heiko Eißfeldt */ 2344 and only holds the Leadout entry. Heiko Eißfeldt */
2345 ntracks = 0; 2345 ntracks = 0;
2346 stat = cdrom_read_tocentry(drive, CDROM_LEADOUT, 1, 0, 2346 stat = cdrom_read_tocentry(drive, CDROM_LEADOUT, 1, 0,
2347 (char *)&toc->hdr, 2347 (char *)&toc->hdr,
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index e5a86a962b26..7b9181b5469d 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -565,7 +565,7 @@ typedef struct os_dat_s {
565 * The following parameter is used to select the point in the internal 565 * The following parameter is used to select the point in the internal
566 * tape fifo in which we will start to refill the buffer. Decreasing 566 * tape fifo in which we will start to refill the buffer. Decreasing
567 * the following parameter will improve the system's latency and 567 * the following parameter will improve the system's latency and
568 * interactive response, while using a high value might improve sytem 568 * interactive response, while using a high value might improve system
569 * throughput. 569 * throughput.
570 */ 570 */
571#define IDETAPE_FIFO_THRESHOLD 2 571#define IDETAPE_FIFO_THRESHOLD 2
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 44cdb745a6ff..a73db1bd482d 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -101,7 +101,7 @@ void q40_ide_setup_ports ( hw_regs_t *hw,
101 101
102/* 102/*
103 * the static array is needed to have the name reported in /proc/ioports, 103 * the static array is needed to have the name reported in /proc/ioports,
104 * hwif->name unfortunately isn´t available yet 104 * hwif->name unfortunately isn't available yet
105 */ 105 */
106static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={ 106static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={
107 "ide0", "ide1" 107 "ide0", "ide1"
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 1a7ddd12e65c..5c9975435319 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -95,7 +95,7 @@ struct it821x_dev
95 95
96/* 96/*
97 * We allow users to force the card into non raid mode without 97 * We allow users to force the card into non raid mode without
98 * flashing the alternative BIOS. This is also neccessary right now 98 * flashing the alternative BIOS. This is also necessary right now
99 * for embedded platforms that cannot run a PC BIOS but are using this 99 * for embedded platforms that cannot run a PC BIOS but are using this
100 * device. 100 * device.
101 */ 101 */
@@ -564,7 +564,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
564 564
565 /* 565 /*
566 * Not in the docs but according to the reference driver 566 * Not in the docs but according to the reference driver
567 * this is neccessary. 567 * this is necessary.
568 */ 568 */
569 569
570 pci_read_config_byte(hwif->pci_dev, 0x08, &conf); 570 pci_read_config_byte(hwif->pci_dev, 0x08, &conf);
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index dc915cb22bec..6d99441c605b 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -26,7 +26,7 @@
26 * 26 *
27 * If you have strange problems with nVidia chipset systems please 27 * If you have strange problems with nVidia chipset systems please
28 * see the SI support documentation and update your system BIOS 28 * see the SI support documentation and update your system BIOS
29 * if neccessary 29 * if necessary
30 * 30 *
31 * The Dell DRAC4 has some interesting features including effectively hot 31 * The Dell DRAC4 has some interesting features including effectively hot
32 * unplugging/replugging the virtual CD interface when the DRAC is reset. 32 * unplugging/replugging the virtual CD interface when the DRAC is reset.
diff --git a/drivers/input/fixp-arith.h b/drivers/input/fixp-arith.h
index ed3d2da0c485..3089d7382325 100644
--- a/drivers/input/fixp-arith.h
+++ b/drivers/input/fixp-arith.h
@@ -24,7 +24,7 @@
24 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 24 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
25 * 25 *
26 * Should you need to contact me, the author, you can do so by 26 * Should you need to contact me, the author, you can do so by
27 * e-mail - mail your message to <deneux@ifrance.com> 27 * e-mail - mail your message to <johann.deneux@gmail.com>
28 */ 28 */
29 29
30#include <linux/types.h> 30#include <linux/types.h>
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 27fc475bd3a1..a6ca9d5e252f 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -4,7 +4,7 @@
4 * Copyright (c) 1999-2001 Vojtech Pavlik 4 * Copyright (c) 1999-2001 Vojtech Pavlik
5 * 5 *
6 * Based on the work of: 6 * Based on the work of:
7 * Andree Borrmann Mats Sjövall 7 * Andree Borrmann Mats Sjövall
8 */ 8 */
9 9
10/* 10/*
diff --git a/drivers/input/joystick/iforce/Makefile b/drivers/input/joystick/iforce/Makefile
index 17ae42bf9ffd..74daff49ab6e 100644
--- a/drivers/input/joystick/iforce/Makefile
+++ b/drivers/input/joystick/iforce/Makefile
@@ -1,7 +1,7 @@
1# 1#
2# Makefile for the I-Force driver 2# Makefile for the I-Force driver
3# 3#
4# By Johann Deneux <deneux@ifrance.com> 4# By Johann Deneux <johann.deneux@gmail.com>
5# 5#
6 6
7# Goal definition 7# Goal definition
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 76f1969552c5..babc913d5492 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -4,7 +4,7 @@
4 * OMAP Keypad Driver 4 * OMAP Keypad Driver
5 * 5 *
6 * Copyright (C) 2003 Nokia Corporation 6 * Copyright (C) 2003 Nokia Corporation
7 * Written by Timo Teräs <ext-timo.teras@nokia.com> 7 * Written by Timo Teräs <ext-timo.teras@nokia.com>
8 * 8 *
9 * Added support for H2 & H3 Keypad 9 * Added support for H2 & H3 Keypad
10 * Copyright (C) 2004 Texas Instruments 10 * Copyright (C) 2004 Texas Instruments
@@ -481,6 +481,6 @@ static void __exit omap_kp_exit(void)
481module_init(omap_kp_init); 481module_init(omap_kp_init);
482module_exit(omap_kp_exit); 482module_exit(omap_kp_exit);
483 483
484MODULE_AUTHOR("Timo Teräs"); 484MODULE_AUTHOR("Timo Teräs");
485MODULE_DESCRIPTION("OMAP Keypad Driver"); 485MODULE_DESCRIPTION("OMAP Keypad Driver");
486MODULE_LICENSE("GPL"); 486MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7acc6351bb44..8f5c7b90187d 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -70,9 +70,9 @@ config INPUT_WISTRON_BTNS
70 select LEDS_CLASS 70 select LEDS_CLASS
71 select CHECK_SIGNATURE 71 select CHECK_SIGNATURE
72 help 72 help
73 Say Y here for support of Winstron laptop button interface, used on 73 Say Y here for support of Wistron laptop button interfaces, used on
74 laptops of various brands, including Acer and Fujitsu-Siemens. If 74 laptops of various brands, including Acer and Fujitsu-Siemens. If
75 available, mail and wifi leds will be controlable via /sys/class/leds. 75 available, mail and wifi LEDs will be controllable via /sys/class/leds.
76 76
77 To compile this driver as a module, choose M here: the module will 77 To compile this driver as a module, choose M here: the module will
78 be called wistron_btns. 78 be called wistron_btns.
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index da316d13d7f5..21a9c0b69a1f 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -906,7 +906,7 @@ static void psmouse_activate(struct psmouse *psmouse)
906 906
907/* 907/*
908 * psmouse_deactivate() puts the mouse into poll mode so that we don't get motion 908 * psmouse_deactivate() puts the mouse into poll mode so that we don't get motion
909 * reports from it unless we explicitely request it. 909 * reports from it unless we explicitly request it.
910 */ 910 */
911 911
912static void psmouse_deactivate(struct psmouse *psmouse) 912static void psmouse_deactivate(struct psmouse *psmouse)
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index 4a321576f345..404eedd5ffa2 100644
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -330,7 +330,7 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse)
330 330
331 /* 331 /*
332 * Check for Power-On-Reset packets. These are sent out 332 * Check for Power-On-Reset packets. These are sent out
333 * after plugging the mouse in, or when explicitely 333 * after plugging the mouse in, or when explicitly
334 * requested by sending 'T'. 334 * requested by sending 'T'.
335 * 335 *
336 * [0]: 1 0 1 0 R3 R2 R1 R0 336 * [0]: 1 0 1 0 R3 R2 R1 R0
diff --git a/drivers/isdn/act2000/act2000_isa.c b/drivers/isdn/act2000/act2000_isa.c
index 09ea50dd3459..819ea85576a3 100644
--- a/drivers/isdn/act2000/act2000_isa.c
+++ b/drivers/isdn/act2000/act2000_isa.c
@@ -126,7 +126,7 @@ act2000_isa_enable_irq(act2000_card * card)
126 126
127/* 127/*
128 * Install interrupt handler, enable irq on card. 128 * Install interrupt handler, enable irq on card.
129 * If irq is -1, choose next free irq, else irq is given explicitely. 129 * If irq is -1, choose next free irq, else irq is given explicitly.
130 */ 130 */
131int 131int
132act2000_isa_config_irq(act2000_card * card, short irq) 132act2000_isa_config_irq(act2000_card * card, short irq)
diff --git a/drivers/isdn/hardware/eicon/capifunc.c b/drivers/isdn/hardware/eicon/capifunc.c
index 82edc1c1db7a..4d425c644d41 100644
--- a/drivers/isdn/hardware/eicon/capifunc.c
+++ b/drivers/isdn/hardware/eicon/capifunc.c
@@ -321,7 +321,7 @@ void sendf(APPL * appl, word command, dword Id, word Number, byte * format, ...)
321 DBG_BLK((((char *)(long)GET_DWORD(&msg.info.data_b3_ind.Data)) + i, 321 DBG_BLK((((char *)(long)GET_DWORD(&msg.info.data_b3_ind.Data)) + i,
322 ((dlength - i) < 256) ? (dlength - i) : 256)) 322 ((dlength - i) < 256) ? (dlength - i) : 256))
323 if (!(myDriverDebugHandle.dbgMask & DL_PRV0)) 323 if (!(myDriverDebugHandle.dbgMask & DL_PRV0))
324 break; /* not more if not explicitely requested */ 324 break; /* not more if not explicitly requested */
325 } 325 }
326 } 326 }
327 break; 327 break;
@@ -965,7 +965,7 @@ static u16 diva_send_message(struct capi_ctr *ctrl,
965 ((GET_WORD(&msg->info.data_b3_req.Data_Length) - j) < 965 ((GET_WORD(&msg->info.data_b3_req.Data_Length) - j) <
966 256) ? (GET_WORD(&msg->info.data_b3_req.Data_Length) - j) : 256)) 966 256) ? (GET_WORD(&msg->info.data_b3_req.Data_Length) - j) : 256))
967 if (!(myDriverDebugHandle.dbgMask & DL_PRV0)) 967 if (!(myDriverDebugHandle.dbgMask & DL_PRV0))
968 break; /* not more if not explicitely requested */ 968 break; /* not more if not explicitly requested */
969 } 969 }
970 } 970 }
971#endif 971#endif
diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c
index 3b19caeba258..c0d7036404a5 100644
--- a/drivers/isdn/hisax/amd7930_fn.c
+++ b/drivers/isdn/hisax/amd7930_fn.c
@@ -767,7 +767,7 @@ Amd7930_init(struct IsdnCardState *cs)
767 /* read */ 767 /* read */
768 if (*ptr++ >= 0x100) { 768 if (*ptr++ >= 0x100) {
769 if (cmd < 8) 769 if (cmd < 8)
770 /* setzt Register zurück */ 770 /* reset register */
771 rByteAMD(cs, cmd); 771 rByteAMD(cs, cmd);
772 else { 772 else {
773 wByteAMD(cs, 0x00, cmd); 773 wByteAMD(cs, 0x00, cmd);
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c
index b73027ff50e8..39f421ed8de8 100644
--- a/drivers/isdn/hisax/enternow_pci.c
+++ b/drivers/isdn/hisax/enternow_pci.c
@@ -75,16 +75,16 @@
75static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $"; 75static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $";
76 76
77 77
78/* für PowerISDN PCI */ 78/* for PowerISDN PCI */
79#define TJ_AMD_IRQ 0x20 79#define TJ_AMD_IRQ 0x20
80#define TJ_LED1 0x40 80#define TJ_LED1 0x40
81#define TJ_LED2 0x80 81#define TJ_LED2 0x80
82 82
83 83
84/* Das Fenster zum AMD... 84/* The window to [the] AMD [chip]...
85 * Ab Adresse hw.njet.base + TJ_AMD_PORT werden vom AMD jeweils 8 Bit in 85 * From address hw.njet.base + TJ_AMD_PORT onwards, the AMD
86 * den TigerJet i/o-Raum gemappt 86 * maps [consecutive/multiple] 8 bits into the TigerJet I/O space
87 * -> 0x01 des AMD bei hw.njet.base + 0C4 */ 87 * -> 0x01 of the AMD at hw.njet.base + 0C4 */
88#define TJ_AMD_PORT 0xC0 88#define TJ_AMD_PORT 0xC0
89 89
90 90
@@ -96,11 +96,11 @@ static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $";
96static unsigned char 96static unsigned char
97ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset) 97ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset)
98{ 98{
99 /* direktes Register */ 99 /* direct register */
100 if(offset < 8) 100 if(offset < 8)
101 return (inb(cs->hw.njet.isac + 4*offset)); 101 return (inb(cs->hw.njet.isac + 4*offset));
102 102
103 /* indirektes Register */ 103 /* indirect register */
104 else { 104 else {
105 outb(offset, cs->hw.njet.isac + 4*AMD_CR); 105 outb(offset, cs->hw.njet.isac + 4*AMD_CR);
106 return(inb(cs->hw.njet.isac + 4*AMD_DR)); 106 return(inb(cs->hw.njet.isac + 4*AMD_DR));
@@ -111,11 +111,11 @@ ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset)
111static void 111static void
112WriteByteAmd7930(struct IsdnCardState *cs, unsigned char offset, unsigned char value) 112WriteByteAmd7930(struct IsdnCardState *cs, unsigned char offset, unsigned char value)
113{ 113{
114 /* direktes Register */ 114 /* direct register */
115 if(offset < 8) 115 if(offset < 8)
116 outb(value, cs->hw.njet.isac + 4*offset); 116 outb(value, cs->hw.njet.isac + 4*offset);
117 117
118 /* indirektes Register */ 118 /* indirect register */
119 else { 119 else {
120 outb(offset, cs->hw.njet.isac + 4*AMD_CR); 120 outb(offset, cs->hw.njet.isac + 4*AMD_CR);
121 outb(value, cs->hw.njet.isac + 4*AMD_DR); 121 outb(value, cs->hw.njet.isac + 4*AMD_DR);
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 077080aca799..fba8b624ffcf 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -1,6 +1,6 @@
1/* $Id: hfc_pci.c,v 1.48.2.4 2004/02/11 13:21:33 keil Exp $ 1/* $Id: hfc_pci.c,v 1.48.2.4 2004/02/11 13:21:33 keil Exp $
2 * 2 *
3 * low level driver for CCD´s hfc-pci based cards 3 * low level driver for CCD's hfc-pci based cards
4 * 4 *
5 * Author Werner Cornelius 5 * Author Werner Cornelius
6 * based on existing driver for CCD hfc ISA cards 6 * based on existing driver for CCD hfc ISA cards
diff --git a/drivers/isdn/hisax/isdnhdlc.c b/drivers/isdn/hisax/isdnhdlc.c
index 268dced6c34a..c69a77a80062 100644
--- a/drivers/isdn/hisax/isdnhdlc.c
+++ b/drivers/isdn/hisax/isdnhdlc.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * isdnhdlc.c -- General purpose ISDN HDLC decoder. 2 * isdnhdlc.c -- General purpose ISDN HDLC decoder.
3 * 3 *
4 *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de> 4 *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de>
5 * 2001 Frode Isaksen <fisaksen@bewan.com> 5 * 2001 Frode Isaksen <fisaksen@bewan.com>
6 * 2001 Kai Germaschewski <kai.germaschewski@gmx.de> 6 * 2001 Kai Germaschewski <kai.germaschewski@gmx.de>
7 * 7 *
@@ -27,7 +27,7 @@
27 27
28/*-------------------------------------------------------------------*/ 28/*-------------------------------------------------------------------*/
29 29
30MODULE_AUTHOR("Wolfgang Mües <wolfgang@iksw-muees.de>, " 30MODULE_AUTHOR("Wolfgang Mües <wolfgang@iksw-muees.de>, "
31 "Frode Isaksen <fisaksen@bewan.com>, " 31 "Frode Isaksen <fisaksen@bewan.com>, "
32 "Kai Germaschewski <kai.germaschewski@gmx.de>"); 32 "Kai Germaschewski <kai.germaschewski@gmx.de>");
33MODULE_DESCRIPTION("General purpose ISDN HDLC decoder"); 33MODULE_DESCRIPTION("General purpose ISDN HDLC decoder");
diff --git a/drivers/isdn/hisax/isdnhdlc.h b/drivers/isdn/hisax/isdnhdlc.h
index 45167d2f8fb0..cf0a95a24015 100644
--- a/drivers/isdn/hisax/isdnhdlc.h
+++ b/drivers/isdn/hisax/isdnhdlc.h
@@ -5,7 +5,7 @@
5 * Neccessary because some ISDN devices don't have HDLC 5 * Neccessary because some ISDN devices don't have HDLC
6 * controllers. Also included: a bit reversal table. 6 * controllers. Also included: a bit reversal table.
7 * 7 *
8 *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de> 8 *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de>
9 * 2001 Frode Isaksen <fisaksen@bewan.com> 9 * 2001 Frode Isaksen <fisaksen@bewan.com>
10 * 2001 Kai Germaschewski <kai.germaschewski@gmx.de> 10 * 2001 Kai Germaschewski <kai.germaschewski@gmx.de>
11 * 11 *
diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c
index 43d61d1bc5b6..70840a710acf 100644
--- a/drivers/isdn/hisax/jade.c
+++ b/drivers/isdn/hisax/jade.c
@@ -304,7 +304,7 @@ initjade(struct IsdnCardState *cs)
304 cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0x00); 304 cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0x00);
305 /* Setup host access to hdlc controller */ 305 /* Setup host access to hdlc controller */
306 jade_write_indirect(cs, jade_HDLCCNTRACCESS, (jadeINDIRECT_HAH1|jadeINDIRECT_HAH2)); 306 jade_write_indirect(cs, jade_HDLCCNTRACCESS, (jadeINDIRECT_HAH1|jadeINDIRECT_HAH2));
307 /* Unmask HDLC int (don´t forget DSP int later on)*/ 307 /* Unmask HDLC int (don't forget DSP int later on)*/
308 cs->BC_Write_Reg(cs, -1,jade_INT, (jadeINT_HDLC1|jadeINT_HDLC2)); 308 cs->BC_Write_Reg(cs, -1,jade_INT, (jadeINT_HDLC1|jadeINT_HDLC2));
309 309
310 /* once again TRANSPARENT */ 310 /* once again TRANSPARENT */
diff --git a/drivers/isdn/pcbit/capi.c b/drivers/isdn/pcbit/capi.c
index 7b55e151f1b0..ac5a91ccde81 100644
--- a/drivers/isdn/pcbit/capi.c
+++ b/drivers/isdn/pcbit/capi.c
@@ -15,9 +15,9 @@
15 15
16/* 16/*
17 * Documentation: 17 * Documentation:
18 * - "Common ISDN API - Perfil Português - Versão 2.1", 18 * - "Common ISDN API - Perfil Português - Versão 2.1",
19 * Telecom Portugal, Fev 1992. 19 * Telecom Portugal, Fev 1992.
20 * - "Common ISDN API - Especificação de protocolos para 20 * - "Common ISDN API - Especificação de protocolos para
21 * acesso aos canais B", Inesc, Jan 1994. 21 * acesso aos canais B", Inesc, Jan 1994.
22 */ 22 */
23 23
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
index 50914439d861..0fd640751294 100644
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@ -43,7 +43,7 @@ static void s3c24xx_led_set(struct led_classdev *led_cdev,
43 struct s3c24xx_gpio_led *led = to_gpio(led_cdev); 43 struct s3c24xx_gpio_led *led = to_gpio(led_cdev);
44 struct s3c24xx_led_platdata *pd = led->pdata; 44 struct s3c24xx_led_platdata *pd = led->pdata;
45 45
46 /* there will be a sort delay between setting the output and 46 /* there will be a short delay between setting the output and
47 * going from output to input when using tristate. */ 47 * going from output to input when using tristate. */
48 48
49 s3c2410_gpio_setpin(pd->gpio, (value ? 1 : 0) ^ 49 s3c2410_gpio_setpin(pd->gpio, (value ? 1 : 0) ^
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index f7c509b7a8ea..dc741d3a4531 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -1521,7 +1521,7 @@ pmu_sr_intr(void)
1521 req = current_req; 1521 req = current_req;
1522 /* 1522 /*
1523 * For PMU sleep and freq change requests, we lock the 1523 * For PMU sleep and freq change requests, we lock the
1524 * PMU until it's explicitely unlocked. This avoids any 1524 * PMU until it's explicitly unlocked. This avoids any
1525 * spurrious event polling getting in 1525 * spurrious event polling getting in
1526 */ 1526 */
1527 current_req = req->next; 1527 current_req = req->next;
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index b41f945df8a1..0eb5416798bd 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -113,7 +113,7 @@ static void clone_init(struct dm_crypt_io *, struct bio *);
113 * Different IV generation algorithms: 113 * Different IV generation algorithms:
114 * 114 *
115 * plain: the initial vector is the 32-bit little-endian version of the sector 115 * plain: the initial vector is the 32-bit little-endian version of the sector
116 * number, padded with zeros if neccessary. 116 * number, padded with zeros if necessary.
117 * 117 *
118 * essiv: "encrypted sector|salt initial vector", the sector number is 118 * essiv: "encrypted sector|salt initial vector", the sector number is
119 * encrypted with the bulk cipher using a salt as key. The salt 119 * encrypted with the bulk cipher using a salt as key. The salt
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 16775a0df7f6..85478d6a9c1a 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -9,7 +9,7 @@
9 * 9 *
10 * Better read-balancing code written by Mika Kuoppala <miku@iki.fi>, 2000 10 * Better read-balancing code written by Mika Kuoppala <miku@iki.fi>, 2000
11 * 11 *
12 * Fixes to reconstruction by Jakob Østergaard" <jakob@ostenfeld.dk> 12 * Fixes to reconstruction by Jakob Østergaard" <jakob@ostenfeld.dk>
13 * Various fixes by Neil Brown <neilb@cse.unsw.edu.au> 13 * Various fixes by Neil Brown <neilb@cse.unsw.edu.au>
14 * 14 *
15 * Changes by Peter T. Breuer <ptb@it.uc3m.es> 31/1/2003 to support 15 * Changes by Peter T. Breuer <ptb@it.uc3m.es> 31/1/2003 to support
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
index d2905720eb74..9c905399a233 100644
--- a/drivers/media/common/saa7146_hlp.c
+++ b/drivers/media/common/saa7146_hlp.c
@@ -312,7 +312,7 @@ static int sort_and_eliminate(u32* values, int* count)
312 return -EINVAL; 312 return -EINVAL;
313 } 313 }
314 314
315 /* bubble sort the first ´count´ items of the array ´values´ */ 315 /* bubble sort the first @count items of the array @values */
316 for( top = *count; top > 0; top--) { 316 for( top = *count; top > 0; top--) {
317 for( low = 0, high = 1; high < top; low++, high++) { 317 for( low = 0, high = 1; high < top; low++, high++) {
318 if( values[low] > values[high] ) { 318 if( values[low] > values[high] ) {
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index eca602d9b3de..85e36a1d6d78 100644
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -280,7 +280,7 @@ static irqreturn_t bt878_irq(int irq, void *dev_id)
280 if (!(astat = (stat & mask))) 280 if (!(astat = (stat & mask)))
281 return IRQ_NONE; /* this interrupt is not for me */ 281 return IRQ_NONE; /* this interrupt is not for me */
282/* dprintk("bt878(%d) debug: irq count %d, stat 0x%8.8x, mask 0x%8.8x\n",bt->nr,count,stat,mask); */ 282/* dprintk("bt878(%d) debug: irq count %d, stat 0x%8.8x, mask 0x%8.8x\n",bt->nr,count,stat,mask); */
283 btwrite(astat, BT878_AINT_STAT); /* try to clear interupt condition */ 283 btwrite(astat, BT878_AINT_STAT); /* try to clear interrupt condition */
284 284
285 285
286 if (astat & (BT878_ASCERR | BT878_AOCERR)) { 286 if (astat & (BT878_ASCERR | BT878_AOCERR)) {
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 154a7ce7cb82..a05e5c182288 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * TerraTec Cinergy T²/qanu USB2 DVB-T adapter. 2 * TerraTec Cinergy T²/qanu USB2 DVB-T adapter.
3 * 3 *
4 * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and 4 * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and
5 * Holger Waechtler <holger@qanu.de> 5 * Holger Waechtler <holger@qanu.de>
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 288e79f2cb0f..7902ae1d9a18 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -128,7 +128,7 @@ struct ttusb {
128 struct dvb_frontend* fe; 128 struct dvb_frontend* fe;
129}; 129};
130 130
131/* ugly workaround ... don't know why it's neccessary to read */ 131/* ugly workaround ... don't know why it's necessary to read */
132/* all result codes. */ 132/* all result codes. */
133 133
134#define DEBUG 0 134#define DEBUG 0
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index dd6a7d68b07f..3abd9fa54d2c 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -1259,7 +1259,7 @@ struct tvcard bttv_tvcards[] = {
1259 .has_radio = 1, 1259 .has_radio = 1,
1260 }, 1260 },
1261 [BTTV_BOARD_LIFETEC_9415] = { 1261 [BTTV_BOARD_LIFETEC_9415] = {
1262 /* Tim Röstermundt <rosterm@uni-muenster.de> 1262 /* Tim Röstermundt <rosterm@uni-muenster.de>
1263 in de.comp.os.unix.linux.hardware: 1263 in de.comp.os.unix.linux.hardware:
1264 options bttv card=0 pll=1 radio=1 gpiomask=0x18e0 1264 options bttv card=0 pll=1 radio=1 gpiomask=0x18e0
1265 gpiomux =0x44c71f,0x44d71f,0,0x44d71f,0x44dfff 1265 gpiomux =0x44c71f,0x44d71f,0,0x44d71f,0x44dfff
@@ -2824,7 +2824,7 @@ struct tvcard bttv_tvcards[] = {
2824 }, 2824 },
2825 /* ---- card 0x8b ---------------------------------- */ 2825 /* ---- card 0x8b ---------------------------------- */
2826 [BTTV_BOARD_PV_M4900] = { 2826 [BTTV_BOARD_PV_M4900] = {
2827 /* Sérgio Fortier <sergiofortier@yahoo.com.br> */ 2827 /* Sérgio Fortier <sergiofortier@yahoo.com.br> */
2828 .name = "Prolink PixelView PlayTV MPEG2 PV-M4900", 2828 .name = "Prolink PixelView PlayTV MPEG2 PV-M4900",
2829 .video_inputs = 3, 2829 .video_inputs = 3,
2830 .audio_inputs = 1, 2830 .audio_inputs = 1,
@@ -4709,18 +4709,18 @@ adtvk503_audio(struct bttv *btv, struct video_audio *v, int set)
4709 * 4709 *
4710 * The board hardwire Y0 (xpoint) to MUX1 and MUXOUT to Yin. 4710 * The board hardwire Y0 (xpoint) to MUX1 and MUXOUT to Yin.
4711 * GPIO pins are wired as: 4711 * GPIO pins are wired as:
4712 * GPIO[0:3] - AX[0:3] (xpoint) - P1[0:3] (microcontroler) 4712 * GPIO[0:3] - AX[0:3] (xpoint) - P1[0:3] (microcontroller)
4713 * GPIO[4:6] - AY[0:2] (xpoint) - P1[4:6] (microcontroler) 4713 * GPIO[4:6] - AY[0:2] (xpoint) - P1[4:6] (microcontroller)
4714 * GPIO[7] - DATA (xpoint) - P1[7] (microcontroler) 4714 * GPIO[7] - DATA (xpoint) - P1[7] (microcontroller)
4715 * GPIO[8] - - P3[5] (microcontroler) 4715 * GPIO[8] - - P3[5] (microcontroller)
4716 * GPIO[9] - RESET (xpoint) - P3[6] (microcontroler) 4716 * GPIO[9] - RESET (xpoint) - P3[6] (microcontroller)
4717 * GPIO[10] - STROBE (xpoint) - P3[7] (microcontroler) 4717 * GPIO[10] - STROBE (xpoint) - P3[7] (microcontroller)
4718 * GPINTR - - P3[4] (microcontroler) 4718 * GPINTR - - P3[4] (microcontroller)
4719 * 4719 *
4720 * The microcontroler is a 80C32 like. It should be possible to change xpoint 4720 * The microcontroller is a 80C32 like. It should be possible to change xpoint
4721 * configuration either directly (as we are doing) or using the microcontroler 4721 * configuration either directly (as we are doing) or using the microcontroller
4722 * which is also wired to I2C interface. I have no further info on the 4722 * which is also wired to I2C interface. I have no further info on the
4723 * microcontroler features, one would need to disassembly the firmware. 4723 * microcontroller features, one would need to disassembly the firmware.
4724 * note: the vendor refused to give any information on this product, all 4724 * note: the vendor refused to give any information on this product, all
4725 * that stuff was found using a multimeter! :) 4725 * that stuff was found using a multimeter! :)
4726 */ 4726 */
@@ -4788,7 +4788,7 @@ static void tibetCS16_init(struct bttv *btv)
4788 * The analog switch is controlled by the "master", but the detection order 4788 * The analog switch is controlled by the "master", but the detection order
4789 * of the four BT878A chips is in an order which I just don't understand. 4789 * of the four BT878A chips is in an order which I just don't understand.
4790 * The "master" is actually the second controller to be detected. The 4790 * The "master" is actually the second controller to be detected. The
4791 * logic on the board uses logical numbers for the 4 controlers, but 4791 * logic on the board uses logical numbers for the 4 controllers, but
4792 * those numbers are different from the detection sequence. When working 4792 * those numbers are different from the detection sequence. When working
4793 * with the analog switch, we need to "map" from the detection sequence 4793 * with the analog switch, we need to "map" from the detection sequence
4794 * over to the board's logical controller number. This mapping sequence 4794 * over to the board's logical controller number. This mapping sequence
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index b8d5327c438d..e467682aabd7 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -907,7 +907,7 @@ static int em28xx_set_fmt(struct em28xx *dev, unsigned int cmd, struct v4l2_form
907 907
908 /* stop io in case it is already in progress */ 908 /* stop io in case it is already in progress */
909 if (dev->stream == STREAM_ON) { 909 if (dev->stream == STREAM_ON) {
910 em28xx_videodbg("VIDIOC_SET_FMT: interupting stream\n"); 910 em28xx_videodbg("VIDIOC_SET_FMT: interrupting stream\n");
911 if ((ret = em28xx_stream_interrupt(dev))) 911 if ((ret = em28xx_stream_interrupt(dev)))
912 return ret; 912 return ret;
913 } 913 }
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 7533fc203319..69283926a8dc 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> 4 * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
5 * 5 *
6 * Copyright (C) 2001-2002 Alcôve <www.alcove.com> 6 * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
7 * 7 *
8 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> 8 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
9 * 9 *
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h
index 323d0074120d..d535748df445 100644
--- a/drivers/media/video/meye.h
+++ b/drivers/media/video/meye.h
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> 4 * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
5 * 5 *
6 * Copyright (C) 2001-2002 Alcôve <www.alcove.com> 6 * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
7 * 7 *
8 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> 8 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
9 * 9 *
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index e20aa3612a7c..ad0232935df6 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -196,10 +196,10 @@ static int i2c_senddata(struct saa5246a_device *t, ...)
196 return i2c_sendbuf(t, buf[0], ct-1, buf+1); 196 return i2c_sendbuf(t, buf[0], ct-1, buf+1);
197} 197}
198 198
199/* Get count number of bytes from I²C-device at address adr, store them in buf. 199/* Get count number of bytes from I²C-device at address adr, store them in buf.
200 * Start & stop handshaking is done by this routine, ack will be sent after the 200 * Start & stop handshaking is done by this routine, ack will be sent after the
201 * last byte to inhibit further sending of data. If uaccess is 'true', data is 201 * last byte to inhibit further sending of data. If uaccess is 'true', data is
202 * written to user-space with put_user. Returns -1 if I²C-device didn't send 202 * written to user-space with put_user. Returns -1 if I²C-device didn't send
203 * acknowledge, 0 otherwise 203 * acknowledge, 0 otherwise
204 */ 204 */
205static int i2c_getdata(struct saa5246a_device *t, int count, u8 *buf) 205static int i2c_getdata(struct saa5246a_device *t, int count, u8 *buf)
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 17f1e2e9a66b..94bb59a32b17 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -291,10 +291,10 @@ static int i2c_senddata(struct saa5249_device *t, ...)
291 return i2c_sendbuf(t, buf[0], ct-1, buf+1); 291 return i2c_sendbuf(t, buf[0], ct-1, buf+1);
292} 292}
293 293
294/* Get count number of bytes from I²C-device at address adr, store them in buf. Start & stop 294/* Get count number of bytes from I²C-device at address adr, store them in buf. Start & stop
295 * handshaking is done by this routine, ack will be sent after the last byte to inhibit further 295 * handshaking is done by this routine, ack will be sent after the last byte to inhibit further
296 * sending of data. If uaccess is 'true', data is written to user-space with put_user. 296 * sending of data. If uaccess is 'true', data is written to user-space with put_user.
297 * Returns -1 if I²C-device didn't send acknowledge, 0 otherwise 297 * Returns -1 if I²C-device didn't send acknowledge, 0 otherwise
298 */ 298 */
299 299
300static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf) 300static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf)
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index ff555129c82f..db3c9e3deb26 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -955,7 +955,7 @@ read_frame(struct vicam_camera *cam, int framenum)
955 request[7] = realShutter >> 8; 955 request[7] = realShutter >> 8;
956 } 956 }
957 957
958 // Per John Markus Bjørndalen, byte at index 8 causes problems if it isn't 0 958 // Per John Markus Bjørndalen, byte at index 8 causes problems if it isn't 0
959 request[8] = 0; 959 request[8] = 0;
960 // bytes 9-15 do not seem to affect exposure or image quality 960 // bytes 9-15 do not seem to affect exposure or image quality
961 961
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index c3440b280d20..321249240d05 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -37,7 +37,7 @@
37 * Video4linux 1/2 integration by Justin Schoeman 37 * Video4linux 1/2 integration by Justin Schoeman
38 * <justin@suntiger.ee.up.ac.za> 38 * <justin@suntiger.ee.up.ac.za>
39 * 2.4 PROCFS support ported from 2.4 kernels by 39 * 2.4 PROCFS support ported from 2.4 kernels by
40 * Iñaki García Etxebarria <garetxe@euskalnet.net> 40 * Iñaki García Etxebarria <garetxe@euskalnet.net>
41 * Makefile fix by "W. Michael Petullo" <mike@flyn.org> 41 * Makefile fix by "W. Michael Petullo" <mike@flyn.org>
42 * 2.4 devfs support ported from 2.4 kernels by 42 * 2.4 devfs support ported from 2.4 kernels by
43 * Dan Merillat <dan@merillat.org> 43 * Dan Merillat <dan@merillat.org>
diff --git a/drivers/message/i2o/README b/drivers/message/i2o/README
index a81f851f7b5d..911fc3021e3b 100644
--- a/drivers/message/i2o/README
+++ b/drivers/message/i2o/README
@@ -30,13 +30,13 @@ Juha Sievanen, University of Helsinki Finland
30 Bug fixes 30 Bug fixes
31 Core code extensions 31 Core code extensions
32 32
33Auvo Häkkinen, University of Helsinki Finland 33Auvo Häkkinen, University of Helsinki Finland
34 LAN OSM code 34 LAN OSM code
35 /Proc interface to LAN class 35 /Proc interface to LAN class
36 Bug fixes 36 Bug fixes
37 Core code extensions 37 Core code extensions
38 38
39Taneli Vähäkangas, University of Helsinki Finland 39Taneli Vähäkangas, University of Helsinki Finland
40 Fixes to i2o_config 40 Fixes to i2o_config
41 41
42CREDITS 42CREDITS
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index ce8f1a34ed21..6cbcc21de518 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -15,8 +15,8 @@
15 * 15 *
16 * Fixes/additions: 16 * Fixes/additions:
17 * Philipp Rumpf 17 * Philipp Rumpf
18 * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI> 18 * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
19 * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI> 19 * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
20 * Deepak Saxena <deepak@plexity.net> 20 * Deepak Saxena <deepak@plexity.net>
21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> 21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
22 * Alan Cox <alan@redhat.com>: 22 * Alan Cox <alan@redhat.com>:
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 84e046e94f5f..c0fb77dc19bb 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -10,12 +10,12 @@
10 * Added basic ioctl() support 10 * Added basic ioctl() support
11 * Deepak Saxena (06/07/1999): 11 * Deepak Saxena (06/07/1999):
12 * Added software download ioctl (still testing) 12 * Added software download ioctl (still testing)
13 * Auvo Häkkinen (09/10/1999): 13 * Auvo Häkkinen (09/10/1999):
14 * Changes to i2o_cfg_reply(), ioctl_parms() 14 * Changes to i2o_cfg_reply(), ioctl_parms()
15 * Added ioct_validate() 15 * Added ioct_validate()
16 * Taneli Vähäkangas (09/30/1999): 16 * Taneli Vähäkangas (09/30/1999):
17 * Fixed ioctl_swdl() 17 * Fixed ioctl_swdl()
18 * Taneli Vähäkangas (10/04/1999): 18 * Taneli Vähäkangas (10/04/1999):
19 * Changed ioctl_swdl(), implemented ioctl_swul() and ioctl_swdel() 19 * Changed ioctl_swdl(), implemented ioctl_swul() and ioctl_swdel()
20 * Deepak Saxena (11/18/1999): 20 * Deepak Saxena (11/18/1999):
21 * Added event managmenet support 21 * Added event managmenet support
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index 06892ac2286e..6fdd072201f9 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -19,8 +19,8 @@
19 * 19 *
20 * 20 *
21 * Fixes/additions: 21 * Fixes/additions:
22 * Juha Sievänen (Juha.Sievanen@cs.Helsinki.FI), 22 * Juha Sievänen (Juha.Sievanen@cs.Helsinki.FI),
23 * Auvo Häkkinen (Auvo.Hakkinen@cs.Helsinki.FI) 23 * Auvo Häkkinen (Auvo.Hakkinen@cs.Helsinki.FI)
24 * University of Helsinki, Department of Computer Science 24 * University of Helsinki, Department of Computer Science
25 * LAN entries 25 * LAN entries
26 * Markus Lidel <Markus.Lidel@shadowconnect.com> 26 * Markus Lidel <Markus.Lidel@shadowconnect.com>
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index a1ec16a075c6..7814a06ae970 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -15,8 +15,8 @@
15 * 15 *
16 * Fixes/additions: 16 * Fixes/additions:
17 * Philipp Rumpf 17 * Philipp Rumpf
18 * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI> 18 * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
19 * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI> 19 * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
20 * Deepak Saxena <deepak@plexity.net> 20 * Deepak Saxena <deepak@plexity.net>
21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> 21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
22 * Alan Cox <alan@redhat.com>: 22 * Alan Cox <alan@redhat.com>:
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 3661e6e065d2..685a89547a51 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -15,8 +15,8 @@
15 * 15 *
16 * Fixes/additions: 16 * Fixes/additions:
17 * Philipp Rumpf 17 * Philipp Rumpf
18 * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI> 18 * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
19 * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI> 19 * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
20 * Deepak Saxena <deepak@plexity.net> 20 * Deepak Saxena <deepak@plexity.net>
21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> 21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
22 * Alan Cox <alan@redhat.com>: 22 * Alan Cox <alan@redhat.com>:
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index a20a51efe118..25716193a534 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -10,8 +10,8 @@ config MFD_SM501
10 ---help--- 10 ---help---
11 This is the core driver for the Silicon Motion SM501 multimedia 11 This is the core driver for the Silicon Motion SM501 multimedia
12 companion chip. This device is a multifunction device which may 12 companion chip. This device is a multifunction device which may
13 provide numerous interfaces including USB host controller USB gadget, 13 provide numerous interfaces including USB host controller, USB gadget,
14 Asyncronous Serial ports, Audio functions and a dual display video 14 asynchronous serial ports, audio functions, and a dual display video
15 interface. The device may be connected by PCI or local bus with 15 interface. The device may be connected by PCI or local bus with
16 varying functions enabled. 16 varying functions enabled.
17 17
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index cf02ddc3436f..b5e67c0ff433 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -180,7 +180,7 @@ config THINKPAD_ACPI
180 For more information about this driver see 180 For more information about this driver see
181 <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> . 181 <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> .
182 182
183 This driver was formely known as ibm-acpi. 183 This driver was formerly known as ibm-acpi.
184 184
185 If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. 185 If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
186 186
@@ -214,7 +214,7 @@ config THINKPAD_ACPI_BAY
214 default y 214 default y
215 ---help--- 215 ---help---
216 Allows the thinkpad_acpi driver to handle removable bays. It will 216 Allows the thinkpad_acpi driver to handle removable bays. It will
217 eletrically disable the device in the bay, and also generate 217 electrically disable the device in the bay, and also generate
218 notifications when the bay lever is ejected or inserted. 218 notifications when the bay lever is ejected or inserted.
219 219
220 If you are not sure, say Y here. 220 If you are not sure, say Y here.
diff --git a/drivers/misc/ibmasm/remote.c b/drivers/misc/ibmasm/remote.c
index 1d9defb1a10c..477bb43c899c 100644
--- a/drivers/misc/ibmasm/remote.c
+++ b/drivers/misc/ibmasm/remote.c
@@ -17,7 +17,7 @@
17 * 17 *
18 * Copyright (C) IBM Corporation, 2004 18 * Copyright (C) IBM Corporation, 2004
19 * 19 *
20 * Authors: Max Asböck <amax@us.ibm.com> 20 * Authors: Max Asböck <amax@us.ibm.com>
21 * Vernon Mauery <vernux@us.ibm.com> 21 * Vernon Mauery <vernux@us.ibm.com>
22 * 22 *
23 */ 23 */
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 1bfbb87e5793..bb13858f60a1 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -14,7 +14,7 @@
14 * 14 *
15 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> 15 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
16 * 16 *
17 * Copyright (C) 2001-2002 Alcôve <www.alcove.com> 17 * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
18 * 18 *
19 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> 19 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
20 * 20 *
@@ -277,7 +277,7 @@ static void do_sony_laptop_release_key(struct work_struct *work)
277static DECLARE_WORK(sony_laptop_release_key_work, 277static DECLARE_WORK(sony_laptop_release_key_work,
278 do_sony_laptop_release_key); 278 do_sony_laptop_release_key);
279 279
280/* forward event to the input subsytem */ 280/* forward event to the input subsystem */
281static void sony_laptop_report_input_event(u8 event) 281static void sony_laptop_report_input_event(u8 event)
282{ 282{
283 struct input_dev *jog_dev = sony_laptop_input.jog_dev; 283 struct input_dev *jog_dev = sony_laptop_input.jog_dev;
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 2a2a125b0c76..a592fc04cf78 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -54,7 +54,7 @@ config MTD_PHYSMAP_BANKWIDTH
54 help 54 help
55 This is the total width of the data bus of the flash devices 55 This is the total width of the data bus of the flash devices
56 in octets. For example, if you have a data bus width of 32 56 in octets. For example, if you have a data bus width of 32
57 bits, you would set the bus width octect value to 4. This is 57 bits, you would set the bus width octet value to 4. This is
58 used internally by the CFI drivers. 58 used internally by the CFI drivers.
59 Ignore this option if you use run-time physmap configuration 59 Ignore this option if you use run-time physmap configuration
60 (i.e., run-time calling physmap_configure()). 60 (i.e., run-time calling physmap_configure()).
@@ -73,12 +73,12 @@ config MTD_PMC_MSP_EVM
73 depends on PMC_MSP && MTD_CFI 73 depends on PMC_MSP && MTD_CFI
74 select MTD_PARTITIONS 74 select MTD_PARTITIONS
75 help 75 help
76 This provides a 'mapping' driver which support the way 76 This provides a 'mapping' driver which supports the way
77 in which user-programmable flash chips are connected on the 77 in which user-programmable flash chips are connected on the
78 PMC-Sierra MSP eval/demo boards 78 PMC-Sierra MSP eval/demo boards.
79 79
80choice 80choice
81 prompt "Maximum mappable memory avialable for flash IO" 81 prompt "Maximum mappable memory available for flash IO"
82 depends on MTD_PMC_MSP_EVM 82 depends on MTD_PMC_MSP_EVM
83 default MSP_FLASH_MAP_LIMIT_32M 83 default MSP_FLASH_MAP_LIMIT_32M
84 84
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 973b684c11e3..eef6fecfff2a 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -73,7 +73,7 @@
73 73
74 Jean-Jacques Michel - bug fix 74 Jean-Jacques Michel - bug fix
75 75
76 Tobias Ringström - Rx interrupt status checking suggestion 76 Tobias Ringström - Rx interrupt status checking suggestion
77 77
78 Andrew Morton - Clear blocked signals, avoid 78 Andrew Morton - Clear blocked signals, avoid
79 buffer overrun setting current->comm. 79 buffer overrun setting current->comm.
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2cafa5c1783e..ce34b539bf38 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -855,7 +855,7 @@ config BFIN_MAC_USE_L1
855 depends on BFIN_MAC && BF537 855 depends on BFIN_MAC && BF537
856 default y 856 default y
857 help 857 help
858 To get maximum network performace, you should use L1 memory as rx/tx buffers. 858 To get maximum network performance, you should use L1 memory as rx/tx buffers.
859 Say N here if you want to reserve L1 memory for other uses. 859 Say N here if you want to reserve L1 memory for other uses.
860 860
861config BFIN_TX_DESC_NUM 861config BFIN_TX_DESC_NUM
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 1cc74ec88a58..eebf5bb2b03a 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1111,7 +1111,7 @@ static struct net_device_stats *amd8111e_get_stats(struct net_device * dev)
1111 1111
1112 return new_stats; 1112 return new_stats;
1113} 1113}
1114/* This function recalculate the interupt coalescing mode on every interrupt 1114/* This function recalculate the interrupt coalescing mode on every interrupt
1115according to the datarate and the packet rate. 1115according to the datarate and the packet rate.
1116*/ 1116*/
1117static int amd8111e_calc_coalesce(struct net_device *dev) 1117static int amd8111e_calc_coalesce(struct net_device *dev)
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 3fa3bccd1adb..10f3a196be32 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Amiga Linux/m68k Ariadne Ethernet Driver 2 * Amiga Linux/m68k Ariadne Ethernet Driver
3 * 3 *
4 * © Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org) 4 * © Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org)
5 * Peter De Schrijver (p2@mind.be) 5 * Peter De Schrijver (p2@mind.be)
6 * 6 *
7 * --------------------------------------------------------------------------- 7 * ---------------------------------------------------------------------------
diff --git a/drivers/net/ariadne.h b/drivers/net/ariadne.h
index f7913d5a39f1..bb613f292e04 100644
--- a/drivers/net/ariadne.h
+++ b/drivers/net/ariadne.h
@@ -1,7 +1,7 @@
1/* 1/*
2 * Amiga Linux/m68k Ariadne Ethernet Driver 2 * Amiga Linux/m68k Ariadne Ethernet Driver
3 * 3 *
4 * © Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org) 4 * © Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org)
5 * Peter De Schrijver 5 * Peter De Schrijver
6 * (Peter.DeSchrijver@linux.cc.kuleuven.ac.be) 6 * (Peter.DeSchrijver@linux.cc.kuleuven.ac.be)
7 * 7 *
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 185f98e3964c..504b7ce2747d 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -542,7 +542,7 @@ static struct {
542static int num_ifs; 542static int num_ifs;
543 543
544/* 544/*
545 * Setup the base address and interupt of the Au1xxx ethernet macs 545 * Setup the base address and interrupt of the Au1xxx ethernet macs
546 * based on cpu type and whether the interface is enabled in sys_pinfunc 546 * based on cpu type and whether the interface is enabled in sys_pinfunc
547 * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0. 547 * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0.
548 */ 548 */
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 80c0c8c415ed..855dc10ffa1b 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -55,7 +55,7 @@ static int expected_refcount = -1;
55static struct class *netdev_class; 55static struct class *netdev_class;
56/*--------------------------- Data Structures -----------------------------*/ 56/*--------------------------- Data Structures -----------------------------*/
57 57
58/* Bonding sysfs lock. Why can't we just use the subsytem lock? 58/* Bonding sysfs lock. Why can't we just use the subsystem lock?
59 * Because kobject_register tries to acquire the subsystem lock. If 59 * Because kobject_register tries to acquire the subsystem lock. If
60 * we already hold the lock (which we would if the user was creating 60 * we already hold the lock (which we would if the user was creating
61 * a new bond through the sysfs interface), we deadlock. 61 * a new bond through the sysfs interface), we deadlock.
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 64f35e20fd48..3dbaec680b46 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1324,7 +1324,7 @@ static inline int e100_exec_cb_wait(struct nic *nic, struct sk_buff *skb,
1324 if (!--counter) break; 1324 if (!--counter) break;
1325 } 1325 }
1326 1326
1327 /* ack any interupts, something could have been set */ 1327 /* ack any interrupts, something could have been set */
1328 iowrite8(~0, &nic->csr->scb.stat_ack); 1328 iowrite8(~0, &nic->csr->scb.stat_ack);
1329 1329
1330 /* if the command failed, or is not OK, notify and return */ 1330 /* if the command failed, or is not OK, notify and return */
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 047263830e6a..f1ce348470cc 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3590,7 +3590,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
3590 3590
3591 spin_lock_irqsave(&adapter->stats_lock, flags); 3591 spin_lock_irqsave(&adapter->stats_lock, flags);
3592 3592
3593 /* these counters are modified from e1000_adjust_tbi_stats, 3593 /* these counters are modified from e1000_tbi_adjust_stats,
3594 * called from the interrupt context, so they must only 3594 * called from the interrupt context, so they must only
3595 * be written while holding adapter->stats_lock 3595 * be written while holding adapter->stats_lock
3596 */ 3596 */
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 43f7647ff246..7bb9c728a1d3 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -111,7 +111,6 @@ MODULE_AUTHOR("Myson or whoever");
111MODULE_DESCRIPTION("Myson MTD-8xx 100/10M Ethernet PCI Adapter Driver"); 111MODULE_DESCRIPTION("Myson MTD-8xx 100/10M Ethernet PCI Adapter Driver");
112MODULE_LICENSE("GPL"); 112MODULE_LICENSE("GPL");
113module_param(max_interrupt_work, int, 0); 113module_param(max_interrupt_work, int, 0);
114//MODULE_PARM(min_pci_latency, "i");
115module_param(debug, int, 0); 114module_param(debug, int, 0);
116module_param(rx_copybreak, int, 0); 115module_param(rx_copybreak, int, 0);
117module_param(multicast_filter_limit, int, 0); 116module_param(multicast_filter_limit, int, 0);
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index ad9e327c3b03..e0119f6a3319 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -3,7 +3,7 @@
3 * devices like TTY. It interfaces between a raw TTY and the 3 * devices like TTY. It interfaces between a raw TTY and the
4 * kernel's AX.25 protocol layers. 4 * kernel's AX.25 protocol layers.
5 * 5 *
6 * Authors: Andreas Könsgen <ajk@iehk.rwth-aachen.de> 6 * Authors: Andreas Könsgen <ajk@iehk.rwth-aachen.de>
7 * Ralf Baechle DL5RB <ralf@linux-mips.org> 7 * Ralf Baechle DL5RB <ralf@linux-mips.org>
8 * 8 *
9 * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by 9 * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 36d2c7d4f4d0..62d5d5cfd6a6 100644
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -64,7 +64,7 @@ config DMASCC
64 dmascc. If you don't pass any parameter to the driver, all 64 dmascc. If you don't pass any parameter to the driver, all
65 possible I/O addresses are probed. This could irritate other devices 65 possible I/O addresses are probed. This could irritate other devices
66 that are currently not in use. You may specify the list of addresses 66 that are currently not in use. You may specify the list of addresses
67 to be probed by "dmascc=addr1,addr2,..." (when compiled into the 67 to be probed by "dmascc.io=addr1,addr2,..." (when compiled into the
68 kernel image) or "io=addr1,addr2,..." (when loaded as a module). The 68 kernel image) or "io=addr1,addr2,..." (when loaded as a module). The
69 network interfaces will be called dmascc0 and dmascc1 for the board 69 network interfaces will be called dmascc0 and dmascc1 for the board
70 detected first, dmascc2 and dmascc3 for the second one, and so on. 70 detected first, dmascc2 and dmascc3 for the second one, and so on.
diff --git a/drivers/net/irda/actisys-sir.c b/drivers/net/irda/actisys-sir.c
index ccf6ec548a64..736d2473b7e1 100644
--- a/drivers/net/irda/actisys-sir.c
+++ b/drivers/net/irda/actisys-sir.c
@@ -21,7 +21,7 @@
21 * published by the Free Software Foundation; either version 2 of 21 * published by the Free Software Foundation; either version 2 of
22 * the License, or (at your option) any later version. 22 * the License, or (at your option) any later version.
23 * 23 *
24 * Neither Dag Brattli nor University of Tromsø admit liability nor 24 * Neither Dag Brattli nor University of Tromsø admit liability nor
25 * provide warranty for any of this software. This material is 25 * provide warranty for any of this software. This material is
26 * provided "AS-IS" and at no charge. 26 * provided "AS-IS" and at no charge.
27 * 27 *
diff --git a/drivers/net/irda/actisys.c b/drivers/net/irda/actisys.c
index b2e31f4a384c..ae0b80a5680c 100644
--- a/drivers/net/irda/actisys.c
+++ b/drivers/net/irda/actisys.c
@@ -19,7 +19,7 @@
19 * published by the Free Software Foundation; either version 2 of 19 * published by the Free Software Foundation; either version 2 of
20 * the License, or (at your option) any later version. 20 * the License, or (at your option) any later version.
21 * 21 *
22 * Neither Dag Brattli nor University of Tromsø admit liability nor 22 * Neither Dag Brattli nor University of Tromsø admit liability nor
23 * provide warranty for any of this software. This material is 23 * provide warranty for any of this software. This material is
24 * provided "AS-IS" and at no charge. 24 * provided "AS-IS" and at no charge.
25 * 25 *
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index a82d8f98383d..1257e1a7e819 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -595,7 +595,7 @@ toshoboe_startchip (struct toshoboe_cb *self)
595 OUTB ((physaddr >> 18) & 0xff, OBOE_RING_BASE1); 595 OUTB ((physaddr >> 18) & 0xff, OBOE_RING_BASE1);
596 OUTB ((physaddr >> 26) & 0x3f, OBOE_RING_BASE2); 596 OUTB ((physaddr >> 26) & 0x3f, OBOE_RING_BASE2);
597 597
598 /*Enable DMA controler in byte mode and RX */ 598 /*Enable DMA controller in byte mode and RX */
599 OUTB (CONFIG0H_DMA_ON, OBOE_CONFIG0H); 599 OUTB (CONFIG0H_DMA_ON, OBOE_CONFIG0H);
600 600
601 /* Start up the clocks */ 601 /* Start up the clocks */
diff --git a/drivers/net/irda/girbil-sir.c b/drivers/net/irda/girbil-sir.c
index 0d2fe87fb9b7..738531b16bd3 100644
--- a/drivers/net/irda/girbil-sir.c
+++ b/drivers/net/irda/girbil-sir.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/irda/girbil.c b/drivers/net/irda/girbil.c
index 248aeb0c726c..1f57391a618b 100644
--- a/drivers/net/irda/girbil.c
+++ b/drivers/net/irda/girbil.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/irda/irport.h b/drivers/net/irda/irport.h
index 3f46b84c6c85..66fc2433e97d 100644
--- a/drivers/net/irda/irport.h
+++ b/drivers/net/irda/irport.h
@@ -17,7 +17,7 @@
17 * published by the Free Software Foundation; either version 2 of 17 * published by the Free Software Foundation; either version 2 of
18 * the License, or (at your option) any later version. 18 * the License, or (at your option) any later version.
19 * 19 *
20 * Neither Dag Brattli nor University of Tromsø admit liability nor 20 * Neither Dag Brattli nor University of Tromsø admit liability nor
21 * provide warranty for any of this software. This material is 21 * provide warranty for any of this software. This material is
22 * provided "AS-IS" and at no charge. 22 * provided "AS-IS" and at no charge.
23 * 23 *
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 6f5f697ec9f8..2c6f7be36e8a 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Tromsø admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 12b9378c587f..a873d2b315ca 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Tromsø admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h
index dacf671abcd6..bbdc97ff83ca 100644
--- a/drivers/net/irda/nsc-ircc.h
+++ b/drivers/net/irda/nsc-ircc.h
@@ -19,7 +19,7 @@
19 * published by the Free Software Foundation; either version 2 of 19 * published by the Free Software Foundation; either version 2 of
20 * the License, or (at your option) any later version. 20 * the License, or (at your option) any later version.
21 * 21 *
22 * Neither Dag Brattli nor University of Tromsø admit liability nor 22 * Neither Dag Brattli nor University of Tromsø admit liability nor
23 * provide warranty for any of this software. This material is 23 * provide warranty for any of this software. This material is
24 * provided "AS-IS" and at no charge. 24 * provided "AS-IS" and at no charge.
25 * 25 *
diff --git a/drivers/net/irda/tekram-sir.c b/drivers/net/irda/tekram-sir.c
index 0dd6bc7af3f2..d1ce5ae6a172 100644
--- a/drivers/net/irda/tekram-sir.c
+++ b/drivers/net/irda/tekram-sir.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Tromsø admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/drivers/net/irda/tekram.c b/drivers/net/irda/tekram.c
index 8f6258221cb0..9bfd2441adbf 100644
--- a/drivers/net/irda/tekram.c
+++ b/drivers/net/irda/tekram.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/irda/w83977af_ir.h b/drivers/net/irda/w83977af_ir.h
index 0b7661deafee..87c3975baf62 100644
--- a/drivers/net/irda/w83977af_ir.h
+++ b/drivers/net/irda/w83977af_ir.h
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 50e1ec67ef9c..953117152bbd 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -996,7 +996,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
996 a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that 996 a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that
997 made udelay() unreliable. 997 made udelay() unreliable.
998 The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is 998 The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is
999 depricated. 999 deprecated.
1000*/ 1000*/
1001#define eeprom_delay(ee_addr) readl(ee_addr) 1001#define eeprom_delay(ee_addr) readl(ee_addr)
1002 1002
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 7c60df46fc65..dd18af0ce676 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -1223,7 +1223,7 @@ static irqreturn_t smc911x_interrupt(int irq, void *dev_id)
1223 } 1223 }
1224#endif 1224#endif
1225 1225
1226 /* Handle PHY interupt condition */ 1226 /* Handle PHY interrupt condition */
1227 if (status & INT_STS_PHY_INT_) { 1227 if (status & INT_STS_PHY_INT_) {
1228 DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev->name); 1228 DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev->name);
1229 smc911x_phy_interrupt(dev); 1229 smc911x_phy_interrupt(dev);
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 571060a3c91e..bccae7e5c6ad 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1639,7 +1639,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
1639 1639
1640/** 1640/**
1641 * spider_net_interrupt - interrupt handler for spider_net 1641 * spider_net_interrupt - interrupt handler for spider_net
1642 * @irq: interupt number 1642 * @irq: interrupt number
1643 * @ptr: pointer to net_device 1643 * @ptr: pointer to net_device
1644 * @regs: PU registers 1644 * @regs: PU registers
1645 * 1645 *
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 8038f2882c9b..d887c05588d5 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -1654,7 +1654,7 @@ tc35815_rx(struct net_device *dev)
1654 panic_queues(dev); 1654 panic_queues(dev);
1655 } 1655 }
1656#endif 1656#endif
1657 /* pass BD to controler */ 1657 /* pass BD to controller */
1658#ifndef TC35815_USE_PACKEDBUFFER 1658#ifndef TC35815_USE_PACKEDBUFFER
1659 if (!lp->rx_skbs[curid].skb) { 1659 if (!lp->rx_skbs[curid].skb) {
1660 lp->rx_skbs[curid].skb = 1660 lp->rx_skbs[curid].skb =
@@ -1694,7 +1694,7 @@ tc35815_rx(struct net_device *dev)
1694 } 1694 }
1695#endif 1695#endif
1696 for (i = 0; i < (bd_count + 1) / 2 + 1; i++) { 1696 for (i = 0; i < (bd_count + 1) / 2 + 1; i++) {
1697 /* pass FD to controler */ 1697 /* pass FD to controller */
1698#ifdef DEBUG 1698#ifdef DEBUG
1699 lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead); 1699 lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead);
1700#else 1700#else
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 3c8e3b63be07..35d0cfcf8c47 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -483,7 +483,7 @@ err_out_netdev:
483 a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that 483 a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that
484 made udelay() unreliable. 484 made udelay() unreliable.
485 The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is 485 The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is
486 depricated. 486 deprecated.
487*/ 487*/
488#define eeprom_delay(ee_addr) ioread32(ee_addr) 488#define eeprom_delay(ee_addr) ioread32(ee_addr)
489 489
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 8dc09a3790cb..5a96d74e4ce8 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -71,7 +71,7 @@ config USB_PEGASUS
71 select MII 71 select MII
72 ---help--- 72 ---help---
73 Say Y here if you know you have Pegasus or Pegasus-II based adapter. 73 Say Y here if you know you have Pegasus or Pegasus-II based adapter.
74 If in doubt then look at <file:drivers/usb/net/pegasus.h> for the 74 If in doubt then look at <file:drivers/net/usb/pegasus.h> for the
75 complete list of supported devices. 75 complete list of supported devices.
76 76
77 If your particular adapter is not in the list and you are _sure_ it 77 If your particular adapter is not in the list and you are _sure_ it
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 4ae05799ac44..5c4a92de9a07 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1648,7 +1648,7 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)
1648 * 1648 *
1649 * Scan the queues looking for transmitted packets that 1649 * Scan the queues looking for transmitted packets that
1650 * we can complete and clean up. Update any statistics as 1650 * we can complete and clean up. Update any statistics as
1651 * neccessary/ 1651 * necessary/
1652 */ 1652 */
1653 1653
1654static int velocity_tx_srv(struct velocity_info *vptr, u32 status) 1654static int velocity_tx_srv(struct velocity_info *vptr, u32 status)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
index 9ecf2bf0d25d..47c135a7f4dc 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
@@ -87,7 +87,7 @@ void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm,
87 87
88/* RX header as received from the hardware. */ 88/* RX header as received from the hardware. */
89struct bcm43xx_rxhdr { 89struct bcm43xx_rxhdr {
90 /* Frame Length. Must be generated explicitely in PIO mode. */ 90 /* Frame Length. Must be generated explicitly in PIO mode. */
91 __le16 frame_length; 91 __le16 frame_length;
92 PAD_BYTES(2); 92 PAD_BYTES(2);
93 /* Flags field 1 */ 93 /* Flags field 1 */
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 7a7797560a23..a6c7904de282 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -6047,7 +6047,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
6047 * ends up causing problems. So, we just handle 6047 * ends up causing problems. So, we just handle
6048 * the WX extensions through the ipw2100_ioctl interface */ 6048 * the WX extensions through the ipw2100_ioctl interface */
6049 6049
6050 /* memset() puts everything to 0, so we only have explicitely set 6050 /* memset() puts everything to 0, so we only have explicitly set
6051 * those values that need to be something else */ 6051 * those values that need to be something else */
6052 6052
6053 /* If power management is turned on, default to AUTO mode */ 6053 /* If power management is turned on, default to AUTO mode */
@@ -7509,7 +7509,7 @@ static int ipw2100_wx_set_power(struct net_device *dev,
7509 switch (wrqu->power.flags & IW_POWER_MODE) { 7509 switch (wrqu->power.flags & IW_POWER_MODE) {
7510 case IW_POWER_ON: /* If not specified */ 7510 case IW_POWER_ON: /* If not specified */
7511 case IW_POWER_MODE: /* If set all mask */ 7511 case IW_POWER_MODE: /* If set all mask */
7512 case IW_POWER_ALL_R: /* If explicitely state all */ 7512 case IW_POWER_ALL_R: /* If explicitly state all */
7513 break; 7513 break;
7514 default: /* Otherwise we don't support it */ 7514 default: /* Otherwise we don't support it */
7515 IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", 7515 IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index feb8fcbab2d5..e3c828401b9a 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -9603,7 +9603,7 @@ static int ipw_wx_set_power(struct net_device *dev,
9603 switch (wrqu->power.flags & IW_POWER_MODE) { 9603 switch (wrqu->power.flags & IW_POWER_MODE) {
9604 case IW_POWER_ON: /* If not specified */ 9604 case IW_POWER_ON: /* If not specified */
9605 case IW_POWER_MODE: /* If set all mask */ 9605 case IW_POWER_MODE: /* If set all mask */
9606 case IW_POWER_ALL_R: /* If explicitely state all */ 9606 case IW_POWER_ALL_R: /* If explicitly state all */
9607 break; 9607 break;
9608 default: /* Otherwise we don't support it */ 9608 default: /* Otherwise we don't support it */
9609 IPW_DEBUG_WX("SET PM Mode: %X not supported.\n", 9609 IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index c2d71afd57e5..2402cb8dd328 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -4,18 +4,18 @@
4 * Version: 0.4.1 4 * Version: 0.4.1
5 * Description: Netwave AirSurfer Wireless LAN PC Card driver 5 * Description: Netwave AirSurfer Wireless LAN PC Card driver
6 * Status: Experimental. 6 * Status: Experimental.
7 * Authors: John Markus Bjørndalen <johnm@cs.uit.no> 7 * Authors: John Markus Bjørndalen <johnm@cs.uit.no>
8 * Dag Brattli <dagb@cs.uit.no> 8 * Dag Brattli <dagb@cs.uit.no>
9 * David Hinds <dahinds@users.sourceforge.net> 9 * David Hinds <dahinds@users.sourceforge.net>
10 * Created at: A long time ago! 10 * Created at: A long time ago!
11 * Modified at: Mon Nov 10 11:54:37 1997 11 * Modified at: Mon Nov 10 11:54:37 1997
12 * Modified by: Dag Brattli <dagb@cs.uit.no> 12 * Modified by: Dag Brattli <dagb@cs.uit.no>
13 * 13 *
14 * Copyright (c) 1997 University of Tromsø, Norway 14 * Copyright (c) 1997 University of Tromsø, Norway
15 * 15 *
16 * Revision History: 16 * Revision History:
17 * 17 *
18 * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no> 18 * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no>
19 * - Fixed some bugs in netwave_rx and cleaned it up a bit. 19 * - Fixed some bugs in netwave_rx and cleaned it up a bit.
20 * (One of the bugs would have destroyed packets when receiving 20 * (One of the bugs would have destroyed packets when receiving
21 * multiple packets per interrupt). 21 * multiple packets per interrupt).
@@ -158,7 +158,7 @@ static int pc_debug = PCMCIA_DEBUG;
158module_param(pc_debug, int, 0); 158module_param(pc_debug, int, 0);
159#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) 159#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
160static char *version = 160static char *version =
161"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n"; 161"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n";
162#else 162#else
163#define DEBUG(n, args...) 163#define DEBUG(n, args...)
164#endif 164#endif
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 6420a90a4a92..cbde770eb121 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -240,7 +240,7 @@ config RTC_DRV_TWL92330
240 depends on MENELAUS 240 depends on MENELAUS
241 help 241 help
242 If you say yes here you get support for the RTC on the 242 If you say yes here you get support for the RTC on the
243 TWL92330 "Menelaus" power mangement chip, used with OMAP2 243 TWL92330 "Menelaus" power management chip, used with OMAP2
244 platforms. The support is integrated with the rest of 244 platforms. The support is integrated with the rest of
245 the Menelaus driver; it's not separate module. 245 the Menelaus driver; it's not separate module.
246 246
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index 8b9d68f6e016..5b7385e430ea 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -40,7 +40,7 @@ struct DCTL_data {
40 * 40 *
41 * Each bit configuration leading to an action code 2 (Exit with 41 * Each bit configuration leading to an action code 2 (Exit with
42 * programming error or unusual condition indication) 42 * programming error or unusual condition indication)
43 * are handled as fatal error´s. 43 * are handled as fatal errors.
44 * 44 *
45 * All other configurations are handled as recoverable errors. 45 * All other configurations are handled as recoverable errors.
46 * 46 *
@@ -2001,7 +2001,7 @@ dasd_3990_erp_compound_code(struct dasd_ccw_req * erp, char *sense)
2001 switch (sense[28]) { 2001 switch (sense[28]) {
2002 case 0x17: 2002 case 0x17:
2003 /* issue a Diagnostic Control command with an 2003 /* issue a Diagnostic Control command with an
2004 * Inhibit Write subcommand and controler modifier */ 2004 * Inhibit Write subcommand and controller modifier */
2005 erp = dasd_3990_erp_DCTL(erp, 0x20); 2005 erp = dasd_3990_erp_DCTL(erp, 0x20);
2006 break; 2006 break;
2007 2007
diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c
index 29fe2a5ec2fe..82a13d9fdfe4 100644
--- a/drivers/s390/char/sclp_cpi.c
+++ b/drivers/s390/char/sclp_cpi.c
@@ -157,7 +157,7 @@ cpi_prepare_req(void)
157 sclp_ascebc_str(evb->system_name, CPI_LENGTH_SYSTEM_NAME); 157 sclp_ascebc_str(evb->system_name, CPI_LENGTH_SYSTEM_NAME);
158 EBC_TOUPPER(evb->system_name, CPI_LENGTH_SYSTEM_NAME); 158 EBC_TOUPPER(evb->system_name, CPI_LENGTH_SYSTEM_NAME);
159 159
160 /* set sytem level */ 160 /* set system level */
161 evb->system_level = LINUX_VERSION_CODE; 161 evb->system_level = LINUX_VERSION_CODE;
162 162
163 /* set sysplex name */ 163 /* set sysplex name */
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index b960f66843e4..725b0dd14269 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -158,7 +158,7 @@ static inline u64 time_to_avg_nsec(u32 value, u32 count)
158 if (count == 0) 158 if (count == 0)
159 return 0; 159 return 0;
160 160
161 /* value comes in units of 128 µsec */ 161 /* value comes in units of 128 µsec */
162 ret = time_to_nsec(value); 162 ret = time_to_nsec(value);
163 do_div(ret, count); 163 do_div(ret, count);
164 164
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 449937233732..6bf3ebbe985a 100644
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation 4 * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
5 * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com) 5 * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com)
6 * Fixes by : Jochen Röhrig (roehrig@de.ibm.com) 6 * Fixes by : Jochen Röhrig (roehrig@de.ibm.com)
7 * Arnaldo Carvalho de Melo <acme@conectiva.com.br> 7 * Arnaldo Carvalho de Melo <acme@conectiva.com.br>
8 Peter Tiedemann (ptiedem@de.ibm.com) 8 Peter Tiedemann (ptiedem@de.ibm.com)
9 * Driver Model stuff by : Cornelia Huck <cornelia.huck@de.ibm.com> 9 * Driver Model stuff by : Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -19,7 +19,7 @@
19 * Dieter Wellerdiek (wel@de.ibm.com) 19 * Dieter Wellerdiek (wel@de.ibm.com)
20 * Martin Schwidefsky (schwidefsky@de.ibm.com) 20 * Martin Schwidefsky (schwidefsky@de.ibm.com)
21 * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) 21 * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
22 * Jochen Röhrig (roehrig@de.ibm.com) 22 * Jochen Röhrig (roehrig@de.ibm.com)
23 * 23 *
24 * This program is free software; you can redistribute it and/or modify 24 * This program is free software; you can redistribute it and/or modify
25 * it under the terms of the GNU General Public License as published by 25 * it under the terms of the GNU General Public License as published by
@@ -885,7 +885,7 @@ ch_action_firstio(fsm_instance * fi, int event, void *arg)
885 } 885 }
886 886
887 /** 887 /**
888 * Don´t setup a timer for receiving the initial RX frame 888 * Don't setup a timer for receiving the initial RX frame
889 * if in compatibility mode, since VM TCP delays the initial 889 * if in compatibility mode, since VM TCP delays the initial
890 * frame until it has some data to send. 890 * frame until it has some data to send.
891 */ 891 */
@@ -905,10 +905,10 @@ ch_action_firstio(fsm_instance * fi, int event, void *arg)
905 ccw_check_return_code(ch, rc, "init IO"); 905 ccw_check_return_code(ch, rc, "init IO");
906 } 906 }
907 /** 907 /**
908 * If in compatibility mode since we don´t setup a timer, we 908 * If in compatibility mode since we don't setup a timer, we
909 * also signal RX channel up immediately. This enables us 909 * also signal RX channel up immediately. This enables us
910 * to send packets early which in turn usually triggers some 910 * to send packets early which in turn usually triggers some
911 * reply from VM TCP which brings up the RX channel to it´s 911 * reply from VM TCP which brings up the RX channel to it's
912 * final state. 912 * final state.
913 */ 913 */
914 if ((CHANNEL_DIRECTION(ch->flags) == READ) && 914 if ((CHANNEL_DIRECTION(ch->flags) == READ) &&
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 03b51025a8f4..9abba8b90f70 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1526,7 +1526,7 @@ struct aac_mntent {
1526 __le32 capacityhigh; 1526 __le32 capacityhigh;
1527}; 1527};
1528 1528
1529#define FSCS_NOTCLEAN 0x0001 /* fsck is neccessary before mounting */ 1529#define FSCS_NOTCLEAN 0x0001 /* fsck is necessary before mounting */
1530#define FSCS_READONLY 0x0002 /* possible result of broken mirror */ 1530#define FSCS_READONLY 0x0002 /* possible result of broken mirror */
1531#define FSCS_HIDDEN 0x0004 /* should be ignored - set during a clear */ 1531#define FSCS_HIDDEN 0x0004 /* should be ignored - set during a clear */
1532 1532
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index f08e71e0205a..a58c265dc8af 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1,6 +1,6 @@
1/* aha152x.c -- Adaptec AHA-152x driver 1/* aha152x.c -- Adaptec AHA-152x driver
2 * Author: Jürgen E. Fischer, fischer@norbit.de 2 * Author: Jürgen E. Fischer, fischer@norbit.de
3 * Copyright 1993-2004 Jürgen E. Fischer 3 * Copyright 1993-2004 Jürgen E. Fischer
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify it 5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License as published by the 6 * under the terms of the GNU General Public License as published by the
@@ -357,7 +357,7 @@ enum {
357 check_condition = 0x0800, /* requesting sense after CHECK CONDITION */ 357 check_condition = 0x0800, /* requesting sense after CHECK CONDITION */
358}; 358};
359 359
360MODULE_AUTHOR("Jürgen Fischer"); 360MODULE_AUTHOR("Jürgen Fischer");
361MODULE_DESCRIPTION(AHA152X_REVID); 361MODULE_DESCRIPTION(AHA152X_REVID);
362MODULE_LICENSE("GPL"); 362MODULE_LICENSE("GPL");
363 363
diff --git a/drivers/scsi/aic7xxx/cam.h b/drivers/scsi/aic7xxx/cam.h
index 26f17e3fc45c..687aef6ef185 100644
--- a/drivers/scsi/aic7xxx/cam.h
+++ b/drivers/scsi/aic7xxx/cam.h
@@ -48,7 +48,7 @@ typedef enum {
48 CAM_REQ_ABORTED, /* CCB request aborted by the host */ 48 CAM_REQ_ABORTED, /* CCB request aborted by the host */
49 CAM_UA_ABORT, /* Unable to abort CCB request */ 49 CAM_UA_ABORT, /* Unable to abort CCB request */
50 CAM_REQ_CMP_ERR, /* CCB request completed with an error */ 50 CAM_REQ_CMP_ERR, /* CCB request completed with an error */
51 CAM_BUSY, /* CAM subsytem is busy */ 51 CAM_BUSY, /* CAM subsystem is busy */
52 CAM_REQ_INVALID, /* CCB request was invalid */ 52 CAM_REQ_INVALID, /* CCB request was invalid */
53 CAM_PATH_INVALID, /* Supplied Path ID is invalid */ 53 CAM_PATH_INVALID, /* Supplied Path ID is invalid */
54 CAM_SEL_TIMEOUT, /* Target Selection Timeout */ 54 CAM_SEL_TIMEOUT, /* Target Selection Timeout */
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index fd42d4789202..a9def6e1d30e 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -1808,12 +1808,12 @@ static irqreturn_t dc395x_interrupt(int irq, void *dev_id)
1808 irqreturn_t handled = IRQ_NONE; 1808 irqreturn_t handled = IRQ_NONE;
1809 1809
1810 /* 1810 /*
1811 * Check for pending interupt 1811 * Check for pending interrupt
1812 */ 1812 */
1813 scsi_status = DC395x_read16(acb, TRM_S1040_SCSI_STATUS); 1813 scsi_status = DC395x_read16(acb, TRM_S1040_SCSI_STATUS);
1814 dma_status = DC395x_read8(acb, TRM_S1040_DMA_STATUS); 1814 dma_status = DC395x_read8(acb, TRM_S1040_DMA_STATUS);
1815 if (scsi_status & SCSIINTERRUPT) { 1815 if (scsi_status & SCSIINTERRUPT) {
1816 /* interupt pending - let's process it! */ 1816 /* interrupt pending - let's process it! */
1817 dc395x_handle_interrupt(acb, scsi_status); 1817 dc395x_handle_interrupt(acb, scsi_status);
1818 handled = IRQ_HANDLED; 1818 handled = IRQ_HANDLED;
1819 } 1819 }
@@ -4579,7 +4579,7 @@ static void adapter_uninit_chip(struct AdapterCtlBlk *acb)
4579 if (acb->config & HCC_SCSI_RESET) 4579 if (acb->config & HCC_SCSI_RESET)
4580 reset_scsi_bus(acb); 4580 reset_scsi_bus(acb);
4581 4581
4582 /* clear any pending interupt state */ 4582 /* clear any pending interrupt state */
4583 DC395x_read8(acb, TRM_S1040_SCSI_INTSTATUS); 4583 DC395x_read8(acb, TRM_S1040_SCSI_INTSTATUS);
4584} 4584}
4585 4585
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index e4e4c6a39ed6..78779209ac89 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -427,7 +427,7 @@ megaraid_exit(void)
427 * @id : pci device id of the class of controllers 427 * @id : pci device id of the class of controllers
428 * 428 *
429 * This routine should be called whenever a new adapter is detected by the 429 * This routine should be called whenever a new adapter is detected by the
430 * PCI hotplug susbsytem. 430 * PCI hotplug susbsystem.
431 */ 431 */
432static int __devinit 432static int __devinit
433megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 433megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 1e29f51d596b..d692c713416a 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -1006,7 +1006,7 @@ int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a)
1006 * qla4xxx_start_firmware - starts qla4xxx firmware 1006 * qla4xxx_start_firmware - starts qla4xxx firmware
1007 * @ha: Pointer to host adapter structure. 1007 * @ha: Pointer to host adapter structure.
1008 * 1008 *
1009 * This routine performs the neccessary steps to start the firmware for 1009 * This routine performs the necessary steps to start the firmware for
1010 * the QLA4010 adapter. 1010 * the QLA4010 adapter.
1011 **/ 1011 **/
1012static int qla4xxx_start_firmware(struct scsi_qla_host *ha) 1012static int qla4xxx_start_firmware(struct scsi_qla_host *ha)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 69f542c4923c..a69b155f39a2 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -676,7 +676,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
676 * success as well). Returns a negated errno value in case of error. 676 * success as well). Returns a negated errno value in case of error.
677 * 677 *
678 * Note: most ioctls are forward onto the block subsystem or further 678 * Note: most ioctls are forward onto the block subsystem or further
679 * down in the scsi subsytem. 679 * down in the scsi subsystem.
680 **/ 680 **/
681static int sd_ioctl(struct inode * inode, struct file * filp, 681static int sd_ioctl(struct inode * inode, struct file * filp,
682 unsigned int cmd, unsigned long arg) 682 unsigned int cmd, unsigned long arg)
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index dc15a22105f7..4aafe89b557f 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -1596,7 +1596,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd,
1596 * IO while SEL is true. But again, there are some disks out the in the 1596 * IO while SEL is true. But again, there are some disks out the in the
1597 * world that do that nevertheless. (Somebody claimed that this announces 1597 * world that do that nevertheless. (Somebody claimed that this announces
1598 * reselection capability of the target.) So we better skip that test and 1598 * reselection capability of the target.) So we better skip that test and
1599 * only wait for BSY... (Famous german words: Der Klügere gibt nach :-) 1599 * only wait for BSY... (Famous german words: Der Klügere gibt nach :-)
1600 */ 1600 */
1601 1601
1602 while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) & 1602 while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) &
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw2.h b/drivers/scsi/sym53c8xx_2/sym_fw2.h
index 6e5b952312e3..ae1fb179b88e 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw2.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw2.h
@@ -1781,7 +1781,7 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = {
1781 * While testing with bogus QUANTUM drives, the C1010 1781 * While testing with bogus QUANTUM drives, the C1010
1782 * sometimes raised a spurious phase mismatch with 1782 * sometimes raised a spurious phase mismatch with
1783 * WSR and the CHMOV(1) triggered another PM. 1783 * WSR and the CHMOV(1) triggered another PM.
1784 * Waiting explicitely for the PHASE seemed to avoid 1784 * Waiting explicitly for the PHASE seemed to avoid
1785 * the nested phase mismatch. Btw, this didn't happen 1785 * the nested phase mismatch. Btw, this didn't happen
1786 * using my IBM drives. 1786 * using my IBM drives.
1787 */ 1787 */
diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h
index 61ffb860dacc..00123f2383d7 100644
--- a/drivers/scsi/wd33c93.h
+++ b/drivers/scsi/wd33c93.h
@@ -155,7 +155,7 @@
155#define WD33C93_FS_12_15 OWNID_FS_12 155#define WD33C93_FS_12_15 OWNID_FS_12
156#define WD33C93_FS_16_20 OWNID_FS_16 156#define WD33C93_FS_16_20 OWNID_FS_16
157 157
158 /* pass input-clock explicitely. accepted mhz values are 8-10,12-20 */ 158 /* pass input-clock explicitly. accepted mhz values are 8-10,12-20 */
159#define WD33C93_FS_MHZ(mhz) (mhz) 159#define WD33C93_FS_MHZ(mhz) (mhz)
160 160
161 /* Control register */ 161 /* Control register */
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index d6ae38e55d01..87665d7df6f2 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -62,11 +62,11 @@ config SERIAL_8250_CONSOLE
62 kernel will automatically use the first serial line, /dev/ttyS0, as 62 kernel will automatically use the first serial line, /dev/ttyS0, as
63 system console. 63 system console.
64 64
65 you can set that using a kernel command line option such as 65 You can set that using a kernel command line option such as
66 "console=uart8250,io,0x3f8,9600n8" 66 "console=uart8250,io,0x3f8,9600n8"
67 "console=uart8250,mmio,0xff5e0000,115200n8". 67 "console=uart8250,mmio,0xff5e0000,115200n8".
68 and it will switch to normal serial console when correponding port is 68 and it will switch to normal serial console when the corresponding
69 ready. 69 port is ready.
70 "earlycon=uart8250,io,0x3f8,9600n8" 70 "earlycon=uart8250,io,0x3f8,9600n8"
71 "earlycon=uart8250,mmio,0xff5e0000,115200n8". 71 "earlycon=uart8250,mmio,0xff5e0000,115200n8".
72 it will not only setup early console. 72 it will not only setup early console.
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 3f26c4b2f322..e773c8e14962 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -20,8 +20,8 @@
20 * - S3C2410 and S3C2440 serial support 20 * - S3C2410 and S3C2440 serial support
21 * - Power Management support 21 * - Power Management support
22 * - Fix console via IrDA devices 22 * - Fix console via IrDA devices
23 * - SysReq (Herbert Pötzl) 23 * - SysReq (Herbert Pötzl)
24 * - Break character handling (Herbert Pötzl) 24 * - Break character handling (Herbert Pötzl)
25 * - spin-lock initialisation (Dimitry Andric) 25 * - spin-lock initialisation (Dimitry Andric)
26 * - added clock control 26 * - added clock control
27 * - updated init code to use platform_device info 27 * - updated init code to use platform_device info
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index e9aba932f217..7051e6c5edc3 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -181,7 +181,7 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
181 } 181 }
182 182
183 183
184 /* enable interupts and wait for wake up 184 /* enable interrupts and wait for wake up
185 * if just one byte is expected the Rx FIFO genererates no 185 * if just one byte is expected the Rx FIFO genererates no
186 * FFULL interrupt, so activate the RxRDY interrupt 186 * FFULL interrupt, so activate the RxRDY interrupt
187 */ 187 */
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index e78c2ddc1f88..367b75c0b25b 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -1272,7 +1272,7 @@ static int lh7a40x_set_halt(struct usb_ep *_ep, int value)
1272 /* 1272 /*
1273 * Attempts to halt IN endpoints will fail (returning -EAGAIN) 1273 * Attempts to halt IN endpoints will fail (returning -EAGAIN)
1274 * if any transfer requests are still queued, or if the controller 1274 * if any transfer requests are still queued, or if the controller
1275 * FIFO still holds bytes that the host hasnt collected. 1275 * FIFO still holds bytes that the host hasn't collected.
1276 */ 1276 */
1277 spin_unlock_irqrestore(&ep->dev->lock, flags); 1277 spin_unlock_irqrestore(&ep->dev->lock, flags);
1278 DEBUG 1278 DEBUG
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 0dcb4164dc83..735db4aec831 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -451,7 +451,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
451 451
452 /* Some boards (mostly VIA?) report bogus overcurrent indications, 452 /* Some boards (mostly VIA?) report bogus overcurrent indications,
453 * causing massive log spam unless we completely ignore them. It 453 * causing massive log spam unless we completely ignore them. It
454 * may be relevant that VIA VT8235 controlers, where PORT_POWER is 454 * may be relevant that VIA VT8235 controllers, where PORT_POWER is
455 * always set, seem to clear PORT_OCC and PORT_CSC when writing to 455 * always set, seem to clear PORT_OCC and PORT_CSC when writing to
456 * PORT_POWER; that's surprising, but maybe within-spec. 456 * PORT_POWER; that's surprising, but maybe within-spec.
457 */ 457 */
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 94d859aa73f8..ba370c56172c 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1556,7 +1556,7 @@ sl811h_start(struct usb_hcd *hcd)
1556 hcd->power_budget = sl811->board->power * 2; 1556 hcd->power_budget = sl811->board->power * 2;
1557 } 1557 }
1558 1558
1559 /* enable power and interupts */ 1559 /* enable power and interrupts */
1560 port_power(sl811, 1); 1560 port_power(sl811, 1);
1561 1561
1562 return 0; 1562 return 0;
diff --git a/drivers/usb/image/Kconfig b/drivers/usb/image/Kconfig
index 95ce703110d2..7595dfb38e3b 100644
--- a/drivers/usb/image/Kconfig
+++ b/drivers/usb/image/Kconfig
@@ -1,5 +1,5 @@
1# 1#
2# USB Imageing devices configuration 2# USB Imaging devices configuration
3# 3#
4comment "USB Imaging devices" 4comment "USB Imaging devices"
5 depends on USB 5 depends on USB
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c
index 04e87acd6e46..2677fea147d9 100644
--- a/drivers/usb/misc/cytherm.c
+++ b/drivers/usb/misc/cytherm.c
@@ -118,7 +118,7 @@ static ssize_t set_brightness(struct device *dev, struct device_attribute *attr,
118 cytherm->brightness, buffer, 8); 118 cytherm->brightness, buffer, 8);
119 if (retval) 119 if (retval)
120 dev_dbg(&cytherm->udev->dev, "retval = %d\n", retval); 120 dev_dbg(&cytherm->udev->dev, "retval = %d\n", retval);
121 /* Inform µC that we have changed the brightness setting */ 121 /* Inform µC that we have changed the brightness setting */
122 retval = vendor_command(cytherm->udev, WRITE_RAM, BRIGHTNESS_SEM, 122 retval = vendor_command(cytherm->udev, WRITE_RAM, BRIGHTNESS_SEM,
123 0x01, buffer, 8); 123 0x01, buffer, 8);
124 if (retval) 124 if (retval)
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index 5c0a26cbd128..cd137577bb2d 100644
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Emagic EMI 2|6 usb audio interface firmware loader. 2 * Emagic EMI 2|6 usb audio interface firmware loader.
3 * Copyright (C) 2002 3 * Copyright (C) 2002
4 * Tapio Laxström (tapio.laxstrom@iptime.fi) 4 * Tapio Laxström (tapio.laxstrom@iptime.fi)
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License, as published by 7 * it under the terms of the GNU General Public License, as published by
@@ -249,7 +249,7 @@ static void __exit emi26_exit (void)
249module_init(emi26_init); 249module_init(emi26_init);
250module_exit(emi26_exit); 250module_exit(emi26_exit);
251 251
252MODULE_AUTHOR("tapio laxström"); 252MODULE_AUTHOR("Tapio Laxström");
253MODULE_DESCRIPTION("Emagic EMI 2|6 firmware loader."); 253MODULE_DESCRIPTION("Emagic EMI 2|6 firmware loader.");
254MODULE_LICENSE("GPL"); 254MODULE_LICENSE("GPL");
255 255
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c
index 23153eac0dfa..4758cc5ccebc 100644
--- a/drivers/usb/misc/emi62.c
+++ b/drivers/usb/misc/emi62.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Emagic EMI 2|6 usb audio interface firmware loader. 2 * Emagic EMI 2|6 usb audio interface firmware loader.
3 * Copyright (C) 2002 3 * Copyright (C) 2002
4 * Tapio Laxström (tapio.laxstrom@iptime.fi) 4 * Tapio Laxström (tapio.laxstrom@iptime.fi)
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License, as published by 7 * it under the terms of the GNU General Public License, as published by
@@ -292,7 +292,7 @@ static void __exit emi62_exit (void)
292module_init(emi62_init); 292module_init(emi62_init);
293module_exit(emi62_exit); 293module_exit(emi62_exit);
294 294
295MODULE_AUTHOR("tapio laxström"); 295MODULE_AUTHOR("Tapio Laxström");
296MODULE_DESCRIPTION("Emagic EMI 6|2m firmware loader."); 296MODULE_DESCRIPTION("Emagic EMI 6|2m firmware loader.");
297MODULE_LICENSE("GPL"); 297MODULE_LICENSE("GPL");
298 298
diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history
index 52c4f7bd7a80..c1b279939bbf 100644
--- a/drivers/usb/serial/ChangeLog.history
+++ b/drivers/usb/serial/ChangeLog.history
@@ -400,7 +400,7 @@ visor.c Change Log comments:
400 400
401 (11/11/2001) gkh 401 (11/11/2001) gkh
402 Added support for the m125 devices, and added check to prevent oopses 402 Added support for the m125 devices, and added check to prevent oopses
403 for Clié devices that lie about the number of ports they have. 403 for Clié devices that lie about the number of ports they have.
404 404
405 (08/30/2001) gkh 405 (08/30/2001) gkh
406 Added support for the Clie devices, both the 3.5 and 4.0 os versions. 406 Added support for the Clie devices, both the 3.5 and 4.0 os versions.
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 99fefed77919..4a86696e6c7d 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -527,7 +527,7 @@ config USB_SERIAL_CYBERJACK
527 depends on USB_SERIAL && EXPERIMENTAL 527 depends on USB_SERIAL && EXPERIMENTAL
528 ---help--- 528 ---help---
529 Say Y here if you want to use a cyberJack pinpad/e-com USB chipcard 529 Say Y here if you want to use a cyberJack pinpad/e-com USB chipcard
530 reader. This is an interface to ISO 7816 compatible contactbased 530 reader. This is an interface to ISO 7816 compatible contact-based
531 chipcards, e.g. GSM SIMs. 531 chipcards, e.g. GSM SIMs.
532 532
533 To compile this driver as a module, choose M here: the 533 To compile this driver as a module, choose M here: the
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 65257867b34b..8a8a6b9fb05b 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -83,7 +83,7 @@
83 * 83 *
84 * (18/Jun/2003) Ian Abbott 84 * (18/Jun/2003) Ian Abbott
85 * Added Device ID of the USB relais from Rudolf Gugler (backported from 85 * Added Device ID of the USB relais from Rudolf Gugler (backported from
86 * Philipp Gühring's patch for 2.5.x kernel). 86 * Philipp Gühring's patch for 2.5.x kernel).
87 * Moved read transfer buffer reallocation into startup function. 87 * Moved read transfer buffer reallocation into startup function.
88 * Free existing write urb and transfer buffer in startup function. 88 * Free existing write urb and transfer buffer in startup function.
89 * Only use urbs in write urb pool that were successfully allocated. 89 * Only use urbs in write urb pool that were successfully allocated.
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index b57b90ae9f9d..b51cbb0eaa05 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -17,7 +17,7 @@
17 * Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the 17 * Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the
18 * FTDI_SIO implementation. 18 * FTDI_SIO implementation.
19 * 19 *
20 * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais 20 * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais
21 * from Rudolf Gugler 21 * from Rudolf Gugler
22 * 22 *
23 */ 23 */
@@ -44,7 +44,7 @@
44#define FTDI_ACTZWAVE_PID 0xF2D0 44#define FTDI_ACTZWAVE_PID 0xF2D0
45 45
46 46
47/* www.starting-point-systems.com µChameleon device */ 47/* www.starting-point-systems.com µChameleon device */
48#define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ 48#define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */
49 49
50/* www.irtrans.de device */ 50/* www.irtrans.de device */
@@ -419,7 +419,7 @@
419 419
420/* 420/*
421 * Teratronik product ids. 421 * Teratronik product ids.
422 * Submitted by O. Wölfelschneider. 422 * Submitted by O. Wölfelschneider.
423 */ 423 */
424#define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ 424#define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */
425#define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ 425#define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index e836ad07fdb9..9b38a08ac83a 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -306,7 +306,7 @@ static struct usb_device_id ipaq_id_table [] = {
306 { USB_DEVICE(0x0930, 0x0705) }, /* TOSHIBA Pocket PC e310 */ 306 { USB_DEVICE(0x0930, 0x0705) }, /* TOSHIBA Pocket PC e310 */
307 { USB_DEVICE(0x0930, 0x0706) }, /* TOSHIBA Pocket PC e740 */ 307 { USB_DEVICE(0x0930, 0x0706) }, /* TOSHIBA Pocket PC e740 */
308 { USB_DEVICE(0x0930, 0x0707) }, /* TOSHIBA Pocket PC e330 Series */ 308 { USB_DEVICE(0x0930, 0x0707) }, /* TOSHIBA Pocket PC e330 Series */
309 { USB_DEVICE(0x0930, 0x0708) }, /* TOSHIBA Pocket PC e350 Series */ 309 { USB_DEVICE(0x0930, 0x0708) }, /* TOSHIBA Pocket PC e350 Series */
310 { USB_DEVICE(0x0930, 0x0709) }, /* TOSHIBA Pocket PC e750 Series */ 310 { USB_DEVICE(0x0930, 0x0709) }, /* TOSHIBA Pocket PC e750 Series */
311 { USB_DEVICE(0x0930, 0x070A) }, /* TOSHIBA Pocket PC e400 Series */ 311 { USB_DEVICE(0x0930, 0x070A) }, /* TOSHIBA Pocket PC e400 Series */
312 { USB_DEVICE(0x0930, 0x070B) }, /* TOSHIBA Pocket PC e800 Series */ 312 { USB_DEVICE(0x0930, 0x070B) }, /* TOSHIBA Pocket PC e800 Series */
@@ -488,7 +488,7 @@ static struct usb_device_id ipaq_id_table [] = {
488 { USB_DEVICE(0x0BF8, 0x1001) }, /* Fujitsu Siemens Computers USB Sync */ 488 { USB_DEVICE(0x0BF8, 0x1001) }, /* Fujitsu Siemens Computers USB Sync */
489 { USB_DEVICE(0x0C44, 0x03A2) }, /* Motorola iDEN Smartphone */ 489 { USB_DEVICE(0x0C44, 0x03A2) }, /* Motorola iDEN Smartphone */
490 { USB_DEVICE(0x0C8E, 0x6000) }, /* Cesscom Luxian Series */ 490 { USB_DEVICE(0x0C8E, 0x6000) }, /* Cesscom Luxian Series */
491 { USB_DEVICE(0x0CAD, 0x9001) }, /* Motorola PowerPad Pocket PC Device */ 491 { USB_DEVICE(0x0CAD, 0x9001) }, /* Motorola PowerPad Pocket PC Device */
492 { USB_DEVICE(0x0F4E, 0x0200) }, /* Freedom Scientific USB Sync */ 492 { USB_DEVICE(0x0F4E, 0x0200) }, /* Freedom Scientific USB Sync */
493 { USB_DEVICE(0x0F98, 0x0201) }, /* Cyberbank USB Sync */ 493 { USB_DEVICE(0x0F98, 0x0201) }, /* Cyberbank USB Sync */
494 { USB_DEVICE(0x0FB8, 0x3001) }, /* Wistron USB Sync */ 494 { USB_DEVICE(0x0FB8, 0x3001) }, /* Wistron USB Sync */
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 6831dca93c1b..93a7724e167a 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -3,7 +3,7 @@
3 * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $ 3 * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $
4 * 4 *
5 * Current development and maintenance: 5 * Current development and maintenance:
6 * (C) 2001-2002 Björn Stenberg (bjorn@haxx.se) 6 * (C) 2001-2002 Björn Stenberg (bjorn@haxx.se)
7 * 7 *
8 * Developed with the assistance of: 8 * Developed with the assistance of:
9 * (C) 2002 Alan Stern <stern@rowland.org> 9 * (C) 2002 Alan Stern <stern@rowland.org>
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 9b656ec427d0..22ab2380367d 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -407,7 +407,7 @@ UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210,
407 "FinePix 1400Zoom", 407 "FinePix 1400Zoom",
408 US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN), 408 US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN),
409 409
410/* Reported by Peter Wächtler <pwaechtler@loewe-komp.de> 410/* Reported by Peter Wächtler <pwaechtler@loewe-komp.de>
411 * The device needs the flags only. 411 * The device needs the flags only.
412 */ 412 */
413UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074, 413UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074,
@@ -1551,7 +1551,7 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999,
1551 US_FL_GO_SLOW ), 1551 US_FL_GO_SLOW ),
1552 1552
1553/* 1553/*
1554 * David Härdeman <david@2gen.com> 1554 * David Härdeman <david@2gen.com>
1555 * The key makes the SCSI stack print confusing (but harmless) messages 1555 * The key makes the SCSI stack print confusing (but harmless) messages
1556 */ 1556 */
1557UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, 1557UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100,
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index b3bf4ecc983a..fb9d8d0b2c04 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -661,7 +661,7 @@ config FB_HECUBA
661 help 661 help
662 This enables support for the Hecuba board. This driver was tested 662 This enables support for the Hecuba board. This driver was tested
663 with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO 663 with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO
664 interface (8 bit data, 4 bit control). If you anticpate using 664 interface (8 bit data, 4 bit control). If you anticipate using
665 this driver, say Y or M; otherwise say N. You must specify the 665 this driver, say Y or M; otherwise say N. You must specify the
666 GPIO IO address to be used for setting control and data. 666 GPIO IO address to be used for setting control and data.
667 667
@@ -815,7 +815,7 @@ config FB_XVR500
815 help 815 help
816 This is the framebuffer device for the Sun XVR-500 and similar 816 This is the framebuffer device for the Sun XVR-500 and similar
817 graphics cards based upon the 3DLABS Wildcat chipset. The driver 817 graphics cards based upon the 3DLABS Wildcat chipset. The driver
818 only works on sparc64 systems where the system firwmare has 818 only works on sparc64 systems where the system firmware has
819 mostly initialized the card already. It is treated as a 819 mostly initialized the card already. It is treated as a
820 completely dumb framebuffer device. 820 completely dumb framebuffer device.
821 821
@@ -828,7 +828,7 @@ config FB_XVR2500
828 help 828 help
829 This is the framebuffer device for the Sun XVR-2500 and similar 829 This is the framebuffer device for the Sun XVR-2500 and similar
830 graphics cards based upon the 3DLABS Wildcat chipset. The driver 830 graphics cards based upon the 3DLABS Wildcat chipset. The driver
831 only works on sparc64 systems where the system firwmare has 831 only works on sparc64 systems where the system firmware has
832 mostly initialized the card already. It is treated as a 832 mostly initialized the card already. It is treated as a
833 completely dumb framebuffer device. 833 completely dumb framebuffer device.
834 834
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index f2e243c353f9..4c9ec3f58c52 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -112,7 +112,7 @@
112 +----------+---------------------------------------------+----------+-------+ 112 +----------+---------------------------------------------+----------+-------+
113 | | ^ | | | 113 | | ^ | | |
114 | | |upper_margin | | | 114 | | |upper_margin | | |
115 | | ¥ | | | 115 | | v | | |
116 +----------###############################################----------+-------+ 116 +----------###############################################----------+-------+
117 | # ^ # | | 117 | # ^ # | |
118 | # | # | | 118 | # | # | |
@@ -133,15 +133,15 @@
133 | # | # | | 133 | # | # | |
134 | # | # | | 134 | # | # | |
135 | # | # | | 135 | # | # | |
136 | # ¥ # | | 136 | # v # | |
137 +----------###############################################----------+-------+ 137 +----------###############################################----------+-------+
138 | | ^ | | | 138 | | ^ | | |
139 | | |lower_margin | | | 139 | | |lower_margin | | |
140 | | ¥ | | | 140 | | v | | |
141 +----------+---------------------------------------------+----------+-------+ 141 +----------+---------------------------------------------+----------+-------+
142 | | ^ | | | 142 | | ^ | | |
143 | | |vsync_len | | | 143 | | |vsync_len | | |
144 | | ¥ | | | 144 | | v | | |
145 +----------+---------------------------------------------+----------+-------+ 145 +----------+---------------------------------------------+----------+-------+
146 146
147 147
@@ -325,7 +325,7 @@
325 CCIR -> PAL 325 CCIR -> PAL
326 ----------- 326 -----------
327 327
328 - a scanline is 64 µs long, of which 52.48 µs are visible. This is about 328 - a scanline is 64 µs long, of which 52.48 µs are visible. This is about
329 736 visible 70 ns pixels per line. 329 736 visible 70 ns pixels per line.
330 - we have 625 scanlines, of which 575 are visible (interlaced); after 330 - we have 625 scanlines, of which 575 are visible (interlaced); after
331 rounding this becomes 576. 331 rounding this becomes 576.
@@ -333,7 +333,7 @@
333 RETMA -> NTSC 333 RETMA -> NTSC
334 ------------- 334 -------------
335 335
336 - a scanline is 63.5 µs long, of which 53.5 µs are visible. This is about 336 - a scanline is 63.5 µs long, of which 53.5 µs are visible. This is about
337 736 visible 70 ns pixels per line. 337 736 visible 70 ns pixels per line.
338 - we have 525 scanlines, of which 485 are visible (interlaced); after 338 - we have 525 scanlines, of which 485 are visible (interlaced); after
339 rounding this becomes 484. 339 rounding this becomes 484.
@@ -802,7 +802,7 @@ static u_short ecs_palette[32];
802 802
803static u_short do_vmode_full = 0; /* Change the Video Mode */ 803static u_short do_vmode_full = 0; /* Change the Video Mode */
804static u_short do_vmode_pan = 0; /* Update the Video Mode */ 804static u_short do_vmode_pan = 0; /* Update the Video Mode */
805static short do_blank = 0; /* (Un)Blank the Screen (±1) */ 805static short do_blank = 0; /* (Un)Blank the Screen (±1) */
806static u_short do_cursor = 0; /* Move the Cursor */ 806static u_short do_cursor = 0; /* Move the Cursor */
807 807
808 808
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index abe0c435a664..d775eb6590b6 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -26,7 +26,7 @@
26 * Anthony Tong <atong@uiuc.edu> 26 * Anthony Tong <atong@uiuc.edu>
27 * 27 *
28 * Generic LCD support written by Daniel Mantione, ported from 2.4.20 by Alex Kern 28 * Generic LCD support written by Daniel Mantione, ported from 2.4.20 by Alex Kern
29 * Many Thanks to Ville Syrjälä for patches and fixing nasting 16 bit color bug. 29 * Many Thanks to Ville Syrjälä for patches and fixing nasting 16 bit color bug.
30 * 30 *
31 * This file is subject to the terms and conditions of the GNU General Public 31 * This file is subject to the terms and conditions of the GNU General Public
32 * License. See the file COPYING in the main directory of this archive for 32 * License. See the file COPYING in the main directory of this archive for
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index a22ccf9485a4..267422f66255 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -27,7 +27,7 @@ config VGACON_SOFT_SCROLLBACK
27 The scrollback buffer of the standard VGA console is located in 27 The scrollback buffer of the standard VGA console is located in
28 the VGA RAM. The size of this RAM is fixed and is quite small. 28 the VGA RAM. The size of this RAM is fixed and is quite small.
29 If you require a larger scrollback buffer, this can be placed in 29 If you require a larger scrollback buffer, this can be placed in
30 System RAM which is dynamically allocated during intialization. 30 System RAM which is dynamically allocated during initialization.
31 Placing the scrollback buffer in System RAM will slightly slow 31 Placing the scrollback buffer in System RAM will slightly slow
32 down the console. 32 down the console.
33 33
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index e8e38edb9b5b..481d58f7535d 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -4,7 +4,7 @@
4 * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/ 4 * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/
5 * 945G/945GM integrated graphics chips. 5 * 945G/945GM integrated graphics chips.
6 * 6 *
7 * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org> 7 * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
8 * 2004 Sylvain Meyer 8 * 2004 Sylvain Meyer
9 * 2006 David Airlie 9 * 2006 David Airlie
10 * 10 *
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 2a0e32074f7d..5f6fb7d2c408 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Linux framebuffer driver for Intel(R) 865G integrated graphics chips. 4 * Linux framebuffer driver for Intel(R) 865G integrated graphics chips.
5 * 5 *
6 * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org> 6 * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
7 * 2004 Sylvain Meyer 7 * 2004 Sylvain Meyer
8 * 8 *
9 * This driver consists of two parts. The first part (intelfbdrv.c) provides 9 * This driver consists of two parts. The first part (intelfbdrv.c) provides
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index 7f4d25b8a184..f4fcf11b290d 100644
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -8,7 +8,7 @@ config FB_OMAP
8 Frame buffer driver for OMAP based boards. 8 Frame buffer driver for OMAP based boards.
9 9
10config FB_OMAP_BOOTLOADER_INIT 10config FB_OMAP_BOOTLOADER_INIT
11 bool "Check bootloader initializaion" 11 bool "Check bootloader initialization"
12 depends on FB_OMAP 12 depends on FB_OMAP
13 help 13 help
14 Say Y here if you want to enable checking if the bootloader has 14 Say Y here if you want to enable checking if the bootloader has
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index ae08d4587091..5857ccf5f6b1 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -56,7 +56,7 @@
56 * - Add support for different devices 56 * - Add support for different devices
57 * - Backlight support 57 * - Backlight support
58 * 58 *
59 * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at> 59 * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at>
60 * - added clock (de-)allocation code 60 * - added clock (de-)allocation code
61 * - added fixem fbmem option 61 * - added fixem fbmem option
62 * 62 *
@@ -64,7 +64,7 @@
64 * - code cleanup 64 * - code cleanup
65 * - added a forgotten return in h1940fb_init 65 * - added a forgotten return in h1940fb_init
66 * 66 *
67 * 2004-07-19: Herbert Pötzl <herbert@13thfloor.at> 67 * 2004-07-19: Herbert Pötzl <herbert@13thfloor.at>
68 * - code cleanup and extended debugging 68 * - code cleanup and extended debugging
69 * 69 *
70 * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org> 70 * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org>
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c
index ff9e805c43bc..c31f549ebea0 100644
--- a/drivers/video/vermilion/vermilion.c
+++ b/drivers/video/vermilion/vermilion.c
@@ -23,8 +23,8 @@
23 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 23 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 * 24 *
25 * Authors: 25 * Authors:
26 * Thomas Hellström <thomas-at-tungstengraphics-dot-com> 26 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
27 * Michel Dänzer <michel-at-tungstengraphics-dot-com> 27 * Michel Dänzer <michel-at-tungstengraphics-dot-com>
28 * Alan Hourihane <alanh-at-tungstengraphics-dot-com> 28 * Alan Hourihane <alanh-at-tungstengraphics-dot-com>
29 */ 29 */
30 30
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h
index 1fc6695a49d2..c4aba59d4809 100644
--- a/drivers/video/vermilion/vermilion.h
+++ b/drivers/video/vermilion/vermilion.h
@@ -23,7 +23,7 @@
23 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 23 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 * 24 *
25 * Authors: 25 * Authors:
26 * Thomas Hellström <thomas-at-tungstengraphics-dot-com> 26 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
27 */ 27 */
28 28
29#ifndef _VERMILION_H_ 29#ifndef _VERMILION_H_
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index c5982502c03d..f236954d2536 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -2,7 +2,7 @@
2 * i6300esb: Watchdog timer driver for Intel 6300ESB chipset 2 * i6300esb: Watchdog timer driver for Intel 6300ESB chipset
3 * 3 *
4 * (c) Copyright 2004 Google Inc. 4 * (c) Copyright 2004 Google Inc.
5 * (c) Copyright 2005 David Härdeman <david@2gen.com> 5 * (c) Copyright 2005 David Härdeman <david@2gen.com>
6 * 6 *
7 * This program is free software; you can redistribute it and/or 7 * This program is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License 8 * modify it under the terms of the GNU General Public License
@@ -19,7 +19,7 @@
19 * Initial version 0.01 19 * Initial version 0.01
20 * 2004YYZZ Ross Biro 20 * 2004YYZZ Ross Biro
21 * Version 0.02 21 * Version 0.02
22 * 20050210 David Härdeman <david@2gen.com> 22 * 20050210 David Härdeman <david@2gen.com>
23 * Ported driver to kernel 2.6 23 * Ported driver to kernel 2.6
24 */ 24 */
25 25
@@ -521,7 +521,7 @@ static void __exit watchdog_cleanup (void)
521module_init(watchdog_init); 521module_init(watchdog_init);
522module_exit(watchdog_cleanup); 522module_exit(watchdog_cleanup);
523 523
524MODULE_AUTHOR("Ross Biro and David Härdeman"); 524MODULE_AUTHOR("Ross Biro and David Härdeman");
525MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets"); 525MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets");
526MODULE_LICENSE("GPL"); 526MODULE_LICENSE("GPL");
527MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 527MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c
index 415083990097..cafc465f2ae3 100644
--- a/drivers/watchdog/iTCO_vendor_support.c
+++ b/drivers/watchdog/iTCO_vendor_support.c
@@ -115,7 +115,7 @@ static void supermicro_old_pre_keepalive(unsigned long acpibase)
115 * For P4DPx: 115 * For P4DPx:
116 * BIOS setup -> Advanced -> I/O Device Configuration -> Watch Dog 116 * BIOS setup -> Advanced -> I/O Device Configuration -> Watch Dog
117 * This setting enables or disables Watchdog function. When enabled, the 117 * This setting enables or disables Watchdog function. When enabled, the
118 * default watchdog timer is set to be 5 minutes (about 4’35â€). It is 118 * default watchdog timer is set to be 5 minutes (about 4m35s). It is
119 * enough to load and run the OS. The application (service or driver) has 119 * enough to load and run the OS. The application (service or driver) has
120 * to take over the control once OS is running up and before watchdog 120 * to take over the control once OS is running up and before watchdog
121 * expires. 121 * expires.
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index d9e821d08deb..51826c216d6d 100644
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -8,7 +8,7 @@
8 * which is based on wdt.c. 8 * which is based on wdt.c.
9 * Original copyright messages: 9 * Original copyright messages:
10 * 10 *
11 * (c) Copyright 2003 Pádraig Brady <P@draigBrady.com> 11 * (c) Copyright 2003 Pádraig Brady <P@draigBrady.com>
12 * 12 *
13 * (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl> 13 * (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
14 * 14 *
diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids
index 5bd4b05d4c45..560fef2a7b1c 100644
--- a/drivers/zorro/zorro.ids
+++ b/drivers/zorro/zorro.ids
@@ -295,7 +295,7 @@
295 0100 RH 800C [HD Controller] 295 0100 RH 800C [HD Controller]
296 0200 RH 800C [RAM Expansion] 296 0200 RH 800C [RAM Expansion]
2970861 Kato 2970861 Kato
298# The Rainbow II and III are actually made by Ingenieurbüro Helfrich 298# The Rainbow II and III are actually made by Ingenieurbüro Helfrich
299 2000 Rainbow II [Graphics Card] 299 2000 Rainbow II [Graphics Card]
300 2100 Rainbow III [Graphics Card] 300 2100 Rainbow III [Graphics Card]
301 8000 Melody MPEG [Audio Card] 301 8000 Melody MPEG [Audio Card]
diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c
index 576dd7de2278..f95ae9789c91 100644
--- a/fs/binfmt_em86.c
+++ b/fs/binfmt_em86.c
@@ -2,7 +2,7 @@
2 * linux/fs/binfmt_em86.c 2 * linux/fs/binfmt_em86.c
3 * 3 *
4 * Based on linux/fs/binfmt_script.c 4 * Based on linux/fs/binfmt_script.c
5 * Copyright (C) 1996 Martin von Löwis 5 * Copyright (C) 1996 Martin von Löwis
6 * original #!-checking implemented by tytso. 6 * original #!-checking implemented by tytso.
7 * 7 *
8 * em86 changes Copyright (C) 1997 Jim Paradis 8 * em86 changes Copyright (C) 1997 Jim Paradis
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 42e94b3ab7be..b53c7e5f41bb 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * binfmt_misc.c 2 * binfmt_misc.c
3 * 3 *
4 * Copyright (C) 1997 Richard Günther 4 * Copyright (C) 1997 Richard Günther
5 * 5 *
6 * binfmt_misc detects binaries via a magic or filename extension and invokes 6 * binfmt_misc detects binaries via a magic or filename extension and invokes
7 * a specified wrapper. This should obsolete binfmt_java, binfmt_em86 and 7 * a specified wrapper. This should obsolete binfmt_java, binfmt_em86 and
diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
index 4d0e0f6d3273..ab33939b12a7 100644
--- a/fs/binfmt_script.c
+++ b/fs/binfmt_script.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * linux/fs/binfmt_script.c 2 * linux/fs/binfmt_script.c
3 * 3 *
4 * Copyright (C) 1996 Martin von Löwis 4 * Copyright (C) 1996 Martin von Löwis
5 * original #!-checking implemented by tytso. 5 * original #!-checking implemented by tytso.
6 */ 6 */
7 7
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index aa359a2e4ce6..09e3d306e96f 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * (C) 1991 Linus Torvalds - minix filesystem 4 * (C) 1991 Linus Torvalds - minix filesystem
5 * 1992, 1993, 1994 Eric Youngdale Modified for ISO 9660 filesystem. 5 * 1992, 1993, 1994 Eric Youngdale Modified for ISO 9660 filesystem.
6 * 1994 Eberhard Moenkeberg - multi session handling. 6 * 1994 Eberhard Mönkeberg - multi session handling.
7 * 1995 Mark Dobie - allow mounting of some weird VideoCDs and PhotoCDs. 7 * 1995 Mark Dobie - allow mounting of some weird VideoCDs and PhotoCDs.
8 * 1997 Gordon Chaffee - Joliet CDs 8 * 1997 Gordon Chaffee - Joliet CDs
9 * 1998 Eric Lammerts - ISO 9660 Level 3 9 * 1998 Eric Lammerts - ISO 9660 Level 3
diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index df0b8535de84..df25ecc418af 100644
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -773,7 +773,7 @@ int dtSearch(struct inode *ip, struct component_name * key, ino_t * data,
773 getChild: 773 getChild:
774 /* update max. number of pages to split */ 774 /* update max. number of pages to split */
775 if (BT_STACK_FULL(btstack)) { 775 if (BT_STACK_FULL(btstack)) {
776 /* Something's corrupted, mark filesytem dirty so 776 /* Something's corrupted, mark filesystem dirty so
777 * chkdsk will fix it. 777 * chkdsk will fix it.
778 */ 778 */
779 jfs_error(sb, "stack overrun in dtSearch!"); 779 jfs_error(sb, "stack overrun in dtSearch!");
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index e87b44ee9ac9..4b0334590ee5 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -43,7 +43,7 @@
43 * from being used (thanks to Leo Spiekman) 43 * from being used (thanks to Leo Spiekman)
44 * Andy Walker : Allow to specify the NFS server in nfs_root 44 * Andy Walker : Allow to specify the NFS server in nfs_root
45 * without giving a path name 45 * without giving a path name
46 * Swen Thümmler : Allow to specify the NFS options in nfs_root 46 * Swen Thümmler : Allow to specify the NFS options in nfs_root
47 * without giving a path name. Fix BOOTP request 47 * without giving a path name. Fix BOOTP request
48 * for domainname (domainname is NIS domain, not 48 * for domainname (domainname is NIS domain, not
49 * DNS domain!). Skip dummy devices for BOOTP. 49 * DNS domain!). Skip dummy devices for BOOTP.
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 345798ebd366..37c11e194372 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -382,7 +382,7 @@ ToDo/Notes:
382 own locking so it does not matter if the vfs inode is locked. 382 own locking so it does not matter if the vfs inode is locked.
383 - Fix bug in mft record writing where we forgot to set the device in 383 - Fix bug in mft record writing where we forgot to set the device in
384 the buffers when mapping them after the VM had discarded them. 384 the buffers when mapping them after the VM had discarded them.
385 Thanks to Martin MOKREJÅ  for the bug report. 385 Thanks to Martin MOKREJÃ… for the bug report.
386 386
3872.1.22 - Many bug and race fixes and error handling improvements. 3872.1.22 - Many bug and race fixes and error handling improvements.
388 388
@@ -1585,7 +1585,7 @@ tng-0.0.4 - Big changes, getting in line with Al Viro's comments.
1585 for reading $MFT (ntfs_mft_readpage). In the process create dedicated 1585 for reading $MFT (ntfs_mft_readpage). In the process create dedicated
1586 address space operations (ntfs_mft_aops) for $MFT inode mapping. Also 1586 address space operations (ntfs_mft_aops) for $MFT inode mapping. Also
1587 removed the now superfluous exports from the kernel core patch. 1587 removed the now superfluous exports from the kernel core patch.
1588 - Fix a bug where kfree() was used insted of ntfs_free(). 1588 - Fix a bug where kfree() was used instead of ntfs_free().
1589 - Change map_mft_record() to take ntfs_inode as argument instead of 1589 - Change map_mft_record() to take ntfs_inode as argument instead of
1590 vfs inode. Dito for unmap_mft_record(). Adapt all callers. 1590 vfs inode. Dito for unmap_mft_record(). Adapt all callers.
1591 - Add pointer to ntfs_volume to ntfs_inode. 1591 - Add pointer to ntfs_volume to ntfs_inode.
diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c
index 4847fbfb0107..9ef85e628fe1 100644
--- a/fs/ntfs/sysctl.c
+++ b/fs/ntfs/sysctl.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * sysctl.c - Code for sysctl handling in NTFS Linux kernel driver. Part of 2 * sysctl.c - Code for sysctl handling in NTFS Linux kernel driver. Part of
3 * the Linux-NTFS project. Adapted from the old NTFS driver, 3 * the Linux-NTFS project. Adapted from the old NTFS driver,
4 * Copyright (C) 1997 Martin von Löwis, Régis Duchesne 4 * Copyright (C) 1997 Martin von Löwis, Régis Duchesne
5 * 5 *
6 * Copyright (c) 2002-2005 Anton Altaparmakov 6 * Copyright (c) 2002-2005 Anton Altaparmakov
7 * 7 *
diff --git a/fs/ntfs/sysctl.h b/fs/ntfs/sysctl.h
index beda5bf96405..d4f8ce920d95 100644
--- a/fs/ntfs/sysctl.h
+++ b/fs/ntfs/sysctl.h
@@ -1,7 +1,7 @@
1/* 1/*
2 * sysctl.h - Defines for sysctl handling in NTFS Linux kernel driver. Part of 2 * sysctl.h - Defines for sysctl handling in NTFS Linux kernel driver. Part of
3 * the Linux-NTFS project. Adapted from the old NTFS driver, 3 * the Linux-NTFS project. Adapted from the old NTFS driver,
4 * Copyright (C) 1997 Martin von Löwis, Régis Duchesne 4 * Copyright (C) 1997 Martin von Löwis, Régis Duchesne
5 * 5 *
6 * Copyright (c) 2002-2004 Anton Altaparmakov 6 * Copyright (c) 2002-2004 Anton Altaparmakov
7 * 7 *
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index 014e73978dac..3094ddb7a254 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -376,7 +376,7 @@ out:
376 * directory locks. The dentries have already been deleted on other 376 * directory locks. The dentries have already been deleted on other
377 * nodes via ocfs2_remote_dentry_delete(). 377 * nodes via ocfs2_remote_dentry_delete().
378 * 378 *
379 * Normally, the VFS handles the d_move() for the file sytem, after 379 * Normally, the VFS handles the d_move() for the file system, after
380 * the ->rename() callback. OCFS2 wants to handle this internally, so 380 * the ->rename() callback. OCFS2 wants to handle this internally, so
381 * the new lock can be created atomically with respect to the cluster. 381 * the new lock can be created atomically with respect to the cluster.
382 */ 382 */
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 57adfe90d5ae..98c3781bc069 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -319,7 +319,7 @@ static int finish_unfinished(struct super_block *s)
319 319
320/* to protect file being unlinked from getting lost we "safe" link files 320/* to protect file being unlinked from getting lost we "safe" link files
321 being unlinked. This link will be deleted in the same transaction with last 321 being unlinked. This link will be deleted in the same transaction with last
322 item of file. mounting the filesytem we scan all these links and remove 322 item of file. mounting the filesystem we scan all these links and remove
323 files which almost got lost */ 323 files which almost got lost */
324void add_save_link(struct reiserfs_transaction_handle *th, 324void add_save_link(struct reiserfs_transaction_handle *th,
325 struct inode *inode, int truncate) 325 struct inode *inode, int truncate)
diff --git a/fs/super.c b/fs/super.c
index d28fde7e1cfb..ceaf2e3d594c 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -15,7 +15,7 @@
15 * Added kerneld support: Jacques Gelinas and Bjorn Ekwall 15 * Added kerneld support: Jacques Gelinas and Bjorn Ekwall
16 * Added change_root: Werner Almesberger & Hans Lermen, Feb '96 16 * Added change_root: Werner Almesberger & Hans Lermen, Feb '96
17 * Added options to /proc/mounts: 17 * Added options to /proc/mounts:
18 * Torbjörn Lindh (torbjorn.lindh@gopta.se), April 14, 1996. 18 * Torbjörn Lindh (torbjorn.lindh@gopta.se), April 14, 1996.
19 * Added devfs support: Richard Gooch <rgooch@atnf.csiro.au>, 13-JAN-1998 19 * Added devfs support: Richard Gooch <rgooch@atnf.csiro.au>, 13-JAN-1998
20 * Heavily rewritten for 'one fs - one tree' dcache architecture. AV, Mar 2000 20 * Heavily rewritten for 'one fs - one tree' dcache architecture. AV, Mar 2000
21 */ 21 */
@@ -417,7 +417,7 @@ restart:
417} 417}
418 418
419/* 419/*
420 * Call the ->sync_fs super_op against all filesytems which are r/w and 420 * Call the ->sync_fs super_op against all filesystems which are r/w and
421 * which implement it. 421 * which implement it.
422 * 422 *
423 * This operation is careful to avoid the livelock which could easily happen 423 * This operation is careful to avoid the livelock which could easily happen
@@ -425,7 +425,7 @@ restart:
425 * is used only here. We set it against all filesystems and then clear it as 425 * is used only here. We set it against all filesystems and then clear it as
426 * we sync them. So redirtied filesystems are skipped. 426 * we sync them. So redirtied filesystems are skipped.
427 * 427 *
428 * But if process A is currently running sync_filesytems and then process B 428 * But if process A is currently running sync_filesystems and then process B
429 * calls sync_filesystems as well, process B will set all the s_need_sync_fs 429 * calls sync_filesystems as well, process B will set all the s_need_sync_fs
430 * flags again, which will cause process A to resync everything. Fix that with 430 * flags again, which will cause process A to resync everything. Fix that with
431 * a local mutex. 431 * a local mutex.
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index d3be1e7fb48b..27d1785b7644 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -540,7 +540,7 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd, const struct attribute *attr,
540/** 540/**
541 * sysfs_create_file - create an attribute file for an object. 541 * sysfs_create_file - create an attribute file for an object.
542 * @kobj: object we're creating for. 542 * @kobj: object we're creating for.
543 * @attr: atrribute descriptor. 543 * @attr: attribute descriptor.
544 */ 544 */
545 545
546int sysfs_create_file(struct kobject * kobj, const struct attribute * attr) 546int sysfs_create_file(struct kobject * kobj, const struct attribute * attr)
diff --git a/include/asm-arm/arch-aaec2000/aaec2000.h b/include/asm-arm/arch-aaec2000/aaec2000.h
index 002227924b9f..a6d1ee0980f2 100644
--- a/include/asm-arm/arch-aaec2000/aaec2000.h
+++ b/include/asm-arm/arch-aaec2000/aaec2000.h
@@ -140,11 +140,11 @@
140#define TIMER3_CLEAR __REG(0x80000e0c) /* Timer 3 Clear Register */ 140#define TIMER3_CLEAR __REG(0x80000e0c) /* Timer 3 Clear Register */
141 141
142/* Timer Control register bits */ 142/* Timer Control register bits */
143#define TIMER_CTRL_ENABLE (1 << 7) /* Enable (Start° Timer */ 143#define TIMER_CTRL_ENABLE (1 << 7) /* Enable (Start Timer) */
144#define TIMER_CTRL_PERIODIC (1 << 6) /* Periodic Running Mode */ 144#define TIMER_CTRL_PERIODIC (1 << 6) /* Periodic Running Mode */
145#define TIMER_CTRL_FREE_RUNNING (0 << 6) /* Normal Running Mode */ 145#define TIMER_CTRL_FREE_RUNNING (0 << 6) /* Normal Running Mode */
146#define TIMER_CTRL_CLKSEL_508K (1 << 3) /* 508KHz Clock select (Timer 1, 2) */ 146#define TIMER_CTRL_CLKSEL_508K (1 << 3) /* 508KHz Clock select (Timer 1, 2) */
147#define TIMER_CTRL_CLKSEL_2K (0 << 3) /* 2KHz Clock Select (Timer 1, 2)*/ 147#define TIMER_CTRL_CLKSEL_2K (0 << 3) /* 2KHz Clock Select (Timer 1, 2) */
148 148
149/* Power and State Control */ 149/* Power and State Control */
150#define POWER_BASE __REG(0x80000400) 150#define POWER_BASE __REG(0x80000400)
diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h
index 678134bf2475..1eb8aac43228 100644
--- a/include/asm-arm/dma-mapping.h
+++ b/include/asm-arm/dma-mapping.h
@@ -401,7 +401,7 @@ extern void dma_sync_sg_for_device(struct device*, struct scatterlist*, int, enu
401 * 401 *
402 * On the SA-1111, a bug limits DMA to only certain regions of RAM. 402 * On the SA-1111, a bug limits DMA to only certain regions of RAM.
403 * On the IXP425, the PCI inbound window is 64MB (256MB total RAM) 403 * On the IXP425, the PCI inbound window is 64MB (256MB total RAM)
404 * On some ADI engineering sytems, PCI inbound window is 32MB (12MB total RAM) 404 * On some ADI engineering systems, PCI inbound window is 32MB (12MB total RAM)
405 * 405 *
406 * The following are helper functions used by the dmabounce subystem 406 * The following are helper functions used by the dmabounce subystem
407 * 407 *
diff --git a/include/asm-blackfin/system.h b/include/asm-blackfin/system.h
index 2b3d47d0bbb6..4a927379ee1c 100644
--- a/include/asm-blackfin/system.h
+++ b/include/asm-blackfin/system.h
@@ -128,9 +128,7 @@ extern unsigned long irq_flags;
128#define mb() asm volatile ("" : : :"memory") 128#define mb() asm volatile ("" : : :"memory")
129#define rmb() asm volatile ("" : : :"memory") 129#define rmb() asm volatile ("" : : :"memory")
130#define wmb() asm volatile ("" : : :"memory") 130#define wmb() asm volatile ("" : : :"memory")
131#define set_rmb(var, value) do { (void) xchg(&var, value); } while (0) 131#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
132#define set_mb(var, value) set_rmb(var, value)
133#define set_wmb(var, value) do { var = value; wmb(); } while (0)
134 132
135#define read_barrier_depends() do { } while(0) 133#define read_barrier_depends() do { } while(0)
136 134
diff --git a/include/asm-h8300/system.h b/include/asm-h8300/system.h
index 7807018f8500..2c1e83f7b419 100644
--- a/include/asm-h8300/system.h
+++ b/include/asm-h8300/system.h
@@ -82,8 +82,7 @@ asmlinkage void resume(void);
82#define mb() asm volatile ("" : : :"memory") 82#define mb() asm volatile ("" : : :"memory")
83#define rmb() asm volatile ("" : : :"memory") 83#define rmb() asm volatile ("" : : :"memory")
84#define wmb() asm volatile ("" : : :"memory") 84#define wmb() asm volatile ("" : : :"memory")
85#define set_rmb(var, value) do { xchg(&var, value); } while (0) 85#define set_mb(var, value) do { xchg(&var, value); } while (0)
86#define set_mb(var, value) set_rmb(var, value)
87 86
88#ifdef CONFIG_SMP 87#ifdef CONFIG_SMP
89#define smp_mb() mb() 88#define smp_mb() mb()
diff --git a/include/asm-m68knommu/system.h b/include/asm-m68knommu/system.h
index 1bd1142685e1..15b4c7d45c94 100644
--- a/include/asm-m68knommu/system.h
+++ b/include/asm-m68knommu/system.h
@@ -104,8 +104,7 @@ asmlinkage void resume(void);
104#define mb() asm volatile ("" : : :"memory") 104#define mb() asm volatile ("" : : :"memory")
105#define rmb() asm volatile ("" : : :"memory") 105#define rmb() asm volatile ("" : : :"memory")
106#define wmb() asm volatile ("" : : :"memory") 106#define wmb() asm volatile ("" : : :"memory")
107#define set_rmb(var, value) do { xchg(&var, value); } while (0) 107#define set_mb(var, value) do { xchg(&var, value); } while (0)
108#define set_mb(var, value) set_rmb(var, value)
109 108
110#ifdef CONFIG_SMP 109#ifdef CONFIG_SMP
111#define smp_mb() mb() 110#define smp_mb() mb()
diff --git a/include/asm-mips/pci/bridge.h b/include/asm-mips/pci/bridge.h
index b84feebf2cef..5f4b9d4e4114 100644
--- a/include/asm-mips/pci/bridge.h
+++ b/include/asm-mips/pci/bridge.h
@@ -538,7 +538,7 @@ typedef struct bridge_err_cmdword_s {
538 BRIDGE_ISR_PMU_ESIZE_FAULT) 538 BRIDGE_ISR_PMU_ESIZE_FAULT)
539 539
540/* 540/*
541 * List of Errors which are fatal and kill the sytem 541 * List of Errors which are fatal and kill the system
542 */ 542 */
543#define BRIDGE_ISR_ERROR_FATAL \ 543#define BRIDGE_ISR_ERROR_FATAL \
544 ((BRIDGE_ISR_XTALK_ERROR & ~BRIDGE_ISR_XREAD_REQ_TIMEOUT)|\ 544 ((BRIDGE_ISR_XTALK_ERROR & ~BRIDGE_ISR_XREAD_REQ_TIMEOUT)|\
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index bf14ab4ef4c9..e44cdfc8493a 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -522,7 +522,7 @@ static inline void name at \
522#else 522#else
523/* 523/*
524 * Enforce synchronisation of stores vs. spin_unlock 524 * Enforce synchronisation of stores vs. spin_unlock
525 * (this does it explicitely, though our implementation of spin_unlock 525 * (this does it explicitly, though our implementation of spin_unlock
526 * does it implicitely too) 526 * does it implicitely too)
527 */ 527 */
528static inline void mmiowb(void) 528static inline void mmiowb(void)
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h
index 98c6bd5756b7..f6dfce025adf 100644
--- a/include/asm-powerpc/paca.h
+++ b/include/asm-powerpc/paca.h
@@ -121,7 +121,5 @@ struct paca_struct {
121 121
122extern struct paca_struct paca[]; 122extern struct paca_struct paca[];
123 123
124void setup_boot_paca(void);
125
126#endif /* __KERNEL__ */ 124#endif /* __KERNEL__ */
127#endif /* _ASM_POWERPC_PACA_H */ 125#endif /* _ASM_POWERPC_PACA_H */
diff --git a/include/asm-sh/se7751.h b/include/asm-sh/se7751.h
index 02ca9347f043..b36792ac5d66 100644
--- a/include/asm-sh/se7751.h
+++ b/include/asm-sh/se7751.h
@@ -36,7 +36,7 @@
36#define PA_LED 0xba000000 /* LED */ 36#define PA_LED 0xba000000 /* LED */
37#define PA_BCR 0xbb000000 /* FPGA on the MS7751SE01 */ 37#define PA_BCR 0xbb000000 /* FPGA on the MS7751SE01 */
38 38
39#define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controler */ 39#define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controller */
40#define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */ 40#define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */
41#define PA_MRSHPC_MW2 0xb8500000 /* MR-SHPC-01 attribute window base */ 41#define PA_MRSHPC_MW2 0xb8500000 /* MR-SHPC-01 attribute window base */
42#define PA_MRSHPC_IO 0xb8600000 /* MR-SHPC-01 I/O window base */ 42#define PA_MRSHPC_IO 0xb8600000 /* MR-SHPC-01 I/O window base */
diff --git a/include/asm-sh/systemh7751.h b/include/asm-sh/systemh7751.h
index b143bb2a2ca7..4161122c84ef 100644
--- a/include/asm-sh/systemh7751.h
+++ b/include/asm-sh/systemh7751.h
@@ -36,7 +36,7 @@
36#define PA_LED 0xba000000 /* LED */ 36#define PA_LED 0xba000000 /* LED */
37#define PA_BCR 0xbb000000 /* FPGA on the MS7751SE01 */ 37#define PA_BCR 0xbb000000 /* FPGA on the MS7751SE01 */
38 38
39#define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controler */ 39#define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controller */
40#define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */ 40#define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */
41#define PA_MRSHPC_MW2 0xb8500000 /* MR-SHPC-01 attribute window base */ 41#define PA_MRSHPC_MW2 0xb8500000 /* MR-SHPC-01 attribute window base */
42#define PA_MRSHPC_IO 0xb8600000 /* MR-SHPC-01 I/O window base */ 42#define PA_MRSHPC_IO 0xb8600000 /* MR-SHPC-01 I/O window base */
diff --git a/include/asm-sh64/system.h b/include/asm-sh64/system.h
index 5ff94644e8c8..be2a15ffcc55 100644
--- a/include/asm-sh64/system.h
+++ b/include/asm-sh64/system.h
@@ -62,8 +62,7 @@ extern void __xchg_called_with_bad_pointer(void);
62#define smp_read_barrier_depends() do { } while (0) 62#define smp_read_barrier_depends() do { } while (0)
63#endif /* CONFIG_SMP */ 63#endif /* CONFIG_SMP */
64 64
65#define set_rmb(var, value) do { (void)xchg(&var, value); } while (0) 65#define set_mb(var, value) do { (void)xchg(&var, value); } while (0)
66#define set_mb(var, value) set_rmb(var, value)
67 66
68/* Interrupt Control */ 67/* Interrupt Control */
69#ifndef HARD_CLI 68#ifndef HARD_CLI
diff --git a/include/asm-v850/system.h b/include/asm-v850/system.h
index 0de2481fd990..a34ddfafd561 100644
--- a/include/asm-v850/system.h
+++ b/include/asm-v850/system.h
@@ -66,8 +66,7 @@ static inline int irqs_disabled (void)
66#define rmb() mb () 66#define rmb() mb ()
67#define wmb() mb () 67#define wmb() mb ()
68#define read_barrier_depends() ((void)0) 68#define read_barrier_depends() ((void)0)
69#define set_rmb(var, value) do { xchg (&var, value); } while (0) 69#define set_mb(var, value) do { xchg (&var, value); } while (0)
70#define set_mb(var, value) set_rmb (var, value)
71 70
72#define smp_mb() mb () 71#define smp_mb() mb ()
73#define smp_rmb() rmb () 72#define smp_rmb() rmb ()
diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h
index 4f51519fc199..b1f3c1ea55d9 100644
--- a/include/asm-x86/hpet.h
+++ b/include/asm-x86/hpet.h
@@ -3,12 +3,6 @@
3 3
4#ifdef CONFIG_HPET_TIMER 4#ifdef CONFIG_HPET_TIMER
5 5
6/*
7 * Documentation on HPET can be found at:
8 * http://www.intel.com/ial/home/sp/pcmmspec.htm
9 * ftp://download.intel.com/ial/home/sp/mmts098.pdf
10 */
11
12#define HPET_MMAP_SIZE 1024 6#define HPET_MMAP_SIZE 1024
13 7
14#define HPET_ID 0x000 8#define HPET_ID 0x000
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 2b641b176e7f..c6d3e22c0624 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -2,7 +2,7 @@
2 * -- <linux/cdrom.h> 2 * -- <linux/cdrom.h>
3 * General header file for linux CD-ROM drivers 3 * General header file for linux CD-ROM drivers
4 * Copyright (C) 1992 David Giller, rafetmad@oxy.edu 4 * Copyright (C) 1992 David Giller, rafetmad@oxy.edu
5 * 1994, 1995 Eberhard Moenkeberg, emoenke@gwdg.de 5 * 1994, 1995 Eberhard Mönkeberg, emoenke@gwdg.de
6 * 1996 David van Leeuwen, david@tm.tno.nl 6 * 1996 David van Leeuwen, david@tm.tno.nl
7 * 1997, 1998 Erik Andersen, andersee@debian.org 7 * 1997, 1998 Erik Andersen, andersee@debian.org
8 * 1998-2002 Jens Axboe, axboe@suse.de 8 * 1998-2002 Jens Axboe, axboe@suse.de
@@ -76,7 +76,7 @@
76 (struct cdrom_multisession) */ 76 (struct cdrom_multisession) */
77#define CDROM_GET_MCN 0x5311 /* Obtain the "Universal Product Code" 77#define CDROM_GET_MCN 0x5311 /* Obtain the "Universal Product Code"
78 if available (struct cdrom_mcn) */ 78 if available (struct cdrom_mcn) */
79#define CDROM_GET_UPC CDROM_GET_MCN /* This one is depricated, 79#define CDROM_GET_UPC CDROM_GET_MCN /* This one is deprecated,
80 but here anyway for compatibility */ 80 but here anyway for compatibility */
81#define CDROMRESET 0x5312 /* hard-reset the drive */ 81#define CDROMRESET 0x5312 /* hard-reset the drive */
82#define CDROMVOLREAD 0x5313 /* Get the drive's volume setting 82#define CDROMVOLREAD 0x5313 /* Get the drive's volume setting
@@ -506,7 +506,7 @@ struct cdrom_generic_command
506#define GPMODE_TO_PROTECT_PAGE 0x1d 506#define GPMODE_TO_PROTECT_PAGE 0x1d
507#define GPMODE_CAPABILITIES_PAGE 0x2a 507#define GPMODE_CAPABILITIES_PAGE 0x2a
508#define GPMODE_ALL_PAGES 0x3f 508#define GPMODE_ALL_PAGES 0x3f
509/* Not in Mt. Fuji, but in ATAPI 2.6 -- depricated now in favor 509/* Not in Mt. Fuji, but in ATAPI 2.6 -- deprecated now in favor
510 * of MODE_SENSE_POWER_PAGE */ 510 * of MODE_SENSE_POWER_PAGE */
511#define GPMODE_CDROM_PAGE 0x0d 511#define GPMODE_CDROM_PAGE 0x0d
512 512
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index fc32694287e2..f3110ebe894a 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -6,7 +6,7 @@
6 * Copyright (c) 2005 Herbert Xu <herbert@gondor.apana.org.au> 6 * Copyright (c) 2005 Herbert Xu <herbert@gondor.apana.org.au>
7 * 7 *
8 * Portions derived from Cryptoapi, by Alexander Kjeldaas <astor@fast.no> 8 * Portions derived from Cryptoapi, by Alexander Kjeldaas <astor@fast.no>
9 * and Nettle, by Niels Möller. 9 * and Nettle, by Niels Möller.
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify it 11 * This program is free software; you can redistribute it and/or modify it
12 * under the terms of the GNU General Public License as published by the Free 12 * under the terms of the GNU General Public License as published by the Free
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 1657e995f72c..1bcce660cf03 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1536,7 +1536,7 @@ static inline int break_lease(struct inode *inode, unsigned int mode)
1536 1536
1537extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs, 1537extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
1538 struct file *filp); 1538 struct file *filp);
1539extern long do_sys_open(int fdf, const char __user *filename, int flags, 1539extern long do_sys_open(int dfd, const char __user *filename, int flags,
1540 int mode); 1540 int mode);
1541extern struct file *filp_open(const char *, int, int); 1541extern struct file *filp_open(const char *, int, int);
1542extern struct file * dentry_open(struct dentry *, struct vfsmount *, int); 1542extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index efa292a52e7e..56ae438ae510 100644
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -118,7 +118,7 @@ struct ipmi_smi_handlers
118 /* Enable/disable firmware maintenance mode. Note that this 118 /* Enable/disable firmware maintenance mode. Note that this
119 is *not* the modes defined, this is simply an on/off 119 is *not* the modes defined, this is simply an on/off
120 setting. The message handler does the mode handling. Note 120 setting. The message handler does the mode handling. Note
121 that this is called from interupt context, so it cannot 121 that this is called from interrupt context, so it cannot
122 block. */ 122 block. */
123 void (*set_maintenance_mode)(void *send_info, int enable); 123 void (*set_maintenance_mode)(void *send_info, int enable);
124 124
diff --git a/include/linux/security.h b/include/linux/security.h
index ff3f857f6957..ac050830a873 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -832,9 +832,11 @@ struct request_sock;
832 * incoming sk_buff @skb has been associated with a particular socket, @sk. 832 * incoming sk_buff @skb has been associated with a particular socket, @sk.
833 * @sk contains the sock (not socket) associated with the incoming sk_buff. 833 * @sk contains the sock (not socket) associated with the incoming sk_buff.
834 * @skb contains the incoming network data. 834 * @skb contains the incoming network data.
835 * @socket_getpeersec: 835 * @socket_getpeersec_stream:
836 * This hook allows the security module to provide peer socket security 836 * This hook allows the security module to provide peer socket security
837 * state to userspace via getsockopt SO_GETPEERSEC. 837 * state for unix or connected tcp sockets to userspace via getsockopt
838 * SO_GETPEERSEC. For tcp sockets this can be meaningful if the
839 * socket is associated with an ipsec SA.
838 * @sock is the local socket. 840 * @sock is the local socket.
839 * @optval userspace memory where the security state is to be copied. 841 * @optval userspace memory where the security state is to be copied.
840 * @optlen userspace int where the module should copy the actual length 842 * @optlen userspace int where the module should copy the actual length
@@ -843,6 +845,17 @@ struct request_sock;
843 * by the caller. 845 * by the caller.
844 * Return 0 if all is well, otherwise, typical getsockopt return 846 * Return 0 if all is well, otherwise, typical getsockopt return
845 * values. 847 * values.
848 * @socket_getpeersec_dgram:
849 * This hook allows the security module to provide peer socket security
850 * state for udp sockets on a per-packet basis to userspace via
851 * getsockopt SO_GETPEERSEC. The application must first have indicated
852 * the IP_PASSSEC option via getsockopt. It can then retrieve the
853 * security state returned by this hook for a packet via the SCM_SECURITY
854 * ancillary message type.
855 * @skb is the skbuff for the packet being queried
856 * @secdata is a pointer to a buffer in which to copy the security data
857 * @seclen is the maximum length for @secdata
858 * Return 0 on success, error on failure.
846 * @sk_alloc_security: 859 * @sk_alloc_security:
847 * Allocate and attach a security structure to the sk->sk_security field, 860 * Allocate and attach a security structure to the sk->sk_security field,
848 * which is used to copy security attributes between local stream sockets. 861 * which is used to copy security attributes between local stream sockets.
diff --git a/include/net/irda/irttp.h b/include/net/irda/irttp.h
index cf80c1af5854..32c385dd9e06 100644
--- a/include/net/irda/irttp.h
+++ b/include/net/irda/irttp.h
@@ -56,7 +56,7 @@
56 56
57/* Receive queue sizes */ 57/* Receive queue sizes */
58/* Minimum of credit that the peer should hold. 58/* Minimum of credit that the peer should hold.
59 * If the peer has less credits than 9 frames, we will explicitely send 59 * If the peer has less credits than 9 frames, we will explicitly send
60 * him some credits (through irttp_give_credit() and a specific frame). 60 * him some credits (through irttp_give_credit() and a specific frame).
61 * Note that when we give credits it's likely that it won't be sent in 61 * Note that when we give credits it's likely that it won't be sent in
62 * this LAP window, but in the next one. So, we make sure that the peer 62 * this LAP window, but in the next one. So, we make sure that the peer
@@ -66,7 +66,7 @@
66/* This is the default maximum number of credits held by the peer, so the 66/* This is the default maximum number of credits held by the peer, so the
67 * default maximum number of frames he can send us before needing flow 67 * default maximum number of frames he can send us before needing flow
68 * control answer from us (this may be negociated differently at TSAP setup). 68 * control answer from us (this may be negociated differently at TSAP setup).
69 * We want to minimise the number of times we have to explicitely send some 69 * We want to minimise the number of times we have to explicitly send some
70 * credit to the peer, hoping we can piggyback it on the return data. In 70 * credit to the peer, hoping we can piggyback it on the return data. In
71 * particular, it doesn't make sense for us to send credit more than once 71 * particular, it doesn't make sense for us to send credit more than once
72 * per LAP window. 72 * per LAP window.
diff --git a/init/main.c b/init/main.c
index 0dd0e7a1f632..f605a969ea61 100644
--- a/init/main.c
+++ b/init/main.c
@@ -70,15 +70,7 @@
70/* 70/*
71 * This is one of the first .c files built. Error out early if we have compiler 71 * This is one of the first .c files built. Error out early if we have compiler
72 * trouble. 72 * trouble.
73 *
74 * Versions of gcc older than that listed below may actually compile and link
75 * okay, but the end product can have subtle run time bugs. To avoid associated
76 * bogus bug reports, we flatly refuse to compile with a gcc that is known to be
77 * too old from the very beginning.
78 */ 73 */
79#if (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 2)
80#error Sorry, your GCC is too old. It builds incorrect kernels.
81#endif
82 74
83#if __GNUC__ == 4 && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 0 75#if __GNUC__ == 4 && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 0
84#warning gcc-4.1.0 is known to miscompile the kernel. A different compiler version is recommended. 76#warning gcc-4.1.0 is known to miscompile the kernel. A different compiler version is recommended.
@@ -288,7 +280,7 @@ static int __init unknown_bootoption(char *param, char *val)
288 return 0; 280 return 0;
289 281
290 /* 282 /*
291 * Preemptive maintenance for "why didn't my mispelled command 283 * Preemptive maintenance for "why didn't my misspelled command
292 * line work?" 284 * line work?"
293 */ 285 */
294 if (strchr(param, '.') && (!val || strchr(param, '.') < val)) { 286 if (strchr(param, '.') && (!val || strchr(param, '.') < val)) {
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b2b2c2b0a49b..b6d2ff7e37ee 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -412,7 +412,7 @@ static int hrtimer_reprogram(struct hrtimer *timer,
412 /* 412 /*
413 * When the callback is running, we do not reprogram the clock event 413 * When the callback is running, we do not reprogram the clock event
414 * device. The timer callback is either running on a different CPU or 414 * device. The timer callback is either running on a different CPU or
415 * the callback is executed in the hrtimer_interupt context. The 415 * the callback is executed in the hrtimer_interrupt context. The
416 * reprogramming is handled either by the softirq, which called the 416 * reprogramming is handled either by the softirq, which called the
417 * callback or at the end of the hrtimer_interrupt. 417 * callback or at the end of the hrtimer_interrupt.
418 */ 418 */
@@ -638,7 +638,7 @@ void __timer_stats_hrtimer_set_start_info(struct hrtimer *timer, void *addr)
638#endif 638#endif
639 639
640/* 640/*
641 * Counterpart to lock_timer_base above: 641 * Counterpart to lock_hrtimer_base above:
642 */ 642 */
643static inline 643static inline
644void unlock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags) 644void unlock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags)
diff --git a/kernel/panic.c b/kernel/panic.c
index 3886bd8230fe..6f6e03e91595 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -148,7 +148,7 @@ EXPORT_SYMBOL(panic);
148 * 'F' - Module has been forcibly loaded. 148 * 'F' - Module has been forcibly loaded.
149 * 'S' - SMP with CPUs not designed for SMP. 149 * 'S' - SMP with CPUs not designed for SMP.
150 * 'R' - User forced a module unload. 150 * 'R' - User forced a module unload.
151 * 'M' - Machine had a machine check experience. 151 * 'M' - System experienced a machine check exception.
152 * 'B' - System has hit bad_page. 152 * 'B' - System has hit bad_page.
153 * 'U' - Userspace-defined naughtiness. 153 * 'U' - Userspace-defined naughtiness.
154 * 154 *
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index ccc95ac07bed..78039b477d2b 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -1005,11 +1005,12 @@ copy_data_pages(struct memory_bitmap *copy_bm, struct memory_bitmap *orig_bm)
1005 } 1005 }
1006 memory_bm_position_reset(orig_bm); 1006 memory_bm_position_reset(orig_bm);
1007 memory_bm_position_reset(copy_bm); 1007 memory_bm_position_reset(copy_bm);
1008 do { 1008 for(;;) {
1009 pfn = memory_bm_next_pfn(orig_bm); 1009 pfn = memory_bm_next_pfn(orig_bm);
1010 if (likely(pfn != BM_END_OF_MAP)) 1010 if (unlikely(pfn == BM_END_OF_MAP))
1011 copy_data_page(memory_bm_next_pfn(copy_bm), pfn); 1011 break;
1012 } while (pfn != BM_END_OF_MAP); 1012 copy_data_page(memory_bm_next_pfn(copy_bm), pfn);
1013 }
1013} 1014}
1014 1015
1015/* Total number of image pages */ 1016/* Total number of image pages */
diff --git a/kernel/sched.c b/kernel/sched.c
index afe76ec2e7fe..7581e331b139 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3310,7 +3310,6 @@ unsigned long long task_sched_runtime(struct task_struct *p)
3310/* 3310/*
3311 * Account user cpu time to a process. 3311 * Account user cpu time to a process.
3312 * @p: the process that the cpu time gets accounted to 3312 * @p: the process that the cpu time gets accounted to
3313 * @hardirq_offset: the offset to subtract from hardirq_count()
3314 * @cputime: the cpu time spent in user space since the last update 3313 * @cputime: the cpu time spent in user space since the last update
3315 */ 3314 */
3316void account_user_time(struct task_struct *p, cputime_t cputime) 3315void account_user_time(struct task_struct *p, cputime_t cputime)
@@ -5146,7 +5145,7 @@ static int __migrate_task_irq(struct task_struct *p, int src_cpu, int dest_cpu)
5146} 5145}
5147 5146
5148/* 5147/*
5149 * Figure out where task on dead CPU should go, use force if neccessary. 5148 * Figure out where task on dead CPU should go, use force if necessary.
5150 * NOTE: interrupts should be disabled by the caller 5149 * NOTE: interrupts should be disabled by the caller
5151 */ 5150 */
5152static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p) 5151static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p)
@@ -5525,7 +5524,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
5525 5524
5526 case CPU_ONLINE: 5525 case CPU_ONLINE:
5527 case CPU_ONLINE_FROZEN: 5526 case CPU_ONLINE_FROZEN:
5528 /* Strictly unneccessary, as first user will wake it. */ 5527 /* Strictly unnecessary, as first user will wake it. */
5529 wake_up_process(cpu_rq(cpu)->migration_thread); 5528 wake_up_process(cpu_rq(cpu)->migration_thread);
5530 break; 5529 break;
5531 5530
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index 9f360f68aad6..354e74bc17c1 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -263,7 +263,7 @@ out:
263 263
264 stats->version = TASKSTATS_VERSION; 264 stats->version = TASKSTATS_VERSION;
265 /* 265 /*
266 * Accounting subsytems can also add calls here to modify 266 * Accounting subsystems can also add calls here to modify
267 * fields of taskstats. 267 * fields of taskstats.
268 */ 268 */
269 return rc; 269 return rc;
diff --git a/lib/argv_split.c b/lib/argv_split.c
index fad6ce4f7b57..5205a8dae5bc 100644
--- a/lib/argv_split.c
+++ b/lib/argv_split.c
@@ -4,7 +4,8 @@
4 4
5#include <linux/kernel.h> 5#include <linux/kernel.h>
6#include <linux/ctype.h> 6#include <linux/ctype.h>
7#include <linux/bug.h> 7#include <linux/slab.h>
8#include <linux/module.h>
8 9
9static const char *skip_sep(const char *cp) 10static const char *skip_sep(const char *cp)
10{ 11{
diff --git a/lib/kernel_lock.c b/lib/kernel_lock.c
index e0fdfddb406e..f73e2f8c308f 100644
--- a/lib/kernel_lock.c
+++ b/lib/kernel_lock.c
@@ -2,7 +2,7 @@
2 * lib/kernel_lock.c 2 * lib/kernel_lock.c
3 * 3 *
4 * This is the traditional BKL - big kernel lock. Largely 4 * This is the traditional BKL - big kernel lock. Largely
5 * relegated to obsolescense, but used by various less 5 * relegated to obsolescence, but used by various less
6 * important (or lazy) subsystems. 6 * important (or lazy) subsystems.
7 */ 7 */
8#include <linux/smp_lock.h> 8#include <linux/smp_lock.h>
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 2e4eae5b0824..5886147252d0 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -126,7 +126,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
126 else 126 else
127 subsystem = kobject_name(&kset->kobj); 127 subsystem = kobject_name(&kset->kobj);
128 if (!subsystem) { 128 if (!subsystem) {
129 pr_debug("unset subsytem caused the event to drop!\n"); 129 pr_debug("unset subsystem caused the event to drop!\n");
130 return 0; 130 return 0;
131 } 131 }
132 132
diff --git a/mm/Kconfig b/mm/Kconfig
index b1f03b0eb7f1..c070ec0c15bf 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -37,7 +37,7 @@ config DISCONTIGMEM_MANUAL
37 in their physical address spaces, and this option provides 37 in their physical address spaces, and this option provides
38 more efficient handling of these holes. However, the vast 38 more efficient handling of these holes. However, the vast
39 majority of hardware has quite flat address spaces, and 39 majority of hardware has quite flat address spaces, and
40 can have degraded performance from extra overhead that 40 can have degraded performance from the extra overhead that
41 this option imposes. 41 this option imposes.
42 42
43 Many NUMA configurations will have this as the only option. 43 Many NUMA configurations will have this as the only option.
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 034617f8cdb2..8b809ecefa39 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1017,7 +1017,7 @@ static long region_chg(struct list_head *head, long f, long t)
1017 1017
1018 /* If we are below the current region then a new region is required. 1018 /* If we are below the current region then a new region is required.
1019 * Subtle, allocate a new region at the position but make it zero 1019 * Subtle, allocate a new region at the position but make it zero
1020 * size such that we can guarentee to record the reservation. */ 1020 * size such that we can guarantee to record the reservation. */
1021 if (&rg->link == head || t < rg->from) { 1021 if (&rg->link == head || t < rg->from) {
1022 nrg = kmalloc(sizeof(*nrg), GFP_KERNEL); 1022 nrg = kmalloc(sizeof(*nrg), GFP_KERNEL);
1023 if (!nrg) 1023 if (!nrg)
diff --git a/mm/memory.c b/mm/memory.c
index 142683df8755..eefd5b68bc42 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2713,7 +2713,7 @@ int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, in
2713 return 0; 2713 return 0;
2714 2714
2715 down_read(&mm->mmap_sem); 2715 down_read(&mm->mmap_sem);
2716 /* ignore errors, just check how much was sucessfully transfered */ 2716 /* ignore errors, just check how much was successfully transferred */
2717 while (len) { 2717 while (len) {
2718 int bytes, ret, offset; 2718 int bytes, ret, offset;
2719 void *maddr; 2719 void *maddr;
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 091b9c6c2529..1833879f8438 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -121,7 +121,7 @@ int __add_pages(struct zone *zone, unsigned long phys_start_pfn,
121 err = __add_section(zone, i << PFN_SECTION_SHIFT); 121 err = __add_section(zone, i << PFN_SECTION_SHIFT);
122 122
123 /* 123 /*
124 * EEXIST is finally dealed with by ioresource collision 124 * EEXIST is finally dealt with by ioresource collision
125 * check. see add_memory() => register_memory_resource() 125 * check. see add_memory() => register_memory_resource()
126 * Warning will be printed if there is collision. 126 * Warning will be printed if there is collision.
127 */ 127 */
diff --git a/mm/mempool.c b/mm/mempool.c
index 02d5ec3feabc..a46eb1b4bb66 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -299,7 +299,7 @@ EXPORT_SYMBOL(mempool_free_slab);
299 299
300/* 300/*
301 * A commonly used alloc and free fn that kmalloc/kfrees the amount of memory 301 * A commonly used alloc and free fn that kmalloc/kfrees the amount of memory
302 * specfied by pool_data 302 * specified by pool_data
303 */ 303 */
304void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data) 304void *mempool_kmalloc(gfp_t gfp_mask, void *pool_data)
305{ 305{
diff --git a/mm/migrate.c b/mm/migrate.c
index 4d6ee03db946..6a207e8d17ea 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -706,7 +706,7 @@ move_newpage:
706 * The function returns after 10 attempts or if no pages 706 * The function returns after 10 attempts or if no pages
707 * are movable anymore because to has become empty 707 * are movable anymore because to has become empty
708 * or no retryable pages exist anymore. All pages will be 708 * or no retryable pages exist anymore. All pages will be
709 * retruned to the LRU or freed. 709 * returned to the LRU or freed.
710 * 710 *
711 * Return: Number of pages not migrated or error code. 711 * Return: Number of pages not migrated or error code.
712 */ 712 */
diff --git a/mm/nommu.c b/mm/nommu.c
index 42fb84e9e815..8f09333f78e1 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -175,7 +175,8 @@ EXPORT_SYMBOL(vfree);
175void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) 175void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
176{ 176{
177 /* 177 /*
178 * kmalloc doesn't like __GFP_HIGHMEM for some reason 178 * You can't specify __GFP_HIGHMEM with kmalloc() since kmalloc()
179 * returns only a logical address.
179 */ 180 */
180 return kmalloc(size, (gfp_mask | __GFP_COMP) & ~__GFP_HIGHMEM); 181 return kmalloc(size, (gfp_mask | __GFP_COMP) & ~__GFP_HIGHMEM);
181} 182}
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 7845462064f4..838a5e31394c 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -989,7 +989,7 @@ int __set_page_dirty_no_writeback(struct page *page)
989 * mapping is pinned by the vma's ->vm_file reference. 989 * mapping is pinned by the vma's ->vm_file reference.
990 * 990 *
991 * We take care to handle the case where the page was truncated from the 991 * We take care to handle the case where the page was truncated from the
992 * mapping by re-checking page_mapping() insode tree_lock. 992 * mapping by re-checking page_mapping() inside tree_lock.
993 */ 993 */
994int __set_page_dirty_nobuffers(struct page *page) 994int __set_page_dirty_nobuffers(struct page *page)
995{ 995{
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 43f757fcf30f..da69d833e067 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -123,7 +123,7 @@ static unsigned long __meminitdata dma_reserve;
123 123
124#ifdef CONFIG_ARCH_POPULATES_NODE_MAP 124#ifdef CONFIG_ARCH_POPULATES_NODE_MAP
125 /* 125 /*
126 * MAX_ACTIVE_REGIONS determines the maxmimum number of distinct 126 * MAX_ACTIVE_REGIONS determines the maximum number of distinct
127 * ranges of memory (RAM) that may be registered with add_active_range(). 127 * ranges of memory (RAM) that may be registered with add_active_range().
128 * Ranges passed to add_active_range() will be merged if possible 128 * Ranges passed to add_active_range() will be merged if possible
129 * so the number of times add_active_range() can be called is 129 * so the number of times add_active_range() can be called is
@@ -1260,7 +1260,7 @@ int zone_watermark_ok(struct zone *z, int order, unsigned long mark,
1260 * skip over zones that are not allowed by the cpuset, or that have 1260 * skip over zones that are not allowed by the cpuset, or that have
1261 * been recently (in last second) found to be nearly full. See further 1261 * been recently (in last second) found to be nearly full. See further
1262 * comments in mmzone.h. Reduces cache footprint of zonelist scans 1262 * comments in mmzone.h. Reduces cache footprint of zonelist scans
1263 * that have to skip over alot of full or unallowed zones. 1263 * that have to skip over a lot of full or unallowed zones.
1264 * 1264 *
1265 * If the zonelist cache is present in the passed in zonelist, then 1265 * If the zonelist cache is present in the passed in zonelist, then
1266 * returns a pointer to the allowed node mask (either the current 1266 * returns a pointer to the allowed node mask (either the current
@@ -2358,7 +2358,7 @@ void build_all_zonelists(void)
2358 __build_all_zonelists(NULL); 2358 __build_all_zonelists(NULL);
2359 cpuset_init_current_mems_allowed(); 2359 cpuset_init_current_mems_allowed();
2360 } else { 2360 } else {
2361 /* we have to stop all cpus to guaranntee there is no user 2361 /* we have to stop all cpus to guarantee there is no user
2362 of zonelist */ 2362 of zonelist */
2363 stop_machine_run(__build_all_zonelists, NULL, NR_CPUS); 2363 stop_machine_run(__build_all_zonelists, NULL, NR_CPUS);
2364 /* cpuset refresh routine should be here */ 2364 /* cpuset refresh routine should be here */
@@ -2864,7 +2864,7 @@ static int __meminit first_active_region_index_in_nid(int nid)
2864 2864
2865/* 2865/*
2866 * Basic iterator support. Return the next active range of PFNs for a node 2866 * Basic iterator support. Return the next active range of PFNs for a node
2867 * Note: nid == MAX_NUMNODES returns next region regardles of node 2867 * Note: nid == MAX_NUMNODES returns next region regardless of node
2868 */ 2868 */
2869static int __meminit next_active_region_index_in_nid(int index, int nid) 2869static int __meminit next_active_region_index_in_nid(int index, int nid)
2870{ 2870{
diff --git a/mm/prio_tree.c b/mm/prio_tree.c
index b4e76c25f953..603ae98d9694 100644
--- a/mm/prio_tree.c
+++ b/mm/prio_tree.c
@@ -34,7 +34,7 @@
34 * Radix priority search tree for address_space->i_mmap 34 * Radix priority search tree for address_space->i_mmap
35 * 35 *
36 * For each vma that map a unique set of file pages i.e., unique [radix_index, 36 * For each vma that map a unique set of file pages i.e., unique [radix_index,
37 * heap_index] value, we have a corresponing priority search tree node. If 37 * heap_index] value, we have a corresponding priority search tree node. If
38 * multiple vmas have identical [radix_index, heap_index] value, then one of 38 * multiple vmas have identical [radix_index, heap_index] value, then one of
39 * them is used as a tree node and others are stored in a vm_set list. The tree 39 * them is used as a tree node and others are stored in a vm_set list. The tree
40 * node points to the first vma (head) of the list using vm_set.head. 40 * node points to the first vma (head) of the list using vm_set.head.
diff --git a/mm/slab.c b/mm/slab.c
index 54eb555c4ef8..cfa6be4e378e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -26,7 +26,7 @@
26 * initialized objects. 26 * initialized objects.
27 * 27 *
28 * This means, that your constructor is used only for newly allocated 28 * This means, that your constructor is used only for newly allocated
29 * slabs and you must pass objects with the same intializations to 29 * slabs and you must pass objects with the same initializations to
30 * kmem_cache_free. 30 * kmem_cache_free.
31 * 31 *
32 * Each cache can only support one memory type (GFP_DMA, GFP_HIGHMEM, 32 * Each cache can only support one memory type (GFP_DMA, GFP_HIGHMEM,
@@ -1369,7 +1369,7 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb,
1369 * structure is usually allocated from kmem_cache_create() and 1369 * structure is usually allocated from kmem_cache_create() and
1370 * gets destroyed at kmem_cache_destroy(). 1370 * gets destroyed at kmem_cache_destroy().
1371 */ 1371 */
1372 /* fall thru */ 1372 /* fall through */
1373#endif 1373#endif
1374 case CPU_UP_CANCELED: 1374 case CPU_UP_CANCELED:
1375 case CPU_UP_CANCELED_FROZEN: 1375 case CPU_UP_CANCELED_FROZEN:
@@ -3806,7 +3806,7 @@ const char *kmem_cache_name(struct kmem_cache *cachep)
3806EXPORT_SYMBOL_GPL(kmem_cache_name); 3806EXPORT_SYMBOL_GPL(kmem_cache_name);
3807 3807
3808/* 3808/*
3809 * This initializes kmem_list3 or resizes varioius caches for all nodes. 3809 * This initializes kmem_list3 or resizes various caches for all nodes.
3810 */ 3810 */
3811static int alloc_kmemlist(struct kmem_cache *cachep) 3811static int alloc_kmemlist(struct kmem_cache *cachep)
3812{ 3812{
diff --git a/mm/swap.c b/mm/swap.c
index a65eff8a517a..9ac88323d237 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -5,7 +5,7 @@
5 */ 5 */
6 6
7/* 7/*
8 * This file contains the default values for the opereation of the 8 * This file contains the default values for the operation of the
9 * Linux VM subsystem. Fine-tuning documentation can be found in 9 * Linux VM subsystem. Fine-tuning documentation can be found in
10 * Documentation/sysctl/vm.txt. 10 * Documentation/sysctl/vm.txt.
11 * Started 18.12.91 11 * Started 18.12.91
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 2e01af365848..af77e171e339 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -247,7 +247,7 @@ struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
247EXPORT_SYMBOL_GPL(__get_vm_area); 247EXPORT_SYMBOL_GPL(__get_vm_area);
248 248
249/** 249/**
250 * get_vm_area - reserve a contingous kernel virtual area 250 * get_vm_area - reserve a contiguous kernel virtual area
251 * @size: size of the area 251 * @size: size of the area
252 * @flags: %VM_IOREMAP for I/O mappings or VM_ALLOC 252 * @flags: %VM_IOREMAP for I/O mappings or VM_ALLOC
253 * 253 *
@@ -303,7 +303,7 @@ found:
303} 303}
304 304
305/** 305/**
306 * remove_vm_area - find and remove a contingous kernel virtual area 306 * remove_vm_area - find and remove a continuous kernel virtual area
307 * @addr: base address 307 * @addr: base address
308 * 308 *
309 * Search for the kernel VM area starting at @addr, and remove it. 309 * Search for the kernel VM area starting at @addr, and remove it.
@@ -364,7 +364,7 @@ static void __vunmap(void *addr, int deallocate_pages)
364 * vfree - release memory allocated by vmalloc() 364 * vfree - release memory allocated by vmalloc()
365 * @addr: memory base address 365 * @addr: memory base address
366 * 366 *
367 * Free the virtually contiguous memory area starting at @addr, as 367 * Free the virtually continuous memory area starting at @addr, as
368 * obtained from vmalloc(), vmalloc_32() or __vmalloc(). If @addr is 368 * obtained from vmalloc(), vmalloc_32() or __vmalloc(). If @addr is
369 * NULL, no operation is performed. 369 * NULL, no operation is performed.
370 * 370 *
diff --git a/mm/vmscan.c b/mm/vmscan.c
index cb474cc99645..e5a9597e3bbc 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -141,7 +141,7 @@ EXPORT_SYMBOL(unregister_shrinker);
141 * percentages of the lru and ageable caches. This should balance the seeks 141 * percentages of the lru and ageable caches. This should balance the seeks
142 * generated by these structures. 142 * generated by these structures.
143 * 143 *
144 * If the vm encounted mapped pages on the LRU it increase the pressure on 144 * If the vm encountered mapped pages on the LRU it increase the pressure on
145 * slab to avoid swapping. 145 * slab to avoid swapping.
146 * 146 *
147 * We do weird things to avoid (scanned*seeks*entries) overflowing 32 bits. 147 * We do weird things to avoid (scanned*seeks*entries) overflowing 32 bits.
diff --git a/net/9p/Kconfig b/net/9p/Kconfig
index eecbf12f6393..71bc110aebf8 100644
--- a/net/9p/Kconfig
+++ b/net/9p/Kconfig
@@ -27,5 +27,5 @@ config NET_9P_DEBUG
27 bool "Debug information" 27 bool "Debug information"
28 depends on NET_9P 28 depends on NET_9P
29 help 29 help
30 Say Y if you want the 9P subsistem to log debug information. 30 Say Y if you want the 9P subsystem to log debug information.
31 31
diff --git a/net/ax25/ax25_ds_in.c b/net/ax25/ax25_ds_in.c
index e37d217a986a..8273b1200eee 100644
--- a/net/ax25/ax25_ds_in.c
+++ b/net/ax25/ax25_ds_in.c
@@ -75,7 +75,7 @@ static int ax25_ds_state1_machine(ax25_cb *ax25, struct sk_buff *skb, int framet
75 } 75 }
76 ax25_dama_on(ax25); 76 ax25_dama_on(ax25);
77 77
78 /* according to DK4EG´s spec we are required to 78 /* according to DK4EG's spec we are required to
79 * send a RR RESPONSE FINAL NR=0. 79 * send a RR RESPONSE FINAL NR=0.
80 */ 80 */
81 81
diff --git a/net/ax25/ax25_ds_subr.c b/net/ax25/ax25_ds_subr.c
index a49773ff2b92..b5e59787be2f 100644
--- a/net/ax25/ax25_ds_subr.c
+++ b/net/ax25/ax25_ds_subr.c
@@ -41,7 +41,7 @@ void ax25_ds_enquiry_response(ax25_cb *ax25)
41 ax25_cb *ax25o; 41 ax25_cb *ax25o;
42 struct hlist_node *node; 42 struct hlist_node *node;
43 43
44 /* Please note that neither DK4EG´s nor DG2FEF´s 44 /* Please note that neither DK4EG's nor DG2FEF's
45 * DAMA spec mention the following behaviour as seen 45 * DAMA spec mention the following behaviour as seen
46 * with TheFirmware: 46 * with TheFirmware:
47 * 47 *
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 1f78c3e336d8..347e935faaf0 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -2,7 +2,7 @@
2 BNEP implementation for Linux Bluetooth stack (BlueZ). 2 BNEP implementation for Linux Bluetooth stack (BlueZ).
3 Copyright (C) 2001-2002 Inventel Systemes 3 Copyright (C) 2001-2002 Inventel Systemes
4 Written 2001-2002 by 4 Written 2001-2002 by
5 Clément Moreau <clement.moreau@inventel.fr> 5 Clément Moreau <clement.moreau@inventel.fr>
6 David Libault <david.libault@inventel.fr> 6 David Libault <david.libault@inventel.fr>
7 7
8 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com> 8 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index 9092816f58de..95e3837e4312 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -2,7 +2,7 @@
2 BNEP implementation for Linux Bluetooth stack (BlueZ). 2 BNEP implementation for Linux Bluetooth stack (BlueZ).
3 Copyright (C) 2001-2002 Inventel Systemes 3 Copyright (C) 2001-2002 Inventel Systemes
4 Written 2001-2002 by 4 Written 2001-2002 by
5 Clément Moreau <clement.moreau@inventel.fr> 5 Clément Moreau <clement.moreau@inventel.fr>
6 David Libault <david.libault@inventel.fr> 6 David Libault <david.libault@inventel.fr>
7 7
8 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com> 8 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index d5a09eaef915..817169e718c1 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -871,7 +871,7 @@ static int translate_table(char *name, struct ebt_table_info *newinfo)
871 return -EINVAL; 871 return -EINVAL;
872 } 872 }
873 873
874 /* we now know the following (along with E=mc²): 874 /* we now know the following (along with E=mc²):
875 - the nr of entries in each chain is right 875 - the nr of entries in each chain is right
876 - the size of the allocated space is right 876 - the size of the allocated space is right
877 - all valid hooks have a corresponding chain 877 - all valid hooks have a corresponding chain
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 7ac703171ff3..c4719edb55c0 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -6,7 +6,7 @@
6 * 6 *
7 * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> 7 * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
8 * Ben Greear <greearb@candelatech.com> 8 * Ben Greear <greearb@candelatech.com>
9 * Jens Låås <jens.laas@data.slu.se> 9 * Jens Låås <jens.laas@data.slu.se>
10 * 10 *
11 * This program is free software; you can redistribute it and/or 11 * This program is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU General Public License 12 * modify it under the terms of the GNU General Public License
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 9b58dd67acb6..d309e8f19992 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -409,7 +409,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
409 (*crypt)->priv); 409 (*crypt)->priv);
410 sec.flags |= (1 << key); 410 sec.flags |= (1 << key);
411 /* This ensures a key will be activated if no key is 411 /* This ensures a key will be activated if no key is
412 * explicitely set */ 412 * explicitly set */
413 if (key == sec.active_key) 413 if (key == sec.active_key)
414 sec.flags |= SEC_ACTIVE_KEY; 414 sec.flags |= SEC_ACTIVE_KEY;
415 415
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index d894f616c3d6..9f9fd2c6f6e2 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -560,7 +560,7 @@ config TCP_CONG_ILLINOIS
560 depends on EXPERIMENTAL 560 depends on EXPERIMENTAL
561 default n 561 default n
562 ---help--- 562 ---help---
563 TCP-Illinois is a sender-side modificatio of TCP Reno for 563 TCP-Illinois is a sender-side modification of TCP Reno for
564 high speed long delay links. It uses round-trip-time to 564 high speed long delay links. It uses round-trip-time to
565 adjust the alpha and beta parameters to achieve a higher average 565 adjust the alpha and beta parameters to achieve a higher average
566 throughput and maintain fairness. 566 throughput and maintain fairness.
diff --git a/net/irda/discovery.c b/net/irda/discovery.c
index af0cea721d2a..80c33f408e3f 100644
--- a/net/irda/discovery.c
+++ b/net/irda/discovery.c
@@ -202,7 +202,7 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force)
202 /* Drop the spinlock before calling the higher layers, as 202 /* Drop the spinlock before calling the higher layers, as
203 * we can't guarantee they won't call us back and create a 203 * we can't guarantee they won't call us back and create a
204 * deadlock. We will work on our own private data, so we 204 * deadlock. We will work on our own private data, so we
205 * don't care to be interupted. - Jean II */ 205 * don't care to be interrupted. - Jean II */
206 spin_unlock_irqrestore(&log->hb_spinlock, flags); 206 spin_unlock_irqrestore(&log->hb_spinlock, flags);
207 207
208 if(buffer == NULL) 208 if(buffer == NULL)
diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index ee3889fa49ab..dc5e34a01620 100644
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Tromsø admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/iriap_event.c b/net/irda/iriap_event.c
index 99b18dc7a0b7..8fb9d7277ca8 100644
--- a/net/irda/iriap_event.c
+++ b/net/irda/iriap_event.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Tromsø admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/irias_object.c b/net/irda/irias_object.c
index cf302457097b..cbcf04380f3a 100644
--- a/net/irda/irias_object.c
+++ b/net/irda/irias_object.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index 87039c2fb6a2..fff52d57a200 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Tromsø admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/net/irda/irlan/irlan_client_event.c b/net/irda/irlan/irlan_client_event.c
index 843ab6fbb394..6afcee59e906 100644
--- a/net/irda/irlan/irlan_client_event.c
+++ b/net/irda/irlan/irlan_client_event.c
@@ -17,7 +17,7 @@
17 * published by the Free Software Foundation; either version 2 of 17 * published by the Free Software Foundation; either version 2 of
18 * the License, or (at your option) any later version. 18 * the License, or (at your option) any later version.
19 * 19 *
20 * Neither Dag Brattli nor University of Tromsø admit liability nor 20 * Neither Dag Brattli nor University of Tromsø admit liability nor
21 * provide warranty for any of this software. This material is 21 * provide warranty for any of this software. This material is
22 * provided "AS-IS" and at no charge. 22 * provided "AS-IS" and at no charge.
23 * 23 *
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index f5778ef3ccc7..a4b56e25a917 100644
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -17,7 +17,7 @@
17 * published by the Free Software Foundation; either version 2 of 17 * published by the Free Software Foundation; either version 2 of
18 * the License, or (at your option) any later version. 18 * the License, or (at your option) any later version.
19 * 19 *
20 * Neither Dag Brattli nor University of Tromsø admit liability nor 20 * Neither Dag Brattli nor University of Tromsø admit liability nor
21 * provide warranty for any of this software. This material is 21 * provide warranty for any of this software. This material is
22 * provided "AS-IS" and at no charge. 22 * provided "AS-IS" and at no charge.
23 * 23 *
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index 340f04a36b02..7f9c8542e5fc 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -19,7 +19,7 @@
19 * published by the Free Software Foundation; either version 2 of 19 * published by the Free Software Foundation; either version 2 of
20 * the License, or (at your option) any later version. 20 * the License, or (at your option) any later version.
21 * 21 *
22 * Neither Dag Brattli nor University of Tromsø admit liability nor 22 * Neither Dag Brattli nor University of Tromsø admit liability nor
23 * provide warranty for any of this software. This material is 23 * provide warranty for any of this software. This material is
24 * provided "AS-IS" and at no charge. 24 * provided "AS-IS" and at no charge.
25 * 25 *
diff --git a/net/irda/irlan/irlan_event.c b/net/irda/irlan/irlan_event.c
index 623e0fd16c19..a9750a801388 100644
--- a/net/irda/irlan/irlan_event.c
+++ b/net/irda/irlan/irlan_event.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/net/irda/irlan/irlan_filter.c b/net/irda/irlan/irlan_filter.c
index e6346b88f934..4384be9a6888 100644
--- a/net/irda/irlan/irlan_filter.c
+++ b/net/irda/irlan/irlan_filter.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index aac66434e473..13db942812e4 100644
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Tromsø admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/net/irda/irlan/irlan_provider_event.c b/net/irda/irlan/irlan_provider_event.c
index ef401bd6ea00..10ece5a47522 100644
--- a/net/irda/irlan/irlan_provider_event.c
+++ b/net/irda/irlan/irlan_provider_event.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Tromsø admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c
index a8b8873aa263..4c33bf5c8354 100644
--- a/net/irda/irlap_event.c
+++ b/net/irda/irlap_event.c
@@ -19,7 +19,7 @@
19 * published by the Free Software Foundation; either version 2 of 19 * published by the Free Software Foundation; either version 2 of
20 * the License, or (at your option) any later version. 20 * the License, or (at your option) any later version.
21 * 21 *
22 * Neither Dag Brattli nor University of Tromsø admit liability nor 22 * Neither Dag Brattli nor University of Tromsø admit liability nor
23 * provide warranty for any of this software. This material is 23 * provide warranty for any of this software. This material is
24 * provided "AS-IS" and at no charge. 24 * provided "AS-IS" and at no charge.
25 * 25 *
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
index 77ac27e81161..4f3764546b2f 100644
--- a/net/irda/irlap_frame.c
+++ b/net/irda/irlap_frame.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Tromsø admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c
index 7db92ced2c02..cedff8068fbc 100644
--- a/net/irda/irlmp.c
+++ b/net/irda/irlmp.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Tromsø admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c
index 65ffa981510a..1bba87e78609 100644
--- a/net/irda/irlmp_event.c
+++ b/net/irda/irlmp_event.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Tromsø admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/irlmp_frame.c b/net/irda/irlmp_frame.c
index 559302d3fe66..0a79d9aeb08c 100644
--- a/net/irda/irlmp_frame.c
+++ b/net/irda/irlmp_frame.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Tromsø admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/irmod.c b/net/irda/irmod.c
index 8ba703da2797..01554b996b9b 100644
--- a/net/irda/irmod.c
+++ b/net/irda/irmod.c
@@ -17,7 +17,7 @@
17 * published by the Free Software Foundation; either version 2 of 17 * published by the Free Software Foundation; either version 2 of
18 * the License, or (at your option) any later version. 18 * the License, or (at your option) any later version.
19 * 19 *
20 * Neither Dag Brattli nor University of Tromsø admit liability nor 20 * Neither Dag Brattli nor University of Tromsø admit liability nor
21 * provide warranty for any of this software. This material is 21 * provide warranty for any of this software. This material is
22 * provided "AS-IS" and at no charge. 22 * provided "AS-IS" and at no charge.
23 * 23 *
diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index d058b467f9e4..40c28efaed95 100644
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -28,7 +28,7 @@
28 * published by the Free Software Foundation; either version 2 of 28 * published by the Free Software Foundation; either version 2 of
29 * the License, or (at your option) any later version. 29 * the License, or (at your option) any later version.
30 * 30 *
31 * Neither Dag Brattli nor University of Tromsø admit liability nor 31 * Neither Dag Brattli nor University of Tromsø admit liability nor
32 * provide warranty for any of this software. This material is 32 * provide warranty for any of this software. This material is
33 * provided "AS-IS" and at no charge. 33 * provided "AS-IS" and at no charge.
34 * 34 *
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index 525343a1c521..565cbf0421cd 100644
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -17,7 +17,7 @@
17 * published by the Free Software Foundation; either version 2 of 17 * published by the Free Software Foundation; either version 2 of
18 * the License, or (at your option) any later version. 18 * the License, or (at your option) any later version.
19 * 19 *
20 * Neither Dag Brattli nor University of Tromsø admit liability nor 20 * Neither Dag Brattli nor University of Tromsø admit liability nor
21 * provide warranty for any of this software. This material is 21 * provide warranty for any of this software. This material is
22 * provided "AS-IS" and at no charge. 22 * provided "AS-IS" and at no charge.
23 * 23 *
diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index 1311976c9dfe..97db158c9274 100644
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Tromsø admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/timer.c b/net/irda/timer.c
index d3a6ee8cc4a2..d730099080a2 100644
--- a/net/irda/timer.c
+++ b/net/irda/timer.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Tromsø admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/wrapper.c b/net/irda/wrapper.c
index a7a7f191f1a8..e71286768a48 100644
--- a/net/irda/wrapper.c
+++ b/net/irda/wrapper.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Tromsø admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 983058d432dc..a2f5a6ea3895 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -389,7 +389,7 @@ static void iucv_block_cpu(void *data)
389 * iucv_declare_cpu 389 * iucv_declare_cpu
390 * @data: unused 390 * @data: unused
391 * 391 *
392 * Declare a interupt buffer on this cpu. 392 * Declare a interrupt buffer on this cpu.
393 */ 393 */
394static void iucv_declare_cpu(void *data) 394static void iucv_declare_cpu(void *data)
395{ 395{
diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c
index 8cc324b159e9..856793e8db7a 100644
--- a/net/netfilter/xt_CONNMARK.c
+++ b/net/netfilter/xt_CONNMARK.c
@@ -23,7 +23,7 @@
23#include <linux/ip.h> 23#include <linux/ip.h>
24#include <net/checksum.h> 24#include <net/checksum.h>
25 25
26MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>"); 26MODULE_AUTHOR("Henrik Nordstrom <hno@marasystems.com>");
27MODULE_DESCRIPTION("IP tables CONNMARK matching module"); 27MODULE_DESCRIPTION("IP tables CONNMARK matching module");
28MODULE_LICENSE("GPL"); 28MODULE_LICENSE("GPL");
29MODULE_ALIAS("ipt_CONNMARK"); 29MODULE_ALIAS("ipt_CONNMARK");
diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index 1071fc54d6d3..9f67920af41f 100644
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -25,7 +25,7 @@
25#include <linux/netfilter/x_tables.h> 25#include <linux/netfilter/x_tables.h>
26#include <linux/netfilter/xt_connmark.h> 26#include <linux/netfilter/xt_connmark.h>
27 27
28MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>"); 28MODULE_AUTHOR("Henrik Nordstrom <hno@marasystems.com>");
29MODULE_DESCRIPTION("IP tables connmark match module"); 29MODULE_DESCRIPTION("IP tables connmark match module");
30MODULE_LICENSE("GPL"); 30MODULE_LICENSE("GPL");
31MODULE_ALIAS("ipt_connmark"); 31MODULE_ALIAS("ipt_connmark");
diff --git a/net/netfilter/xt_limit.c b/net/netfilter/xt_limit.c
index 4fcca797150f..f263a77e57b7 100644
--- a/net/netfilter/xt_limit.c
+++ b/net/netfilter/xt_limit.c
@@ -1,5 +1,5 @@
1/* (C) 1999 Jérôme de Vivie <devivie@info.enserb.u-bordeaux.fr> 1/* (C) 1999 Jérôme de Vivie <devivie@info.enserb.u-bordeaux.fr>
2 * (C) 1999 Hervé Eychenne <eychenne@info.enserb.u-bordeaux.fr> 2 * (C) 1999 Hervé Eychenne <eychenne@info.enserb.u-bordeaux.fr>
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/net/sched/em_meta.c b/net/sched/em_meta.c
index e9989610712c..ceda8890ab0e 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -55,7 +55,7 @@
55 * ppp0..9. 55 * ppp0..9.
56 * 56 *
57 * NOTE: Certain meta values depend on other subsystems and are 57 * NOTE: Certain meta values depend on other subsystems and are
58 * only available if that subsytem is enabled in the kernel. 58 * only available if that subsystem is enabled in the kernel.
59 */ 59 */
60 60
61#include <linux/module.h> 61#include <linux/module.h>
diff --git a/sound/core/seq/seq_midi_emul.c b/sound/core/seq/seq_midi_emul.c
index d7c4fb86b9eb..17b3e6f13ca3 100644
--- a/sound/core/seq/seq_midi_emul.c
+++ b/sound/core/seq/seq_midi_emul.c
@@ -71,7 +71,7 @@ static void reset_all_channels(struct snd_midi_channel_set *chset);
71 * such as GM, GS and XG. 71 * such as GM, GS and XG.
72 * There modes that this module will run in are: 72 * There modes that this module will run in are:
73 * Generic MIDI - no interpretation at all, it will just save current values 73 * Generic MIDI - no interpretation at all, it will just save current values
74 * of controlers etc. 74 * of controllers etc.
75 * GM - You can use all gm_ prefixed elements of chan. Controls, RPN, NRPN, 75 * GM - You can use all gm_ prefixed elements of chan. Controls, RPN, NRPN,
76 * SysEx will be interpreded as defined in General Midi. 76 * SysEx will be interpreded as defined in General Midi.
77 * GS - You can use all gs_ prefixed elements of chan. Codes for GS will be 77 * GS - You can use all gs_ prefixed elements of chan. Codes for GS will be
@@ -176,7 +176,7 @@ snd_midi_process_event(struct snd_midi_op *ops,
176 ev->data.control.value); 176 ev->data.control.value);
177 break; 177 break;
178 case SNDRV_SEQ_EVENT_NONREGPARAM: 178 case SNDRV_SEQ_EVENT_NONREGPARAM:
179 /* Break it back into its controler values */ 179 /* Break it back into its controller values */
180 chan->param_type = SNDRV_MIDI_PARAM_TYPE_NONREGISTERED; 180 chan->param_type = SNDRV_MIDI_PARAM_TYPE_NONREGISTERED;
181 chan->control[MIDI_CTL_MSB_DATA_ENTRY] 181 chan->control[MIDI_CTL_MSB_DATA_ENTRY]
182 = (ev->data.control.value >> 7) & 0x7f; 182 = (ev->data.control.value >> 7) & 0x7f;
@@ -189,7 +189,7 @@ snd_midi_process_event(struct snd_midi_op *ops,
189 nrpn(ops, drv, chan, chanset); 189 nrpn(ops, drv, chan, chanset);
190 break; 190 break;
191 case SNDRV_SEQ_EVENT_REGPARAM: 191 case SNDRV_SEQ_EVENT_REGPARAM:
192 /* Break it back into its controler values */ 192 /* Break it back into its controller values */
193 chan->param_type = SNDRV_MIDI_PARAM_TYPE_REGISTERED; 193 chan->param_type = SNDRV_MIDI_PARAM_TYPE_REGISTERED;
194 chan->control[MIDI_CTL_MSB_DATA_ENTRY] 194 chan->control[MIDI_CTL_MSB_DATA_ENTRY]
195 = (ev->data.control.value >> 7) & 0x7f; 195 = (ev->data.control.value >> 7) & 0x7f;
@@ -267,7 +267,7 @@ note_off(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,
267} 267}
268 268
269/* 269/*
270 * Do all driver independent operations for this controler and pass 270 * Do all driver independent operations for this controller and pass
271 * events that need to take place immediately to the driver. 271 * events that need to take place immediately to the driver.
272 */ 272 */
273static void 273static void
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c
index 1b6f227af370..3557b6e20eb5 100644
--- a/sound/drivers/opl3/opl3_midi.c
+++ b/sound/drivers/opl3/opl3_midi.c
@@ -808,7 +808,7 @@ static void snd_opl3_pitch_ctrl(struct snd_opl3 *opl3, struct snd_midi_channel *
808} 808}
809 809
810/* 810/*
811 * Deal with a controler type event. This includes all types of 811 * Deal with a controller type event. This includes all types of
812 * control events, not just the midi controllers 812 * control events, not just the midi controllers
813 */ 813 */
814void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan) 814void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan)
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 4a7367a8ff9d..c1af28fd4a1f 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -623,7 +623,7 @@ static int snd_es18xx_capture_prepare(struct snd_pcm_substream *substream)
623 (snd_pcm_format_width(runtime->format) == 16 ? 0x04 : 0x00) | 623 (snd_pcm_format_width(runtime->format) == 16 ? 0x04 : 0x00) |
624 (snd_pcm_format_unsigned(runtime->format) ? 0x00 : 0x20)); 624 (snd_pcm_format_unsigned(runtime->format) ? 0x00 : 0x20));
625 625
626 /* Set DMA controler */ 626 /* Set DMA controller */
627 snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT); 627 snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);
628 628
629 return 0; 629 return 0;
@@ -689,7 +689,7 @@ static int snd_es18xx_playback2_prepare(struct snd_es18xx *chip,
689 (snd_pcm_format_width(runtime->format) == 16 ? 0x04 : 0x00) | 689 (snd_pcm_format_width(runtime->format) == 16 ? 0x04 : 0x00) |
690 (snd_pcm_format_unsigned(runtime->format) ? 0x00 : 0x20)); 690 (snd_pcm_format_unsigned(runtime->format) ? 0x00 : 0x20));
691 691
692 /* Set DMA controler */ 692 /* Set DMA controller */
693 snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT); 693 snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);
694 694
695 return 0; 695 return 0;
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index 8a61a1191861..24460a558bf7 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -498,8 +498,8 @@ snd_au1000_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
498 int i; 498 int i;
499 499
500 spin_lock(&au1000->ac97_lock); 500 spin_lock(&au1000->ac97_lock);
501/* would rather use the interupt than this polling but it works and I can't 501/* would rather use the interrupt than this polling but it works and I can't
502get the interupt driven case to work efficiently */ 502get the interrupt driven case to work efficiently */
503 for (i = 0; i < 0x5000; i++) 503 for (i = 0; i < 0x5000; i++)
504 if (!(au1000->ac97_ioport->status & AC97C_CP)) 504 if (!(au1000->ac97_ioport->status & AC97C_CP))
505 break; 505 break;
@@ -535,8 +535,8 @@ snd_au1000_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short
535 int i; 535 int i;
536 536
537 spin_lock(&au1000->ac97_lock); 537 spin_lock(&au1000->ac97_lock);
538/* would rather use the interupt than this polling but it works and I can't 538/* would rather use the interrupt than this polling but it works and I can't
539get the interupt driven case to work efficiently */ 539get the interrupt driven case to work efficiently */
540 for (i = 0; i < 0x5000; i++) 540 for (i = 0; i < 0x5000; i++)
541 if (!(au1000->ac97_ioport->status & AC97C_CP)) 541 if (!(au1000->ac97_ioport->status & AC97C_CP))
542 break; 542 break;
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index f70286a7364a..26819e2f5761 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -191,7 +191,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
191 191
192 /* Init audio core. 192 /* Init audio core.
193 * This must be done before we do request_irq otherwise we can get spurious 193 * This must be done before we do request_irq otherwise we can get spurious
194 * interupts that we do not handle properly and make a mess of things */ 194 * interrupts that we do not handle properly and make a mess of things */
195 if ((err = vortex_core_init(chip)) != 0) { 195 if ((err = vortex_core_init(chip)) != 0) {
196 printk(KERN_ERR "hw core init failed\n"); 196 printk(KERN_ERR "hw core init failed\n");
197 goto core_out; 197 goto core_out;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 91651bdfa761..e6a67b58f296 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -264,7 +264,7 @@ out:
264} 264}
265 265
266/* 266/*
267 * Power down the audio subsytem pmdown_time msecs after close is called. 267 * Power down the audio subsystem pmdown_time msecs after close is called.
268 * This is to ensure there are no pops or clicks in between any music tracks 268 * This is to ensure there are no pops or clicks in between any music tracks
269 * due to DAPM power cycling. 269 * due to DAPM power cycling.
270 */ 270 */
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index b3193e687db7..29a546fecacf 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -24,7 +24,7 @@
24 * o Automatic Mic Bias support 24 * o Automatic Mic Bias support
25 * o Jack insertion power event initiation - e.g. hp insertion will enable 25 * o Jack insertion power event initiation - e.g. hp insertion will enable
26 * sinks, dacs, etc 26 * sinks, dacs, etc
27 * o Delayed powerdown of audio susbsytem to reduce pops between a quick 27 * o Delayed powerdown of audio susbsystem to reduce pops between a quick
28 * device reopen. 28 * device reopen.
29 * 29 *
30 * Todo: 30 * Todo:
diff --git a/sound/synth/emux/emux_synth.c b/sound/synth/emux/emux_synth.c
index 3733118d39bb..478369bb38c3 100644
--- a/sound/synth/emux/emux_synth.c
+++ b/sound/synth/emux/emux_synth.c
@@ -317,7 +317,7 @@ snd_emux_update_port(struct snd_emux_port *port, int update)
317 317
318 318
319/* 319/*
320 * Deal with a controler type event. This includes all types of 320 * Deal with a controller type event. This includes all types of
321 * control events, not just the midi controllers 321 * control events, not just the midi controllers
322 */ 322 */
323void 323void