From b80a32b9cc634adfa8eaef33ec981e7febf2ade2 Mon Sep 17 00:00:00 2001 From: Justin Waters Date: Tue, 26 Feb 2008 13:07:02 -0500 Subject: Update the i.MX31 Kernel to 2.6.23 This is the result of a brute-force attempt to update the kernel to 2.6.23. Now that we have a git tree, our effort will be a little nicer in the future. Signed-off-by: Justin Waters --- .gitignore | 5 + CREDITS | 15 +- Documentation/00-INDEX | 140 +- Documentation/ABI/testing/sysfs-bus-usb | 13 + Documentation/Changes | 1 + Documentation/CodingStyle | 59 +- Documentation/DMA-API.txt | 79 +- Documentation/DMA-mapping.txt | 103 - Documentation/DocBook/Makefile | 10 +- Documentation/DocBook/deviceiobook.tmpl | 3 +- Documentation/DocBook/kernel-api.tmpl | 88 +- Documentation/DocBook/kernel-locking.tmpl | 2 +- Documentation/DocBook/libata.tmpl | 5 +- Documentation/DocBook/procfs-guide.tmpl | 82 +- Documentation/HOWTO | 7 +- Documentation/ManagementStyle | 2 +- Documentation/RCU/checklist.txt | 10 +- Documentation/SubmitChecklist | 3 +- Documentation/SubmittingPatches | 26 +- Documentation/accounting/getdelays.c | 19 +- Documentation/accounting/taskstats-struct.txt | 6 + Documentation/block/barrier.txt | 22 +- Documentation/block/biodoc.txt | 10 +- Documentation/block/request.txt | 2 +- Documentation/cachetlb.txt | 2 +- Documentation/cdrom/00-INDEX | 22 - Documentation/cdrom/aztcd | 822 - Documentation/cdrom/cdu31a | 196 - Documentation/cdrom/cm206 | 185 - Documentation/cdrom/gscd | 60 - Documentation/cdrom/isp16 | 100 - Documentation/cdrom/mcdx | 29 - Documentation/cdrom/optcd | 57 - Documentation/cdrom/sbpcd | 1061 - Documentation/cdrom/sjcd | 60 - Documentation/cdrom/sonycd535 | 122 - Documentation/connector/cn_test.c | 3 +- Documentation/console/console.txt | 2 +- Documentation/devices.txt | 2 + Documentation/dontdiff | 3 + Documentation/driver-model/devres.txt | 2 +- Documentation/drivers/edac/edac.txt | 192 +- Documentation/dvb/bt8xx.txt | 32 +- Documentation/dvb/get_dvb_firmware | 87 +- Documentation/ecryptfs.txt | 77 - Documentation/fault-injection/failcmd.sh | 4 - Documentation/fault-injection/failmodule.sh | 31 - Documentation/fault-injection/fault-injection.txt | 110 +- Documentation/fb/pvr2fb.txt | 22 +- Documentation/feature-removal-schedule.txt | 192 +- Documentation/filesystems/00-INDEX | 2 + Documentation/filesystems/9p.txt | 24 +- Documentation/filesystems/Locking | 13 +- Documentation/filesystems/configfs/configfs.txt | 57 +- .../filesystems/configfs/configfs_example.c | 8 +- Documentation/filesystems/ocfs2.txt | 13 +- Documentation/filesystems/proc.txt | 125 +- Documentation/filesystems/vfs.txt | 51 +- .../firmware_sample_firmware_class.c | 2 + Documentation/gpio.txt | 7 +- Documentation/hpet.txt | 2 +- Documentation/hrtimer/timer_stats.txt | 4 + Documentation/hwmon/abituguru | 31 +- Documentation/hwmon/adm1031 | 4 +- Documentation/hwmon/f71805f | 35 +- Documentation/hwmon/it87 | 9 +- Documentation/hwmon/lm90 | 36 +- Documentation/hwmon/smsc47b397 | 7 +- Documentation/hwmon/sysfs-interface | 15 +- Documentation/hwmon/w83627ehf | 6 +- Documentation/i2c/busses/i2c-i801 | 4 +- Documentation/i2c/busses/i2c-piix4 | 2 +- Documentation/i2c/chips/max6875 | 2 +- Documentation/i2c/chips/x1205 | 38 - Documentation/i2c/summary | 2 - Documentation/i2c/writing-clients | 2 +- Documentation/i386/zero-page.txt | 11 + Documentation/ia64/aliasing-test.c | 26 +- Documentation/ia64/aliasing.txt | 12 + Documentation/input/iforce-protocol.txt | 508 +- Documentation/ioctl-number.txt | 2 +- Documentation/iostats.txt | 2 +- Documentation/kbuild/kconfig-language.txt | 9 + Documentation/kbuild/makefiles.txt | 14 + Documentation/kernel-parameters.txt | 369 +- Documentation/keys.txt | 5 +- Documentation/kobject.txt | 178 +- Documentation/kprobes.txt | 8 +- Documentation/m68k/kernel-options.txt | 7 - Documentation/networking/ip-sysctl.txt | 9 +- Documentation/networking/net-modules.txt | 6 - Documentation/networking/netdevices.txt | 38 +- Documentation/oops-tracing.txt | 16 + Documentation/pci.txt | 8 +- Documentation/power/kernel_threads.txt | 40 - Documentation/power/pci.txt | 37 - Documentation/power/swsusp.txt | 21 +- Documentation/powerpc/booting-without-of.txt | 46 +- Documentation/rtc.txt | 2 +- Documentation/sched-stats.txt | 195 +- Documentation/scsi/aacraid.txt | 3 + Documentation/sound/alsa/ALSA-Configuration.txt | 75 +- Documentation/sound/alsa/Audiophile-Usb.txt | 242 +- Documentation/sound/alsa/OSS-Emulation.txt | 15 + Documentation/sound/oss/AD1816 | 84 - Documentation/sound/oss/NM256 | 280 - Documentation/sound/oss/OPL3-SA2 | 210 - Documentation/sound/oss/VIA-chipset | 43 - Documentation/sound/oss/cs46xx | 138 - Documentation/spinlocks.txt | 20 +- Documentation/stable_api_nonsense.txt | 2 +- Documentation/sysctl/vm.txt | 63 +- Documentation/sysrq.txt | 6 +- Documentation/thinkpad-acpi.txt | 417 +- Documentation/time_interpolators.txt | 41 - Documentation/usb/dma.txt | 52 +- Documentation/video4linux/CARDLIST.bttv | 4 +- Documentation/video4linux/CARDLIST.cx88 | 1 + Documentation/video4linux/CARDLIST.saa7134 | 1 + Documentation/video4linux/CARDLIST.tuner | 3 +- .../video4linux/cx2341x/fw-encoder-api.txt | 4 +- Documentation/video4linux/sn9c102.txt | 3 +- Documentation/video4linux/zr364xx.txt | 2 +- Documentation/vm/hugetlbpage.txt | 10 +- Documentation/vm/slabinfo.c | 2 +- Documentation/vm/slub.txt | 139 +- Documentation/x86_64/boot-options.txt | 14 +- Documentation/x86_64/machinecheck | 14 +- Kbuild | 1 + MAINTAINERS | 401 +- Makefile | 43 +- arch/alpha/Kconfig | 3 + arch/alpha/boot/Makefile | 2 +- arch/alpha/boot/main.c | 2 +- arch/alpha/boot/tools/mkbb.c | 5 +- arch/alpha/boot/tools/objstrip.c | 2 +- arch/alpha/kernel/head.S | 1 + arch/alpha/kernel/module.c | 3 +- arch/alpha/kernel/pci.c | 10 +- arch/alpha/kernel/pci_iommu.c | 36 +- arch/alpha/kernel/ptrace.c | 4 +- arch/alpha/kernel/smp.c | 11 +- arch/alpha/kernel/srmcons.c | 2 +- arch/alpha/kernel/sys_marvel.c | 2 +- arch/alpha/kernel/sys_titan.c | 27 +- arch/alpha/kernel/time.c | 2 +- arch/alpha/kernel/traps.c | 1 + arch/alpha/kernel/vmlinux.lds.S | 11 +- arch/alpha/lib/checksum.c | 1 + arch/alpha/mm/fault.c | 22 +- arch/alpha/mm/init.c | 3 +- arch/arm/Kconfig | 39 +- arch/arm/Kconfig.debug | 18 +- arch/arm/Makefile | 2 +- arch/arm/boot/Makefile | 8 + arch/arm/boot/compressed/.gitignore | 1 + arch/arm/boot/compressed/Makefile | 15 +- arch/arm/boot/compressed/head-xscale.S | 5 - arch/arm/boot/compressed/head.S | 95 +- arch/arm/common/locomo.c | 11 +- arch/arm/common/sa1111.c | 13 +- arch/arm/common/sharpsl_pm.c | 2 - arch/arm/configs/badge4_defconfig | 1 - arch/arm/configs/clps7500_defconfig | 1 - arch/arm/configs/footbridge_defconfig | 1 - arch/arm/configs/iop13xx_defconfig | 306 +- arch/arm/configs/iop32x_defconfig | 382 +- arch/arm/configs/iop33x_defconfig | 313 +- arch/arm/configs/neponset_defconfig | 1 - arch/arm/configs/picotux200_defconfig | 1 - arch/arm/configs/rpc_defconfig | 792 +- arch/arm/configs/s3c2410_defconfig | 11 +- arch/arm/kernel/bios32.c | 4 +- arch/arm/kernel/entry-common.S | 2 +- arch/arm/kernel/head-common.S | 40 +- arch/arm/kernel/head.S | 7 +- arch/arm/kernel/process.c | 8 +- arch/arm/kernel/ptrace.c | 15 +- arch/arm/kernel/setup.c | 7 +- arch/arm/kernel/smp.c | 3 +- arch/arm/kernel/traps.c | 3 +- arch/arm/kernel/vmlinux.lds.S | 1 + arch/arm/mach-at91/at91rm9200_devices.c | 10 +- arch/arm/mach-at91/at91sam9261_devices.c | 2 + arch/arm/mach-at91/at91sam9263_devices.c | 2 + arch/arm/mach-at91/board-csb337.c | 10 + arch/arm/mach-at91/board-sam9261ek.c | 130 + arch/arm/mach-at91/board-sam9263ek.c | 64 + arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/board-evm.c | 2 + arch/arm/mach-davinci/io.c | 6 + arch/arm/mach-davinci/psc.c | 87 +- arch/arm/mach-davinci/time.c | 2 + arch/arm/mach-ep93xx/core.c | 2 +- arch/arm/mach-imx/generic.c | 119 + arch/arm/mach-imx/time.c | 122 +- arch/arm/mach-iop13xx/pci.c | 3 +- arch/arm/mach-iop13xx/setup.c | 217 +- arch/arm/mach-iop13xx/tpmi.c | 32 +- arch/arm/mach-iop32x/Kconfig | 7 + arch/arm/mach-iop32x/Makefile | 1 + arch/arm/mach-iop32x/glantank.c | 2 + arch/arm/mach-iop32x/iq31244.c | 5 + arch/arm/mach-iop32x/iq80321.c | 3 + arch/arm/mach-iop32x/irq.c | 3 +- arch/arm/mach-iop32x/n2100.c | 12 + arch/arm/mach-iop33x/iq80331.c | 3 + arch/arm/mach-iop33x/iq80332.c | 3 + arch/arm/mach-ixp4xx/Kconfig | 16 + arch/arm/mach-ixp4xx/Makefile | 4 + arch/arm/mach-ixp4xx/common.c | 4 +- arch/arm/mach-ixp4xx/gtwx5715-pci.c | 8 +- arch/arm/mach-ixp4xx/ixdp425-setup.c | 96 + arch/arm/mach-ks8695/Makefile | 2 +- arch/arm/mach-ks8695/board-micrel.c | 8 +- arch/arm/mach-ks8695/irq.c | 1 - arch/arm/mach-ns9xxx/Makefile | 1 + arch/arm/mach-ns9xxx/board-a9m9750dev.c | 7 +- arch/arm/mach-ns9xxx/generic.c | 2 + arch/arm/mach-ns9xxx/irq.c | 11 +- arch/arm/mach-ns9xxx/mach-cc9p9360js.c | 2 +- arch/arm/mach-omap1/board-h3.c | 12 +- arch/arm/mach-omap1/leds-osk.c | 6 +- arch/arm/mach-omap1/pm.c | 11 - arch/arm/mach-omap1/time.c | 1 + arch/arm/mach-omap2/clock.c | 13 +- arch/arm/mach-omap2/serial.c | 2 +- arch/arm/mach-pxa/Kconfig | 4 + arch/arm/mach-pxa/Makefile | 1 + arch/arm/mach-pxa/clock.c | 15 +- arch/arm/mach-pxa/corgi.c | 7 +- arch/arm/mach-pxa/dma.c | 44 +- arch/arm/mach-pxa/generic.c | 101 +- arch/arm/mach-pxa/generic.h | 6 +- arch/arm/mach-pxa/idp.c | 3 +- arch/arm/mach-pxa/irq.c | 106 +- arch/arm/mach-pxa/lpd270.c | 3 +- arch/arm/mach-pxa/lubbock.c | 3 +- arch/arm/mach-pxa/mainstone.c | 3 +- arch/arm/mach-pxa/pm.c | 184 +- arch/arm/mach-pxa/poodle.c | 3 +- arch/arm/mach-pxa/pxa25x.c | 137 +- arch/arm/mach-pxa/pxa27x.c | 183 +- arch/arm/mach-pxa/sleep.S | 112 +- arch/arm/mach-pxa/spitz.c | 7 +- arch/arm/mach-pxa/time.c | 263 +- arch/arm/mach-pxa/tosa.c | 4 +- arch/arm/mach-pxa/trizeps4.c | 3 +- arch/arm/mach-realview/realview_eb.c | 2 +- arch/arm/mach-rpc/riscpc.c | 2 +- arch/arm/mach-s3c2410/Kconfig | 1 + arch/arm/mach-s3c2410/clock.c | 2 +- arch/arm/mach-s3c2410/dma.c | 8 +- arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +- arch/arm/mach-s3c2410/mach-bast.c | 65 +- arch/arm/mach-s3c2410/mach-h1940.c | 4 +- arch/arm/mach-s3c2410/mach-n30.c | 4 +- arch/arm/mach-s3c2410/mach-otom.c | 2 +- arch/arm/mach-s3c2410/mach-qt2410.c | 6 +- arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- arch/arm/mach-s3c2410/s3c2410.c | 3 +- arch/arm/mach-s3c2410/sleep.S | 2 +- arch/arm/mach-s3c2412/Kconfig | 1 + arch/arm/mach-s3c2412/clock.c | 2 +- arch/arm/mach-s3c2412/dma.c | 8 +- arch/arm/mach-s3c2412/mach-smdk2413.c | 4 +- arch/arm/mach-s3c2412/mach-vstms.c | 4 +- arch/arm/mach-s3c2412/s3c2412.c | 5 +- arch/arm/mach-s3c2440/Kconfig | 1 + arch/arm/mach-s3c2440/dma.c | 8 +- arch/arm/mach-s3c2440/mach-anubis.c | 145 +- arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +- arch/arm/mach-s3c2440/mach-osiris.c | 60 +- arch/arm/mach-s3c2440/mach-rx3715.c | 4 +- arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +- arch/arm/mach-s3c2442/Kconfig | 3 +- arch/arm/mach-s3c2443/Kconfig | 1 + arch/arm/mach-s3c2443/dma.c | 8 +- arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +- arch/arm/mach-sa1100/Kconfig | 13 +- arch/arm/mach-sa1100/Makefile | 2 + arch/arm/mach-sa1100/jornada720.c | 27 +- arch/arm/mach-sa1100/neponset.c | 17 +- arch/arm/mach-sa1100/pm.c | 9 - arch/arm/mach-sa1100/time.c | 24 - arch/arm/mm/Kconfig | 18 +- arch/arm/mm/cache-l2x0.c | 6 + arch/arm/mm/fault.c | 40 +- arch/arm/mm/ioremap.c | 10 +- arch/arm/mm/mmu.c | 14 +- arch/arm/mm/proc-syms.c | 2 + arch/arm/mm/proc-v7.S | 33 +- arch/arm/nwfpe/Makefile | 1 - arch/arm/nwfpe/entry26.S | 112 - arch/arm/plat-iop/Makefile | 2 + arch/arm/plat-iop/time.c | 8 + arch/arm/plat-omap/common.c | 2 +- arch/arm/plat-omap/dmtimer.c | 5 - arch/arm/plat-omap/mailbox.c | 8 +- arch/arm/plat-omap/timer32k.c | 12 +- arch/arm/plat-s3c24xx/Kconfig | 60 +- arch/arm/plat-s3c24xx/common-smdk.c | 2 +- arch/arm/plat-s3c24xx/cpu.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 6 +- arch/arm/plat-s3c24xx/dma.c | 2 +- arch/arm/plat-s3c24xx/pm.c | 2 +- arch/arm/plat-s3c24xx/s3c244x.c | 3 +- arch/arm/plat-s3c24xx/sleep.S | 2 +- arch/arm/plat-s3c24xx/time.c | 2 +- arch/arm/vfp/vfphw.S | 12 +- arch/arm/vfp/vfpmodule.c | 13 +- arch/arm26/ACKNOWLEDGEMENTS | 29 - arch/arm26/Kconfig | 250 - arch/arm26/Kconfig.debug | 50 - arch/arm26/Makefile | 107 - arch/arm26/boot/Makefile | 83 - arch/arm26/boot/compressed/Makefile | 50 - arch/arm26/boot/compressed/head.S | 516 - arch/arm26/boot/compressed/ll_char_wr.S | 162 - arch/arm26/boot/compressed/misc.c | 316 - arch/arm26/boot/compressed/uncompress.h | 110 - arch/arm26/boot/compressed/vmlinux.lds.in | 60 - arch/arm26/boot/install.sh | 62 - arch/arm26/defconfig | 362 - arch/arm26/kernel/Makefile | 17 - arch/arm26/kernel/armksyms.c | 206 - arch/arm26/kernel/asm-offsets.c | 55 - arch/arm26/kernel/calls.S | 265 - arch/arm26/kernel/compat.c | 173 - arch/arm26/kernel/dma.c | 273 - arch/arm26/kernel/ecard.c | 847 - arch/arm26/kernel/entry.S | 951 - arch/arm26/kernel/fiq.c | 201 - arch/arm26/kernel/head.S | 112 - arch/arm26/kernel/init_task.c | 49 - arch/arm26/kernel/irq.c | 716 - arch/arm26/kernel/process.c | 392 - arch/arm26/kernel/ptrace.c | 681 - arch/arm26/kernel/ptrace.h | 13 - arch/arm26/kernel/semaphore.c | 222 - arch/arm26/kernel/setup.c | 572 - arch/arm26/kernel/signal.c | 538 - arch/arm26/kernel/sys_arm.c | 323 - arch/arm26/kernel/time.c | 210 - arch/arm26/kernel/traps.c | 547 - arch/arm26/kernel/vmlinux-arm26-xip.lds.in | 136 - arch/arm26/kernel/vmlinux-arm26.lds.in | 129 - arch/arm26/kernel/vmlinux.lds.S | 11 - arch/arm26/lib/Makefile | 26 - arch/arm26/lib/ashldi3.c | 61 - arch/arm26/lib/ashrdi3.c | 61 - arch/arm26/lib/backtrace.S | 144 - arch/arm26/lib/changebit.S | 28 - arch/arm26/lib/clearbit.S | 31 - arch/arm26/lib/copy_page.S | 62 - arch/arm26/lib/csumipv6.S | 32 - arch/arm26/lib/csumpartial.S | 130 - arch/arm26/lib/csumpartialcopy.S | 52 - arch/arm26/lib/csumpartialcopygeneric.S | 352 - arch/arm26/lib/csumpartialcopyuser.S | 114 - arch/arm26/lib/delay.S | 57 - arch/arm26/lib/ecard.S | 40 - arch/arm26/lib/findbit.S | 67 - arch/arm26/lib/floppydma.S | 32 - arch/arm26/lib/gcclib.h | 21 - arch/arm26/lib/getuser.S | 112 - arch/arm26/lib/io-acorn.S | 70 - arch/arm26/lib/io-readsb.S | 116 - arch/arm26/lib/io-readsl.S | 78 - arch/arm26/lib/io-readsw.S | 107 - arch/arm26/lib/io-writesb.S | 122 - arch/arm26/lib/io-writesl.S | 56 - arch/arm26/lib/io-writesw.S | 127 - arch/arm26/lib/kbd.c | 278 - arch/arm26/lib/lib1funcs.S | 313 - arch/arm26/lib/longlong.h | 184 - arch/arm26/lib/lshrdi3.c | 61 - arch/arm26/lib/memchr.S | 25 - arch/arm26/lib/memcpy.S | 318 - arch/arm26/lib/memset.S | 80 - arch/arm26/lib/memzero.S | 80 - arch/arm26/lib/muldi3.c | 77 - arch/arm26/lib/putuser.S | 109 - arch/arm26/lib/setbit.S | 29 - arch/arm26/lib/strchr.S | 25 - arch/arm26/lib/strrchr.S | 25 - arch/arm26/lib/testchangebit.S | 29 - arch/arm26/lib/testclearbit.S | 29 - arch/arm26/lib/testsetbit.S | 29 - arch/arm26/lib/uaccess-kernel.S | 173 - arch/arm26/lib/uaccess-user.S | 718 - arch/arm26/lib/ucmpdi2.c | 51 - arch/arm26/lib/udivdi3.c | 242 - arch/arm26/machine/Makefile | 8 - arch/arm26/machine/dma.c | 214 - arch/arm26/machine/irq.c | 164 - arch/arm26/machine/latches.c | 72 - arch/arm26/mm/Makefile | 6 - arch/arm26/mm/extable.c | 24 - arch/arm26/mm/fault.c | 314 - arch/arm26/mm/fault.h | 5 - arch/arm26/mm/init.c | 406 - arch/arm26/mm/memc.c | 184 - arch/arm26/mm/proc-funcs.S | 359 - arch/arm26/mm/small_page.c | 192 - arch/arm26/nwfpe/ARM-gcc.h | 120 - arch/arm26/nwfpe/ChangeLog | 83 - arch/arm26/nwfpe/Makefile | 15 - arch/arm26/nwfpe/double_cpdo.c | 288 - arch/arm26/nwfpe/entry.S | 114 - arch/arm26/nwfpe/extended_cpdo.c | 273 - arch/arm26/nwfpe/fpa11.c | 221 - arch/arm26/nwfpe/fpa11.h | 87 - arch/arm26/nwfpe/fpa11.inl | 51 - arch/arm26/nwfpe/fpa11_cpdo.c | 117 - arch/arm26/nwfpe/fpa11_cpdt.c | 368 - arch/arm26/nwfpe/fpa11_cprt.c | 289 - arch/arm26/nwfpe/fpmodule.c | 180 - arch/arm26/nwfpe/fpmodule.h | 46 - arch/arm26/nwfpe/fpmodule.inl | 84 - arch/arm26/nwfpe/fpopcode.c | 148 - arch/arm26/nwfpe/fpopcode.h | 390 - arch/arm26/nwfpe/fpsr.h | 108 - arch/arm26/nwfpe/milieu.h | 48 - arch/arm26/nwfpe/single_cpdo.c | 255 - arch/arm26/nwfpe/softfloat-macros | 740 - arch/arm26/nwfpe/softfloat-specialize | 366 - arch/arm26/nwfpe/softfloat.c | 3439 --- arch/arm26/nwfpe/softfloat.h | 232 - arch/avr32/Kconfig | 25 + arch/avr32/boards/atngw100/setup.c | 49 + arch/avr32/boards/atstk1000/atstk1002.c | 112 +- arch/avr32/configs/atngw100_defconfig | 16 +- arch/avr32/kernel/ptrace.c | 13 +- arch/avr32/kernel/setup.c | 4 +- arch/avr32/kernel/traps.c | 3 +- arch/avr32/mach-at32ap/Makefile | 1 + arch/avr32/mach-at32ap/at32ap.c | 31 - arch/avr32/mach-at32ap/at32ap7000.c | 340 +- arch/avr32/mach-at32ap/extint.c | 200 +- arch/avr32/mach-at32ap/sm.h | 242 - arch/avr32/mm/fault.c | 23 +- arch/blackfin/Kconfig | 59 +- arch/blackfin/Makefile | 6 + arch/blackfin/boot/Makefile | 3 +- arch/blackfin/kernel/Makefile | 7 +- arch/blackfin/kernel/asm-offsets.c | 7 +- arch/blackfin/kernel/bfin_dma_5xx.c | 251 +- arch/blackfin/kernel/bfin_gpio.c | 294 +- arch/blackfin/kernel/bfin_ksyms.c | 5 +- arch/blackfin/kernel/dma-mapping.c | 14 +- arch/blackfin/kernel/dualcore_test.c | 6 +- arch/blackfin/kernel/flat.c | 55 +- arch/blackfin/kernel/init_task.c | 1 + arch/blackfin/kernel/irqchip.c | 2 +- arch/blackfin/kernel/module.c | 32 +- arch/blackfin/kernel/process.c | 77 +- arch/blackfin/kernel/ptrace.c | 6 +- arch/blackfin/kernel/setup.c | 373 +- arch/blackfin/kernel/signal.c | 10 +- arch/blackfin/kernel/sys_bfin.c | 9 +- arch/blackfin/kernel/time.c | 4 +- arch/blackfin/kernel/traps.c | 65 +- arch/blackfin/kernel/vmlinux.lds.S | 12 +- arch/blackfin/lib/strcmp.c | 3 +- arch/blackfin/lib/strcpy.c | 3 +- arch/blackfin/lib/strncmp.c | 3 +- arch/blackfin/lib/strncpy.c | 3 +- arch/blackfin/mach-bf533/Makefile | 4 +- arch/blackfin/mach-bf533/boards/cm_bf533.c | 14 +- arch/blackfin/mach-bf533/boards/ezkit.c | 8 +- arch/blackfin/mach-bf533/boards/generic_board.c | 6 +- arch/blackfin/mach-bf533/boards/stamp.c | 30 +- arch/blackfin/mach-bf533/cpu.c | 3 +- arch/blackfin/mach-bf533/head.S | 5 + arch/blackfin/mach-bf533/ints-priority.c | 2 +- arch/blackfin/mach-bf537/Makefile | 2 +- arch/blackfin/mach-bf537/boards/cm_bf537.c | 16 +- arch/blackfin/mach-bf537/boards/eth_mac.c | 5 +- arch/blackfin/mach-bf537/boards/generic_board.c | 36 +- arch/blackfin/mach-bf537/boards/pnav10.c | 54 +- arch/blackfin/mach-bf537/boards/stamp.c | 77 +- arch/blackfin/mach-bf537/head.S | 6 + arch/blackfin/mach-bf537/ints-priority.c | 2 +- arch/blackfin/mach-bf561/Makefile | 2 +- arch/blackfin/mach-bf561/boards/cm_bf561.c | 32 +- arch/blackfin/mach-bf561/boards/ezkit.c | 33 +- arch/blackfin/mach-bf561/boards/generic_board.c | 6 +- arch/blackfin/mach-bf561/boards/tepla.c | 6 +- arch/blackfin/mach-bf561/coreb.c | 18 +- arch/blackfin/mach-bf561/head.S | 16 +- arch/blackfin/mach-bf561/ints-priority.c | 2 +- arch/blackfin/mach-common/Makefile | 4 +- arch/blackfin/mach-common/cacheinit.S | 90 +- arch/blackfin/mach-common/cplbinfo.c | 13 +- arch/blackfin/mach-common/entry.S | 99 +- arch/blackfin/mach-common/interrupt.S | 8 +- arch/blackfin/mach-common/ints-priority-dc.c | 46 +- arch/blackfin/mach-common/ints-priority-sc.c | 435 +- arch/blackfin/mach-common/pm.c | 10 +- arch/blackfin/mm/blackfin_sram.c | 7 +- arch/blackfin/mm/init.c | 47 +- arch/blackfin/oprofile/common.c | 6 +- arch/blackfin/oprofile/op_model_bf533.c | 6 +- arch/blackfin/oprofile/timer_int.c | 3 +- arch/cris/Kconfig | 2 - arch/cris/arch-v10/defconfig | 1 - arch/cris/arch-v10/drivers/Kconfig | 1 + arch/cris/arch-v10/drivers/pcf8563.c | 4 +- arch/cris/arch-v10/kernel/ptrace.c | 21 +- arch/cris/arch-v10/vmlinux.lds.S | 2 +- arch/cris/arch-v32/drivers/Kconfig | 1 + arch/cris/arch-v32/drivers/cryptocop.c | 8 +- arch/cris/arch-v32/drivers/i2c.c | 8 +- arch/cris/arch-v32/drivers/pcf8563.c | 12 +- arch/cris/arch-v32/drivers/pci/dma.c | 6 +- arch/cris/arch-v32/kernel/ptrace.c | 7 +- arch/cris/arch-v32/vmlinux.lds.S | 7 +- arch/cris/mm/fault.c | 23 +- arch/frv/Makefile | 2 +- arch/frv/kernel/entry.S | 5 + arch/frv/kernel/gdb-stub.c | 12 +- arch/frv/kernel/ptrace.c | 16 +- arch/frv/kernel/setup.c | 17 +- arch/frv/kernel/sys_frv.c | 1 + arch/frv/kernel/vmlinux.lds.S | 5 +- arch/frv/mb93090-mb00/pci-vdk.c | 3 +- arch/frv/mm/fault.c | 23 +- arch/h8300/Kconfig | 3 + arch/h8300/Kconfig.debug | 2 +- arch/h8300/Makefile | 7 +- arch/h8300/boot/compressed/Makefile | 4 +- arch/h8300/boot/compressed/head.S | 2 +- arch/h8300/kernel/Makefile | 3 +- arch/h8300/kernel/ints.c | 256 - arch/h8300/kernel/process.c | 1 + arch/h8300/kernel/ptrace.c | 7 +- arch/h8300/kernel/signal.c | 6 + arch/h8300/kernel/sys_h8300.c | 1 + arch/h8300/platform/h8300h/Makefile | 2 +- arch/h8300/platform/h8300h/entry.S | 332 - arch/h8300/platform/h8s/Makefile | 2 +- arch/h8300/platform/h8s/entry.S | 331 - arch/i386/Kconfig | 54 +- arch/i386/Kconfig.cpu | 11 +- arch/i386/Kconfig.debug | 4 +- arch/i386/Makefile | 4 + arch/i386/boot/.gitignore | 2 + arch/i386/boot/Makefile | 48 +- arch/i386/boot/bootsect.S | 98 - arch/i386/boot/compressed/Makefile | 7 +- arch/i386/boot/compressed/head.S | 6 +- arch/i386/boot/compressed/relocs.c | 3 + arch/i386/boot/edd.S | 231 - arch/i386/boot/install.sh | 9 +- arch/i386/boot/setup.S | 1075 - arch/i386/boot/tools/build.c | 162 +- arch/i386/boot/video.S | 2043 -- arch/i386/defconfig | 265 +- arch/i386/kernel/Makefile | 1 + arch/i386/kernel/acpi/boot.c | 44 +- arch/i386/kernel/acpi/sleep.c | 12 +- arch/i386/kernel/acpi/wakeup.S | 78 +- arch/i386/kernel/alternative.c | 88 +- arch/i386/kernel/apic.c | 22 +- arch/i386/kernel/apm.c | 4 +- arch/i386/kernel/asm-offsets.c | 29 + arch/i386/kernel/cpu/Makefile | 3 +- arch/i386/kernel/cpu/amd.c | 18 +- arch/i386/kernel/cpu/bugs.c | 1 + arch/i386/kernel/cpu/common.c | 4 +- arch/i386/kernel/cpu/cpufreq/Kconfig | 31 +- arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 47 +- arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c | 6 +- arch/i386/kernel/cpu/cpufreq/gx-suspmod.c | 6 +- arch/i386/kernel/cpu/cpufreq/longhaul.c | 274 +- arch/i386/kernel/cpu/cpufreq/longhaul.h | 12 +- arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 29 +- arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | 276 +- arch/i386/kernel/cpu/cpufreq/speedstep-ich.c | 4 +- arch/i386/kernel/cpu/cyrix.c | 2 +- arch/i386/kernel/cpu/intel_cacheinfo.c | 83 +- arch/i386/kernel/cpu/mcheck/mce.c | 14 + arch/i386/kernel/cpu/mcheck/non-fatal.c | 4 +- arch/i386/kernel/cpu/mcheck/therm_throt.c | 6 +- arch/i386/kernel/cpu/mtrr/cyrix.c | 1 + arch/i386/kernel/cpu/mtrr/generic.c | 2 +- arch/i386/kernel/cpu/mtrr/main.c | 2 +- arch/i386/kernel/cpu/mtrr/state.c | 1 + arch/i386/kernel/cpu/perfctr-watchdog.c | 30 +- arch/i386/kernel/cpu/proc.c | 21 +- arch/i386/kernel/cpu/rise.c | 52 - arch/i386/kernel/e820.c | 34 +- arch/i386/kernel/efi.c | 2 +- arch/i386/kernel/entry.S | 87 +- arch/i386/kernel/head.S | 17 +- arch/i386/kernel/hpet.c | 74 +- arch/i386/kernel/i8253.c | 32 +- arch/i386/kernel/init_task.c | 2 +- arch/i386/kernel/io_apic.c | 42 +- arch/i386/kernel/irq.c | 10 +- arch/i386/kernel/kprobes.c | 9 +- arch/i386/kernel/microcode.c | 1 + arch/i386/kernel/nmi.c | 16 +- arch/i386/kernel/paravirt.c | 89 +- arch/i386/kernel/process.c | 85 +- arch/i386/kernel/ptrace.c | 40 +- arch/i386/kernel/reboot.c | 9 + arch/i386/kernel/setup.c | 25 +- arch/i386/kernel/signal.c | 7 + arch/i386/kernel/smp.c | 5 +- arch/i386/kernel/smpboot.c | 20 +- arch/i386/kernel/smpcommon.c | 8 +- arch/i386/kernel/sys_i386.c | 1 + arch/i386/kernel/syscall_table.S | 1 + arch/i386/kernel/sysenter.c | 1 + arch/i386/kernel/time.c | 50 +- arch/i386/kernel/traps.c | 86 +- arch/i386/kernel/tsc.c | 35 +- arch/i386/kernel/verify_cpu.S | 94 - arch/i386/kernel/vmi.c | 39 +- arch/i386/kernel/vmiclock.c | 8 +- arch/i386/kernel/vmlinux.lds.S | 8 +- arch/i386/kernel/vsyscall-note.S | 52 +- arch/i386/lib/Makefile | 2 +- arch/i386/mach-generic/Makefile | 2 +- arch/i386/mach-generic/es7000.c | 2 +- arch/i386/mach-visws/traps.c | 4 +- arch/i386/mach-voyager/Makefile | 2 +- arch/i386/mach-voyager/voyager_thread.c | 2 +- arch/i386/mm/fault.c | 33 +- arch/i386/mm/highmem.c | 7 +- arch/i386/mm/hugetlbpage.c | 2 +- arch/i386/mm/init.c | 15 +- arch/i386/mm/ioremap.c | 2 +- arch/i386/mm/pageattr.c | 20 +- arch/i386/mm/pgtable.c | 6 +- arch/i386/pci/acpi.c | 32 +- arch/i386/pci/common.c | 36 +- arch/i386/pci/fixup.c | 15 +- arch/i386/pci/irq.c | 6 +- arch/i386/pci/legacy.c | 2 +- arch/i386/pci/mmconfig-shared.c | 48 +- arch/i386/pci/mmconfig.c | 14 +- arch/i386/pci/numa.c | 15 +- arch/i386/pci/pcbios.c | 2 +- arch/i386/pci/pci.h | 43 + arch/i386/pci/visws.c | 4 +- arch/i386/power/Makefile | 2 +- arch/ia64/Kconfig | 31 +- arch/ia64/configs/bigsur_defconfig | 4 +- arch/ia64/configs/gensparse_defconfig | 4 +- arch/ia64/configs/sim_defconfig | 4 +- arch/ia64/configs/sn2_defconfig | 4 +- arch/ia64/configs/tiger_defconfig | 322 +- arch/ia64/configs/zx1_defconfig | 4 +- arch/ia64/defconfig | 337 +- arch/ia64/hp/common/sba_iommu.c | 27 +- arch/ia64/hp/sim/boot/boot_head.S | 1 + arch/ia64/hp/sim/boot/fw-emu.c | 5 - arch/ia64/hp/sim/hpsim_console.c | 16 +- arch/ia64/hp/sim/hpsim_setup.c | 9 +- arch/ia64/hp/sim/simeth.c | 12 +- arch/ia64/hp/sim/simscsi.c | 71 +- arch/ia64/hp/sim/simserial.c | 4 - arch/ia64/ia32/binfmt_elf32.c | 67 +- arch/ia64/ia32/ia32_entry.S | 2 +- arch/ia64/ia32/ia32_support.c | 8 +- arch/ia64/ia32/ia32priv.h | 12 +- arch/ia64/ia32/sys_ia32.c | 82 +- arch/ia64/kernel/acpi.c | 28 +- arch/ia64/kernel/asm-offsets.c | 35 +- arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 6 +- arch/ia64/kernel/cyclone.c | 60 +- arch/ia64/kernel/efi.c | 1 + arch/ia64/kernel/entry.S | 2 +- arch/ia64/kernel/fsys.S | 181 +- arch/ia64/kernel/gate.S | 1 + arch/ia64/kernel/head.S | 4 +- arch/ia64/kernel/init_task.c | 1 + arch/ia64/kernel/iosapic.c | 655 +- arch/ia64/kernel/irq.c | 7 +- arch/ia64/kernel/irq_ia64.c | 335 +- arch/ia64/kernel/kprobes.c | 7 +- arch/ia64/kernel/machvec.c | 27 +- arch/ia64/kernel/mca.c | 111 +- arch/ia64/kernel/mca_asm.S | 12 - arch/ia64/kernel/mca_drv_asm.S | 6 +- arch/ia64/kernel/msi_ia64.c | 23 +- arch/ia64/kernel/perfmon.c | 4 +- arch/ia64/kernel/process.c | 20 +- arch/ia64/kernel/ptrace.c | 11 +- arch/ia64/kernel/setup.c | 37 +- arch/ia64/kernel/smp.c | 12 +- arch/ia64/kernel/smpboot.c | 16 +- arch/ia64/kernel/time.c | 112 +- arch/ia64/kernel/traps.c | 1 + arch/ia64/kernel/vmlinux.lds.S | 15 +- arch/ia64/lib/checksum.c | 1 + arch/ia64/mm/contig.c | 3 + arch/ia64/mm/discontig.c | 3 + arch/ia64/mm/fault.c | 40 +- arch/ia64/mm/hugetlbpage.c | 6 +- arch/ia64/mm/tlb.c | 2 +- arch/ia64/pci/pci.c | 24 +- arch/ia64/sn/kernel/huberror.c | 14 +- arch/ia64/sn/kernel/io_acpi_init.c | 17 +- arch/ia64/sn/kernel/io_common.c | 2 +- arch/ia64/sn/kernel/io_init.c | 20 +- arch/ia64/sn/kernel/irq.c | 27 +- arch/ia64/sn/kernel/setup.c | 1 - arch/ia64/sn/kernel/sn2/sn2_smp.c | 26 + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 6 +- arch/ia64/sn/kernel/sn2/timer.c | 26 +- arch/ia64/sn/kernel/tiocx.c | 2 +- arch/ia64/sn/pci/pcibr/pcibr_provider.c | 3 +- arch/ia64/sn/pci/tioca_provider.c | 2 + arch/ia64/sn/pci/tioce_provider.c | 1 + arch/m32r/Kconfig | 23 + arch/m32r/Makefile | 3 +- arch/m32r/defconfig | 349 +- arch/m32r/kernel/Makefile | 8 - arch/m32r/kernel/entry.S | 569 +- arch/m32r/kernel/io_m32104ut.c | 297 - arch/m32r/kernel/io_m32700ut.c | 395 - arch/m32r/kernel/io_mappi.c | 325 - arch/m32r/kernel/io_mappi2.c | 383 - arch/m32r/kernel/io_mappi3.c | 405 - arch/m32r/kernel/io_oaks32r.c | 228 - arch/m32r/kernel/io_opsput.c | 395 - arch/m32r/kernel/io_usrv.c | 225 - arch/m32r/kernel/ptrace.c | 20 +- arch/m32r/kernel/setup_m32104ut.c | 155 - arch/m32r/kernel/setup_m32700ut.c | 518 - arch/m32r/kernel/setup_mappi.c | 200 - arch/m32r/kernel/setup_mappi2.c | 201 - arch/m32r/kernel/setup_mappi3.c | 251 - arch/m32r/kernel/setup_oaks32r.c | 135 - arch/m32r/kernel/setup_opsput.c | 519 - arch/m32r/kernel/setup_usrv.c | 249 - arch/m32r/kernel/smpboot.c | 1 + arch/m32r/kernel/sys_m32r.c | 1 + arch/m32r/kernel/vmlinux.lds.S | 5 +- arch/m32r/m32104ut/defconfig.m32104ut | 1141 - arch/m32r/m32700ut/defconfig.m32700ut.smp | 972 - arch/m32r/m32700ut/defconfig.m32700ut.up | 969 - arch/m32r/m32700ut/dot.gdbinit_200MHz_16MB | 249 - arch/m32r/m32700ut/dot.gdbinit_300MHz_32MB | 249 - arch/m32r/m32700ut/dot.gdbinit_400MHz_32MB | 249 - arch/m32r/mappi/defconfig.nommu | 775 - arch/m32r/mappi/defconfig.smp | 895 - arch/m32r/mappi/defconfig.up | 892 - arch/m32r/mappi/dot.gdbinit | 242 - arch/m32r/mappi/dot.gdbinit.nommu | 245 - arch/m32r/mappi/dot.gdbinit.smp | 344 - arch/m32r/mappi2/defconfig.opsp | 883 - arch/m32r/mappi2/defconfig.vdec2 | 881 - arch/m32r/mappi2/dot.gdbinit.vdec2 | 233 - arch/m32r/mappi3/defconfig.smp | 898 - arch/m32r/mappi3/dot.gdbinit | 224 - arch/m32r/mm/fault.c | 23 +- arch/m32r/oaks32r/defconfig.nommu | 742 - arch/m32r/oaks32r/dot.gdbinit.nommu | 154 - arch/m32r/opsput/defconfig.opsput | 850 - arch/m32r/opsput/dot.gdbinit | 218 - arch/m68k/Kconfig | 7 + arch/m68k/apollo/config.c | 4 +- arch/m68k/apollo/dn_ints.c | 2 +- arch/m68k/atari/atakeyb.c | 9 +- arch/m68k/bvme6000/config.c | 2 +- arch/m68k/kernel/entry.S | 10 + arch/m68k/kernel/head.S | 2 +- arch/m68k/kernel/ints.c | 4 + arch/m68k/kernel/process.c | 1 + arch/m68k/kernel/ptrace.c | 9 +- arch/m68k/kernel/setup.c | 3 +- arch/m68k/kernel/sun3-head.S | 2 +- arch/m68k/kernel/sys_m68k.c | 1 + arch/m68k/kernel/time.c | 2 +- arch/m68k/kernel/traps.c | 1 + arch/m68k/kernel/vmlinux-std.lds | 5 +- arch/m68k/kernel/vmlinux-sun3.lds | 2 +- arch/m68k/lib/checksum.c | 1 + arch/m68k/mac/config.c | 7 +- arch/m68k/mac/macints.c | 4 +- arch/m68k/mm/fault.c | 21 +- arch/m68k/mm/init.c | 2 +- arch/m68k/mm/motorola.c | 6 +- arch/m68k/mm/sun3kmap.c | 2 + arch/m68k/mvme147/config.c | 2 +- arch/m68k/mvme16x/config.c | 2 +- arch/m68k/q40/q40ints.c | 2 +- arch/m68k/sun3/sun3ints.c | 2 +- arch/m68k/sun3x/prom.c | 2 +- arch/m68knommu/Kconfig | 28 + arch/m68knommu/Makefile | 2 + arch/m68knommu/kernel/Makefile | 4 +- arch/m68knommu/kernel/asm-offsets.c | 5 - arch/m68knommu/kernel/dma.c | 1 + arch/m68knommu/kernel/m68k_ksyms.c | 2 - arch/m68knommu/kernel/process.c | 3 +- arch/m68knommu/kernel/ptrace.c | 17 +- arch/m68knommu/kernel/setup.c | 111 +- arch/m68knommu/kernel/sys_m68k.c | 1 + arch/m68knommu/kernel/syscalltable.S | 10 + arch/m68knommu/kernel/traps.c | 5 +- arch/m68knommu/mm/memory.c | 100 +- arch/m68knommu/platform/5206/config.c | 10 - arch/m68knommu/platform/5206e/config.c | 10 +- arch/m68knommu/platform/520x/config.c | 9 - arch/m68knommu/platform/523x/config.c | 10 - arch/m68knommu/platform/5249/config.c | 10 - arch/m68knommu/platform/5272/config.c | 9 +- arch/m68knommu/platform/527x/config.c | 10 - arch/m68knommu/platform/528x/config.c | 10 - arch/m68knommu/platform/5307/Makefile | 2 +- arch/m68knommu/platform/5307/config.c | 9 +- arch/m68knommu/platform/5307/entry.S | 53 +- arch/m68knommu/platform/5307/ints.c | 279 - arch/m68knommu/platform/5307/pit.c | 14 +- arch/m68knommu/platform/5307/timers.c | 13 +- arch/m68knommu/platform/5307/vectors.c | 29 +- arch/m68knommu/platform/532x/config.c | 7 +- arch/m68knommu/platform/5407/config.c | 9 - arch/m68knommu/platform/68328/entry.S | 10 - arch/m68knommu/platform/68328/ints.c | 130 +- arch/m68knommu/platform/68328/timers.c | 11 +- arch/m68knommu/platform/68360/config.c | 14 +- arch/m68knommu/platform/68360/entry.S | 6 +- arch/m68knommu/platform/68360/ints.c | 233 +- arch/m68knommu/platform/68VZ328/config.c | 7 - arch/mips/Kconfig | 447 +- arch/mips/Makefile | 151 +- arch/mips/arc/console.c | 31 - arch/mips/arc/file.c | 22 +- arch/mips/au1000/Kconfig | 1 + arch/mips/au1000/common/Makefile | 2 + arch/mips/au1000/common/gpio.c | 128 +- arch/mips/au1000/common/pci.c | 1 + arch/mips/au1000/common/platform.c | 2 +- arch/mips/au1000/common/setup.c | 9 - arch/mips/au1000/common/time.c | 29 - arch/mips/au1000/mtx-1/board_setup.c | 4 +- arch/mips/au1000/pb1000/board_setup.c | 6 +- arch/mips/au1000/pb1100/board_setup.c | 4 +- arch/mips/au1000/pb1200/board_setup.c | 9 +- arch/mips/au1000/pb1500/board_setup.c | 6 +- arch/mips/basler/excite/excite_setup.c | 1 + arch/mips/boot/Makefile | 4 - arch/mips/cobalt/Makefile | 2 + arch/mips/cobalt/serial.c | 4 +- arch/mips/configs/atlas_defconfig | 7 - arch/mips/configs/bigsur_defconfig | 11 +- arch/mips/configs/capcella_defconfig | 424 +- arch/mips/configs/cobalt_defconfig | 731 +- arch/mips/configs/db1000_defconfig | 7 - arch/mips/configs/db1100_defconfig | 7 - arch/mips/configs/db1200_defconfig | 7 - arch/mips/configs/db1500_defconfig | 7 - arch/mips/configs/db1550_defconfig | 7 - arch/mips/configs/ddb5477_defconfig | 994 - arch/mips/configs/decstation_defconfig | 7 - arch/mips/configs/e55_defconfig | 326 +- arch/mips/configs/emma2rh_defconfig | 7 - arch/mips/configs/ev64120_defconfig | 985 - arch/mips/configs/excite_defconfig | 7 - arch/mips/configs/ip22_defconfig | 380 +- arch/mips/configs/ip27_defconfig | 401 +- arch/mips/configs/ip32_defconfig | 7 - arch/mips/configs/jazz_defconfig | 9 +- arch/mips/configs/jmr3927_defconfig | 403 +- arch/mips/configs/lasat200_defconfig | 1118 - arch/mips/configs/malta_defconfig | 433 +- arch/mips/configs/mipssim_defconfig | 40 +- arch/mips/configs/mpc30x_defconfig | 579 +- arch/mips/configs/ocelot_3_defconfig | 1283 - arch/mips/configs/ocelot_c_defconfig | 982 - arch/mips/configs/ocelot_defconfig | 923 - arch/mips/configs/pb1100_defconfig | 7 - arch/mips/configs/pb1500_defconfig | 7 - arch/mips/configs/pb1550_defconfig | 7 - arch/mips/configs/pnx8550-jbs_defconfig | 7 - arch/mips/configs/pnx8550-stb810_defconfig | 7 - arch/mips/configs/qemu_defconfig | 9 +- arch/mips/configs/rbhma4200_defconfig | 338 +- arch/mips/configs/rbhma4500_defconfig | 1116 +- arch/mips/configs/rm200_defconfig | 9 +- arch/mips/configs/sb1250-swarm_defconfig | 11 +- arch/mips/configs/sead_defconfig | 7 - arch/mips/configs/tb0219_defconfig | 511 +- arch/mips/configs/tb0226_defconfig | 555 +- arch/mips/configs/tb0287_defconfig | 599 +- arch/mips/configs/workpad_defconfig | 514 +- arch/mips/configs/wrppmc_defconfig | 7 - arch/mips/configs/yosemite_defconfig | 9 - arch/mips/ddb5xxx/Kconfig | 4 - arch/mips/ddb5xxx/common/Makefile | 5 - arch/mips/ddb5xxx/common/nile4.c | 130 - arch/mips/ddb5xxx/common/prom.c | 132 - arch/mips/ddb5xxx/common/rtc_ds1386.c | 170 - arch/mips/ddb5xxx/ddb5477/Makefile | 8 - arch/mips/ddb5xxx/ddb5477/debug.c | 160 - arch/mips/ddb5xxx/ddb5477/irq.c | 209 - arch/mips/ddb5xxx/ddb5477/irq_5477.c | 154 - arch/mips/ddb5xxx/ddb5477/kgdb_io.c | 136 - arch/mips/ddb5xxx/ddb5477/lcd44780.c | 96 - arch/mips/ddb5xxx/ddb5477/lcd44780.h | 15 - arch/mips/ddb5xxx/ddb5477/setup.c | 399 - arch/mips/dec/Makefile | 2 + arch/mips/dec/prom/console.c | 32 +- arch/mips/dec/prom/init.c | 5 +- arch/mips/dec/reset.c | 10 +- arch/mips/dec/setup.c | 2 +- arch/mips/defconfig | 380 +- arch/mips/gt64120/common/Makefile | 5 - arch/mips/gt64120/common/time.c | 101 - arch/mips/gt64120/ev64120/Kconfig | 3 - arch/mips/gt64120/ev64120/Makefile | 9 - arch/mips/gt64120/ev64120/irq.c | 116 - arch/mips/gt64120/ev64120/promcon.c | 48 - arch/mips/gt64120/ev64120/reset.c | 45 - arch/mips/gt64120/ev64120/serialGT.c | 212 - arch/mips/gt64120/ev64120/setup.c | 99 - arch/mips/gt64120/momenco_ocelot/Makefile | 7 - arch/mips/gt64120/momenco_ocelot/dbg_io.c | 121 - arch/mips/gt64120/momenco_ocelot/irq.c | 95 - arch/mips/gt64120/momenco_ocelot/ocelot_pld.h | 30 - arch/mips/gt64120/momenco_ocelot/prom.c | 71 - arch/mips/gt64120/momenco_ocelot/reset.c | 47 - arch/mips/gt64120/momenco_ocelot/setup.c | 365 - arch/mips/gt64120/wrppmc/Makefile | 2 + arch/mips/gt64120/wrppmc/setup.c | 5 +- arch/mips/jazz/Makefile | 4 +- arch/mips/jazz/io.c | 135 - arch/mips/jazz/reset.c | 13 - arch/mips/jazz/setup.c | 4 - arch/mips/jmr3927/common/Makefile | 2 + arch/mips/jmr3927/rbhma3100/Makefile | 2 + arch/mips/jmr3927/rbhma3100/irq.c | 48 +- arch/mips/jmr3927/rbhma3100/setup.c | 15 +- arch/mips/kernel/Makefile | 22 +- arch/mips/kernel/asm-offsets.c | 5 +- arch/mips/kernel/branch.c | 5 +- arch/mips/kernel/cpu-bugs64.c | 4 +- arch/mips/kernel/cpu-probe.c | 65 +- arch/mips/kernel/entry.S | 2 + arch/mips/kernel/gdb-stub.c | 4 +- arch/mips/kernel/genex.S | 2 + arch/mips/kernel/head.S | 11 +- arch/mips/kernel/i8253.c | 28 - arch/mips/kernel/i8259.c | 6 +- arch/mips/kernel/irixsig.c | 2 +- arch/mips/kernel/irq-msc01.c | 10 +- arch/mips/kernel/irq-mv6434x.c | 111 - arch/mips/kernel/irq.c | 10 +- arch/mips/kernel/kspd.c | 19 +- arch/mips/kernel/linux32.c | 9 +- arch/mips/kernel/machine_kexec.c | 18 +- arch/mips/kernel/mips-mt.c | 212 +- arch/mips/kernel/proc.c | 2 +- arch/mips/kernel/process.c | 20 +- arch/mips/kernel/ptrace.c | 32 +- arch/mips/kernel/r4k_switch.S | 7 +- arch/mips/kernel/relocate_kernel.S | 78 +- arch/mips/kernel/rtlx.c | 30 +- arch/mips/kernel/scall32-o32.S | 1 + arch/mips/kernel/scall64-64.S | 1 + arch/mips/kernel/scall64-n32.S | 3 +- arch/mips/kernel/scall64-o32.S | 1 + arch/mips/kernel/setup.c | 16 + arch/mips/kernel/signal32.c | 1 - arch/mips/kernel/smp-mt.c | 6 +- arch/mips/kernel/smp.c | 69 +- arch/mips/kernel/smtc.c | 45 +- arch/mips/kernel/syscall.c | 28 +- arch/mips/kernel/time.c | 1 + arch/mips/kernel/traps.c | 119 +- arch/mips/kernel/unaligned.c | 94 +- arch/mips/kernel/vmlinux.lds.S | 14 +- arch/mips/kernel/vpe.c | 360 +- arch/mips/lasat/Kconfig | 15 - arch/mips/lasat/Makefile | 14 - arch/mips/lasat/at93c.c | 148 - arch/mips/lasat/at93c.h | 18 - arch/mips/lasat/ds1603.c | 183 - arch/mips/lasat/ds1603.h | 33 - arch/mips/lasat/image/Makefile | 53 - arch/mips/lasat/image/head.S | 31 - arch/mips/lasat/image/romscript.normal | 23 - arch/mips/lasat/interrupt.c | 130 - arch/mips/lasat/lasat_board.c | 279 - arch/mips/lasat/lasat_models.h | 63 - arch/mips/lasat/picvue.c | 240 - arch/mips/lasat/picvue.h | 48 - arch/mips/lasat/picvue_proc.c | 186 - arch/mips/lasat/prom.c | 117 - arch/mips/lasat/prom.h | 5 - arch/mips/lasat/reset.c | 69 - arch/mips/lasat/setup.c | 182 - arch/mips/lasat/sysctl.c | 441 - arch/mips/lasat/sysctl.h | 24 - arch/mips/lib-32/Makefile | 23 - arch/mips/lib-32/dump_tlb.c | 242 - arch/mips/lib-32/r3k_dump_tlb.c | 182 - arch/mips/lib-32/watch.S | 60 - arch/mips/lib-64/Makefile | 23 - arch/mips/lib-64/dump_tlb.c | 216 - arch/mips/lib-64/watch.S | 57 - arch/mips/lib/Makefile | 21 +- arch/mips/lib/uncached.c | 1 + arch/mips/math-emu/Makefile | 2 + arch/mips/math-emu/cp1emu.c | 53 +- arch/mips/math-emu/dsemul.c | 12 +- arch/mips/mips-boards/atlas/Makefile | 2 + arch/mips/mips-boards/atlas/atlas_int.c | 1 + arch/mips/mips-boards/atlas/atlas_setup.c | 1 + arch/mips/mips-boards/generic/Makefile | 2 + arch/mips/mips-boards/generic/init.c | 1 + arch/mips/mips-boards/generic/time.c | 4 +- arch/mips/mips-boards/malta/Makefile | 5 +- arch/mips/mips-boards/malta/malta_int.c | 14 +- arch/mips/mips-boards/malta/malta_smtc.c | 18 +- arch/mips/mips-boards/sead/Makefile | 2 + arch/mips/mips-boards/sead/sead_setup.c | 1 + arch/mips/mips-boards/sim/Makefile | 24 - arch/mips/mips-boards/sim/sim_cmdline.c | 35 - arch/mips/mips-boards/sim/sim_console.c | 40 - arch/mips/mips-boards/sim/sim_int.c | 88 - arch/mips/mips-boards/sim/sim_mem.c | 115 - arch/mips/mips-boards/sim/sim_platform.c | 35 - arch/mips/mips-boards/sim/sim_setup.c | 98 - arch/mips/mips-boards/sim/sim_smp.c | 115 - arch/mips/mips-boards/sim/sim_time.c | 202 - arch/mips/mm/Makefile | 3 + arch/mips/mm/c-r4k.c | 58 +- arch/mips/mm/c-sb1.c | 4 +- arch/mips/mm/cache.c | 10 + arch/mips/mm/dma-default.c | 2 +- arch/mips/mm/fault.c | 23 +- arch/mips/mm/init.c | 16 +- arch/mips/mm/pg-r4k.c | 2 +- arch/mips/mm/tlb-r4k.c | 23 +- arch/mips/mm/tlbex.c | 38 +- arch/mips/momentum/ocelot_3/Makefile | 8 - arch/mips/momentum/ocelot_3/irq.c | 109 - arch/mips/momentum/ocelot_3/ocelot_3_fpga.h | 59 - arch/mips/momentum/ocelot_3/platform.c | 208 - arch/mips/momentum/ocelot_3/prom.c | 189 - arch/mips/momentum/ocelot_3/reset.c | 59 - arch/mips/momentum/ocelot_3/setup.c | 398 - arch/mips/momentum/ocelot_c/Makefile | 8 - arch/mips/momentum/ocelot_c/cpci-irq.c | 100 - arch/mips/momentum/ocelot_c/dbg_io.c | 121 - arch/mips/momentum/ocelot_c/irq.c | 107 - arch/mips/momentum/ocelot_c/ocelot_c_fpga.h | 61 - arch/mips/momentum/ocelot_c/platform.c | 183 - arch/mips/momentum/ocelot_c/prom.c | 183 - arch/mips/momentum/ocelot_c/reset.c | 58 - arch/mips/momentum/ocelot_c/setup.c | 362 - arch/mips/momentum/ocelot_c/uart-irq.c | 91 - arch/mips/oprofile/op_model_rm9000.c | 1 + arch/mips/pci/Makefile | 14 +- arch/mips/pci/fixup-atlas.c | 2 +- arch/mips/pci/fixup-au1000.c | 2 +- arch/mips/pci/fixup-capcella.c | 2 +- arch/mips/pci/fixup-cobalt.c | 12 +- arch/mips/pci/fixup-ddb5477.c | 78 - arch/mips/pci/fixup-emma2rh.c | 2 +- arch/mips/pci/fixup-excite.c | 2 +- arch/mips/pci/fixup-ip32.c | 2 +- arch/mips/pci/fixup-jmr3927.c | 2 +- arch/mips/pci/fixup-malta.c | 2 +- arch/mips/pci/fixup-mpc30x.c | 2 +- arch/mips/pci/fixup-ocelot-c.c | 41 - arch/mips/pci/fixup-ocelot.c | 75 - arch/mips/pci/fixup-ocelot3.c | 41 - arch/mips/pci/fixup-pnx8550.c | 2 +- arch/mips/pci/fixup-rbtx4927.c | 4 +- arch/mips/pci/fixup-sni.c | 2 +- arch/mips/pci/fixup-tb0219.c | 2 +- arch/mips/pci/fixup-tb0226.c | 2 +- arch/mips/pci/fixup-tb0287.c | 2 +- arch/mips/pci/fixup-tx4938.c | 4 +- arch/mips/pci/fixup-vr4133.c | 2 +- arch/mips/pci/fixup-wrppmc.c | 2 +- arch/mips/pci/fixup-yosemite.c | 2 +- arch/mips/pci/ops-bonito64.c | 88 +- arch/mips/pci/ops-ddb5477.c | 278 - arch/mips/pci/ops-emma2rh.c | 2 +- arch/mips/pci/ops-mace.c | 21 +- arch/mips/pci/ops-marvell.c | 93 - arch/mips/pci/ops-nile4.c | 147 - arch/mips/pci/ops-pnx8550.c | 12 +- arch/mips/pci/ops-tx4938.c | 80 +- arch/mips/pci/pci-bcm1480.c | 3 +- arch/mips/pci/pci-dac.c | 79 - arch/mips/pci/pci-ddb5477.c | 207 - arch/mips/pci/pci-ev64120.c | 22 - arch/mips/pci/pci-ip27.c | 2 +- arch/mips/pci/pci-lasat.c | 91 - arch/mips/pci/pci-ocelot-c.c | 145 - arch/mips/pci/pci-ocelot.c | 107 - arch/mips/pci/pci-sb1250.c | 2 +- arch/mips/pci/pci.c | 12 +- arch/mips/philips/pnx8550/common/Kconfig | 1 - arch/mips/philips/pnx8550/common/Makefile | 2 + arch/mips/philips/pnx8550/common/platform.c | 2 +- arch/mips/philips/pnx8550/common/proc.c | 30 +- arch/mips/pmc-sierra/Kconfig | 46 + arch/mips/pmc-sierra/msp71xx/msp_serial.c | 1 + arch/mips/pmc-sierra/yosemite/Makefile | 4 +- arch/mips/pmc-sierra/yosemite/i2c-yosemite.c | 188 - arch/mips/pmc-sierra/yosemite/irq.c | 4 + arch/mips/pmc-sierra/yosemite/prom.c | 4 +- arch/mips/pmc-sierra/yosemite/setup.c | 5 +- arch/mips/pmc-sierra/yosemite/smp.c | 25 +- arch/mips/qemu/Makefile | 2 + arch/mips/qemu/q-smp.c | 6 +- arch/mips/sgi-ip22/ip22-mc.c | 2 +- arch/mips/sgi-ip22/ip22-platform.c | 4 +- arch/mips/sgi-ip22/ip22-reset.c | 6 +- arch/mips/sgi-ip22/ip22-setup.c | 1 + arch/mips/sgi-ip22/ip22-time.c | 4 +- arch/mips/sgi-ip27/Makefile | 2 + arch/mips/sgi-ip27/ip27-berr.c | 1 - arch/mips/sgi-ip27/ip27-irq.c | 8 +- arch/mips/sgi-ip27/ip27-klnuma.c | 16 +- arch/mips/sgi-ip27/ip27-smp.c | 6 +- arch/mips/sgi-ip32/Makefile | 2 + arch/mips/sgi-ip32/ip32-platform.c | 52 + arch/mips/sgi-ip32/ip32-reset.c | 3 +- arch/mips/sgi-ip32/ip32-setup.c | 36 - arch/mips/sibyte/Kconfig | 1 - arch/mips/sibyte/bcm1480/Makefile | 2 + arch/mips/sibyte/bcm1480/irq.c | 12 +- arch/mips/sibyte/bcm1480/setup.c | 4 + arch/mips/sibyte/cfe/console.c | 2 +- arch/mips/sibyte/cfe/setup.c | 6 +- arch/mips/sibyte/cfe/smp.c | 6 +- arch/mips/sibyte/common/Makefile | 1 + arch/mips/sibyte/sb1250/Makefile | 2 + arch/mips/sibyte/sb1250/irq.c | 4 +- arch/mips/sibyte/sb1250/setup.c | 1 + arch/mips/sibyte/swarm/time.c | 244 - arch/mips/sni/Makefile | 4 +- arch/mips/sni/a20r.c | 39 +- arch/mips/sni/ds1216.c | 81 - arch/mips/sni/pcimt.c | 26 +- arch/mips/sni/pcimt_scache.c | 37 - arch/mips/sni/pcit.c | 26 +- arch/mips/sni/reset.c | 4 - arch/mips/sni/rm200.c | 36 +- arch/mips/sni/setup.c | 2 - arch/mips/sni/sniprom.c | 10 +- arch/mips/tx4927/common/Makefile | 2 + arch/mips/tx4927/common/tx4927_irq.c | 396 +- arch/mips/tx4927/toshiba_rbtx4927/Makefile | 2 + .../tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 171 +- .../toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 90 +- arch/mips/tx4938/common/Makefile | 3 +- arch/mips/tx4938/common/irq.c | 279 +- arch/mips/tx4938/common/rtc_rx5c348.c | 192 - arch/mips/tx4938/toshiba_rbtx4938/Makefile | 4 +- arch/mips/tx4938/toshiba_rbtx4938/irq.c | 8 +- arch/mips/tx4938/toshiba_rbtx4938/setup.c | 319 +- arch/mips/tx4938/toshiba_rbtx4938/spi_eeprom.c | 261 +- arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c | 164 - arch/mips/vr41xx/common/Makefile | 4 +- arch/parisc/hpux/fs.c | 1 + arch/parisc/kernel/init_task.c | 1 + arch/parisc/kernel/process.c | 1 + arch/parisc/kernel/ptrace.c | 13 +- arch/parisc/kernel/smp.c | 1 + arch/parisc/kernel/sys_parisc32.c | 141 - arch/parisc/kernel/syscall_table.S | 4 +- arch/parisc/kernel/traps.c | 3 +- arch/parisc/kernel/unwind.c | 2 +- arch/parisc/kernel/vmlinux.lds.S | 9 +- arch/parisc/mm/fault.c | 23 +- arch/powerpc/Kconfig | 290 +- arch/powerpc/Kconfig.debug | 4 +- arch/powerpc/Makefile | 10 +- arch/powerpc/boot/44x.c | 45 + arch/powerpc/boot/44x.h | 3 + arch/powerpc/boot/Makefile | 81 +- arch/powerpc/boot/cuboot-83xx.c | 13 +- arch/powerpc/boot/cuboot-85xx.c | 13 +- arch/powerpc/boot/cuboot-ebony.c | 16 +- arch/powerpc/boot/dcr.h | 37 + arch/powerpc/boot/dts/ebony.dts | 12 +- arch/powerpc/boot/dts/holly.dts | 52 +- arch/powerpc/boot/dts/kuroboxHD.dts | 18 +- arch/powerpc/boot/dts/kuroboxHG.dts | 19 +- arch/powerpc/boot/dts/mpc7448hpc2.dts | 31 +- arch/powerpc/boot/dts/mpc8272ads.dts | 42 +- arch/powerpc/boot/dts/mpc8313erdb.dts | 2 +- arch/powerpc/boot/dts/mpc832x_mds.dts | 18 +- arch/powerpc/boot/dts/mpc832x_rdb.dts | 18 +- arch/powerpc/boot/dts/mpc8349emitx.dts | 15 +- arch/powerpc/boot/dts/mpc8349emitxgp.dts | 2 +- arch/powerpc/boot/dts/mpc834x_mds.dts | 14 +- arch/powerpc/boot/dts/mpc836x_mds.dts | 18 +- arch/powerpc/boot/dts/mpc8540ads.dts | 149 +- arch/powerpc/boot/dts/mpc8541cds.dts | 94 +- arch/powerpc/boot/dts/mpc8544ds.dts | 227 +- arch/powerpc/boot/dts/mpc8548cds.dts | 296 +- arch/powerpc/boot/dts/mpc8555cds.dts | 94 +- arch/powerpc/boot/dts/mpc8560ads.dts | 150 +- arch/powerpc/boot/dts/mpc8568mds.dts | 126 +- arch/powerpc/boot/dts/mpc8641_hpcn.dts | 273 +- arch/powerpc/boot/dts/mpc866ads.dts | 31 +- arch/powerpc/boot/dts/mpc885ads.dts | 54 +- arch/powerpc/boot/dts/prpmc2800.dts | 8 +- arch/powerpc/boot/ebony.c | 19 +- arch/powerpc/boot/flatdevtree.c | 18 - arch/powerpc/boot/main.c | 2 - arch/powerpc/boot/of.c | 212 +- arch/powerpc/boot/ops.h | 4 +- arch/powerpc/boot/serial.c | 2 +- arch/powerpc/boot/stdio.c | 10 +- arch/powerpc/boot/types.h | 4 + arch/powerpc/boot/wrapper | 55 + arch/powerpc/configs/cell_defconfig | 223 +- arch/powerpc/configs/celleb_defconfig | 196 +- arch/powerpc/configs/chrp32_defconfig | 220 +- arch/powerpc/configs/ebony_defconfig | 190 +- arch/powerpc/configs/g5_defconfig | 208 +- arch/powerpc/configs/holly_defconfig | 209 +- arch/powerpc/configs/iseries_defconfig | 210 +- arch/powerpc/configs/linkstation_defconfig | 219 +- arch/powerpc/configs/lite5200_defconfig | 193 +- arch/powerpc/configs/maple_defconfig | 189 +- arch/powerpc/configs/mpc7448_hpc2_defconfig | 202 +- arch/powerpc/configs/mpc8272_ads_defconfig | 193 +- arch/powerpc/configs/mpc8313_rdb_defconfig | 224 +- arch/powerpc/configs/mpc832x_mds_defconfig | 209 +- arch/powerpc/configs/mpc832x_rdb_defconfig | 211 +- arch/powerpc/configs/mpc834x_itx_defconfig | 206 +- arch/powerpc/configs/mpc834x_itxgp_defconfig | 203 +- arch/powerpc/configs/mpc834x_mds_defconfig | 205 +- arch/powerpc/configs/mpc836x_mds_defconfig | 209 +- arch/powerpc/configs/mpc8540_ads_defconfig | 183 +- arch/powerpc/configs/mpc8544_ds_defconfig | 738 +- arch/powerpc/configs/mpc8560_ads_defconfig | 196 +- arch/powerpc/configs/mpc8568mds_defconfig | 329 +- arch/powerpc/configs/mpc85xx_cds_defconfig | 198 +- arch/powerpc/configs/mpc8641_hpcn_defconfig | 880 +- arch/powerpc/configs/mpc866_ads_defconfig | 174 +- arch/powerpc/configs/mpc885_ads_defconfig | 174 +- arch/powerpc/configs/pasemi_defconfig | 225 +- arch/powerpc/configs/pmac32_defconfig | 239 +- arch/powerpc/configs/ppc64_defconfig | 220 +- arch/powerpc/configs/prpmc2800_defconfig | 213 +- arch/powerpc/configs/ps3_defconfig | 252 +- arch/powerpc/configs/pseries_defconfig | 205 +- arch/powerpc/kernel/Makefile | 14 +- arch/powerpc/kernel/cputable.c | 35 +- arch/powerpc/kernel/crash.c | 67 + arch/powerpc/kernel/entry_64.S | 4 +- arch/powerpc/kernel/head_32.S | 122 +- arch/powerpc/kernel/head_64.S | 27 +- arch/powerpc/kernel/ibmebus.c | 30 +- arch/powerpc/kernel/io.c | 12 +- arch/powerpc/kernel/iomap.c | 8 +- arch/powerpc/kernel/irq.c | 68 +- arch/powerpc/kernel/kprobes.c | 11 +- arch/powerpc/kernel/legacy_serial.c | 2 +- arch/powerpc/kernel/lparcfg.c | 3 +- arch/powerpc/kernel/misc_32.S | 22 +- arch/powerpc/kernel/misc_64.S | 26 +- arch/powerpc/kernel/of_device.c | 122 +- arch/powerpc/kernel/of_platform.c | 93 +- arch/powerpc/kernel/pci_32.c | 560 +- arch/powerpc/kernel/pci_64.c | 753 +- arch/powerpc/kernel/ppc_ksyms.c | 5 - arch/powerpc/kernel/process.c | 31 +- arch/powerpc/kernel/prom.c | 281 +- arch/powerpc/kernel/prom_init.c | 4 +- arch/powerpc/kernel/ptrace-common.h | 161 - arch/powerpc/kernel/ptrace.c | 343 +- arch/powerpc/kernel/ptrace32.c | 239 +- arch/powerpc/kernel/rtas_flash.c | 2 +- arch/powerpc/kernel/rtas_pci.c | 7 +- arch/powerpc/kernel/setup-common.c | 25 + arch/powerpc/kernel/setup_32.c | 12 +- arch/powerpc/kernel/signal_32.c | 191 +- arch/powerpc/kernel/signal_64.c | 182 +- arch/powerpc/kernel/smp.c | 16 +- arch/powerpc/kernel/sys_ppc32.c | 7 + arch/powerpc/kernel/syscalls.c | 1 + arch/powerpc/kernel/sysfs.c | 5 +- arch/powerpc/kernel/time.c | 72 +- arch/powerpc/kernel/traps.c | 7 +- arch/powerpc/kernel/udbg.c | 2 +- arch/powerpc/kernel/vdso.c | 14 +- arch/powerpc/kernel/vmlinux.lds.S | 13 +- arch/powerpc/lib/rheap.c | 1 + arch/powerpc/mm/44x_mmu.c | 1 - arch/powerpc/mm/4xx_mmu.c | 1 - arch/powerpc/mm/Makefile | 3 +- arch/powerpc/mm/fault.c | 36 +- arch/powerpc/mm/fsl_booke_mmu.c | 1 - arch/powerpc/mm/hash_low_64.S | 6 +- arch/powerpc/mm/hash_native_64.c | 27 +- arch/powerpc/mm/hash_utils_64.c | 10 +- arch/powerpc/mm/hugetlbpage.c | 2 +- arch/powerpc/mm/imalloc.c | 313 - arch/powerpc/mm/init_32.c | 1 - arch/powerpc/mm/init_64.c | 4 +- arch/powerpc/mm/lmb.c | 4 +- arch/powerpc/mm/mem.c | 3 - arch/powerpc/mm/mmu_context_32.c | 1 - arch/powerpc/mm/mmu_decl.h | 17 +- arch/powerpc/mm/numa.c | 4 +- arch/powerpc/mm/pgtable_32.c | 123 - arch/powerpc/mm/pgtable_64.c | 206 +- arch/powerpc/mm/ppc_mmu_32.c | 7 +- arch/powerpc/mm/slb.c | 39 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/mm/tlb_32.c | 3 +- arch/powerpc/mm/tlb_64.c | 57 +- arch/powerpc/oprofile/Kconfig | 7 + arch/powerpc/oprofile/Makefile | 4 +- arch/powerpc/oprofile/common.c | 51 +- arch/powerpc/oprofile/op_model_7450.c | 14 +- arch/powerpc/oprofile/op_model_cell.c | 607 +- arch/powerpc/oprofile/op_model_fsl_booke.c | 11 +- arch/powerpc/oprofile/op_model_pa6t.c | 12 +- arch/powerpc/oprofile/op_model_power4.c | 25 +- arch/powerpc/oprofile/op_model_rs64.c | 10 +- arch/powerpc/platforms/52xx/efika.c | 13 +- arch/powerpc/platforms/52xx/lite5200.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 18 +- arch/powerpc/platforms/52xx/mpc52xx_pm.c | 8 +- arch/powerpc/platforms/82xx/Kconfig | 2 +- arch/powerpc/platforms/82xx/mpc82xx_ads.c | 20 +- arch/powerpc/platforms/83xx/Kconfig | 2 +- arch/powerpc/platforms/83xx/Makefile | 2 +- arch/powerpc/platforms/83xx/mpc8313_rdb.c | 8 +- arch/powerpc/platforms/83xx/mpc832x_mds.c | 7 +- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 7 +- arch/powerpc/platforms/83xx/mpc834x_itx.c | 9 +- arch/powerpc/platforms/83xx/mpc834x_mds.c | 56 +- arch/powerpc/platforms/83xx/mpc836x_mds.c | 7 +- arch/powerpc/platforms/83xx/mpc83xx.h | 34 +- arch/powerpc/platforms/83xx/pci.c | 22 +- arch/powerpc/platforms/85xx/Kconfig | 7 +- arch/powerpc/platforms/85xx/Makefile | 2 +- arch/powerpc/platforms/85xx/misc.c | 32 + arch/powerpc/platforms/85xx/mpc8544_ds.c | 74 +- arch/powerpc/platforms/85xx/mpc85xx.h | 1 - arch/powerpc/platforms/85xx/mpc85xx_ads.c | 33 +- arch/powerpc/platforms/85xx/mpc85xx_cds.c | 217 +- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 35 +- arch/powerpc/platforms/85xx/pci.c | 96 - arch/powerpc/platforms/86xx/Kconfig | 6 +- arch/powerpc/platforms/86xx/Makefile | 1 - arch/powerpc/platforms/86xx/mpc86xx.h | 10 - arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 260 +- arch/powerpc/platforms/86xx/pci.c | 205 - arch/powerpc/platforms/8xx/m8xx_setup.c | 5 + arch/powerpc/platforms/8xx/mpc885ads_setup.c | 188 +- arch/powerpc/platforms/Kconfig | 48 +- arch/powerpc/platforms/Makefile | 3 + arch/powerpc/platforms/apus/Kconfig | 130 - arch/powerpc/platforms/cell/Kconfig | 10 + arch/powerpc/platforms/cell/Makefile | 6 +- arch/powerpc/platforms/cell/cbe_cpufreq.c | 217 +- arch/powerpc/platforms/cell/cbe_regs.c | 7 + arch/powerpc/platforms/cell/cbe_regs.h | 8 +- arch/powerpc/platforms/cell/cbe_thermal.c | 31 +- arch/powerpc/platforms/cell/io-workarounds.c | 2 +- arch/powerpc/platforms/cell/pervasive.c | 26 + arch/powerpc/platforms/cell/spu_base.c | 230 +- arch/powerpc/platforms/cell/spu_manage.c | 175 +- arch/powerpc/platforms/cell/spu_syscalls.c | 18 +- arch/powerpc/platforms/cell/spufs/backing_ops.c | 9 +- arch/powerpc/platforms/cell/spufs/context.c | 54 +- arch/powerpc/platforms/cell/spufs/coredump.c | 2 +- arch/powerpc/platforms/cell/spufs/fault.c | 51 +- arch/powerpc/platforms/cell/spufs/file.c | 233 +- arch/powerpc/platforms/cell/spufs/gang.c | 6 + arch/powerpc/platforms/cell/spufs/inode.c | 144 +- arch/powerpc/platforms/cell/spufs/run.c | 91 +- arch/powerpc/platforms/cell/spufs/sched.c | 740 +- arch/powerpc/platforms/cell/spufs/spu_restore.c | 8 +- .../cell/spufs/spu_restore_dump.h_shipped | 480 +- arch/powerpc/platforms/cell/spufs/spu_save.c | 2 +- arch/powerpc/platforms/cell/spufs/spufs.h | 108 +- arch/powerpc/platforms/cell/spufs/switch.c | 90 +- arch/powerpc/platforms/cell/spufs/syscalls.c | 34 +- arch/powerpc/platforms/chrp/Kconfig | 1 + arch/powerpc/platforms/chrp/Makefile | 3 +- arch/powerpc/platforms/chrp/pci.c | 14 +- arch/powerpc/platforms/embedded6xx/Kconfig | 4 +- arch/powerpc/platforms/embedded6xx/holly.c | 2 +- arch/powerpc/platforms/embedded6xx/linkstation.c | 12 +- arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 9 +- arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h | 5 - arch/powerpc/platforms/iseries/call_hpt.h | 9 +- arch/powerpc/platforms/iseries/htab.c | 8 +- arch/powerpc/platforms/iseries/lpevents.c | 2 +- arch/powerpc/platforms/iseries/pci.c | 7 +- arch/powerpc/platforms/iseries/setup.c | 6 +- arch/powerpc/platforms/maple/pci.c | 44 +- arch/powerpc/platforms/pasemi/Kconfig | 9 + arch/powerpc/platforms/pasemi/Makefile | 1 + arch/powerpc/platforms/pasemi/iommu.c | 6 +- arch/powerpc/platforms/pasemi/pci.c | 24 +- arch/powerpc/platforms/pasemi/setup.c | 2 +- arch/powerpc/platforms/powermac/Kconfig | 1 + arch/powerpc/platforms/powermac/feature.c | 6 +- arch/powerpc/platforms/powermac/low_i2c.c | 23 +- arch/powerpc/platforms/powermac/pci.c | 46 +- arch/powerpc/platforms/ps3/Kconfig | 72 +- arch/powerpc/platforms/ps3/Makefile | 1 + arch/powerpc/platforms/ps3/htab.c | 31 +- arch/powerpc/platforms/ps3/interrupt.c | 272 +- arch/powerpc/platforms/ps3/mm.c | 632 +- arch/powerpc/platforms/ps3/os-area.c | 4 +- arch/powerpc/platforms/ps3/platform.h | 44 +- arch/powerpc/platforms/ps3/repository.c | 603 +- arch/powerpc/platforms/ps3/setup.c | 108 +- arch/powerpc/platforms/ps3/smp.c | 18 +- arch/powerpc/platforms/ps3/spu.c | 27 +- arch/powerpc/platforms/ps3/system-bus.c | 562 +- arch/powerpc/platforms/ps3/time.c | 2 +- arch/powerpc/platforms/pseries/Makefile | 2 +- arch/powerpc/platforms/pseries/eeh.c | 19 +- arch/powerpc/platforms/pseries/eeh_cache.c | 5 +- arch/powerpc/platforms/pseries/eeh_driver.c | 6 +- arch/powerpc/platforms/pseries/firmware.c | 19 +- arch/powerpc/platforms/pseries/lpar.c | 17 +- arch/powerpc/platforms/pseries/pci_dlpar.c | 9 +- arch/powerpc/platforms/pseries/plpar_wrappers.h | 15 + arch/powerpc/platforms/pseries/pseries.h | 4 +- arch/powerpc/platforms/pseries/reconfig.c | 2 +- arch/powerpc/platforms/pseries/setup.c | 21 +- arch/powerpc/platforms/pseries/xics.c | 53 +- arch/powerpc/sysdev/Makefile | 8 +- arch/powerpc/sysdev/commproc.c | 2 +- arch/powerpc/sysdev/cpm2_common.c | 2 +- arch/powerpc/sysdev/fsl_pcie.c | 171 - arch/powerpc/sysdev/fsl_pcie.h | 94 - arch/powerpc/sysdev/fsl_soc.c | 84 + arch/powerpc/sysdev/grackle.c | 2 +- arch/powerpc/sysdev/indirect_pci.c | 92 +- arch/powerpc/sysdev/mpc8xx_pic.h | 11 +- arch/powerpc/sysdev/mpic.c | 32 + arch/powerpc/sysdev/mv64x60_dev.c | 92 + arch/powerpc/sysdev/mv64x60_pci.c | 9 +- arch/powerpc/sysdev/pmi.c | 51 +- arch/powerpc/sysdev/qe_lib/ucc.c | 2 + arch/powerpc/sysdev/qe_lib/ucc_fast.c | 8 + arch/powerpc/sysdev/timer.c | 14 +- arch/powerpc/sysdev/tsi108_dev.c | 33 +- arch/powerpc/sysdev/tsi108_pci.c | 10 +- arch/powerpc/xmon/nonstdio.c | 5 + arch/powerpc/xmon/nonstdio.h | 3 +- arch/powerpc/xmon/start.c | 2 +- arch/powerpc/xmon/xmon.c | 4 +- arch/ppc/8260_io/enet.c | 4 +- arch/ppc/8260_io/fcc_enet.c | 4 +- arch/ppc/8xx_io/commproc.c | 2 +- arch/ppc/8xx_io/enet.c | 4 +- arch/ppc/8xx_io/fec.c | 2 +- arch/ppc/Kconfig | 6 +- arch/ppc/Makefile | 8 +- arch/ppc/configs/TQM8540_defconfig | 2 +- arch/ppc/configs/TQM8541_defconfig | 2 +- arch/ppc/configs/TQM8555_defconfig | 2 +- arch/ppc/configs/TQM8560_defconfig | 2 +- arch/ppc/configs/ev64260_defconfig | 1 - arch/ppc/configs/ev64360_defconfig | 2 +- arch/ppc/configs/ml300_defconfig | 2 +- arch/ppc/configs/ml403_defconfig | 2 +- arch/ppc/configs/mpc834x_sys_defconfig | 2 +- arch/ppc/configs/mpc8540_ads_defconfig | 1 - arch/ppc/configs/mpc8548_cds_defconfig | 1 - arch/ppc/configs/mpc8555_cds_defconfig | 1 - arch/ppc/configs/mpc8560_ads_defconfig | 1 - arch/ppc/configs/prep_defconfig | 2 +- arch/ppc/configs/radstone_ppc7d_defconfig | 1 - arch/ppc/configs/stx_gp3_defconfig | 1 - arch/ppc/configs/sycamore_defconfig | 1 - arch/ppc/kernel/head_8xx.S | 2 - arch/ppc/kernel/misc.S | 20 +- arch/ppc/kernel/pci.c | 6 - arch/ppc/kernel/ppc_ksyms.c | 1 - arch/ppc/kernel/setup.c | 2 +- arch/ppc/kernel/traps.c | 3 +- arch/ppc/kernel/vmlinux.lds.S | 5 +- arch/ppc/mm/fault.c | 23 +- arch/ppc/mm/tlb.c | 1 + arch/ppc/platforms/4xx/bamboo.c | 1 + arch/ppc/platforms/4xx/bubinga.c | 1 + arch/ppc/platforms/4xx/cpci405.c | 1 + arch/ppc/platforms/4xx/ebony.c | 1 + arch/ppc/platforms/4xx/luan.c | 1 + arch/ppc/platforms/4xx/ocotea.c | 1 + arch/ppc/platforms/4xx/taishan.c | 1 + arch/ppc/platforms/4xx/yucca.c | 1 + arch/ppc/platforms/85xx/sbc8560.c | 1 + arch/ppc/platforms/chestnut.c | 1 + arch/ppc/platforms/ev64260.c | 1 + arch/ppc/platforms/prep_setup.c | 3 - arch/ppc/platforms/radstone_ppc7d.c | 1 + arch/ppc/platforms/spruce.c | 1 + arch/ppc/syslib/Makefile | 1 + arch/ppc/syslib/mv64x60.c | 45 +- arch/ppc/syslib/virtex_devices.c | 38 +- arch/ppc/syslib/virtex_devices.h | 7 + arch/s390/Kconfig | 4 - arch/s390/Makefile | 2 +- arch/s390/appldata/appldata_base.c | 12 +- arch/s390/crypto/crypt_s390.h | 2 +- arch/s390/defconfig | 110 +- arch/s390/hypfs/inode.c | 45 +- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/compat_wrapper.S | 10 + arch/s390/kernel/dis.c | 9 +- arch/s390/kernel/early.c | 45 +- arch/s390/kernel/entry.S | 13 +- arch/s390/kernel/entry64.S | 13 +- arch/s390/kernel/head.S | 1 + arch/s390/kernel/init_task.c | 1 + arch/s390/kernel/ipl.c | 29 +- arch/s390/kernel/kprobes.c | 2 +- arch/s390/kernel/process.c | 7 +- arch/s390/kernel/ptrace.c | 11 +- arch/s390/kernel/s390_ksyms.c | 1 - arch/s390/kernel/smp.c | 94 +- arch/s390/kernel/stacktrace.c | 26 +- arch/s390/kernel/sys_s390.c | 21 + arch/s390/kernel/syscalls.S | 2 +- arch/s390/kernel/time.c | 4 +- arch/s390/kernel/traps.c | 3 +- arch/s390/kernel/vmlinux.lds.S | 8 +- arch/s390/kernel/vtime.c | 6 +- arch/s390/lib/Makefile | 4 +- arch/s390/lib/uaccess_pt.c | 23 +- arch/s390/mm/cmm.c | 1 + arch/s390/mm/fault.c | 30 +- arch/s390/mm/init.c | 17 - arch/s390/mm/vmem.c | 6 +- arch/sh/Kconfig | 468 +- arch/sh/Kconfig.debug | 5 + arch/sh/Makefile | 120 +- arch/sh/boards/dreamcast/setup.c | 3 +- arch/sh/boards/hp6xx/mach.c | 46 - arch/sh/boards/hp6xx/setup.c | 3 +- arch/sh/boards/landisk/setup.c | 3 +- arch/sh/boards/lboxre2/setup.c | 3 +- arch/sh/boards/mpc1211/pci.c | 2 +- arch/sh/boards/mpc1211/setup.c | 3 +- arch/sh/boards/renesas/edosk7705/setup.c | 3 +- arch/sh/boards/renesas/hs7751rvoip/setup.c | 3 +- arch/sh/boards/renesas/r7780rp/Kconfig | 6 +- arch/sh/boards/renesas/r7780rp/setup.c | 57 +- arch/sh/boards/renesas/rts7751r2d/setup.c | 15 +- arch/sh/boards/renesas/sh7710voipgw/setup.c | 3 +- arch/sh/boards/renesas/systemh/setup.c | 3 +- arch/sh/boards/saturn/Makefile | 8 - arch/sh/boards/saturn/io.c | 26 - arch/sh/boards/saturn/irq.c | 118 - arch/sh/boards/saturn/setup.c | 31 - arch/sh/boards/saturn/smp.c | 68 - arch/sh/boards/se/7206/setup.c | 3 +- arch/sh/boards/se/7300/Makefile | 5 - arch/sh/boards/se/7300/io.c | 268 - arch/sh/boards/se/7300/irq.c | 40 - arch/sh/boards/se/7300/setup.c | 75 - arch/sh/boards/se/73180/Makefile | 5 - arch/sh/boards/se/73180/io.c | 268 - arch/sh/boards/se/73180/irq.c | 136 - arch/sh/boards/se/73180/setup.c | 76 - arch/sh/boards/se/7343/setup.c | 3 +- arch/sh/boards/se/7619/setup.c | 3 +- arch/sh/boards/se/770x/irq.c | 124 +- arch/sh/boards/se/770x/setup.c | 3 +- arch/sh/boards/se/7722/irq.c | 87 +- arch/sh/boards/se/7722/setup.c | 8 +- arch/sh/boards/se/7751/irq.c | 59 +- arch/sh/boards/se/7751/setup.c | 3 +- arch/sh/boards/se/7780/irq.c | 45 +- arch/sh/boards/se/7780/setup.c | 3 +- arch/sh/boards/sh03/setup.c | 31 +- arch/sh/boards/shmin/setup.c | 33 +- arch/sh/boards/snapgear/setup.c | 31 +- arch/sh/boards/superh/microdev/setup.c | 3 +- arch/sh/boards/titan/setup.c | 25 +- arch/sh/boards/unknown/Makefile | 6 - arch/sh/boards/unknown/setup.c | 21 - arch/sh/boot/Makefile | 7 +- arch/sh/boot/compressed/Makefile | 7 +- arch/sh/cchips/Kconfig | 6 +- arch/sh/cchips/hd6446x/hd64461/Makefile | 6 - arch/sh/cchips/hd6446x/hd64461/io.c | 150 - arch/sh/cchips/hd6446x/hd64461/setup.c | 162 - arch/sh/configs/dreamcast_defconfig | 338 +- arch/sh/configs/hs7751rvoip_defconfig | 2 +- arch/sh/configs/landisk_defconfig | 4 +- arch/sh/configs/lboxre2_defconfig | 4 +- arch/sh/configs/r7780rp_defconfig | 2 +- arch/sh/configs/r7785rp_defconfig | 296 +- arch/sh/configs/rts7751r2d_defconfig | 10 +- arch/sh/configs/se7206_defconfig | 272 +- arch/sh/configs/se7300_defconfig | 696 - arch/sh/configs/se73180_defconfig | 648 - arch/sh/configs/se7619_defconfig | 215 +- arch/sh/configs/se7722_defconfig | 291 +- arch/sh/configs/se7750_defconfig | 2 +- arch/sh/configs/se7780_defconfig | 1 + arch/sh/configs/snapgear_defconfig | 587 +- arch/sh/configs/systemh_defconfig | 2 +- arch/sh/configs/titan_defconfig | 2 +- arch/sh/drivers/dma/Kconfig | 20 +- arch/sh/drivers/dma/dma-api.c | 7 +- arch/sh/drivers/heartbeat.c | 2 +- arch/sh/drivers/pci/Kconfig | 1 + arch/sh/drivers/pci/Makefile | 1 + arch/sh/drivers/pci/ops-sh4.c | 2 +- arch/sh/drivers/pci/pci-st40.c | 2 +- arch/sh/drivers/pci/pci.c | 2 +- arch/sh/drivers/push-switch.c | 2 +- arch/sh/kernel/Makefile | 9 +- arch/sh/kernel/cf-enabler.c | 6 +- arch/sh/kernel/cpu/clock.c | 16 + arch/sh/kernel/cpu/init.c | 15 +- arch/sh/kernel/cpu/irq/Makefile | 2 +- arch/sh/kernel/cpu/irq/intc2.c | 63 +- arch/sh/kernel/cpu/irq/ipr.c | 61 +- arch/sh/kernel/cpu/irq/pint.c | 220 - arch/sh/kernel/cpu/sh2/entry.S | 1 + arch/sh/kernel/cpu/sh2/probe.c | 13 +- arch/sh/kernel/cpu/sh2/setup-sh7619.c | 26 +- arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 26 +- arch/sh/kernel/cpu/sh3/Makefile | 4 +- arch/sh/kernel/cpu/sh3/clock-sh7300.c | 78 - arch/sh/kernel/cpu/sh3/entry.S | 22 +- arch/sh/kernel/cpu/sh3/setup-sh7300.c | 43 - arch/sh/kernel/cpu/sh3/setup-sh7705.c | 40 +- arch/sh/kernel/cpu/sh3/setup-sh7709.c | 112 +- arch/sh/kernel/cpu/sh3/setup-sh7710.c | 42 +- arch/sh/kernel/cpu/sh4/Makefile | 4 + arch/sh/kernel/cpu/sh4/probe.c | 14 +- arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 5 + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 249 +- arch/sh/kernel/cpu/sh4/setup-sh7760.c | 41 +- arch/sh/kernel/cpu/sh4/sq.c | 21 +- arch/sh/kernel/cpu/sh4a/Makefile | 4 +- arch/sh/kernel/cpu/sh4a/clock-sh73180.c | 81 - arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 15 + arch/sh/kernel/cpu/sh4a/setup-sh73180.c | 43 - arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 185 +- arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 216 +- arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 18 +- arch/sh/kernel/cpufreq.c | 215 +- arch/sh/kernel/early_printk.c | 2 +- arch/sh/kernel/head.S | 3 +- arch/sh/kernel/init_task.c | 2 +- arch/sh/kernel/irq.c | 17 +- arch/sh/kernel/process.c | 25 +- arch/sh/kernel/ptrace.c | 23 +- arch/sh/kernel/setup.c | 218 +- arch/sh/kernel/sh_bios.c | 3 +- arch/sh/kernel/sh_ksyms.c | 45 + arch/sh/kernel/signal.c | 3 +- arch/sh/kernel/sys_sh.c | 1 + arch/sh/kernel/syscalls.S | 7 +- arch/sh/kernel/timers/timer-tmu.c | 11 +- arch/sh/kernel/traps.c | 13 +- arch/sh/kernel/vmlinux.lds.S | 26 +- arch/sh/kernel/vsyscall/vsyscall.c | 1 + arch/sh/lib/div64-generic.c | 9 +- arch/sh/lib/div64.S | 6 +- arch/sh/math-emu/math.c | 18 +- arch/sh/mm/Kconfig | 113 +- arch/sh/mm/Makefile | 9 +- arch/sh/mm/cache-sh4.c | 14 - arch/sh/mm/fault-nommu.c | 47 +- arch/sh/mm/fault.c | 67 +- arch/sh/mm/init.c | 107 +- arch/sh/mm/pg-dma.c | 95 - arch/sh/mm/pg-sh4.c | 76 +- arch/sh/mm/pmb.c | 2 +- arch/sh/tools/Makefile | 1 + arch/sh/tools/mach-types | 4 +- arch/sh64/Kconfig | 3 + arch/sh64/configs/cayman_defconfig | 158 +- arch/sh64/kernel/head.S | 2 +- arch/sh64/kernel/init_task.c | 2 +- arch/sh64/kernel/irq_intc.c | 1 + arch/sh64/kernel/pci-dma.c | 4 +- arch/sh64/kernel/pci_sh5.c | 4 +- arch/sh64/kernel/process.c | 1 + arch/sh64/kernel/ptrace.c | 17 +- arch/sh64/kernel/setup.c | 4 - arch/sh64/kernel/signal.c | 1 - arch/sh64/kernel/sys_sh64.c | 1 + arch/sh64/kernel/syscalls.S | 1 + arch/sh64/kernel/vmlinux.lds.S | 6 +- arch/sh64/lib/c-checksum.c | 1 + arch/sh64/lib/dbg.c | 1 + arch/sh64/mm/fault.c | 24 +- arch/sh64/mm/ioremap.c | 2 +- arch/sparc/Kconfig | 12 + arch/sparc/defconfig | 188 +- arch/sparc/kernel/ebus.c | 8 + arch/sparc/kernel/entry.S | 7 +- arch/sparc/kernel/init_task.c | 1 + arch/sparc/kernel/irq.c | 111 +- arch/sparc/kernel/of_device.c | 227 +- arch/sparc/kernel/pcic.c | 1 + arch/sparc/kernel/process.c | 8 +- arch/sparc/kernel/prom.c | 320 +- arch/sparc/kernel/setup.c | 65 +- arch/sparc/kernel/smp.c | 12 +- arch/sparc/kernel/sparc_ksyms.c | 6 +- arch/sparc/kernel/sun4c_irq.c | 15 + arch/sparc/kernel/sun4d_irq.c | 6 +- arch/sparc/kernel/sun4d_smp.c | 1 + arch/sparc/kernel/sun4m_irq.c | 74 + arch/sparc/kernel/sun4m_smp.c | 2 + arch/sparc/kernel/systbls.S | 9 +- arch/sparc/kernel/tick14.c | 6 +- arch/sparc/kernel/time.c | 4 +- arch/sparc/kernel/traps.c | 1 + arch/sparc/kernel/vmlinux.lds.S | 7 +- arch/sparc/lib/Makefile | 3 +- arch/sparc/mm/fault.c | 22 +- arch/sparc/mm/init.c | 3 + arch/sparc/mm/io-unit.c | 18 +- arch/sparc/mm/iommu.c | 12 +- arch/sparc/mm/srmmu.c | 6 +- arch/sparc/mm/sun4c.c | 13 +- arch/sparc/prom/console.c | 119 - arch/sparc/prom/misc.c | 4 +- arch/sparc/prom/printf.c | 2 + arch/sparc64/Kconfig | 31 +- arch/sparc64/Kconfig.debug | 2 +- arch/sparc64/defconfig | 213 +- arch/sparc64/kernel/Makefile | 7 +- arch/sparc64/kernel/auxio.c | 2 +- arch/sparc64/kernel/binfmt_aout32.c | 4 +- arch/sparc64/kernel/cpu.c | 36 +- arch/sparc64/kernel/ebus.c | 12 +- arch/sparc64/kernel/head.S | 167 +- arch/sparc64/kernel/init_task.c | 1 + arch/sparc64/kernel/irq.c | 249 +- arch/sparc64/kernel/isa.c | 7 + arch/sparc64/kernel/mdesc.c | 860 +- arch/sparc64/kernel/of_device.c | 243 +- arch/sparc64/kernel/pci.c | 77 +- arch/sparc64/kernel/pci_common.c | 4 +- arch/sparc64/kernel/pci_fire.c | 24 +- arch/sparc64/kernel/pci_iommu.c | 823 - arch/sparc64/kernel/pci_psycho.c | 32 +- arch/sparc64/kernel/pci_sabre.c | 35 +- arch/sparc64/kernel/pci_schizo.c | 42 +- arch/sparc64/kernel/pci_sun4v.c | 190 +- arch/sparc64/kernel/power.c | 72 +- arch/sparc64/kernel/process.c | 28 +- arch/sparc64/kernel/prom.c | 255 +- arch/sparc64/kernel/sbus.c | 568 +- arch/sparc64/kernel/setup.c | 75 +- arch/sparc64/kernel/signal.c | 15 +- arch/sparc64/kernel/smp.c | 283 +- arch/sparc64/kernel/sparc64_ksyms.c | 19 +- arch/sparc64/kernel/sys_sparc32.c | 12 +- arch/sparc64/kernel/sysfs.c | 2 - arch/sparc64/kernel/systbls.S | 11 +- arch/sparc64/kernel/time.c | 238 +- arch/sparc64/kernel/trampoline.S | 47 +- arch/sparc64/kernel/traps.c | 1 + arch/sparc64/kernel/vmlinux.lds.S | 8 +- arch/sparc64/lib/Makefile | 8 +- arch/sparc64/lib/NGcopy_from_user.S | 8 +- arch/sparc64/lib/NGcopy_to_user.S | 8 +- arch/sparc64/lib/NGmemcpy.S | 371 +- arch/sparc64/lib/NGpage.S | 1 + arch/sparc64/lib/delay.c | 46 - arch/sparc64/mm/fault.c | 24 +- arch/sparc64/mm/hugetlbpage.c | 2 +- arch/sparc64/mm/tsb.c | 3 +- arch/sparc64/prom/console.c | 85 - arch/sparc64/prom/misc.c | 33 +- arch/sparc64/prom/p1275.c | 1 + arch/sparc64/prom/tree.c | 21 +- arch/sparc64/solaris/socksys.c | 3 +- arch/um/Kconfig.debug | 9 + arch/um/Makefile | 2 +- arch/um/config.release | 333 - arch/um/defconfig | 4 +- arch/um/drivers/chan_kern.c | 32 +- arch/um/drivers/chan_user.c | 78 +- arch/um/drivers/cow_sys.h | 2 +- arch/um/drivers/daemon_user.c | 4 +- arch/um/drivers/fd.c | 2 +- arch/um/drivers/harddog_user.c | 2 +- arch/um/drivers/line.c | 65 +- arch/um/drivers/mcast_user.c | 2 +- arch/um/drivers/mconsole_kern.c | 4 +- arch/um/drivers/mconsole_user.c | 5 +- arch/um/drivers/mmapper_kern.c | 1 + arch/um/drivers/net_kern.c | 2 +- arch/um/drivers/net_user.c | 4 +- arch/um/drivers/pcap_user.c | 2 +- arch/um/drivers/port_user.c | 4 +- arch/um/drivers/pty.c | 78 +- arch/um/drivers/slip_user.c | 4 +- arch/um/drivers/slirp_user.c | 2 +- arch/um/drivers/ssl.c | 10 +- arch/um/drivers/stdio_console.c | 9 +- arch/um/drivers/tty.c | 2 +- arch/um/drivers/ubd_kern.c | 10 +- arch/um/drivers/ubd_user.c | 6 + arch/um/drivers/xterm.c | 174 +- arch/um/drivers/xterm_kern.c | 49 +- arch/um/include/chan_kern.h | 2 +- arch/um/include/chan_user.h | 5 +- arch/um/include/common-offsets.h | 3 + arch/um/include/kern_util.h | 2 +- arch/um/include/os.h | 6 +- arch/um/include/um_malloc.h | 12 +- arch/um/kernel/dyn.lds.S | 12 +- arch/um/kernel/exec.c | 1 + arch/um/kernel/init_task.c | 1 + arch/um/kernel/irq.c | 8 +- arch/um/kernel/mem.c | 2 +- arch/um/kernel/physmem.c | 15 +- arch/um/kernel/process.c | 16 - arch/um/kernel/ptrace.c | 18 +- arch/um/kernel/skas/process.c | 4 +- arch/um/kernel/syscall.c | 1 + arch/um/kernel/trap.c | 29 +- arch/um/kernel/uml.lds.S | 11 +- arch/um/os-Linux/aio.c | 58 +- arch/um/os-Linux/drivers/ethertap_user.c | 6 +- arch/um/os-Linux/drivers/tuntap_user.c | 2 +- arch/um/os-Linux/file.c | 3 +- arch/um/os-Linux/helper.c | 23 +- arch/um/os-Linux/main.c | 4 +- arch/um/os-Linux/process.c | 2 +- arch/um/os-Linux/sigio.c | 23 +- arch/um/os-Linux/signal.c | 4 +- arch/um/os-Linux/skas/process.c | 2 +- arch/um/os-Linux/sys-x86_64/registers.c | 15 + arch/um/os-Linux/user_syms.c | 5 +- arch/um/sys-i386/Makefile | 2 +- arch/um/sys-x86_64/ptrace.c | 6 - arch/v850/kernel/ptrace.c | 14 +- arch/x86_64/Kconfig | 15 +- arch/x86_64/Makefile | 3 +- arch/x86_64/boot/.gitignore | 2 + arch/x86_64/boot/Makefile | 136 +- arch/x86_64/boot/bootsect.S | 98 - arch/x86_64/boot/compressed/Makefile | 11 +- arch/x86_64/boot/compressed/head.S | 13 +- arch/x86_64/boot/install.sh | 2 - arch/x86_64/boot/mtools.conf.in | 17 - arch/x86_64/boot/setup.S | 826 - arch/x86_64/boot/tools/build.c | 185 - arch/x86_64/defconfig | 291 +- arch/x86_64/ia32/ia32_aout.c | 2 +- arch/x86_64/ia32/ia32_binfmt.c | 64 +- arch/x86_64/ia32/ia32entry.S | 26 +- arch/x86_64/ia32/ptrace32.c | 1 + arch/x86_64/ia32/sys_ia32.c | 8 + arch/x86_64/ia32/syscall32.c | 8 - arch/x86_64/kernel/Makefile | 4 +- arch/x86_64/kernel/acpi/sleep.c | 12 +- arch/x86_64/kernel/acpi/wakeup.S | 79 +- arch/x86_64/kernel/aperture.c | 4 +- arch/x86_64/kernel/apic.c | 75 +- arch/x86_64/kernel/bugs.c | 1 + arch/x86_64/kernel/cpufreq/Kconfig | 6 +- arch/x86_64/kernel/e820.c | 138 +- arch/x86_64/kernel/early-quirks.c | 1 + arch/x86_64/kernel/early_printk.c | 5 + arch/x86_64/kernel/entry.S | 6 +- arch/x86_64/kernel/head.S | 23 +- arch/x86_64/kernel/hpet.c | 8 +- arch/x86_64/kernel/i8259.c | 18 - arch/x86_64/kernel/init_task.c | 2 +- arch/x86_64/kernel/io_apic.c | 73 +- arch/x86_64/kernel/kprobes.c | 10 +- arch/x86_64/kernel/mce.c | 255 +- arch/x86_64/kernel/mce_amd.c | 6 +- arch/x86_64/kernel/mpparse.c | 21 +- arch/x86_64/kernel/nmi.c | 29 +- arch/x86_64/kernel/pci-calgary.c | 569 +- arch/x86_64/kernel/pci-dma.c | 14 +- arch/x86_64/kernel/pci-gart.c | 27 +- arch/x86_64/kernel/pci-nommu.c | 8 +- arch/x86_64/kernel/pci-swiotlb.c | 2 +- arch/x86_64/kernel/process.c | 21 +- arch/x86_64/kernel/ptrace.c | 44 +- arch/x86_64/kernel/reboot.c | 4 + arch/x86_64/kernel/setup.c | 33 +- arch/x86_64/kernel/signal.c | 9 +- arch/x86_64/kernel/smp.c | 16 +- arch/x86_64/kernel/suspend.c | 24 +- arch/x86_64/kernel/sys_x86_64.c | 1 + arch/x86_64/kernel/tce.c | 18 +- arch/x86_64/kernel/time.c | 158 +- arch/x86_64/kernel/traps.c | 21 +- arch/x86_64/kernel/tsc.c | 43 +- arch/x86_64/kernel/verify_cpu.S | 22 +- arch/x86_64/kernel/vmlinux.lds.S | 37 +- arch/x86_64/kernel/vsyscall.c | 22 +- arch/x86_64/lib/memcpy.S | 4 +- arch/x86_64/mm/fault.c | 55 +- arch/x86_64/mm/init.c | 48 +- arch/x86_64/mm/k8topology.c | 13 +- arch/x86_64/mm/numa.c | 15 +- arch/x86_64/mm/pageattr.c | 24 +- arch/x86_64/mm/srat.c | 97 +- arch/x86_64/pci/k8-bus.c | 6 +- arch/x86_64/pci/mmconfig.c | 12 +- arch/xtensa/Makefile | 7 +- arch/xtensa/kernel/Makefile | 2 +- arch/xtensa/kernel/asm-offsets.c | 13 +- arch/xtensa/kernel/entry.S | 115 +- arch/xtensa/kernel/module.c | 195 +- arch/xtensa/kernel/pci.c | 69 - arch/xtensa/kernel/process.c | 15 +- arch/xtensa/kernel/ptrace.c | 17 +- arch/xtensa/kernel/semaphore.c | 2 +- arch/xtensa/kernel/syscall.c | 5 + arch/xtensa/kernel/time.c | 46 +- arch/xtensa/kernel/traps.c | 5 +- arch/xtensa/kernel/vmlinux.lds.S | 8 +- arch/xtensa/mm/Makefile | 6 +- arch/xtensa/mm/fault.c | 29 +- arch/xtensa/mm/init.c | 252 +- arch/xtensa/mm/misc.S | 306 +- arch/xtensa/platform-iss/console.c | 1 - block/Kconfig | 17 +- block/Makefile | 1 + block/as-iosched.c | 29 +- block/blktrace.c | 30 +- block/cfq-iosched.c | 124 +- block/deadline-iosched.c | 21 +- block/elevator.c | 91 +- block/genhd.c | 20 +- block/ll_rw_blk.c | 264 +- block/noop-iosched.c | 14 +- block/scsi_ioctl.c | 185 +- crypto/Kconfig | 16 +- crypto/Makefile | 6 + crypto/ablkcipher.c | 31 +- crypto/algapi.c | 4 +- crypto/api.c | 2 +- crypto/blkcipher.c | 36 +- crypto/cipher.c | 33 +- crypto/hash.c | 38 +- crypto/proc.c | 17 +- drivers/Kconfig | 9 +- drivers/Makefile | 7 + drivers/acorn/README | 1 - drivers/acorn/block/Kconfig | 36 - drivers/acorn/block/Makefile | 9 - drivers/acorn/block/fd1772.c | 1604 -- drivers/acorn/block/fd1772dma.S | 100 - drivers/acorn/block/mfm.S | 162 - drivers/acorn/block/mfmhd.c | 1392 - drivers/acpi/Kconfig | 97 +- drivers/acpi/ac.c | 14 +- drivers/acpi/acpi_memhotplug.c | 8 +- drivers/acpi/asus_acpi.c | 14 +- drivers/acpi/battery.c | 685 +- drivers/acpi/bay.c | 19 +- drivers/acpi/bus.c | 6 +- drivers/acpi/button.c | 14 +- drivers/acpi/container.c | 10 +- drivers/acpi/dock.c | 120 +- drivers/acpi/ec.c | 283 +- drivers/acpi/event.c | 165 +- drivers/acpi/events/evrgnini.c | 3 +- drivers/acpi/fan.c | 8 +- drivers/acpi/glue.c | 2 +- drivers/acpi/hardware/hwsleep.c | 19 +- drivers/acpi/namespace/nsxfeval.c | 4 +- drivers/acpi/numa.c | 31 +- drivers/acpi/osl.c | 42 +- drivers/acpi/pci_link.c | 11 +- drivers/acpi/pci_root.c | 9 +- drivers/acpi/power.c | 8 +- drivers/acpi/processor_core.c | 55 +- drivers/acpi/processor_idle.c | 85 +- drivers/acpi/processor_perflib.c | 6 +- drivers/acpi/processor_throttling.c | 435 +- drivers/acpi/resources/rsxface.c | 2 - drivers/acpi/sbs.c | 50 +- drivers/acpi/scan.c | 157 +- drivers/acpi/sleep/Makefile | 6 +- drivers/acpi/sleep/main.c | 320 +- drivers/acpi/sleep/poweroff.c | 98 - drivers/acpi/sleep/proc.c | 24 +- drivers/acpi/sleep/sleep.h | 2 + drivers/acpi/sleep/wakeup.c | 2 - drivers/acpi/system.c | 165 +- drivers/acpi/tables/tbutils.c | 71 + drivers/acpi/tables/tbxface.c | 23 + drivers/acpi/thermal.c | 234 +- drivers/acpi/utilities/uteval.c | 21 +- drivers/acpi/utilities/utglobal.c | 1 + drivers/acpi/video.c | 244 +- drivers/ata/Kconfig | 10 +- drivers/ata/ahci.c | 413 +- drivers/ata/ata_generic.c | 6 +- drivers/ata/ata_piix.c | 251 +- drivers/ata/libata-acpi.c | 914 +- drivers/ata/libata-core.c | 286 +- drivers/ata/libata-eh.c | 311 +- drivers/ata/libata-scsi.c | 67 +- drivers/ata/libata-sff.c | 299 +- drivers/ata/libata.h | 21 +- drivers/ata/pata_ali.c | 67 +- drivers/ata/pata_amd.c | 44 +- drivers/ata/pata_artop.c | 25 +- drivers/ata/pata_atiixp.c | 4 +- drivers/ata/pata_cmd640.c | 2 +- drivers/ata/pata_cmd64x.c | 20 +- drivers/ata/pata_cs5520.c | 8 +- drivers/ata/pata_cs5530.c | 12 +- drivers/ata/pata_cs5535.c | 4 +- drivers/ata/pata_cypress.c | 2 +- drivers/ata/pata_efar.c | 2 +- drivers/ata/pata_hpt366.c | 4 +- drivers/ata/pata_hpt37x.c | 52 +- drivers/ata/pata_hpt3x2n.c | 12 +- drivers/ata/pata_hpt3x3.c | 95 +- drivers/ata/pata_icside.c | 30 +- drivers/ata/pata_isapnp.c | 4 +- drivers/ata/pata_it8213.c | 4 +- drivers/ata/pata_it821x.c | 15 +- drivers/ata/pata_ixp4xx_cf.c | 79 +- drivers/ata/pata_jmicron.c | 4 +- drivers/ata/pata_marvell.c | 14 +- drivers/ata/pata_mpc52xx.c | 20 +- drivers/ata/pata_netcell.c | 4 +- drivers/ata/pata_ns87410.c | 2 +- drivers/ata/pata_oldpiix.c | 2 +- drivers/ata/pata_opti.c | 2 +- drivers/ata/pata_optidma.c | 4 +- drivers/ata/pata_pcmcia.c | 3 +- drivers/ata/pata_pdc2027x.c | 20 +- drivers/ata/pata_pdc202xx_old.c | 6 +- drivers/ata/pata_platform.c | 11 +- drivers/ata/pata_radisys.c | 2 +- drivers/ata/pata_rz1000.c | 2 +- drivers/ata/pata_sc1200.c | 8 +- drivers/ata/pata_scc.c | 63 +- drivers/ata/pata_serverworks.c | 19 +- drivers/ata/pata_sil680.c | 23 +- drivers/ata/pata_sis.c | 49 +- drivers/ata/pata_sl82c105.c | 11 +- drivers/ata/pata_triflex.c | 2 +- drivers/ata/pata_via.c | 33 +- drivers/ata/pdc_adma.c | 22 +- drivers/ata/sata_inic162x.c | 24 +- drivers/ata/sata_mv.c | 1113 +- drivers/ata/sata_nv.c | 42 +- drivers/ata/sata_promise.c | 146 +- drivers/ata/sata_qstor.c | 22 +- drivers/ata/sata_sil.c | 40 +- drivers/ata/sata_sil24.c | 165 +- drivers/ata/sata_sis.c | 28 +- drivers/ata/sata_svw.c | 28 +- drivers/ata/sata_sx4.c | 170 +- drivers/ata/sata_uli.c | 22 +- drivers/ata/sata_via.c | 43 +- drivers/ata/sata_vsc.c | 17 +- drivers/atm/Kconfig | 15 +- drivers/atm/ambassador.c | 4 +- drivers/atm/eni.c | 28 +- drivers/atm/firestream.c | 14 +- drivers/atm/fore200e.c | 2 +- drivers/atm/idt77252.c | 19 +- drivers/atm/iphase.c | 23 +- drivers/atm/lanai.c | 32 +- drivers/atm/nicstarmac.c | 2 +- drivers/atm/zatm.c | 10 +- drivers/auxdisplay/Kconfig | 13 +- drivers/auxdisplay/cfag12864b.c | 2 +- drivers/base/attribute_container.c | 1 + drivers/base/base.h | 2 +- drivers/base/bus.c | 24 +- drivers/base/class.c | 46 +- drivers/base/core.c | 251 +- drivers/base/dd.c | 21 +- drivers/base/devres.c | 2 + drivers/base/dmapool.c | 2 +- drivers/base/firmware_class.c | 7 +- drivers/base/power/Makefile | 4 +- drivers/base/power/main.c | 44 +- drivers/base/power/power.h | 13 +- drivers/base/power/resume.c | 23 +- drivers/base/power/runtime.c | 85 - drivers/base/power/shutdown.c | 2 - drivers/base/power/suspend.c | 72 +- drivers/base/power/sysfs.c | 66 - drivers/base/power/trace.c | 5 +- drivers/base/sys.c | 24 +- drivers/block/DAC960.c | 18 +- drivers/block/DAC960.h | 7 - drivers/block/Kconfig | 82 +- drivers/block/Makefile | 7 +- drivers/block/acsi.c | 1825 -- drivers/block/acsi_slm.c | 1032 - drivers/block/amiflop.c | 4 +- drivers/block/aoe/aoe.h | 2 +- drivers/block/aoe/aoeblk.c | 6 +- drivers/block/ataflop.c | 2 +- drivers/block/cciss.c | 35 +- drivers/block/cciss_scsi.c | 75 +- drivers/block/cpqarray.c | 84 +- drivers/block/floppy.c | 4 +- drivers/block/loop.c | 79 +- drivers/block/nbd.c | 28 +- drivers/block/paride/pcd.c | 4 +- drivers/block/paride/pd.c | 2 +- drivers/block/paride/pf.c | 4 +- drivers/block/pktcdvd.c | 19 +- drivers/block/ps2esdi.c | 4 +- drivers/block/rd.c | 2 +- drivers/block/swim3.c | 4 +- drivers/block/sx8.c | 23 +- drivers/block/ub.c | 20 +- drivers/block/umem.c | 64 +- drivers/block/viodasd.c | 7 +- drivers/block/xd.c | 2 +- drivers/block/xd.h | 2 +- drivers/block/z2ram.c | 9 +- drivers/bluetooth/hci_usb.c | 93 +- drivers/bluetooth/hci_usb.h | 5 +- drivers/bluetooth/hci_vhci.c | 6 - drivers/cdrom/Kconfig | 213 - drivers/cdrom/Makefile | 10 - drivers/cdrom/aztcd.c | 2492 -- drivers/cdrom/aztcd.h | 162 - drivers/cdrom/cdrom.c | 225 +- drivers/cdrom/cdu31a.c | 3251 --- drivers/cdrom/cdu31a.h | 411 - drivers/cdrom/cm206.c | 1594 -- drivers/cdrom/cm206.h | 171 - drivers/cdrom/gscd.c | 1029 - drivers/cdrom/gscd.h | 108 - drivers/cdrom/isp16.c | 374 - drivers/cdrom/isp16.h | 72 - drivers/cdrom/mcdx.c | 1943 -- drivers/cdrom/mcdx.h | 185 - drivers/cdrom/optcd.c | 2105 -- drivers/cdrom/optcd.h | 52 - drivers/cdrom/sbpcd.c | 5966 ---- drivers/cdrom/sbpcd.h | 839 - drivers/cdrom/sjcd.c | 1815 -- drivers/cdrom/sjcd.h | 181 - drivers/cdrom/sonycd535.c | 1689 -- drivers/cdrom/sonycd535.h | 183 - drivers/cdrom/viocd.c | 2 +- drivers/char/Kconfig | 105 +- drivers/char/Makefile | 11 +- drivers/char/agp/Kconfig | 2 +- drivers/char/agp/agp.h | 3 +- drivers/char/agp/amd-k7-agp.c | 6 +- drivers/char/agp/amd64-agp.c | 6 +- drivers/char/agp/ati-agp.c | 12 +- drivers/char/agp/backend.c | 2 +- drivers/char/agp/compat_ioctl.c | 1 + drivers/char/agp/efficeon-agp.c | 2 + drivers/char/agp/frontend.c | 1 + drivers/char/agp/generic.c | 2 - drivers/char/agp/hp-agp.c | 1 + drivers/char/agp/i460-agp.c | 4 + drivers/char/agp/intel-agp.c | 40 +- drivers/char/agp/nvidia-agp.c | 3 + drivers/char/agp/sgi-agp.c | 1 - drivers/char/agp/via-agp.c | 5 + drivers/char/amiserial.c | 10 +- drivers/char/apm-emulation.c | 12 +- drivers/char/briq_panel.c | 10 - drivers/char/consolemap.c | 78 +- drivers/char/cyclades.c | 371 +- drivers/char/decserial.c | 67 - drivers/char/drm/ati_pcigart.c | 8 +- drivers/char/drm/drm.h | 329 +- drivers/char/drm/drmP.h | 356 +- drivers/char/drm/drm_agpsupport.c | 116 +- drivers/char/drm/drm_auth.c | 40 +- drivers/char/drm/drm_bufs.c | 222 +- drivers/char/drm/drm_context.c | 226 +- drivers/char/drm/drm_dma.c | 12 +- drivers/char/drm/drm_drawable.c | 270 +- drivers/char/drm/drm_drv.c | 87 +- drivers/char/drm/drm_fops.c | 68 +- drivers/char/drm/drm_hashtab.c | 34 +- drivers/char/drm/drm_hashtab.h | 24 +- drivers/char/drm/drm_ioc32.c | 82 +- drivers/char/drm/drm_ioctl.c | 68 +- drivers/char/drm/drm_irq.c | 58 +- drivers/char/drm/drm_lock.c | 28 +- drivers/char/drm/drm_memory.c | 8 +- drivers/char/drm/drm_mm.c | 66 +- drivers/char/drm/drm_os_linux.h | 22 +- drivers/char/drm/drm_pci.c | 6 +- drivers/char/drm/drm_proc.c | 50 +- drivers/char/drm/drm_sarea.h | 26 +- drivers/char/drm/drm_scatter.c | 22 +- drivers/char/drm/drm_sman.c | 93 +- drivers/char/drm/drm_sman.h | 50 +- drivers/char/drm/drm_stub.c | 32 +- drivers/char/drm/drm_sysfs.c | 4 +- drivers/char/drm/drm_vm.c | 106 +- drivers/char/drm/i810_dma.c | 164 +- drivers/char/drm/i810_drm.h | 2 +- drivers/char/drm/i810_drv.h | 18 +- drivers/char/drm/i830_dma.c | 157 +- drivers/char/drm/i830_drm.h | 2 +- drivers/char/drm/i830_drv.h | 24 +- drivers/char/drm/i830_irq.c | 20 +- drivers/char/drm/i915_dma.c | 44 +- drivers/char/drm/i915_drm.h | 8 +- drivers/char/drm/i915_drv.h | 28 +- drivers/char/drm/i915_irq.c | 40 +- drivers/char/drm/i915_mem.c | 6 +- drivers/char/drm/mga_dma.c | 79 +- drivers/char/drm/mga_drm.h | 6 +- drivers/char/drm/mga_drv.c | 4 +- drivers/char/drm/mga_drv.h | 22 +- drivers/char/drm/mga_irq.c | 12 +- drivers/char/drm/mga_state.c | 36 +- drivers/char/drm/r128_cce.c | 41 +- drivers/char/drm/r128_drm.h | 4 +- drivers/char/drm/r128_drv.h | 20 +- drivers/char/drm/r128_irq.c | 10 +- drivers/char/drm/r128_state.c | 60 +- drivers/char/drm/r300_cmdbuf.c | 53 +- drivers/char/drm/r300_reg.h | 1163 +- drivers/char/drm/radeon_cp.c | 54 +- drivers/char/drm/radeon_drm.h | 12 +- drivers/char/drm/radeon_drv.c | 3 +- drivers/char/drm/radeon_drv.h | 45 +- drivers/char/drm/radeon_irq.c | 118 +- drivers/char/drm/radeon_state.c | 108 +- drivers/char/drm/savage_bci.c | 44 +- drivers/char/drm/savage_drm.h | 4 +- drivers/char/drm/savage_drv.h | 20 +- drivers/char/drm/savage_state.c | 28 +- drivers/char/drm/sis_drv.c | 4 +- drivers/char/drm/sis_drv.h | 9 +- drivers/char/drm/sis_mm.c | 18 +- drivers/char/drm/via_dma.c | 10 +- drivers/char/drm/via_dmablit.c | 25 +- drivers/char/drm/via_dmablit.h | 2 +- drivers/char/drm/via_drm.h | 4 +- drivers/char/drm/via_drv.h | 32 +- drivers/char/drm/via_irq.c | 12 +- drivers/char/drm/via_map.c | 10 +- drivers/char/drm/via_mm.c | 6 +- drivers/char/drm/via_verifier.c | 12 +- drivers/char/drm/via_verifier.h | 6 +- drivers/char/esp.c | 13 +- drivers/char/generic_serial.c | 120 +- drivers/char/genrtc.c | 22 +- drivers/char/hpet.c | 90 +- drivers/char/hvc_console.c | 3 +- drivers/char/hvc_iseries.c | 8 +- drivers/char/hvc_rtas.c | 2 +- drivers/char/hvcs.c | 12 +- drivers/char/hw_random/Kconfig | 2 +- drivers/char/hw_random/intel-rng.c | 10 +- drivers/char/ip2/i2ellis.c | 44 +- drivers/char/ip2/ip2main.c | 7 +- drivers/char/ipmi/Kconfig | 15 +- drivers/char/ipmi/ipmi_msghandler.c | 13 +- drivers/char/ipmi/ipmi_poweroff.c | 2 +- drivers/char/ipmi/ipmi_si_intf.c | 8 +- drivers/char/isicom.c | 93 +- drivers/char/istallion.c | 12 +- drivers/char/keyboard.c | 34 +- drivers/char/lcd.c | 1 - drivers/char/mbcs.c | 27 +- drivers/char/mbcs.h | 10 +- drivers/char/mem.c | 9 +- drivers/char/misc.c | 18 +- drivers/char/mmtimer.c | 1 + drivers/char/moxa.c | 37 +- drivers/char/mspec.c | 68 +- drivers/char/mxser.c | 16 +- drivers/char/mxser_new.c | 22 +- drivers/char/n_hdlc.c | 16 +- drivers/char/n_r3964.c | 14 +- drivers/char/n_tty.c | 23 +- drivers/char/nvram.c | 192 +- drivers/char/pcmcia/cm4000_cs.c | 5 +- drivers/char/pcmcia/cm4040_cs.c | 2 +- drivers/char/pcmcia/synclink_cs.c | 3 +- drivers/char/random.c | 10 +- drivers/char/rio/rio_linux.c | 4 +- drivers/char/rio/riocmd.c | 4 +- drivers/char/rio/riotable.c | 3 +- drivers/char/riscom8.c | 12 +- drivers/char/rocket.c | 6 +- drivers/char/rtc.c | 35 +- drivers/char/selection.c | 48 +- drivers/char/serial167.c | 6 - drivers/char/sonypi.c | 56 +- drivers/char/specialix.c | 16 +- drivers/char/stallion.c | 10 +- drivers/char/synclink.c | 11 +- drivers/char/synclink_gt.c | 90 +- drivers/char/synclinkmp.c | 11 +- drivers/char/tpm/Kconfig | 18 +- drivers/char/tpm/tpm.c | 2 +- drivers/char/tpm/tpm.h | 2 +- drivers/char/tpm/tpm_atmel.c | 2 +- drivers/char/tpm/tpm_atmel.h | 2 +- drivers/char/tpm/tpm_bios.c | 24 +- drivers/char/tpm/tpm_nsc.c | 2 +- drivers/char/tpm/tpm_tis.c | 2 + drivers/char/tty_io.c | 127 +- drivers/char/tty_ioctl.c | 46 +- drivers/char/viotape.c | 19 +- drivers/char/vme_scc.c | 8 - drivers/char/vr41xx_giu.c | 132 +- drivers/char/vt.c | 35 +- drivers/char/vt_ioctl.c | 19 +- drivers/char/watchdog/Kconfig | 140 +- drivers/char/watchdog/Makefile | 47 +- drivers/char/watchdog/alim1535_wdt.c | 7 +- drivers/char/watchdog/booke_wdt.c | 2 +- drivers/char/watchdog/cpu5wdt.c | 4 + drivers/char/watchdog/ep93xx_wdt.c | 4 - drivers/char/watchdog/eurotechwdt.c | 13 +- drivers/char/watchdog/iTCO_wdt.c | 38 +- drivers/char/watchdog/machzwd.c | 1 + drivers/char/watchdog/mixcomwd.c | 132 +- drivers/char/watchdog/mpc83xx_wdt.c | 3 + drivers/char/watchdog/mpc8xx_wdt.c | 2 +- drivers/char/watchdog/mpcore_wdt.c | 3 +- drivers/char/watchdog/mtx-1_wdt.c | 1 + drivers/char/watchdog/mv64x60_wdt.c | 218 +- drivers/char/watchdog/omap_wdt.c | 4 +- drivers/char/watchdog/pcwd_usb.c | 3 +- drivers/char/watchdog/pnx4008_wdt.c | 4 - drivers/char/watchdog/s3c2410_wdt.c | 47 +- drivers/char/watchdog/sa1100_wdt.c | 3 +- drivers/char/watchdog/sbc60xxwdt.c | 4 +- drivers/char/watchdog/sc1200wdt.c | 4 +- drivers/char/watchdog/sc520_wdt.c | 4 +- drivers/char/watchdog/w83627hf_wdt.c | 24 +- drivers/clocksource/acpi_pm.c | 7 +- drivers/connector/Kconfig | 7 +- drivers/cpufreq/cpufreq.c | 47 +- drivers/cpufreq/cpufreq_stats.c | 3 +- drivers/cpufreq/cpufreq_userspace.c | 25 +- drivers/cpufreq/freq_table.c | 1 - drivers/crypto/Kconfig | 14 +- drivers/dma/Kconfig | 14 +- drivers/dma/Makefile | 1 + drivers/dma/dmaengine.c | 419 +- drivers/dma/ioatdma.c | 388 +- drivers/dma/ioatdma.h | 19 +- drivers/dma/ioatdma_io.h | 118 - drivers/dma/iovlock.c | 27 - drivers/edac/Kconfig | 65 +- drivers/edac/Makefile | 17 +- drivers/edac/amd76x_edac.c | 75 +- drivers/edac/e752x_edac.c | 322 +- drivers/edac/e7xxx_edac.c | 125 +- drivers/edac/edac_mc.c | 1699 +- drivers/edac/edac_mc.h | 481 - drivers/edac/i82860_edac.c | 56 +- drivers/edac/i82875p_edac.c | 92 +- drivers/edac/r82600_edac.c | 77 +- drivers/firewire/Kconfig | 3 +- drivers/firewire/fw-card.c | 13 +- drivers/firewire/fw-cdev.c | 2 +- drivers/firewire/fw-device.c | 38 +- drivers/firewire/fw-device.h | 1 + drivers/firewire/fw-ohci.c | 31 +- drivers/firewire/fw-sbp2.c | 186 +- drivers/firewire/fw-topology.c | 66 +- drivers/firewire/fw-topology.h | 25 +- drivers/firewire/fw-transaction.c | 9 +- drivers/firewire/fw-transaction.h | 3 +- drivers/firmware/Kconfig | 9 + drivers/firmware/Makefile | 1 + drivers/firmware/dcdbas.c | 10 +- drivers/firmware/dcdbas.h | 3 +- drivers/firmware/dell_rbu.c | 31 +- drivers/firmware/dmi_scan.c | 73 +- drivers/firmware/edd.c | 9 +- drivers/firmware/efivars.c | 6 +- drivers/firmware/pcdp.c | 6 +- drivers/hid/Kconfig | 15 +- drivers/hid/hid-core.c | 93 +- drivers/hid/hid-debug.c | 15 + drivers/hid/hid-input.c | 125 +- drivers/hid/usbhid/hid-core.c | 125 +- drivers/hid/usbhid/hid-lgff.c | 10 +- drivers/hid/usbhid/hid-pidff.c | 1 + drivers/hid/usbhid/hid-quirks.c | 323 +- drivers/hid/usbhid/hid-tmff.c | 2 +- drivers/hid/usbhid/hid-zpff.c | 8 +- drivers/hid/usbhid/hiddev.c | 2 +- drivers/hid/usbhid/usbkbd.c | 6 +- drivers/hwmon/Kconfig | 92 +- drivers/hwmon/Makefile | 4 + drivers/hwmon/abituguru.c | 45 +- drivers/hwmon/ams/ams-core.c | 1 - drivers/hwmon/applesmc.c | 14 +- drivers/hwmon/coretemp.c | 2 +- drivers/hwmon/ds1621.c | 161 +- drivers/hwmon/f71805f.c | 178 +- drivers/hwmon/fscher.c | 4 +- drivers/hwmon/it87.c | 497 +- drivers/hwmon/lm63.c | 4 +- drivers/hwmon/lm70.c | 4 + drivers/hwmon/lm78.c | 4 +- drivers/hwmon/lm83.c | 12 +- drivers/hwmon/lm90.c | 78 +- drivers/hwmon/pc87360.c | 232 +- drivers/hwmon/pc87427.c | 2 +- drivers/hwmon/sis5595.c | 510 +- drivers/hwmon/smsc47b397.c | 7 +- drivers/hwmon/smsc47m1.c | 14 +- drivers/hwmon/smsc47m192.c | 37 +- drivers/hwmon/via686a.c | 538 +- drivers/hwmon/vt8231.c | 318 +- drivers/hwmon/w83627ehf.c | 661 +- drivers/hwmon/w83627hf.c | 155 +- drivers/hwmon/w83781d.c | 2 +- drivers/i2c/algos/Kconfig | 4 - drivers/i2c/algos/i2c-algo-bit.c | 52 +- drivers/i2c/busses/Kconfig | 41 +- drivers/i2c/busses/Makefile | 4 +- drivers/i2c/busses/i2c-acorn.c | 2 +- drivers/i2c/busses/i2c-gpio.c | 12 +- drivers/i2c/busses/i2c-i801.c | 249 +- drivers/i2c/busses/i2c-iop3xx.c | 4 +- drivers/i2c/busses/i2c-isa.c | 192 - drivers/i2c/busses/i2c-mpc.c | 35 +- drivers/i2c/busses/i2c-mv64xxx.c | 34 +- drivers/i2c/busses/i2c-nforce2.c | 44 +- drivers/i2c/busses/i2c-piix4.c | 4 +- drivers/i2c/busses/i2c-powermac.c | 3 +- drivers/i2c/busses/i2c-pxa.c | 9 +- drivers/i2c/busses/i2c-rpx.c | 101 - drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/busses/i2c-savage4.c | 21 +- drivers/i2c/busses/i2c-sis5595.c | 27 +- drivers/i2c/busses/i2c-viapro.c | 5 +- drivers/i2c/busses/scx200_acb.c | 16 +- drivers/i2c/chips/Kconfig | 45 +- drivers/i2c/chips/Makefile | 3 + drivers/i2c/chips/eeprom.c | 10 +- drivers/i2c/chips/isp1301_omap.c | 42 +- drivers/i2c/chips/max6875.c | 7 +- drivers/i2c/chips/tps65010.c | 2 +- drivers/i2c/i2c-core.c | 27 +- drivers/i2c/i2c-dev.c | 9 + drivers/ide/Kconfig | 18 +- drivers/ide/arm/icside.c | 21 +- drivers/ide/arm/ide_arm.c | 20 +- drivers/ide/arm/mxc_ide.c | 6 +- drivers/ide/cris/ide-cris.c | 13 +- drivers/ide/ide-cd.c | 10 +- drivers/ide/ide-cd.h | 2 - drivers/ide/ide-disk.c | 31 +- drivers/ide/ide-dma.c | 151 +- drivers/ide/ide-floppy.c | 47 +- drivers/ide/ide-io.c | 28 +- drivers/ide/ide-iops.c | 54 +- drivers/ide/ide-lib.c | 72 +- drivers/ide/ide-probe.c | 16 +- drivers/ide/ide-proc.c | 34 +- drivers/ide/ide-tape.c | 2 +- drivers/ide/ide-timing.h | 70 +- drivers/ide/ide.c | 119 +- drivers/ide/legacy/ali14xx.c | 7 +- drivers/ide/legacy/dtc2278.c | 3 +- drivers/ide/legacy/falconide.c | 2 + drivers/ide/legacy/hd.c | 80 +- drivers/ide/legacy/ht6560b.c | 12 +- drivers/ide/legacy/ide-cs.c | 1 + drivers/ide/legacy/macide.c | 14 - drivers/ide/legacy/qd65xx.c | 21 +- drivers/ide/legacy/umc8672.c | 4 +- drivers/ide/mips/au1xxx-ide.c | 28 +- drivers/ide/mips/swarm.c | 3 +- drivers/ide/pci/aec62xx.c | 137 +- drivers/ide/pci/alim15x3.c | 92 +- drivers/ide/pci/amd74xx.c | 149 +- drivers/ide/pci/atiixp.c | 42 +- drivers/ide/pci/cmd640.c | 19 +- drivers/ide/pci/cmd64x.c | 160 +- drivers/ide/pci/cs5520.c | 8 +- drivers/ide/pci/cs5530.c | 14 +- drivers/ide/pci/cs5535.c | 51 +- drivers/ide/pci/cy82c693.c | 5 +- drivers/ide/pci/generic.c | 15 - drivers/ide/pci/hpt34x.c | 23 +- drivers/ide/pci/hpt366.c | 308 +- drivers/ide/pci/it8213.c | 44 +- drivers/ide/pci/it821x.c | 17 +- drivers/ide/pci/jmicron.c | 43 +- drivers/ide/pci/ns87415.c | 10 - drivers/ide/pci/opti621.c | 8 +- drivers/ide/pci/pdc202xx_new.c | 49 +- drivers/ide/pci/pdc202xx_old.c | 64 +- drivers/ide/pci/piix.c | 74 +- drivers/ide/pci/rz1000.c | 1 - drivers/ide/pci/sc1200.c | 43 +- drivers/ide/pci/scc_pata.c | 141 +- drivers/ide/pci/serverworks.c | 219 +- drivers/ide/pci/sgiioc4.c | 23 +- drivers/ide/pci/siimage.c | 157 +- drivers/ide/pci/sis5513.c | 47 +- drivers/ide/pci/sl82c105.c | 46 +- drivers/ide/pci/slc90e66.c | 24 +- drivers/ide/pci/tc86c001.c | 11 +- drivers/ide/pci/triflex.c | 7 +- drivers/ide/pci/trm290.c | 1 - drivers/ide/pci/via82cxxx.c | 210 +- drivers/ide/ppc/mpc8xx.c | 6 +- drivers/ide/ppc/pmac.c | 75 +- drivers/ide/setup-pci.c | 59 +- drivers/ieee1394/Kconfig | 2 +- drivers/ieee1394/dv1394.c | 8 +- drivers/ieee1394/eth1394.c | 6 +- drivers/ieee1394/highlevel.c | 45 - drivers/ieee1394/highlevel.h | 16 +- drivers/ieee1394/hosts.c | 11 +- drivers/ieee1394/hosts.h | 10 +- drivers/ieee1394/ieee1394_core.c | 13 +- drivers/ieee1394/ieee1394_core.h | 15 +- drivers/ieee1394/ieee1394_transactions.c | 30 - drivers/ieee1394/ieee1394_transactions.h | 2 - drivers/ieee1394/nodemgr.c | 188 +- drivers/ieee1394/nodemgr.h | 4 +- drivers/ieee1394/ohci1394.c | 276 +- drivers/ieee1394/ohci1394.h | 14 - drivers/ieee1394/pcilynx.c | 16 +- drivers/ieee1394/raw1394-private.h | 5 - drivers/ieee1394/raw1394.c | 364 +- drivers/ieee1394/raw1394.h | 4 +- drivers/ieee1394/sbp2.c | 104 +- drivers/ieee1394/sbp2.h | 2 +- drivers/ieee1394/video1394.c | 10 +- drivers/infiniband/Kconfig | 15 +- drivers/infiniband/core/addr.c | 3 +- drivers/infiniband/core/agent.c | 43 +- drivers/infiniband/core/agent.h | 6 +- drivers/infiniband/core/cm.c | 247 +- drivers/infiniband/core/cm_msgs.h | 1 + drivers/infiniband/core/cma.c | 3 +- drivers/infiniband/core/device.c | 2 +- drivers/infiniband/core/mad.c | 64 +- drivers/infiniband/core/mad_rmpp.c | 8 +- drivers/infiniband/core/multicast.c | 2 +- drivers/infiniband/core/sa.h | 2 +- drivers/infiniband/core/sa_query.c | 85 +- drivers/infiniband/core/smi.c | 16 +- drivers/infiniband/core/smi.h | 2 + drivers/infiniband/core/sysfs.c | 3 +- drivers/infiniband/core/ucm.c | 1 - drivers/infiniband/core/umem.c | 6 + drivers/infiniband/hw/amso1100/Kconfig | 2 +- drivers/infiniband/hw/amso1100/c2_qp.c | 1 + drivers/infiniband/hw/amso1100/c2_vq.c | 2 +- drivers/infiniband/hw/cxgb3/Kconfig | 2 +- drivers/infiniband/hw/cxgb3/cxio_hal.c | 8 +- drivers/infiniband/hw/cxgb3/cxio_wr.h | 3 +- drivers/infiniband/hw/cxgb3/iwch_cm.c | 128 +- drivers/infiniband/hw/cxgb3/iwch_cm.h | 1 + drivers/infiniband/hw/cxgb3/iwch_provider.c | 7 +- drivers/infiniband/hw/cxgb3/iwch_qp.c | 7 +- drivers/infiniband/hw/ehca/Kconfig | 2 +- drivers/infiniband/hw/ehca/ehca_av.c | 10 +- drivers/infiniband/hw/ehca/ehca_classes.h | 164 +- drivers/infiniband/hw/ehca/ehca_classes_pSeries.h | 156 +- drivers/infiniband/hw/ehca/ehca_cq.c | 62 +- drivers/infiniband/hw/ehca/ehca_eq.c | 11 +- drivers/infiniband/hw/ehca/ehca_hca.c | 97 +- drivers/infiniband/hw/ehca/ehca_irq.c | 250 +- drivers/infiniband/hw/ehca/ehca_irq.h | 1 - drivers/infiniband/hw/ehca/ehca_iverbs.h | 25 +- drivers/infiniband/hw/ehca/ehca_main.c | 181 +- drivers/infiniband/hw/ehca/ehca_mrmw.c | 1356 +- drivers/infiniband/hw/ehca/ehca_mrmw.h | 23 +- drivers/infiniband/hw/ehca/ehca_pd.c | 26 +- drivers/infiniband/hw/ehca/ehca_qes.h | 22 +- drivers/infiniband/hw/ehca/ehca_qp.c | 876 +- drivers/infiniband/hw/ehca/ehca_reqs.c | 100 +- drivers/infiniband/hw/ehca/ehca_tools.h | 45 +- drivers/infiniband/hw/ehca/ehca_uverbs.c | 25 +- drivers/infiniband/hw/ehca/hcp_if.c | 111 +- drivers/infiniband/hw/ehca/hcp_if.h | 1 - drivers/infiniband/hw/ehca/hcp_phyp.c | 2 +- drivers/infiniband/hw/ehca/hipz_fns_core.h | 4 +- drivers/infiniband/hw/ehca/hipz_hw.h | 41 +- drivers/infiniband/hw/ehca/ipz_pt_fn.c | 222 +- drivers/infiniband/hw/ehca/ipz_pt_fn.h | 60 +- drivers/infiniband/hw/ipath/Kconfig | 2 +- drivers/infiniband/hw/ipath/Makefile | 1 - drivers/infiniband/hw/ipath/ipath_common.h | 36 +- drivers/infiniband/hw/ipath/ipath_cq.c | 7 +- drivers/infiniband/hw/ipath/ipath_debug.h | 2 +- drivers/infiniband/hw/ipath/ipath_diag.c | 42 +- drivers/infiniband/hw/ipath/ipath_driver.c | 199 +- drivers/infiniband/hw/ipath/ipath_eeprom.c | 303 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 205 +- drivers/infiniband/hw/ipath/ipath_fs.c | 9 +- drivers/infiniband/hw/ipath/ipath_iba6110.c | 101 +- drivers/infiniband/hw/ipath/ipath_iba6120.c | 108 +- drivers/infiniband/hw/ipath/ipath_init_chip.c | 31 +- drivers/infiniband/hw/ipath/ipath_intr.c | 196 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 98 +- drivers/infiniband/hw/ipath/ipath_keys.c | 2 +- drivers/infiniband/hw/ipath/ipath_layer.c | 365 - drivers/infiniband/hw/ipath/ipath_layer.h | 71 - drivers/infiniband/hw/ipath/ipath_mad.c | 11 +- drivers/infiniband/hw/ipath/ipath_mmap.c | 2 +- drivers/infiniband/hw/ipath/ipath_mr.c | 2 +- drivers/infiniband/hw/ipath/ipath_qp.c | 19 +- drivers/infiniband/hw/ipath/ipath_rc.c | 116 +- drivers/infiniband/hw/ipath/ipath_registers.h | 2 +- drivers/infiniband/hw/ipath/ipath_ruc.c | 38 +- drivers/infiniband/hw/ipath/ipath_srq.c | 4 +- drivers/infiniband/hw/ipath/ipath_stats.c | 79 +- drivers/infiniband/hw/ipath/ipath_sysfs.c | 43 +- drivers/infiniband/hw/ipath/ipath_uc.c | 9 +- drivers/infiniband/hw/ipath/ipath_ud.c | 6 +- drivers/infiniband/hw/ipath/ipath_user_pages.c | 28 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 31 +- drivers/infiniband/hw/ipath/ipath_verbs.h | 9 +- drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 2 +- drivers/infiniband/hw/ipath/ipath_wc_ppc64.c | 2 +- drivers/infiniband/hw/ipath/ipath_wc_x86_64.c | 29 +- drivers/infiniband/hw/mlx4/Kconfig | 1 - drivers/infiniband/hw/mlx4/cq.c | 2 +- drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/hw/mlx4/main.c | 6 +- drivers/infiniband/hw/mlx4/mlx4_ib.h | 4 + drivers/infiniband/hw/mlx4/qp.c | 305 +- drivers/infiniband/hw/mlx4/srq.c | 18 + drivers/infiniband/hw/mthca/Kconfig | 2 +- drivers/infiniband/hw/mthca/mthca_allocator.c | 2 +- drivers/infiniband/hw/mthca/mthca_cmd.c | 3 +- drivers/infiniband/hw/mthca/mthca_eq.c | 2 +- drivers/infiniband/hw/mthca/mthca_main.c | 22 +- drivers/infiniband/hw/mthca/mthca_qp.c | 221 +- drivers/infiniband/hw/mthca/mthca_srq.c | 28 +- drivers/infiniband/hw/mthca/mthca_wqe.h | 15 + drivers/infiniband/ulp/ipoib/Kconfig | 2 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 33 +- drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 1 + drivers/infiniband/ulp/iser/Kconfig | 2 +- drivers/infiniband/ulp/iser/iscsi_iser.c | 43 +- drivers/infiniband/ulp/iser/iscsi_iser.h | 9 +- drivers/infiniband/ulp/iser/iser_initiator.c | 14 +- drivers/infiniband/ulp/iser/iser_memory.c | 4 +- drivers/infiniband/ulp/iser/iser_verbs.c | 51 +- drivers/infiniband/ulp/srp/Kconfig | 2 +- drivers/infiniband/ulp/srp/ib_srp.c | 94 +- drivers/infiniband/ulp/srp/ib_srp.h | 5 - drivers/input/evdev.c | 86 +- drivers/input/gameport/gameport.c | 1 + drivers/input/input.c | 165 +- drivers/input/joydev.c | 84 +- drivers/input/joystick/Kconfig | 14 + drivers/input/joystick/grip_mp.c | 4 +- drivers/input/joystick/iforce/iforce-packets.c | 8 +- drivers/input/joystick/xpad.c | 393 +- drivers/input/keyboard/atkbd.c | 4 +- drivers/input/keyboard/gpio_keys.c | 1 - drivers/input/keyboard/pxa27x_keyboard.c | 2 +- drivers/input/misc/Kconfig | 7 +- drivers/input/misc/atlas_btns.c | 9 +- drivers/input/misc/pcspkr.c | 11 +- drivers/input/misc/wistron_btns.c | 359 +- drivers/input/mouse/Kconfig | 16 + drivers/input/mouse/Makefile | 1 + drivers/input/mouse/appletouch.c | 113 +- drivers/input/mouse/psmouse-base.c | 29 + drivers/input/mouse/psmouse.h | 2 +- drivers/input/mouse/touchkit_ps2.h | 3 +- drivers/input/mousedev.c | 242 +- drivers/input/serio/Kconfig | 2 +- drivers/input/serio/ambakmi.c | 6 +- drivers/input/serio/gscps2.c | 6 +- drivers/input/serio/i8042-x86ia64io.h | 46 +- drivers/input/serio/i8042.c | 6 +- drivers/input/serio/pcips2.c | 6 +- drivers/input/serio/sa1111ps2.c | 6 +- drivers/input/serio/serio.c | 1 + drivers/input/serio/serio_raw.c | 2 +- drivers/input/tablet/aiptek.c | 991 +- drivers/input/tablet/wacom.h | 8 +- drivers/input/tablet/wacom_sys.c | 6 + drivers/input/tablet/wacom_wac.c | 47 +- drivers/input/tablet/wacom_wac.h | 1 + drivers/input/touchscreen/Kconfig | 19 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/ads7846.c | 80 +- drivers/input/touchscreen/ucb1400_ts.c | 1 + drivers/input/touchscreen/usbtouchscreen.c | 35 +- drivers/input/tsdev.c | 90 +- drivers/isdn/Kconfig | 27 +- drivers/isdn/act2000/Kconfig | 2 +- drivers/isdn/capi/Kconfig | 7 +- drivers/isdn/capi/capi.c | 2 +- drivers/isdn/capi/kcapi.c | 6 +- drivers/isdn/capi/kcapi_proc.c | 28 +- drivers/isdn/divert/divert_procfs.c | 4 +- drivers/isdn/gigaset/Kconfig | 10 +- drivers/isdn/hardware/Kconfig | 1 - drivers/isdn/hardware/avm/Kconfig | 23 +- drivers/isdn/hardware/eicon/Kconfig | 22 +- drivers/isdn/hardware/eicon/idifunc.c | 1 + drivers/isdn/hisax/Kconfig | 1 - drivers/isdn/hisax/bkm_a4t.c | 108 +- drivers/isdn/hisax/bkm_a8.c | 4 +- drivers/isdn/hisax/config.c | 245 +- drivers/isdn/hisax/enternow_pci.c | 165 +- drivers/isdn/hisax/hfc_pci.c | 191 +- drivers/isdn/hisax/hfc_usb.c | 603 +- drivers/isdn/hisax/hfc_usb.h | 130 +- drivers/isdn/hisax/nj_s.c | 194 +- drivers/isdn/hisax/nj_u.c | 167 +- drivers/isdn/hisax/sedlbauer.c | 8 +- drivers/isdn/i4l/Kconfig | 4 - drivers/isdn/i4l/isdn_bsdcomp.c | 5 +- drivers/isdn/i4l/isdn_common.c | 7 +- drivers/isdn/icn/Kconfig | 2 +- drivers/isdn/pcbit/Kconfig | 2 +- drivers/isdn/sc/Kconfig | 2 +- drivers/isdn/sc/card.h | 2 +- drivers/isdn/sc/command.c | 2 +- drivers/isdn/sc/timer.c | 2 +- drivers/kvm/Kconfig | 15 +- drivers/kvm/kvm.h | 136 +- drivers/kvm/kvm_main.c | 558 +- drivers/kvm/mmu.c | 401 +- drivers/kvm/paging_tmpl.h | 275 +- drivers/kvm/svm.c | 53 +- drivers/kvm/vmx.c | 652 +- drivers/kvm/x86_emulate.c | 74 +- drivers/leds/Kconfig | 22 +- drivers/leds/Makefile | 1 + drivers/leds/led-class.c | 49 +- drivers/leds/led-triggers.c | 27 +- drivers/leds/leds-locomo.c | 2 +- drivers/leds/leds.h | 8 +- drivers/leds/ledtrig-timer.c | 49 +- drivers/macintosh/Kconfig | 5 + drivers/macintosh/adb.c | 14 +- drivers/macintosh/mac_hid.c | 1 + drivers/macintosh/macio_asic.c | 3 +- drivers/macintosh/rack-meter.c | 1 - drivers/macintosh/smu.c | 3 +- drivers/macintosh/therm_adt746x.c | 1 + drivers/macintosh/therm_pm72.c | 6 +- drivers/macintosh/therm_windtunnel.c | 3 +- drivers/macintosh/via-pmu.c | 34 +- drivers/macintosh/via-pmu68k.c | 240 - drivers/macintosh/windfarm_core.c | 6 +- drivers/macintosh/windfarm_lm75_sensor.c | 3 +- drivers/macintosh/windfarm_smu_sat.c | 28 +- drivers/md/Kconfig | 23 +- drivers/md/Makefile | 6 +- drivers/md/bitmap.c | 169 +- drivers/md/dm-bio-list.h | 7 +- drivers/md/dm-crypt.c | 30 +- drivers/md/dm-delay.c | 23 +- drivers/md/dm-exception-store.c | 66 +- drivers/md/dm-mpath.c | 31 +- drivers/md/dm-raid1.c | 74 +- drivers/md/dm-round-robin.c | 2 +- drivers/md/dm-snap.c | 105 +- drivers/md/dm-snap.h | 6 +- drivers/md/dm-table.c | 8 +- drivers/md/dm.c | 42 +- drivers/md/dm.h | 40 +- drivers/md/faulty.c | 2 +- drivers/md/kcopyd.c | 11 +- drivers/md/linear.c | 14 +- drivers/md/md.c | 75 +- drivers/md/multipath.c | 12 +- drivers/md/raid0.c | 14 +- drivers/md/raid1.c | 40 +- drivers/md/raid10.c | 17 +- drivers/md/raid5.c | 4023 +-- drivers/md/xor.c | 154 - drivers/media/Kconfig | 4 + drivers/media/common/ir-functions.c | 27 +- drivers/media/common/saa7146_core.c | 8 +- drivers/media/common/saa7146_video.c | 8 +- drivers/media/dvb/b2c2/Kconfig | 2 +- drivers/media/dvb/b2c2/Makefile | 2 +- drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 4 +- drivers/media/dvb/b2c2/flexcop-i2c.c | 7 + drivers/media/dvb/bt8xx/Kconfig | 2 +- drivers/media/dvb/bt8xx/Makefile | 2 +- drivers/media/dvb/bt8xx/dst.c | 2 +- drivers/media/dvb/bt8xx/dvb-bt8xx.c | 5 +- drivers/media/dvb/cinergyT2/Makefile | 2 +- drivers/media/dvb/cinergyT2/cinergyT2.c | 22 +- drivers/media/dvb/dvb-core/dmxdev.c | 2 +- drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 12 +- drivers/media/dvb/dvb-core/dvb_demux.c | 2 +- drivers/media/dvb/dvb-core/dvb_frontend.c | 1 + drivers/media/dvb/dvb-core/dvb_frontend.h | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 10 +- drivers/media/dvb/dvb-core/dvbdev.c | 10 +- drivers/media/dvb/dvb-usb/Kconfig | 29 +- drivers/media/dvb/dvb-usb/Makefile | 8 +- drivers/media/dvb/dvb-usb/cxusb.c | 18 +- drivers/media/dvb/dvb-usb/dibusb-common.c | 2 +- drivers/media/dvb/dvb-usb/dibusb-mb.c | 53 +- drivers/media/dvb/dvb-usb/dibusb.h | 1 + drivers/media/dvb/dvb-usb/digitv.c | 21 +- drivers/media/dvb/dvb-usb/digitv.h | 4 + drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 79 - drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 6 + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- drivers/media/dvb/dvb-usb/dvb-usb.h | 11 - drivers/media/dvb/dvb-usb/gl861.c | 7 +- drivers/media/dvb/dvb-usb/m920x.c | 127 +- drivers/media/dvb/dvb-usb/m920x.h | 5 +- drivers/media/dvb/dvb-usb/opera1.c | 25 +- drivers/media/dvb/dvb-usb/umt-010.c | 8 +- drivers/media/dvb/frontends/Makefile | 2 +- drivers/media/dvb/frontends/cx22702.c | 1 - drivers/media/dvb/frontends/cx24123.c | 2 +- drivers/media/dvb/frontends/dvb-pll.c | 258 +- drivers/media/dvb/frontends/dvb-pll.h | 73 +- drivers/media/dvb/frontends/nxt200x.c | 23 +- drivers/media/dvb/frontends/nxt200x.h | 3 - drivers/media/dvb/frontends/or51132.c | 1 - drivers/media/dvb/frontends/or51211.c | 31 +- drivers/media/dvb/frontends/stv0299.c | 2 +- drivers/media/dvb/frontends/tda10023.c | 2 +- drivers/media/dvb/pluto2/Makefile | 2 +- drivers/media/dvb/ttpci/Kconfig | 2 +- drivers/media/dvb/ttpci/Makefile | 2 +- drivers/media/dvb/ttpci/av7110.c | 15 +- drivers/media/dvb/ttpci/av7110.h | 1 + drivers/media/dvb/ttpci/av7110_av.c | 20 +- drivers/media/dvb/ttpci/av7110_ca.c | 4 +- drivers/media/dvb/ttpci/av7110_hw.c | 8 +- drivers/media/dvb/ttpci/av7110_hw.h | 2 +- drivers/media/dvb/ttpci/av7110_ir.c | 2 +- drivers/media/dvb/ttpci/av7110_v4l.c | 2 +- drivers/media/dvb/ttpci/budget-av.c | 31 +- drivers/media/dvb/ttpci/budget-ci.c | 2 +- drivers/media/dvb/ttusb-budget/Makefile | 2 +- drivers/media/dvb/ttusb-dec/Makefile | 2 +- drivers/media/radio/Kconfig | 4 +- drivers/media/radio/radio-aimslab.c | 3 +- drivers/media/radio/radio-aztech.c | 1 - drivers/media/radio/radio-cadet.c | 4 +- drivers/media/radio/radio-gemtek-pci.c | 8 +- drivers/media/radio/radio-gemtek.c | 1 - drivers/media/radio/radio-rtrack2.c | 1 - drivers/media/radio/radio-sf16fmi.c | 1 - drivers/media/radio/radio-sf16fmr2.c | 1 - drivers/media/radio/radio-terratec.c | 1 - drivers/media/radio/radio-trust.c | 1 - drivers/media/radio/radio-typhoon.c | 1 - drivers/media/video/Kconfig | 13 +- drivers/media/video/Makefile | 6 +- drivers/media/video/adv7170.c | 8 +- drivers/media/video/adv7175.c | 8 +- drivers/media/video/bt819.c | 9 +- drivers/media/video/bt856.c | 8 +- drivers/media/video/bt866.c | 2 +- drivers/media/video/bt8xx/bttv-cards.c | 682 +- drivers/media/video/bt8xx/bttv-driver.c | 34 +- drivers/media/video/bt8xx/bttv-input.c | 4 +- drivers/media/video/bt8xx/bttv.h | 2 + drivers/media/video/bt8xx/bttvp.h | 6 +- drivers/media/video/c-qcam.c | 4 +- drivers/media/video/cafe_ccic.c | 35 +- drivers/media/video/cpia2/cpia2_core.c | 13 +- drivers/media/video/cpia2/cpia2_v4l.c | 8 +- drivers/media/video/cx88/Kconfig | 2 +- drivers/media/video/cx88/cx88-blackbird.c | 14 +- drivers/media/video/cx88/cx88-cards.c | 24 + drivers/media/video/cx88/cx88-dvb.c | 122 +- drivers/media/video/cx88/cx88-i2c.c | 25 +- drivers/media/video/cx88/cx88-input.c | 25 +- drivers/media/video/cx88/cx88-mpeg.c | 4 +- drivers/media/video/cx88/cx88-tvaudio.c | 1 + drivers/media/video/cx88/cx88-video.c | 8 +- drivers/media/video/cx88/cx88-vp3054-i2c.c | 12 +- drivers/media/video/cx88/cx88-vp3054-i2c.h | 7 + drivers/media/video/cx88/cx88.h | 8 +- drivers/media/video/em28xx/em28xx-video.c | 1 + drivers/media/video/et61x251/Kconfig | 2 +- drivers/media/video/et61x251/et61x251.h | 23 +- drivers/media/video/et61x251/et61x251_core.c | 189 +- drivers/media/video/et61x251/et61x251_sensor.h | 8 +- drivers/media/video/et61x251/et61x251_tas5130d1b.c | 2 +- drivers/media/video/ir-kbd-i2c.c | 53 +- drivers/media/video/ivtv/Kconfig | 5 +- drivers/media/video/ivtv/ivtv-driver.c | 53 +- drivers/media/video/ivtv/ivtv-driver.h | 20 +- drivers/media/video/ivtv/ivtv-fileops.c | 36 +- drivers/media/video/ivtv/ivtv-firmware.c | 29 +- drivers/media/video/ivtv/ivtv-gpio.c | 11 +- drivers/media/video/ivtv/ivtv-i2c.c | 20 +- drivers/media/video/ivtv/ivtv-ioctl.c | 35 +- drivers/media/video/ivtv/ivtv-irq.c | 40 +- drivers/media/video/ivtv/ivtv-mailbox.c | 45 +- drivers/media/video/ivtv/ivtv-streams.c | 26 +- drivers/media/video/meye.c | 4 +- drivers/media/video/msp3400-driver.c | 9 +- drivers/media/video/msp3400-kthreads.c | 6 +- drivers/media/video/mt20xx.c | 80 +- drivers/media/video/ov7670.c | 9 +- drivers/media/video/planb.c | 3 +- drivers/media/video/pwc/pwc-if.c | 14 +- drivers/media/video/pwc/pwc.h | 4 +- drivers/media/video/saa5249.c | 8 +- drivers/media/video/saa7110.c | 4 +- drivers/media/video/saa7111.c | 8 +- drivers/media/video/saa7114.c | 10 +- drivers/media/video/saa7134/Kconfig | 2 +- drivers/media/video/saa7134/saa7134-alsa.c | 16 +- drivers/media/video/saa7134/saa7134-cards.c | 53 +- drivers/media/video/saa7134/saa7134-dvb.c | 169 +- drivers/media/video/saa7134/saa7134-empress.c | 8 + drivers/media/video/saa7134/saa7134-input.c | 20 +- drivers/media/video/saa7134/saa7134-tvaudio.c | 42 +- drivers/media/video/saa7134/saa7134.h | 8 +- drivers/media/video/saa7185.c | 8 +- drivers/media/video/saa7191.c | 4 +- drivers/media/video/sn9c102/sn9c102.h | 9 +- drivers/media/video/sn9c102/sn9c102_core.c | 173 +- drivers/media/video/sn9c102/sn9c102_ov7630.c | 214 +- drivers/media/video/sn9c102/sn9c102_ov7660.c | 88 +- drivers/media/video/stradis.c | 2 +- drivers/media/video/stv680.c | 7 +- drivers/media/video/tda8290.c | 129 +- drivers/media/video/tda9887.c | 57 +- drivers/media/video/tea5767.c | 16 +- drivers/media/video/tuner-core.c | 95 +- drivers/media/video/tuner-simple.c | 27 +- drivers/media/video/tuner-types.c | 22 +- drivers/media/video/tvaudio.c | 6 +- drivers/media/video/tveeprom.c | 8 +- drivers/media/video/tvp5150.c | 2 +- drivers/media/video/usbvideo/konicawc.c | 2 +- drivers/media/video/usbvideo/quickcam_messenger.c | 4 +- drivers/media/video/usbvideo/vicam.c | 184 +- drivers/media/video/usbvision/usbvision-cards.c | 9 +- drivers/media/video/usbvision/usbvision-core.c | 43 +- drivers/media/video/usbvision/usbvision-video.c | 1561 +- drivers/media/video/usbvision/usbvision.h | 13 +- drivers/media/video/video-buf-dvb.c | 1 + drivers/media/video/vino.c | 6 +- drivers/media/video/vivi.c | 179 +- drivers/media/video/zc0301/Kconfig | 2 +- drivers/media/video/zc0301/zc0301.h | 21 +- drivers/media/video/zc0301/zc0301_core.c | 147 +- drivers/media/video/zc0301/zc0301_pas202bcb.c | 1 + drivers/media/video/zc0301/zc0301_pb0330.c | 1 + drivers/media/video/zc0301/zc0301_sensor.h | 2 +- drivers/media/video/zoran.h | 5 + drivers/media/video/zoran_device.c | 50 +- drivers/media/video/zoran_driver.c | 296 +- drivers/media/video/zr364xx.c | 18 +- drivers/message/fusion/Kconfig | 15 + drivers/message/fusion/Makefile | 37 +- drivers/message/fusion/linux_compat.h | 9 - drivers/message/fusion/lsi/mpi.h | 7 +- drivers/message/fusion/lsi/mpi_cnfg.h | 61 +- drivers/message/fusion/lsi/mpi_history.txt | 66 +- drivers/message/fusion/lsi/mpi_inb.h | 221 - drivers/message/fusion/lsi/mpi_init.h | 10 +- drivers/message/fusion/lsi/mpi_ioc.h | 40 +- drivers/message/fusion/lsi/mpi_raid.h | 11 +- drivers/message/fusion/mptbase.c | 904 +- drivers/message/fusion/mptbase.h | 213 +- drivers/message/fusion/mptctl.c | 268 +- drivers/message/fusion/mptctl.h | 2 +- drivers/message/fusion/mptfc.c | 114 +- drivers/message/fusion/mptlan.c | 5 +- drivers/message/fusion/mptlan.h | 2 +- drivers/message/fusion/mptsas.c | 480 +- drivers/message/fusion/mptscsih.c | 827 +- drivers/message/fusion/mptscsih.h | 3 +- drivers/message/fusion/mptspi.c | 63 +- drivers/message/i2o/Kconfig | 22 +- drivers/message/i2o/debug.c | 134 +- drivers/message/i2o/device.c | 18 +- drivers/message/i2o/exec-osm.c | 10 +- drivers/message/i2o/i2o_block.c | 11 +- drivers/message/i2o/i2o_config.c | 62 +- drivers/message/i2o/i2o_scsi.c | 24 +- drivers/message/i2o/iop.c | 2 +- drivers/mfd/mcp-core.c | 3 +- drivers/mfd/ucb1x00-core.c | 3 +- drivers/mfd/ucb1x00-ts.c | 1 + drivers/misc/Kconfig | 21 +- drivers/misc/Makefile | 1 + drivers/misc/asus-laptop.c | 48 +- drivers/misc/ibmasm/command.c | 20 +- drivers/misc/ibmasm/dot_command.c | 10 +- drivers/misc/ibmasm/dot_command.h | 2 +- drivers/misc/ibmasm/event.c | 8 +- drivers/misc/ibmasm/heartbeat.c | 2 +- drivers/misc/ibmasm/i2o.h | 10 +- drivers/misc/ibmasm/ibmasm.h | 70 +- drivers/misc/ibmasm/ibmasmfs.c | 27 +- drivers/misc/ibmasm/lowlevel.c | 2 +- drivers/misc/ibmasm/lowlevel.h | 16 +- drivers/misc/ibmasm/module.c | 13 +- drivers/misc/ibmasm/r_heartbeat.c | 10 +- drivers/misc/ibmasm/remote.c | 37 +- drivers/misc/ibmasm/remote.h | 8 +- drivers/misc/ibmasm/uart.c | 2 +- drivers/misc/msi-laptop.c | 46 +- drivers/misc/sony-laptop.c | 393 +- drivers/misc/thinkpad_acpi.c | 688 +- drivers/misc/thinkpad_acpi.h | 47 +- drivers/mmc/card/queue.c | 29 +- drivers/mmc/core/bus.c | 4 +- drivers/mmc/core/host.c | 4 +- drivers/mmc/host/at91_mci.c | 14 +- drivers/mmc/host/pxamci.h | 22 - drivers/mmc/host/sdhci.c | 55 +- drivers/mmc/host/sdhci.h | 1 + drivers/mmc/host/wbsd.c | 10 +- drivers/mtd/Makefile | 2 +- drivers/mtd/devices/docprobe.c | 5 +- drivers/mtd/maps/Kconfig | 8 +- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/lasat.c | 103 - drivers/mtd/maps/lubbock-flash.c | 6 +- drivers/mtd/maps/mainstone-flash.c | 5 +- drivers/mtd/mtd_blkdevs.c | 3 +- drivers/mtd/mtdchar.c | 1 + drivers/mtd/mtdpart.c | 4 - drivers/mtd/mtdsuper.c | 2 + drivers/mtd/nand/at91_nand.c | 5 +- drivers/mtd/nand/cafe_nand.c | 3 +- drivers/mtd/nand/diskonchip.c | 5 +- drivers/mtd/nand/edb7312.c | 10 +- drivers/mtd/nand/nand_base.c | 12 +- drivers/mtd/rfd_ftl.c | 1 + drivers/mtd/ubi/build.c | 25 +- drivers/mtd/ubi/cdev.c | 49 +- drivers/mtd/ubi/debug.c | 44 +- drivers/mtd/ubi/debug.h | 2 - drivers/mtd/ubi/eba.c | 104 +- drivers/mtd/ubi/gluebi.c | 27 +- drivers/mtd/ubi/io.c | 65 +- drivers/mtd/ubi/kapi.c | 19 +- drivers/mtd/ubi/misc.c | 4 +- drivers/mtd/ubi/scan.c | 127 +- drivers/mtd/ubi/scan.h | 2 - drivers/mtd/ubi/ubi.h | 3 + drivers/mtd/ubi/upd.c | 4 +- drivers/mtd/ubi/vmt.c | 53 +- drivers/mtd/ubi/vtbl.c | 85 +- drivers/mtd/ubi/wl.c | 96 +- drivers/mxc/pm/dptc.c | 4 + drivers/mxc/vpu/mxc_vpu.c | 6 +- drivers/net/3c523.c | 2 +- drivers/net/3c59x.c | 4 +- drivers/net/7990.c | 4 +- drivers/net/8139cp.c | 46 +- drivers/net/8139too.c | 10 +- drivers/net/82596.c | 1 + drivers/net/8390.h | 11 + drivers/net/Kconfig | 322 +- drivers/net/Makefile | 15 +- drivers/net/Space.c | 8 - drivers/net/a2065.c | 4 +- drivers/net/acenic.c | 10 - drivers/net/ariadne.c | 2 +- drivers/net/arm/Kconfig | 13 +- drivers/net/arm/ep93xx_eth.c | 2 +- drivers/net/arm/ether1.c | 3 +- drivers/net/arm/ether3.c | 5 +- drivers/net/arm/etherh.c | 1 - drivers/net/atari_bionet.c | 675 - drivers/net/atari_pamsnet.c | 896 - drivers/net/atl1/atl1.h | 157 +- drivers/net/atl1/atl1_hw.h | 9 +- drivers/net/atl1/atl1_main.c | 2719 +- drivers/net/au1000_eth.c | 4 +- drivers/net/b44.c | 60 +- drivers/net/b44.h | 2 - drivers/net/bnx2.c | 630 +- drivers/net/bnx2.h | 76 +- drivers/net/bonding/bond_main.c | 74 +- drivers/net/bonding/bonding.h | 2 - drivers/net/bsd_comp.c | 9 +- drivers/net/cassini.c | 12 +- drivers/net/cxgb3/adapter.h | 40 +- drivers/net/cxgb3/common.h | 29 + drivers/net/cxgb3/cxgb3_main.c | 217 +- drivers/net/cxgb3/cxgb3_offload.c | 18 +- drivers/net/cxgb3/cxgb3_offload.h | 2 + drivers/net/cxgb3/regs.h | 11 + drivers/net/cxgb3/sge.c | 446 +- drivers/net/cxgb3/t3_hw.c | 162 +- drivers/net/cxgb3/t3cdev.h | 3 - drivers/net/cxgb3/version.h | 2 +- drivers/net/defxx.c | 17 +- drivers/net/dl2k.c | 7 +- drivers/net/dl2k.h | 1 - drivers/net/dm9000.c | 42 +- drivers/net/dummy.c | 82 +- drivers/net/e100.c | 21 +- drivers/net/e1000/e1000_ethtool.c | 4 +- drivers/net/e1000/e1000_hw.c | 6 + drivers/net/e1000/e1000_hw.h | 4 + drivers/net/e1000/e1000_main.c | 9 +- drivers/net/eepro100.c | 9 +- drivers/net/ehea/ehea.h | 36 +- drivers/net/ehea/ehea_hw.h | 24 +- drivers/net/ehea/ehea_main.c | 316 +- drivers/net/ehea/ehea_phyp.h | 3 + drivers/net/ehea/ehea_qmr.c | 218 +- drivers/net/ehea/ehea_qmr.h | 14 +- drivers/net/epic100.c | 2 +- drivers/net/eql.c | 2 +- drivers/net/fealnx.c | 4 +- drivers/net/fec.c | 62 +- drivers/net/fec_8xx/Kconfig | 2 +- drivers/net/forcedeth.c | 57 +- drivers/net/fs_enet/Kconfig | 2 +- drivers/net/gianfar.c | 39 +- drivers/net/gianfar.h | 6 + drivers/net/gianfar_mii.c | 58 +- drivers/net/gianfar_mii.h | 2 +- drivers/net/hamachi.c | 4 +- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/bpqether.c | 6 +- drivers/net/hamradio/dmascc.c | 6 +- drivers/net/ibmveth.c | 29 +- drivers/net/ibmveth.h | 3 - drivers/net/ifb.c | 78 +- drivers/net/ioc3-eth.c | 121 +- drivers/net/irda/Kconfig | 11 +- drivers/net/irda/Makefile | 1 + drivers/net/irda/irda-usb.c | 24 +- drivers/net/irda/irport.c | 3 +- drivers/net/irda/irtty-sir.c | 3 +- drivers/net/irda/kingsun-sir.c | 8 +- drivers/net/irda/vlsi_ir.c | 27 +- drivers/net/irda/vlsi_ir.h | 2 +- drivers/net/iseries_veth.c | 6 +- drivers/net/ixgb/ixgb_ethtool.c | 1 - drivers/net/ixp2000/ixpdev.c | 2 +- drivers/net/lance.c | 7 +- drivers/net/lasi_82596.c | 1460 +- drivers/net/lib8390.c | 55 +- drivers/net/loopback.c | 7 +- drivers/net/mac89x0.c | 2 +- drivers/net/macb.c | 563 +- drivers/net/macb.h | 10 +- drivers/net/macmace.c | 2 +- drivers/net/meth.c | 2 +- drivers/net/mlx4/catas.c | 106 +- drivers/net/mlx4/cmd.c | 3 +- drivers/net/mlx4/eq.c | 56 +- drivers/net/mlx4/fw.c | 3 + drivers/net/mlx4/fw.h | 1 + drivers/net/mlx4/intf.c | 2 + drivers/net/mlx4/main.c | 27 +- drivers/net/mlx4/mlx4.h | 14 +- drivers/net/mlx4/mr.c | 15 +- drivers/net/mlx4/qp.c | 24 +- drivers/net/mlx4/reset.c | 3 + drivers/net/mlx4/srq.c | 30 + drivers/net/mv643xx_eth.c | 7 +- drivers/net/mv643xx_eth.h | 4 +- drivers/net/myri10ge/myri10ge.c | 71 +- drivers/net/natsemi.c | 9 +- drivers/net/ne2k-pci.c | 8 +- drivers/net/netxen/netxen_nic.h | 106 +- drivers/net/netxen/netxen_nic_ethtool.c | 1 - drivers/net/netxen/netxen_nic_hdr.h | 6 +- drivers/net/netxen/netxen_nic_hw.c | 8 +- drivers/net/netxen/netxen_nic_main.c | 207 +- drivers/net/netxen/netxen_nic_niu.c | 6 +- drivers/net/ni5010.c | 6 +- drivers/net/ni52.c | 2 +- drivers/net/ni65.c | 4 +- drivers/net/ns83820.c | 2 +- drivers/net/pasemi_mac.c | 2 +- drivers/net/pci-skeleton.c | 2 +- drivers/net/pcmcia/axnet_cs.c | 7 +- drivers/net/pcmcia/com20020_cs.c | 3 +- drivers/net/pcmcia/fmvj18x_cs.c | 23 +- drivers/net/pcmcia/ibmtr_cs.c | 3 +- drivers/net/pcmcia/nmclan_cs.c | 4 +- drivers/net/pcmcia/pcnet_cs.c | 11 +- drivers/net/pcmcia/smc91c92_cs.c | 23 +- drivers/net/pcnet32.c | 5 +- drivers/net/phy/Kconfig | 5 + drivers/net/phy/Makefile | 1 + drivers/net/phy/marvell.c | 139 +- drivers/net/phy/phy.c | 9 +- drivers/net/phy/phy_device.c | 6 +- drivers/net/phy/vitesse.c | 46 +- drivers/net/ppp_async.c | 3 +- drivers/net/ppp_deflate.c | 6 +- drivers/net/ppp_generic.c | 61 +- drivers/net/ppp_mppe.c | 17 +- drivers/net/ppp_synctty.c | 3 +- drivers/net/pppoe.c | 108 +- drivers/net/pppox.c | 11 +- drivers/net/qla3xxx.c | 41 +- drivers/net/r8169.c | 957 +- drivers/net/rrunner.c | 2 +- drivers/net/s2io-regs.h | 5 +- drivers/net/s2io.c | 690 +- drivers/net/s2io.h | 18 +- drivers/net/saa9730.c | 13 +- drivers/net/sc92031.c | 1 - drivers/net/sgiseeq.c | 6 +- drivers/net/shaper.c | 3 +- drivers/net/sis190.c | 5 +- drivers/net/sis900.c | 2 +- drivers/net/sk98lin/skethtool.c | 1 - drivers/net/sk98lin/skge.c | 8 + drivers/net/skfp/pmf.c | 2 +- drivers/net/skge.c | 1 - drivers/net/sky2.c | 964 +- drivers/net/sky2.h | 209 +- drivers/net/slip.c | 2 +- drivers/net/smc91x.h | 4 +- drivers/net/spider_net.c | 237 +- drivers/net/spider_net.h | 21 +- drivers/net/starfire.c | 4 +- drivers/net/sun3_82586.c | 2 +- drivers/net/sun3lance.c | 5 +- drivers/net/sunbmac.c | 2 +- drivers/net/sundance.c | 10 +- drivers/net/sunhme.c | 10 +- drivers/net/sunlance.c | 52 +- drivers/net/sunqe.c | 4 +- drivers/net/tc35815.c | 51 +- drivers/net/tg3.c | 281 +- drivers/net/tg3.h | 10 + drivers/net/tlan.c | 5 +- drivers/net/tokenring/3c359.c | 2 +- drivers/net/tokenring/smctr.c | 6 +- drivers/net/tulip/Kconfig | 27 +- drivers/net/tulip/de2104x.c | 1 - drivers/net/tulip/de4x5.c | 106 +- drivers/net/tulip/de4x5.h | 9 - drivers/net/tulip/dmfe.c | 26 +- drivers/net/tulip/interrupt.c | 8 +- drivers/net/tulip/tulip_core.c | 23 +- drivers/net/tulip/winbond-840.c | 2 +- drivers/net/tulip/xircom_cb.c | 7 +- drivers/net/tulip/xircom_tulip_cb.c | 8 +- drivers/net/tun.c | 15 +- drivers/net/typhoon.c | 9 +- drivers/net/ucc_geth.c | 338 +- drivers/net/ucc_geth.h | 6 + drivers/net/ucc_geth_mii.c | 9 +- drivers/net/usb/catc.c | 2 +- drivers/net/usb/cdc_subset.c | 3 + drivers/net/usb/dm9601.c | 2 +- drivers/net/usb/kaweth.c | 2 +- drivers/net/usb/pegasus.c | 4 +- drivers/net/usb/usbnet.c | 78 +- drivers/net/usb/usbnet.h | 10 +- drivers/net/via-rhine.c | 24 +- drivers/net/via-velocity.c | 5 +- drivers/net/wan/Kconfig | 2 +- drivers/net/wan/c101.c | 3 +- drivers/net/wan/cosa.c | 4 +- drivers/net/wan/cycx_main.c | 4 +- drivers/net/wan/cycx_x25.c | 3 +- drivers/net/wan/dscc4.c | 6 +- drivers/net/wan/farsync.c | 3 +- drivers/net/wan/hdlc_fr.c | 3 +- drivers/net/wan/hostess_sv11.c | 3 +- drivers/net/wan/n2.c | 3 +- drivers/net/wan/pc300_drv.c | 9 +- drivers/net/wan/pc300too.c | 5 +- drivers/net/wan/pci200syn.c | 5 +- drivers/net/wan/sbni.c | 7 +- drivers/net/wan/sdla.c | 3 +- drivers/net/wan/sealevel.c | 3 +- drivers/net/wan/wanxl.c | 3 +- drivers/net/wan/x25_asy.c | 4 +- drivers/net/wireless/Kconfig | 12 + drivers/net/wireless/Makefile | 5 +- drivers/net/wireless/airo.c | 211 +- drivers/net/wireless/bcm43xx/bcm43xx_main.c | 34 +- drivers/net/wireless/bcm43xx/bcm43xx_main.h | 2 +- drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | 2 +- drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 2 +- drivers/net/wireless/hostap/hostap_ap.c | 34 +- drivers/net/wireless/hostap/hostap_config.h | 2 - drivers/net/wireless/hostap/hostap_cs.c | 4 - drivers/net/wireless/hostap/hostap_ioctl.c | 2 - drivers/net/wireless/hostap/hostap_main.c | 1 - drivers/net/wireless/hostap/hostap_pci.c | 7 - drivers/net/wireless/hostap/hostap_plx.c | 8 - drivers/net/wireless/ipw2100.c | 17 +- drivers/net/wireless/ipw2200.c | 23 +- drivers/net/wireless/libertas/cmd.c | 2 +- drivers/net/wireless/libertas/main.c | 1 + drivers/net/wireless/libertas/rx.c | 1 - drivers/net/wireless/libertas/version.h | 1 - drivers/net/wireless/libertas/wext.c | 3 - drivers/net/wireless/prism54/isl_ioctl.c | 22 +- drivers/net/wireless/prism54/islpci_hotplug.c | 4 +- drivers/net/wireless/wl3501_cs.c | 2 +- drivers/net/wireless/zd1211rw/Makefile | 2 +- drivers/net/wireless/zd1211rw/zd_chip.c | 93 +- drivers/net/wireless/zd1211rw/zd_chip.h | 16 +- drivers/net/wireless/zd1211rw/zd_mac.c | 61 +- drivers/net/wireless/zd1211rw/zd_mac.h | 3 +- drivers/net/wireless/zd1211rw/zd_rf.c | 24 +- drivers/net/wireless/zd1211rw/zd_rf.h | 30 +- drivers/net/wireless/zd1211rw/zd_rf_al2230.c | 13 +- drivers/net/wireless/zd1211rw/zd_rf_al7230b.c | 3 +- drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | 2 +- drivers/net/wireless/zd1211rw/zd_usb.c | 103 +- drivers/net/wireless/zd1211rw/zd_usb.h | 3 + drivers/net/yellowfin.c | 2 +- drivers/nubus/nubus.c | 6 +- drivers/oprofile/buffer_sync.c | 3 +- drivers/oprofile/event_buffer.h | 20 +- drivers/oprofile/oprof.c | 28 + drivers/parisc/hppb.c | 1 + drivers/parisc/pdc_stable.c | 4 +- drivers/parisc/superio.c | 1 + drivers/parport/Kconfig | 26 +- drivers/parport/parport_cs.c | 3 +- drivers/parport/parport_pc.c | 9 +- drivers/parport/parport_serial.c | 3 +- drivers/pci/Makefile | 4 +- drivers/pci/hotplug/acpiphp.h | 1 + drivers/pci/hotplug/acpiphp_core.c | 6 +- drivers/pci/hotplug/acpiphp_glue.c | 53 +- drivers/pci/hotplug/acpiphp_ibm.c | 14 +- drivers/pci/hotplug/cpci_hotplug_core.c | 66 +- drivers/pci/hotplug/cpci_hotplug_pci.c | 2 - drivers/pci/hotplug/cpqphp_core.c | 12 +- drivers/pci/hotplug/cpqphp_ctrl.c | 4 +- drivers/pci/hotplug/pciehp.h | 1 + drivers/pci/hotplug/pciehp_ctrl.c | 12 + drivers/pci/hotplug/pciehp_hpc.c | 191 +- drivers/pci/hotplug/rpadlpar_core.c | 6 +- drivers/pci/pci-acpi.c | 40 +- drivers/pci/pci-driver.c | 2 +- drivers/pci/pci-sysfs.c | 35 +- drivers/pci/pci.c | 214 +- drivers/pci/pci.h | 11 +- drivers/pci/pcie/aer/Kconfig | 2 +- drivers/pci/pcie/aer/Makefile | 3 +- drivers/pci/pcie/aer/aerdrv.c | 5 +- drivers/pci/pcie/aer/aerdrv.h | 14 +- drivers/pci/pcie/aer/aerdrv_acpi.c | 36 +- drivers/pci/pcie/aer/aerdrv_core.c | 34 +- drivers/pci/probe.c | 17 +- drivers/pci/proc.c | 3 +- drivers/pci/quirks.c | 57 +- drivers/pci/rom.c | 73 +- drivers/pci/search.c | 11 +- drivers/pci/setup-bus.c | 8 +- drivers/pci/syscall.c | 20 +- drivers/pcmcia/Kconfig | 17 +- drivers/pcmcia/cs.c | 1 + drivers/pcmcia/ds.c | 40 +- drivers/pcmcia/m8xx_pcmcia.c | 829 +- drivers/pcmcia/socket_sysfs.c | 10 +- drivers/pnp/Kconfig | 13 +- drivers/pnp/card.c | 158 +- drivers/pnp/core.c | 60 +- drivers/pnp/driver.c | 77 +- drivers/pnp/interface.c | 212 +- drivers/pnp/isapnp/Kconfig | 2 +- drivers/pnp/isapnp/compat.c | 39 +- drivers/pnp/isapnp/core.c | 358 +- drivers/pnp/isapnp/proc.c | 62 +- drivers/pnp/manager.c | 157 +- drivers/pnp/pnpacpi/core.c | 113 +- drivers/pnp/pnpacpi/rsparser.c | 452 +- drivers/pnp/pnpbios/Kconfig | 2 +- drivers/pnp/pnpbios/bioscalls.c | 339 +- drivers/pnp/pnpbios/core.c | 302 +- drivers/pnp/pnpbios/proc.c | 105 +- drivers/pnp/pnpbios/rsparser.c | 350 +- drivers/pnp/quirks.c | 163 +- drivers/pnp/resource.c | 116 +- drivers/pnp/support.c | 17 +- drivers/pnp/system.c | 40 +- drivers/ps3/Makefile | 5 +- drivers/ps3/ps3av.c | 372 +- drivers/ps3/ps3av_cmd.c | 51 +- drivers/ps3/sys-manager.c | 290 +- drivers/ps3/vuart.c | 817 +- drivers/ps3/vuart.h | 71 +- drivers/rapidio/rio-scan.c | 6 +- drivers/rapidio/rio-sysfs.c | 7 +- drivers/rtc/Kconfig | 139 +- drivers/rtc/Makefile | 39 +- drivers/rtc/class.c | 5 +- drivers/rtc/rtc-bfin.c | 2 +- drivers/rtc/rtc-cmos.c | 33 +- drivers/rtc/rtc-dev.c | 4 + drivers/rtc/rtc-ds1307.c | 300 +- drivers/rtc/rtc-ds1553.c | 15 +- drivers/rtc/rtc-ds1742.c | 15 +- drivers/rtc/rtc-max6900.c | 96 +- drivers/rtc/rtc-max6902.c | 6 +- drivers/rtc/rtc-rs5c348.c | 2 +- drivers/rtc/rtc-rs5c372.c | 95 +- drivers/rtc/rtc-s3c.c | 2 +- drivers/rtc/rtc-sh.c | 1 + drivers/rtc/rtc-v3020.c | 9 +- drivers/rtc/rtc-vr41xx.c | 186 +- drivers/rtc/rtc-x1205.c | 5 +- drivers/s390/block/dasd.c | 4 +- drivers/s390/block/dasd_devmap.c | 2 +- drivers/s390/block/dasd_diag.c | 1 + drivers/s390/block/dasd_eckd.c | 4 +- drivers/s390/block/dasd_int.h | 2 +- drivers/s390/block/dasd_proc.c | 4 + drivers/s390/block/dcssblk.c | 9 +- drivers/s390/block/xpram.c | 2 +- drivers/s390/char/Kconfig | 19 +- drivers/s390/char/Makefile | 1 + drivers/s390/char/monwriter.c | 6 + drivers/s390/char/raw3270.c | 7 +- drivers/s390/char/sclp.h | 12 + drivers/s390/char/sclp_chp.c | 4 + drivers/s390/char/sclp_info.c | 117 +- drivers/s390/char/sclp_vt220.c | 62 +- drivers/s390/char/tape.h | 2 +- drivers/s390/char/tape_34xx.c | 3 +- drivers/s390/char/tape_block.c | 4 +- drivers/s390/char/vmcp.c | 100 +- drivers/s390/char/vmcp.h | 4 +- drivers/s390/char/vmlogrdr.c | 4 +- drivers/s390/char/zcore.c | 2 +- drivers/s390/cio/blacklist.c | 19 +- drivers/s390/cio/ccwgroup.c | 3 - drivers/s390/cio/chp.c | 31 +- drivers/s390/cio/chsc.c | 26 +- drivers/s390/cio/chsc.h | 2 + drivers/s390/cio/cio.c | 13 +- drivers/s390/cio/cio_debug.h | 2 + drivers/s390/cio/cmf.c | 20 +- drivers/s390/cio/css.c | 33 +- drivers/s390/cio/css.h | 1 - drivers/s390/cio/device.c | 67 +- drivers/s390/cio/device_fsm.c | 20 +- drivers/s390/cio/device_id.c | 56 +- drivers/s390/cio/device_ops.c | 257 - drivers/s390/cio/qdio.c | 113 +- drivers/s390/crypto/ap_bus.c | 98 +- drivers/s390/crypto/ap_bus.h | 11 + drivers/s390/crypto/zcrypt_cex2a.c | 27 +- drivers/s390/crypto/zcrypt_pcica.c | 27 +- drivers/s390/crypto/zcrypt_pcicc.c | 27 +- drivers/s390/crypto/zcrypt_pcixcc.c | 40 +- drivers/s390/net/claw.c | 9 +- drivers/s390/net/ctcmain.c | 6 +- drivers/s390/net/netiucv.c | 4 +- drivers/s390/net/qeth.h | 13 +- drivers/s390/net/qeth_main.c | 331 +- drivers/s390/net/qeth_mpc.h | 1 + drivers/s390/net/qeth_proc.c | 6 + drivers/s390/net/qeth_sys.c | 10 +- drivers/s390/scsi/zfcp_aux.c | 37 +- drivers/s390/scsi/zfcp_def.h | 1 + drivers/s390/scsi/zfcp_erp.c | 10 +- drivers/s390/scsi/zfcp_fsf.c | 7 +- drivers/s390/scsi/zfcp_qdio.c | 152 +- drivers/s390/scsi/zfcp_scsi.c | 4 +- drivers/sbus/char/Kconfig | 1 + drivers/sbus/char/bbc_envctrl.c | 15 +- drivers/sbus/char/bbc_i2c.c | 7 +- drivers/sbus/char/cpwatchdog.c | 1 + drivers/sbus/char/envctrl.c | 7 +- drivers/sbus/char/jsflash.c | 5 +- drivers/sbus/char/vfc_dev.c | 6 +- drivers/sbus/sbus.c | 14 + drivers/scsi/3w-9xxx.c | 205 +- drivers/scsi/3w-9xxx.h | 5 +- drivers/scsi/3w-xxxx.c | 104 +- drivers/scsi/53c700.c | 77 +- drivers/scsi/53c700.h | 5 + drivers/scsi/53c7xx.c | 6102 ---- drivers/scsi/53c7xx.h | 1608 -- drivers/scsi/53c7xx.scr | 1591 -- drivers/scsi/53c7xx_d.h_shipped | 2874 -- drivers/scsi/53c7xx_u.h_shipped | 102 - drivers/scsi/BusLogic.c | 51 +- drivers/scsi/Kconfig | 80 +- drivers/scsi/Makefile | 24 +- drivers/scsi/NCR5380.c | 14 +- drivers/scsi/NCR5380.h | 6 +- drivers/scsi/NCR53C9x.c | 10 +- drivers/scsi/NCR53c406a.c | 45 +- drivers/scsi/NCR_D700.c | 3 +- drivers/scsi/NCR_Q720.c | 3 +- drivers/scsi/a100u2w.c | 1239 +- drivers/scsi/a100u2w.h | 297 +- drivers/scsi/aacraid/aachba.c | 528 +- drivers/scsi/aacraid/aacraid.h | 58 +- drivers/scsi/aacraid/commsup.c | 226 +- drivers/scsi/aacraid/linit.c | 111 +- drivers/scsi/aacraid/nark.c | 3 +- drivers/scsi/aacraid/rkt.c | 2 +- drivers/scsi/aacraid/rx.c | 33 +- drivers/scsi/advansys.c | 28394 ++++++++++--------- drivers/scsi/advansys.h | 36 - drivers/scsi/aha152x.c | 219 +- drivers/scsi/aha152x.h | 2 +- drivers/scsi/aha1740.c | 48 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 74 +- drivers/scsi/aic7xxx/aic79xx_osm.h | 4 +- drivers/scsi/aic7xxx/aic7xxx_core.c | 22 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 70 +- drivers/scsi/aic7xxx/aic7xxx_osm.h | 4 +- drivers/scsi/aic7xxx_old.c | 57 +- drivers/scsi/aic94xx/aic94xx_dev.c | 2 +- drivers/scsi/aic94xx/aic94xx_init.c | 20 +- drivers/scsi/aic94xx/aic94xx_task.c | 24 +- drivers/scsi/amiga7xx.c | 138 - drivers/scsi/amiga7xx.h | 23 - drivers/scsi/arcmsr/arcmsr.h | 4 +- drivers/scsi/arcmsr/arcmsr_attr.c | 18 +- drivers/scsi/arcmsr/arcmsr_hba.c | 559 +- drivers/scsi/arm/Kconfig | 9 - drivers/scsi/arm/Makefile | 1 - drivers/scsi/arm/cumana_1.c | 207 +- drivers/scsi/arm/ecoscsi.c | 236 - drivers/scsi/arm/oak.c | 74 +- drivers/scsi/bvme6000.c | 76 - drivers/scsi/bvme6000.h | 24 - drivers/scsi/dc395x.c | 163 +- drivers/scsi/dpt_i2o.c | 165 +- drivers/scsi/dpti.h | 9 +- drivers/scsi/eata.c | 48 +- drivers/scsi/esp_scsi.c | 33 +- drivers/scsi/esp_scsi.h | 2 - drivers/scsi/fdomain.c | 70 +- drivers/scsi/gdth.c | 52 +- drivers/scsi/gdth.h | 6 - drivers/scsi/hosts.c | 2 +- drivers/scsi/hptiop.c | 76 +- drivers/scsi/ibmmca.c | 1267 +- drivers/scsi/ibmmca.h | 21 - drivers/scsi/ibmvscsi/ibmvscsi.c | 486 +- drivers/scsi/ibmvscsi/ibmvscsi.h | 2 + drivers/scsi/ibmvscsi/rpa_vscsi.c | 20 +- drivers/scsi/ide-scsi.c | 10 +- drivers/scsi/imm.c | 3 +- drivers/scsi/initio.c | 3819 ++- drivers/scsi/initio.h | 313 +- drivers/scsi/ipr.c | 184 +- drivers/scsi/ips.c | 413 +- drivers/scsi/ips.h | 44 +- drivers/scsi/iscsi_tcp.c | 608 +- drivers/scsi/iscsi_tcp.h | 9 +- drivers/scsi/jazz_esp.c | 4 +- drivers/scsi/lasi700.c | 3 +- drivers/scsi/libiscsi.c | 714 +- drivers/scsi/libsas/Kconfig | 8 + drivers/scsi/libsas/Makefile | 1 + drivers/scsi/libsas/sas_discover.c | 405 +- drivers/scsi/libsas/sas_dump.c | 2 +- drivers/scsi/libsas/sas_expander.c | 241 +- drivers/scsi/libsas/sas_init.c | 3 +- drivers/scsi/libsas/sas_internal.h | 3 + drivers/scsi/libsas/sas_scsi_host.c | 87 +- drivers/scsi/lpfc/Makefile | 5 +- drivers/scsi/lpfc/lpfc.h | 402 +- drivers/scsi/lpfc/lpfc_attr.c | 1147 +- drivers/scsi/lpfc/lpfc_crtn.h | 196 +- drivers/scsi/lpfc/lpfc_ct.c | 1006 +- drivers/scsi/lpfc/lpfc_disc.h | 15 +- drivers/scsi/lpfc/lpfc_els.c | 3574 ++- drivers/scsi/lpfc/lpfc_hbadisc.c | 2351 +- drivers/scsi/lpfc/lpfc_hw.h | 564 +- drivers/scsi/lpfc/lpfc_init.c | 1058 +- drivers/scsi/lpfc/lpfc_logmsg.h | 11 +- drivers/scsi/lpfc/lpfc_mbox.c | 314 +- drivers/scsi/lpfc/lpfc_mem.c | 113 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 1341 +- drivers/scsi/lpfc/lpfc_scsi.c | 670 +- drivers/scsi/lpfc/lpfc_scsi.h | 3 +- drivers/scsi/lpfc/lpfc_sli.c | 2226 +- drivers/scsi/lpfc/lpfc_sli.h | 55 +- drivers/scsi/lpfc/lpfc_version.h | 4 +- drivers/scsi/mac53c94.c | 62 +- drivers/scsi/megaraid.c | 147 +- drivers/scsi/megaraid/mega_common.h | 1 + drivers/scsi/megaraid/megaraid_mbox.c | 185 +- drivers/scsi/megaraid/megaraid_mbox.h | 4 +- drivers/scsi/megaraid/megaraid_mm.c | 3 +- drivers/scsi/megaraid/megaraid_sas.c | 116 +- drivers/scsi/mesh.c | 46 +- drivers/scsi/mvme16x.c | 78 - drivers/scsi/mvme16x.h | 24 - drivers/scsi/ncr53c8xx.c | 70 +- drivers/scsi/nsp32.c | 204 +- drivers/scsi/pcmcia/Kconfig | 7 +- drivers/scsi/pcmcia/aha152x_stub.c | 3 +- drivers/scsi/pcmcia/nsp_cs.c | 3 +- drivers/scsi/pcmcia/qlogic_stub.c | 3 +- drivers/scsi/pcmcia/sym53c500_cs.c | 45 +- drivers/scsi/ppa.c | 60 +- drivers/scsi/qla2xxx/Makefile | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 286 +- drivers/scsi/qla2xxx/qla_dbg.c | 1193 +- drivers/scsi/qla2xxx/qla_dbg.h | 48 +- drivers/scsi/qla2xxx/qla_def.h | 110 +- drivers/scsi/qla2xxx/qla_fw.h | 127 +- drivers/scsi/qla2xxx/qla_gbl.h | 45 +- drivers/scsi/qla2xxx/qla_gs.c | 113 +- drivers/scsi/qla2xxx/qla_init.c | 374 +- drivers/scsi/qla2xxx/qla_inline.h | 4 +- drivers/scsi/qla2xxx/qla_iocb.c | 252 +- drivers/scsi/qla2xxx/qla_isr.c | 141 +- drivers/scsi/qla2xxx/qla_mbx.c | 454 +- drivers/scsi/qla2xxx/qla_os.c | 635 +- drivers/scsi/qla2xxx/qla_sup.c | 35 +- drivers/scsi/qla2xxx/qla_version.h | 6 +- drivers/scsi/qla4xxx/ql4_dbg.c | 174 +- drivers/scsi/qla4xxx/ql4_def.h | 78 +- drivers/scsi/qla4xxx/ql4_fw.h | 426 +- drivers/scsi/qla4xxx/ql4_glbl.h | 7 +- drivers/scsi/qla4xxx/ql4_init.c | 105 +- drivers/scsi/qla4xxx/ql4_iocb.c | 101 +- drivers/scsi/qla4xxx/ql4_isr.c | 114 +- drivers/scsi/qla4xxx/ql4_mbx.c | 274 +- drivers/scsi/qla4xxx/ql4_nvram.c | 3 + drivers/scsi/qla4xxx/ql4_os.c | 98 +- drivers/scsi/qla4xxx/ql4_version.h | 3 +- drivers/scsi/qlogicfas408.c | 30 +- drivers/scsi/qlogicpti.c | 50 +- drivers/scsi/scsi.c | 50 +- drivers/scsi/scsi_debug.c | 4 +- drivers/scsi/scsi_devinfo.c | 4 + drivers/scsi/scsi_error.c | 29 +- drivers/scsi/scsi_lib.c | 31 +- drivers/scsi/scsi_scan.c | 67 +- drivers/scsi/scsi_sysctl.c | 1 + drivers/scsi/scsi_sysfs.c | 41 +- drivers/scsi/scsi_tgt_lib.c | 2 +- drivers/scsi/scsi_transport_fc.c | 833 +- drivers/scsi/scsi_transport_iscsi.c | 138 +- drivers/scsi/scsi_transport_sas.c | 125 +- drivers/scsi/scsi_transport_spi.c | 28 +- drivers/scsi/sd.c | 22 +- drivers/scsi/seagate.c | 2 +- drivers/scsi/sg.c | 2 +- drivers/scsi/sim710.c | 6 +- drivers/scsi/sni_53c710.c | 10 +- drivers/scsi/sr.c | 10 +- drivers/scsi/st.c | 19 +- drivers/scsi/st.h | 3 +- drivers/scsi/stex.c | 111 +- drivers/scsi/sun_esp.c | 2 +- drivers/scsi/sym53c416.c | 44 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 85 +- drivers/scsi/sym53c8xx_2/sym_glue.h | 2 +- drivers/scsi/tmscsim.c | 88 +- drivers/scsi/tmscsim.h | 10 +- drivers/scsi/u14-34f.c | 60 +- drivers/scsi/ultrastor.c | 19 +- drivers/scsi/wd33c93.c | 4 +- drivers/scsi/wd7000.c | 20 +- drivers/serial/68328serial.c | 71 +- drivers/serial/68360serial.c | 7 - drivers/serial/8250.c | 118 +- drivers/serial/8250_early.c | 127 +- drivers/serial/8250_hp300.c | 1 + drivers/serial/8250_pci.c | 212 +- drivers/serial/Kconfig | 130 +- drivers/serial/Makefile | 2 + drivers/serial/amba-pl011.c | 3 +- drivers/serial/atmel_serial.c | 32 +- drivers/serial/bfin_5xx.c | 182 +- drivers/serial/cpm_uart/cpm_uart_core.c | 2 +- drivers/serial/cpm_uart/cpm_uart_cpm1.h | 2 +- drivers/serial/imx.c | 2 +- drivers/serial/ip22zilog.c | 3 + drivers/serial/jsm/jsm_driver.c | 2 +- drivers/serial/mpsc.c | 711 +- drivers/serial/of_serial.c | 33 +- drivers/serial/s3c2410.c | 2 +- drivers/serial/serial_core.c | 22 +- drivers/serial/serial_cs.c | 5 + drivers/serial/serial_txx9.c | 19 +- drivers/serial/sh-sci.c | 13 +- drivers/serial/sh-sci.h | 116 +- drivers/serial/sn_console.c | 4 +- drivers/serial/suncore.c | 123 +- drivers/serial/suncore.h | 2 + drivers/serial/sunhv.c | 25 +- drivers/serial/sunsab.c | 131 +- drivers/serial/sunsu.c | 28 +- drivers/serial/sunzilog.c | 38 +- drivers/serial/vr41xx_siu.c | 150 +- drivers/sh/superhyway/superhyway.c | 3 +- drivers/sn/ioc3.c | 3 +- drivers/spi/Kconfig | 45 +- drivers/spi/Makefile | 6 +- drivers/spi/at25.c | 7 +- drivers/spi/atmel_spi.c | 185 +- drivers/spi/au1550_spi.c | 9 + drivers/spi/mpc52xx_psc_spi.c | 9 + drivers/spi/omap_uwire.c | 9 + drivers/spi/pxa2xx_spi.c | 9 + drivers/spi/spi.c | 59 +- drivers/spi/spi_bfin5xx.c | 3 +- drivers/spi/spi_bitbang.c | 8 +- drivers/spi/spi_imx.c | 26 +- drivers/spi/spi_mpc83xx.c | 102 +- drivers/spi/spi_s3c24xx.c | 11 +- drivers/spi/spi_s3c24xx_gpio.c | 2 +- drivers/spi/spidev.c | 23 +- drivers/tc/Makefile | 1 - drivers/tc/zs.c | 2203 -- drivers/tc/zs.h | 404 - drivers/telephony/Kconfig | 13 +- drivers/telephony/ixj.c | 7 +- drivers/telephony/ixj_pcmcia.c | 3 +- drivers/usb/Kconfig | 14 +- drivers/usb/Makefile | 3 +- drivers/usb/atm/cxacru.c | 77 +- drivers/usb/atm/speedtch.c | 7 +- drivers/usb/atm/ueagle-atm.c | 12 +- drivers/usb/atm/usbatm.c | 11 +- drivers/usb/class/cdc-acm.c | 21 +- drivers/usb/class/usblp.c | 621 +- drivers/usb/core/Kconfig | 25 + drivers/usb/core/config.c | 42 +- drivers/usb/core/devices.c | 26 + drivers/usb/core/driver.c | 166 +- drivers/usb/core/file.c | 29 +- drivers/usb/core/generic.c | 29 +- drivers/usb/core/hcd-pci.c | 3 +- drivers/usb/core/hcd.c | 247 +- drivers/usb/core/hcd.h | 14 +- drivers/usb/core/hub.c | 652 +- drivers/usb/core/message.c | 107 +- drivers/usb/core/quirks.c | 83 + drivers/usb/core/sysfs.c | 162 +- drivers/usb/core/urb.c | 193 +- drivers/usb/core/usb.c | 12 +- drivers/usb/core/usb.h | 14 +- drivers/usb/gadget/Kconfig | 74 + drivers/usb/gadget/Makefile | 7 + drivers/usb/gadget/arcotg_udc.c | 46 - drivers/usb/gadget/at91_udc.c | 21 - drivers/usb/gadget/config.c | 2 +- drivers/usb/gadget/dummy_hcd.c | 41 +- drivers/usb/gadget/epautoconf.c | 2 +- drivers/usb/gadget/ether.c | 15 +- drivers/usb/gadget/file_storage.c | 35 +- drivers/usb/gadget/fsl_usb2_udc.c | 176 +- drivers/usb/gadget/fsl_usb2_udc.h | 4 + drivers/usb/gadget/gadget_chips.h | 35 +- drivers/usb/gadget/gmidi.c | 8 +- drivers/usb/gadget/goku_udc.c | 87 +- drivers/usb/gadget/goku_udc.h | 10 +- drivers/usb/gadget/inode.c | 12 +- drivers/usb/gadget/lh7a40x_udc.c | 27 - drivers/usb/gadget/net2280.c | 99 +- drivers/usb/gadget/omap_udc.c | 108 - drivers/usb/gadget/pxa2xx_udc.c | 507 +- drivers/usb/gadget/pxa2xx_udc.h | 48 +- drivers/usb/gadget/rndis.c | 164 +- drivers/usb/gadget/serial.c | 67 +- drivers/usb/gadget/zero.c | 15 +- drivers/usb/host/Kconfig | 28 +- drivers/usb/host/Makefile | 2 + drivers/usb/host/ehci-au1xxx.c | 5 +- drivers/usb/host/ehci-dbg.c | 183 +- drivers/usb/host/ehci-fsl.c | 10 +- drivers/usb/host/ehci-hcd.c | 51 +- drivers/usb/host/ehci-hub.c | 122 +- drivers/usb/host/ehci-mem.c | 24 +- drivers/usb/host/ehci-pci.c | 10 +- drivers/usb/host/ehci-ps3.c | 86 +- drivers/usb/host/ehci-q.c | 92 +- drivers/usb/host/ehci-sched.c | 212 +- drivers/usb/host/ehci.h | 220 +- drivers/usb/host/isp116x-hcd.c | 187 +- drivers/usb/host/ohci-dbg.c | 6 +- drivers/usb/host/ohci-hcd.c | 95 +- drivers/usb/host/ohci-hub.c | 5 +- drivers/usb/host/ohci-mem.c | 1 + drivers/usb/host/ohci-pci.c | 57 +- drivers/usb/host/ohci-pnx4008.c | 2 +- drivers/usb/host/ohci-ps3.c | 87 +- drivers/usb/host/ohci.h | 2 + drivers/usb/host/sl811_cs.c | 3 +- drivers/usb/host/u132-hcd.c | 20 +- drivers/usb/host/uhci-hcd.c | 7 +- drivers/usb/host/uhci-q.c | 59 +- drivers/usb/image/mdc800.c | 45 +- drivers/usb/image/microtek.c | 19 +- drivers/usb/misc/adutux.c | 86 +- drivers/usb/misc/appledisplay.c | 13 +- drivers/usb/misc/auerswald.c | 35 +- drivers/usb/misc/berry_charge.c | 35 + drivers/usb/misc/ftdi-elan.c | 21 +- drivers/usb/misc/idmouse.c | 54 +- drivers/usb/misc/iowarrior.c | 47 +- drivers/usb/misc/ldusb.c | 53 +- drivers/usb/misc/legousbtower.c | 52 +- drivers/usb/misc/phidgetkit.c | 13 +- drivers/usb/misc/phidgetmotorcontrol.c | 13 +- drivers/usb/misc/sisusbvga/sisusb.c | 39 +- drivers/usb/misc/sisusbvga/sisusb_con.c | 25 +- drivers/usb/misc/sisusbvga/sisusb_init.h | 2 - drivers/usb/misc/usblcd.c | 78 +- drivers/usb/misc/usbtest.c | 4 +- drivers/usb/misc/uss720.c | 5 +- drivers/usb/mon/mon_bin.c | 34 +- drivers/usb/mon/mon_main.c | 14 +- drivers/usb/mon/mon_text.c | 31 +- drivers/usb/mon/usb_mon.h | 7 +- drivers/usb/serial/Kconfig | 10 + drivers/usb/serial/Makefile | 1 + drivers/usb/serial/aircable.c | 16 +- drivers/usb/serial/airprime.c | 11 +- drivers/usb/serial/ark3116.c | 61 +- drivers/usb/serial/belkin_sa.c | 82 +- drivers/usb/serial/bus.c | 2 +- drivers/usb/serial/cp2101.c | 69 +- drivers/usb/serial/cyberjack.c | 17 +- drivers/usb/serial/cypress_m8.c | 18 +- drivers/usb/serial/digi_acceleport.c | 1047 +- drivers/usb/serial/empeg.c | 14 +- drivers/usb/serial/ftdi_sio.c | 18 +- drivers/usb/serial/ftdi_sio.h | 11 + drivers/usb/serial/garmin_gps.c | 136 +- drivers/usb/serial/generic.c | 97 +- drivers/usb/serial/io_edgeport.c | 40 +- drivers/usb/serial/io_fw_down3.h | 1460 +- drivers/usb/serial/io_ti.c | 134 +- drivers/usb/serial/io_usbvend.h | 12 +- drivers/usb/serial/ipaq.c | 15 +- drivers/usb/serial/ipw.c | 12 +- drivers/usb/serial/ir-usb.c | 154 +- drivers/usb/serial/keyspan.c | 456 +- drivers/usb/serial/keyspan.h | 74 +- drivers/usb/serial/keyspan_pda.c | 17 +- drivers/usb/serial/kl5kusb105.c | 22 +- drivers/usb/serial/kobil_sct.c | 26 +- drivers/usb/serial/mct_u232.c | 199 +- drivers/usb/serial/mct_u232.h | 17 +- drivers/usb/serial/mos7720.c | 48 +- drivers/usb/serial/mos7840.c | 125 +- drivers/usb/serial/navman.c | 7 +- drivers/usb/serial/omninet.c | 20 +- drivers/usb/serial/option.c | 47 +- drivers/usb/serial/pl2303.c | 90 +- drivers/usb/serial/safe_serial.c | 12 +- drivers/usb/serial/sierra.c | 491 +- drivers/usb/serial/ti_usb_3410_5052.c | 46 +- drivers/usb/serial/usb-serial.c | 49 +- drivers/usb/serial/visor.c | 66 +- drivers/usb/serial/visor.h | 3 + drivers/usb/serial/whiteheat.c | 122 +- drivers/usb/storage/dpcm.c | 56 +- drivers/usb/storage/onetouch.c | 13 +- drivers/usb/storage/scsiglue.c | 8 +- drivers/usb/storage/unusual_devs.h | 259 +- drivers/usb/storage/usb.c | 100 +- drivers/usb/storage/usb.h | 2 + drivers/usb/usb-skeleton.c | 151 +- drivers/video/68328fb.c | 2 +- drivers/video/Kconfig | 51 +- drivers/video/Makefile | 5 +- drivers/video/acornfb.c | 20 - drivers/video/amba-clcd.c | 3 +- drivers/video/atmel_lcdfb.c | 67 +- drivers/video/aty/ati_ids.h | 11 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/aty/atyfb_base.c | 11 +- drivers/video/aty/radeon_backlight.c | 4 +- drivers/video/aty/radeon_base.c | 14 +- drivers/video/aty/radeonfb.h | 2 +- drivers/video/au1100fb.c | 92 +- drivers/video/au1200fb.c | 3 +- drivers/video/backlight/Kconfig | 26 +- drivers/video/backlight/backlight.c | 125 +- drivers/video/backlight/cr_bllcd.c | 2 +- drivers/video/backlight/lcd.c | 112 +- drivers/video/bw2.c | 131 +- drivers/video/cg14.c | 150 +- drivers/video/cg3.c | 157 +- drivers/video/cg6.c | 166 +- drivers/video/chipsfb.c | 3 +- drivers/video/clps711xfb.c | 3 +- drivers/video/console/Kconfig | 22 +- drivers/video/console/fbcon.c | 378 +- drivers/video/console/fonts.c | 4 +- drivers/video/console/newport_con.c | 3 +- drivers/video/console/sticore.c | 14 +- drivers/video/console/vgacon.c | 6 +- drivers/video/controlfb.c | 2 +- drivers/video/cyber2000fb.c | 3 +- drivers/video/cyblafb.c | 21 +- drivers/video/epson1355fb.c | 21 +- drivers/video/fbmem.c | 341 +- drivers/video/ffb.c | 170 +- drivers/video/fm2fb.c | 16 +- drivers/video/gbefb.c | 41 +- drivers/video/geode/Kconfig | 15 + drivers/video/geode/Makefile | 2 + drivers/video/i810/i810.h | 2 +- drivers/video/igafb.c | 4 - drivers/video/imsttfb.c | 2 +- drivers/video/intelfb/intelfb.h | 2 +- drivers/video/intelfb/intelfbhw.c | 8 +- drivers/video/kyro/STG4000InitDevice.c | 5 +- drivers/video/leo.c | 147 +- drivers/video/logo/Kconfig | 5 + drivers/video/logo/Makefile | 2 + drivers/video/logo/logo.c | 6 +- drivers/video/macfb.c | 93 +- drivers/video/matrox/g450_pll.c | 23 +- drivers/video/matrox/matroxfb_DAC1064.h | 15 + drivers/video/matrox/matroxfb_accel.c | 11 +- drivers/video/matrox/matroxfb_base.c | 8 +- drivers/video/matrox/matroxfb_base.h | 3 +- drivers/video/matrox/matroxfb_crtc2.c | 6 - drivers/video/matrox/matroxfb_crtc2.h | 4 +- drivers/video/matrox/matroxfb_maven.c | 9 +- drivers/video/matrox/matroxfb_misc.c | 1 + drivers/video/nvidia/nv_backlight.c | 2 +- drivers/video/nvidia/nv_hw.c | 62 +- drivers/video/nvidia/nv_setup.c | 12 +- drivers/video/nvidia/nv_type.h | 1 + drivers/video/nvidia/nvidia.c | 9 +- drivers/video/offb.c | 2 +- drivers/video/p9100.c | 138 +- drivers/video/platinumfb.c | 2 +- drivers/video/pm2fb.c | 202 +- drivers/video/pm3fb.c | 270 +- drivers/video/ps3fb.c | 293 +- drivers/video/pvr2fb.c | 125 +- drivers/video/pxafb.c | 2 +- drivers/video/q40fb.c | 2 +- drivers/video/riva/fbdev.c | 4 +- drivers/video/riva/riva_hw.c | 7 +- drivers/video/s3c2410fb.c | 88 +- drivers/video/s3c2410fb.h | 3 + drivers/video/savage/savagefb_driver.c | 3 +- drivers/video/sbuslib.c | 25 - drivers/video/sgivwfb.c | 2 +- drivers/video/sis/sis.h | 2 +- drivers/video/sis/sis_main.c | 8 +- drivers/video/sstfb.c | 2 +- drivers/video/tcx.c | 184 +- drivers/video/tgafb.c | 7 +- drivers/video/tridentfb.c | 30 +- drivers/video/tx3912fb.c | 326 - drivers/video/valkyriefb.c | 3 +- drivers/video/vt8623fb.c | 42 +- drivers/video/xilinxfb.c | 23 +- drivers/w1/Kconfig | 12 +- drivers/w1/masters/Kconfig | 7 +- drivers/w1/masters/ds1wm.c | 2 +- drivers/w1/masters/matrox_w1.c | 3 +- drivers/w1/slaves/Kconfig | 17 +- drivers/w1/slaves/Makefile | 2 +- drivers/w1/slaves/w1_ds2433.c | 14 +- drivers/w1/slaves/w1_therm.c | 8 +- drivers/w1/w1.c | 19 +- drivers/w1/w1_family.h | 1 + drivers/w1/w1_int.c | 13 +- drivers/zorro/zorro-sysfs.c | 8 +- fs/9p/9p.h | 375 - fs/9p/Makefile | 6 - fs/9p/conv.c | 846 - fs/9p/conv.h | 50 - fs/9p/debug.h | 77 - fs/9p/error.c | 93 - fs/9p/error.h | 177 - fs/9p/fcall.c | 427 - fs/9p/fcprint.c | 345 - fs/9p/fid.c | 157 +- fs/9p/fid.h | 42 +- fs/9p/mux.c | 1033 - fs/9p/mux.h | 55 - fs/9p/trans_fd.c | 308 - fs/9p/transport.h | 45 - fs/9p/v9fs.c | 295 +- fs/9p/v9fs.h | 32 +- fs/9p/v9fs_vfs.h | 6 +- fs/9p/vfs_addr.c | 57 +- fs/9p/vfs_dentry.c | 37 +- fs/9p/vfs_dir.c | 155 +- fs/9p/vfs_file.c | 166 +- fs/9p/vfs_inode.c | 754 +- fs/9p/vfs_super.c | 93 +- fs/Kconfig | 65 +- fs/adfs/file.c | 2 +- fs/adfs/super.c | 4 +- fs/affs/file.c | 2 +- fs/affs/super.c | 2 +- fs/afs/Makefile | 1 + fs/afs/afs.h | 8 + fs/afs/afs_fs.h | 3 + fs/afs/callback.c | 3 + fs/afs/dir.c | 1 + fs/afs/file.c | 4 +- fs/afs/fsclient.c | 155 +- fs/afs/internal.h | 30 + fs/afs/main.c | 1 + fs/afs/misc.c | 1 + fs/afs/mntpt.c | 2 +- fs/afs/proc.c | 81 +- fs/afs/rxrpc.c | 21 +- fs/afs/super.c | 6 +- fs/afs/vnode.c | 132 +- fs/aio.c | 2 +- fs/anon_inodes.c | 11 +- fs/attr.c | 4 +- fs/autofs4/root.c | 31 +- fs/bad_inode.c | 7 - fs/befs/linuxvfs.c | 4 +- fs/bfs/file.c | 2 +- fs/bfs/inode.c | 4 +- fs/binfmt_elf.c | 58 +- fs/binfmt_elf_fdpic.c | 64 +- fs/binfmt_flat.c | 6 +- fs/binfmt_misc.c | 4 +- fs/binfmt_script.c | 4 +- fs/bio.c | 34 +- fs/block_dev.c | 66 +- fs/buffer.c | 110 +- fs/char_dev.c | 3 +- fs/cifs/CHANGES | 16 +- fs/cifs/README | 51 +- fs/cifs/TODO | 15 +- fs/cifs/asn1.c | 57 +- fs/cifs/cifs_debug.c | 103 +- fs/cifs/cifs_fs_sb.h | 2 +- fs/cifs/cifs_unicode.c | 2 +- fs/cifs/cifs_unicode.h | 39 +- fs/cifs/cifs_uniupr.h | 8 +- fs/cifs/cifsencrypt.c | 262 +- fs/cifs/cifsfs.c | 218 +- fs/cifs/cifsfs.h | 23 +- fs/cifs/cifsglob.h | 78 +- fs/cifs/cifspdu.h | 297 +- fs/cifs/cifsproto.h | 123 +- fs/cifs/cifssmb.c | 1621 +- fs/cifs/connect.c | 1263 +- fs/cifs/dir.c | 22 +- fs/cifs/export.c | 50 +- fs/cifs/fcntl.c | 2 +- fs/cifs/file.c | 316 +- fs/cifs/inode.c | 320 +- fs/cifs/ioctl.c | 4 +- fs/cifs/link.c | 116 +- fs/cifs/md4.c | 10 +- fs/cifs/md5.c | 8 +- fs/cifs/misc.c | 239 +- fs/cifs/netmisc.c | 171 +- fs/cifs/nterr.c | 8 +- fs/cifs/nterr.h | 8 +- fs/cifs/ntlmssp.h | 22 +- fs/cifs/readdir.c | 375 +- fs/cifs/sess.c | 253 +- fs/cifs/smbdes.c | 30 +- fs/cifs/smbencrypt.c | 52 +- fs/cifs/smberr.h | 8 +- fs/cifs/transport.c | 248 +- fs/cifs/xattr.c | 229 +- fs/coda/cache.c | 7 +- fs/coda/cnode.c | 7 +- fs/coda/coda_int.h | 7 + fs/coda/dir.c | 305 +- fs/coda/file.c | 91 +- fs/coda/inode.c | 50 +- fs/coda/psdev.c | 88 +- fs/coda/symlink.c | 2 - fs/coda/sysctl.c | 228 +- fs/coda/upcall.c | 499 +- fs/compat.c | 128 +- fs/compat_ioctl.c | 51 +- fs/configfs/configfs_internal.h | 7 +- fs/configfs/dir.c | 289 +- fs/configfs/file.c | 28 +- fs/configfs/item.c | 29 +- fs/configfs/mount.c | 2 +- fs/cramfs/inode.c | 212 +- fs/dcache.c | 11 +- fs/dcookies.c | 3 +- fs/debugfs/inode.c | 68 +- fs/direct-io.c | 18 +- fs/dlm/Makefile | 1 + fs/dlm/config.c | 39 +- fs/dlm/config.h | 1 + fs/dlm/debug_fs.c | 186 +- fs/dlm/dlm_internal.h | 17 + fs/dlm/lock.c | 537 +- fs/dlm/lock.h | 13 +- fs/dlm/lockspace.c | 86 +- fs/dlm/lowcomms.c | 49 +- fs/dlm/main.c | 11 +- fs/dlm/member.c | 15 +- fs/dlm/memory.c | 14 +- fs/dlm/rcom.c | 8 +- fs/dlm/recoverd.c | 4 +- fs/dlm/user.c | 129 +- fs/dnotify.c | 2 +- fs/dquot.c | 11 +- fs/drop_caches.c | 2 +- fs/ecryptfs/file.c | 15 +- fs/ecryptfs/inode.c | 8 +- fs/ecryptfs/main.c | 22 +- fs/ecryptfs/mmap.c | 8 +- fs/efs/namei.c | 32 + fs/efs/super.c | 6 +- fs/eventpoll.c | 4 +- fs/exec.c | 687 +- fs/exportfs/expfs.c | 439 +- fs/ext2/acl.c | 2 +- fs/ext2/file.c | 8 +- fs/ext2/ioctl.c | 4 +- fs/ext2/super.c | 31 +- fs/ext3/acl.c | 2 +- fs/ext3/dir.c | 14 +- fs/ext3/file.c | 1 - fs/ext3/inode.c | 2 +- fs/ext3/ioctl.c | 6 +- fs/ext3/namei.c | 83 +- fs/ext3/super.c | 67 +- fs/ext4/acl.c | 2 +- fs/ext4/balloc.c | 6 +- fs/ext4/dir.c | 14 +- fs/ext4/extents.c | 682 +- fs/ext4/file.c | 2 +- fs/ext4/ialloc.c | 8 +- fs/ext4/inode.c | 120 +- fs/ext4/ioctl.c | 15 +- fs/ext4/namei.c | 159 +- fs/ext4/super.c | 114 +- fs/ext4/xattr.c | 276 +- fs/ext4/xattr.h | 17 + fs/fat/cache.c | 2 +- fs/fat/dir.c | 31 +- fs/fat/fatent.c | 7 + fs/fat/file.c | 2 +- fs/fat/inode.c | 6 +- fs/fcntl.c | 4 +- fs/freevxfs/vxfs_dir.h | 2 +- fs/freevxfs/vxfs_super.c | 4 +- fs/fuse/dev.c | 2 +- fs/fuse/file.c | 4 +- fs/fuse/inode.c | 2 +- fs/generic_acl.c | 2 +- fs/gfs2/Makefile | 2 +- fs/gfs2/acl.c | 2 +- fs/gfs2/bmap.c | 23 +- fs/gfs2/daemon.c | 11 + fs/gfs2/dir.c | 69 +- fs/gfs2/dir.h | 9 +- fs/gfs2/eaops.c | 1 + fs/gfs2/eattr.c | 14 +- fs/gfs2/glock.c | 123 +- fs/gfs2/glock.h | 1 + fs/gfs2/glops.c | 2 +- fs/gfs2/incore.h | 81 +- fs/gfs2/inode.c | 288 +- fs/gfs2/inode.h | 30 +- fs/gfs2/locking/dlm/lock.c | 11 +- fs/gfs2/locking/dlm/lock_dlm.h | 2 +- fs/gfs2/locking/dlm/mount.c | 2 +- fs/gfs2/locking/dlm/plock.c | 8 +- fs/gfs2/locking/dlm/thread.c | 11 +- fs/gfs2/log.c | 129 +- fs/gfs2/lops.c | 53 +- fs/gfs2/lops.h | 23 + fs/gfs2/main.c | 6 +- fs/gfs2/meta_io.c | 8 +- fs/gfs2/meta_io.h | 2 +- fs/gfs2/ondisk.c | 251 - fs/gfs2/ops_address.c | 74 +- fs/gfs2/ops_address.h | 2 +- fs/gfs2/ops_dentry.c | 24 +- fs/gfs2/ops_export.c | 66 +- fs/gfs2/ops_export.h | 22 - fs/gfs2/ops_file.c | 58 +- fs/gfs2/ops_fstype.c | 33 +- fs/gfs2/ops_fstype.h | 1 + fs/gfs2/ops_inode.c | 30 +- fs/gfs2/ops_super.c | 8 +- fs/gfs2/ops_vm.c | 66 +- fs/gfs2/quota.c | 57 +- fs/gfs2/recovery.c | 22 +- fs/gfs2/rgrp.c | 383 +- fs/gfs2/rgrp.h | 1 + fs/gfs2/super.c | 79 +- fs/gfs2/super.h | 2 +- fs/gfs2/util.c | 6 +- fs/hfs/inode.c | 2 +- fs/hfs/super.c | 2 +- fs/hfsplus/btree.c | 4 +- fs/hfsplus/dir.c | 2 + fs/hfsplus/hfsplus_fs.h | 4 + fs/hfsplus/inode.c | 7 +- fs/hfsplus/ioctl.c | 2 +- fs/hfsplus/super.c | 6 +- fs/hfsplus/unicode.c | 230 +- fs/hostfs/hostfs_kern.c | 2 +- fs/hpfs/file.c | 2 +- fs/hpfs/super.c | 4 +- fs/hugetlbfs/inode.c | 113 +- fs/inode.c | 20 +- fs/inotify_user.c | 4 +- fs/ioctl.c | 22 +- fs/isofs/dir.c | 87 +- fs/isofs/inode.c | 426 +- fs/isofs/isofs.h | 1 + fs/isofs/joliet.c | 10 +- fs/isofs/namei.c | 26 +- fs/jbd/journal.c | 8 +- fs/jbd/revoke.c | 9 +- fs/jbd2/journal.c | 87 +- fs/jbd2/recovery.c | 8 +- fs/jbd2/revoke.c | 9 +- fs/jffs2/acl.c | 2 +- fs/jffs2/background.c | 9 +- fs/jffs2/file.c | 2 +- fs/jffs2/fs.c | 2 +- fs/jffs2/malloc.c | 18 +- fs/jffs2/nodelist.h | 5 + fs/jffs2/readinode.c | 4 +- fs/jffs2/scan.c | 3 +- fs/jffs2/super.c | 2 +- fs/jffs2/write.c | 15 +- fs/jfs/endian24.h | 2 +- fs/jfs/file.c | 1 - fs/jfs/ioctl.c | 2 +- fs/jfs/jfs_debug.c | 28 - fs/jfs/jfs_debug.h | 2 - fs/jfs/jfs_dinode.h | 42 +- fs/jfs/jfs_dmap.c | 419 +- fs/jfs/jfs_dmap.h | 118 +- fs/jfs/jfs_dtree.c | 105 +- fs/jfs/jfs_dtree.h | 2 +- fs/jfs/jfs_extent.c | 102 +- fs/jfs/jfs_filsys.h | 13 +- fs/jfs/jfs_imap.c | 296 +- fs/jfs/jfs_imap.h | 98 +- fs/jfs/jfs_incore.h | 4 +- fs/jfs/jfs_inode.h | 1 + fs/jfs/jfs_logmgr.c | 90 +- fs/jfs/jfs_logmgr.h | 26 +- fs/jfs/jfs_metapage.c | 5 +- fs/jfs/jfs_mount.c | 6 +- fs/jfs/jfs_txnmgr.c | 302 +- fs/jfs/jfs_txnmgr.h | 2 +- fs/jfs/jfs_types.h | 20 +- fs/jfs/jfs_umount.c | 2 +- fs/jfs/jfs_xtree.c | 428 +- fs/jfs/jfs_xtree.h | 48 +- fs/jfs/namei.c | 58 +- fs/jfs/resize.c | 48 +- fs/jfs/super.c | 4 +- fs/jfs/xattr.c | 11 +- fs/lockd/host.c | 39 +- fs/lockd/mon.c | 2 +- fs/lockd/svc.c | 35 +- fs/lockd/svclock.c | 37 +- fs/locks.c | 116 +- fs/mbcache.c | 11 +- fs/minix/file.c | 2 +- fs/minix/inode.c | 4 +- fs/namei.c | 41 +- fs/namespace.c | 25 +- fs/ncpfs/file.c | 2 - fs/ncpfs/inode.c | 4 +- fs/ncpfs/mmap.c | 40 +- fs/ncpfs/ncplib_kernel.c | 3 - fs/nfs/Makefile | 4 +- fs/nfs/callback.c | 2 + fs/nfs/callback_xdr.c | 10 +- fs/nfs/client.c | 111 +- fs/nfs/delegation.c | 199 +- fs/nfs/delegation.h | 26 +- fs/nfs/dir.c | 26 +- fs/nfs/direct.c | 36 +- fs/nfs/file.c | 33 +- fs/nfs/getroot.c | 3 + fs/nfs/inode.c | 67 +- fs/nfs/internal.h | 4 +- fs/nfs/mount_clnt.c | 169 +- fs/nfs/namespace.c | 4 +- fs/nfs/nfs2xdr.c | 25 +- fs/nfs/nfs3proc.c | 64 +- fs/nfs/nfs3xdr.c | 32 +- fs/nfs/nfs4_fs.h | 42 +- fs/nfs/nfs4proc.c | 884 +- fs/nfs/nfs4renewd.c | 5 +- fs/nfs/nfs4state.c | 315 +- fs/nfs/nfs4xdr.c | 384 +- fs/nfs/nfsroot.c | 5 +- fs/nfs/pagelist.c | 62 +- fs/nfs/proc.c | 40 +- fs/nfs/read.c | 42 +- fs/nfs/super.c | 1244 +- fs/nfs/unlink.c | 195 +- fs/nfs/write.c | 195 +- fs/nfsctl.c | 16 +- fs/nfsd/auth.c | 19 +- fs/nfsd/export.c | 294 +- fs/nfsd/lockd.c | 1 + fs/nfsd/nfs4acl.c | 12 +- fs/nfsd/nfs4callback.c | 20 +- fs/nfsd/nfs4idmap.c | 19 +- fs/nfsd/nfs4proc.c | 45 +- fs/nfsd/nfs4state.c | 65 +- fs/nfsd/nfs4xdr.c | 101 +- fs/nfsd/nfsctl.c | 3 +- fs/nfsd/nfsfh.c | 71 +- fs/nfsd/nfsproc.c | 3 +- fs/nfsd/nfssvc.c | 12 + fs/nfsd/vfs.c | 173 +- fs/nls/Makefile | 2 - fs/ntfs/file.c | 2 +- fs/ntfs/namei.c | 1 + fs/ntfs/super.c | 10 +- fs/ocfs2/alloc.c | 3505 ++- fs/ocfs2/alloc.h | 43 +- fs/ocfs2/aops.c | 1022 +- fs/ocfs2/aops.h | 61 +- fs/ocfs2/cluster/heartbeat.c | 96 +- fs/ocfs2/cluster/heartbeat.h | 6 +- fs/ocfs2/cluster/masklog.c | 1 - fs/ocfs2/cluster/nodemanager.c | 42 +- fs/ocfs2/cluster/nodemanager.h | 5 + fs/ocfs2/cluster/tcp.c | 45 +- fs/ocfs2/dir.c | 2 +- fs/ocfs2/dlm/dlmdomain.c | 8 +- fs/ocfs2/dlm/dlmfs.c | 2 +- fs/ocfs2/dlm/dlmmaster.c | 42 +- fs/ocfs2/dlm/dlmrecovery.c | 79 +- fs/ocfs2/dlmglue.c | 6 +- fs/ocfs2/endian.h | 5 + fs/ocfs2/export.h | 2 + fs/ocfs2/extent_map.c | 41 +- fs/ocfs2/file.c | 789 +- fs/ocfs2/file.h | 10 +- fs/ocfs2/heartbeat.c | 12 +- fs/ocfs2/ioctl.c | 17 +- fs/ocfs2/journal.c | 6 +- fs/ocfs2/journal.h | 2 + fs/ocfs2/localalloc.c | 8 +- fs/ocfs2/localalloc.h | 2 +- fs/ocfs2/mmap.c | 183 +- fs/ocfs2/namei.c | 18 +- fs/ocfs2/ocfs2.h | 22 +- fs/ocfs2/ocfs2_fs.h | 33 +- fs/ocfs2/slot_map.c | 12 +- fs/ocfs2/suballoc.c | 75 +- fs/ocfs2/suballoc.h | 28 +- fs/ocfs2/super.c | 145 +- fs/ocfs2/uptodate.c | 2 +- fs/ocfs2/vote.c | 4 +- fs/open.c | 89 +- fs/openpromfs/inode.c | 2 +- fs/partitions/acorn.c | 9 + fs/partitions/check.c | 4 +- fs/partitions/ibm.c | 167 +- fs/partitions/ldm.c | 137 +- fs/partitions/ldm.h | 2 +- fs/partitions/msdos.c | 5 +- fs/partitions/sun.c | 62 +- fs/partitions/sun.h | 1 + fs/pipe.c | 70 +- fs/proc/array.c | 125 +- fs/proc/base.c | 247 +- fs/proc/generic.c | 52 +- fs/proc/inode.c | 279 +- fs/proc/proc_misc.c | 25 +- fs/proc/proc_tty.c | 15 +- fs/qnx4/file.c | 2 +- fs/qnx4/inode.c | 2 +- fs/quota.c | 118 + fs/ramfs/file-mmu.c | 2 +- fs/ramfs/file-nommu.c | 9 +- fs/ramfs/inode.c | 1 + fs/read_write.c | 20 +- fs/reiserfs/file.c | 2 - fs/reiserfs/inode.c | 1 + fs/reiserfs/ioctl.c | 5 +- fs/reiserfs/stree.c | 5 +- fs/reiserfs/super.c | 16 +- fs/reiserfs/xattr_acl.c | 2 +- fs/romfs/inode.c | 4 +- fs/select.c | 2 - fs/seq_file.c | 52 +- fs/signalfd.c | 192 +- fs/smbfs/file.c | 9 +- fs/smbfs/inode.c | 4 +- fs/smbfs/request.c | 2 +- fs/splice.c | 529 +- fs/super.c | 1 + fs/sysfs/bin.c | 200 +- fs/sysfs/dir.c | 1303 +- fs/sysfs/file.c | 381 +- fs/sysfs/group.c | 55 +- fs/sysfs/inode.c | 221 +- fs/sysfs/mount.c | 38 +- fs/sysfs/symlink.c | 154 +- fs/sysfs/sysfs.h | 168 +- fs/sysv/file.c | 2 +- fs/sysv/inode.c | 2 +- fs/udf/balloc.c | 553 +- fs/udf/crc.c | 19 +- fs/udf/dir.c | 108 +- fs/udf/directory.c | 173 +- fs/udf/ecma_167.h | 191 +- fs/udf/file.c | 104 +- fs/udf/fsync.c | 6 +- fs/udf/ialloc.c | 42 +- fs/udf/inode.c | 1245 +- fs/udf/lowlevel.c | 21 +- fs/udf/misc.c | 113 +- fs/udf/namei.c | 564 +- fs/udf/osta_udf.h | 75 +- fs/udf/partition.c | 119 +- fs/udf/super.c | 1282 +- fs/udf/symlink.c | 54 +- fs/udf/truncate.c | 166 +- fs/udf/udf_sb.h | 22 +- fs/udf/udfdecl.h | 102 +- fs/udf/udfend.h | 18 + fs/udf/udftime.c | 87 +- fs/udf/unicode.c | 258 +- fs/ufs/file.c | 2 +- fs/ufs/super.c | 13 +- fs/utimes.c | 2 +- fs/xattr.c | 3 +- fs/xfs/Makefile-linux-2.6 | 2 + fs/xfs/linux-2.6/kmem.h | 25 +- fs/xfs/linux-2.6/xfs_aops.c | 52 +- fs/xfs/linux-2.6/xfs_buf.c | 67 +- fs/xfs/linux-2.6/xfs_buf.h | 2 +- fs/xfs/linux-2.6/xfs_file.c | 77 +- fs/xfs/linux-2.6/xfs_globals.c | 1 + fs/xfs/linux-2.6/xfs_ioctl.c | 2 +- fs/xfs/linux-2.6/xfs_ioctl32.c | 321 +- fs/xfs/linux-2.6/xfs_linux.h | 2 +- fs/xfs/linux-2.6/xfs_lrw.c | 44 - fs/xfs/linux-2.6/xfs_lrw.h | 3 - fs/xfs/linux-2.6/xfs_super.c | 10 +- fs/xfs/linux-2.6/xfs_super.h | 2 + fs/xfs/linux-2.6/xfs_sysctl.c | 11 + fs/xfs/linux-2.6/xfs_sysctl.h | 2 + fs/xfs/linux-2.6/xfs_vfs.h | 15 + fs/xfs/linux-2.6/xfs_vnode.h | 11 - fs/xfs/quota/xfs_qm.c | 16 +- fs/xfs/support/debug.h | 10 +- fs/xfs/xfs.h | 1 + fs/xfs/xfs_ag.h | 9 +- fs/xfs/xfs_alloc.c | 101 +- fs/xfs/xfs_alloc.h | 6 +- fs/xfs/xfs_alloc_btree.c | 20 +- fs/xfs/xfs_bit.c | 91 +- fs/xfs/xfs_bit.h | 4 +- fs/xfs/xfs_bmap.c | 369 +- fs/xfs/xfs_bmap.h | 6 +- fs/xfs/xfs_bmap_btree.c | 88 +- fs/xfs/xfs_btree.h | 32 +- fs/xfs/xfs_buf_item.c | 4 +- fs/xfs/xfs_clnt.h | 2 + fs/xfs/xfs_da_btree.c | 1 - fs/xfs/xfs_dinode.h | 4 +- fs/xfs/xfs_dir2.c | 12 +- fs/xfs/xfs_dir2_block.c | 98 +- fs/xfs/xfs_dir2_block.h | 2 - fs/xfs/xfs_dir2_data.c | 54 +- fs/xfs/xfs_dir2_data.h | 12 +- fs/xfs/xfs_dir2_leaf.c | 106 +- fs/xfs/xfs_dir2_leaf.h | 29 +- fs/xfs/xfs_dir2_node.c | 66 +- fs/xfs/xfs_dir2_node.h | 4 +- fs/xfs/xfs_dir2_sf.c | 204 +- fs/xfs/xfs_dir2_sf.h | 20 +- fs/xfs/xfs_fs.h | 2 + fs/xfs/xfs_fsops.c | 17 +- fs/xfs/xfs_ialloc.c | 28 +- fs/xfs/xfs_ialloc.h | 10 + fs/xfs/xfs_inode.c | 39 +- fs/xfs/xfs_inode.h | 16 +- fs/xfs/xfs_iomap.c | 41 +- fs/xfs/xfs_itable.c | 42 +- fs/xfs/xfs_itable.h | 20 +- fs/xfs/xfs_log.c | 53 +- fs/xfs/xfs_log_recover.c | 20 +- fs/xfs/xfs_mount.c | 237 +- fs/xfs/xfs_mount.h | 15 +- fs/xfs/xfs_rtalloc.c | 4 +- fs/xfs/xfs_rw.h | 36 +- fs/xfs/xfs_sb.h | 16 +- fs/xfs/xfs_trans.c | 125 +- fs/xfs/xfs_trans.h | 3 +- fs/xfs/xfs_vfsops.c | 159 +- fs/xfs/xfs_vnodeops.c | 172 +- include/acpi/acmacros.h | 63 +- include/acpi/acoutput.h | 4 +- include/acpi/acpi_bus.h | 25 +- include/acpi/acpi_drivers.h | 25 +- include/acpi/acpi_numa.h | 1 + include/acpi/acpixf.h | 2 +- include/acpi/acstruct.h | 2 +- include/acpi/actypes.h | 6 +- include/acpi/acutils.h | 4 +- include/acpi/platform/acenv.h | 2 +- include/acpi/platform/aclinux.h | 3 + include/acpi/processor.h | 51 +- include/asm-alpha/a.out.h | 2 + include/asm-alpha/bitops.h | 2 +- include/asm-alpha/fcntl.h | 1 + include/asm-alpha/io.h | 13 +- include/asm-alpha/irq.h | 4 - include/asm-alpha/page.h | 3 +- include/asm-alpha/pci.h | 29 - include/asm-alpha/pgtable.h | 6 - include/asm-alpha/system.h | 10 - include/asm-alpha/termios.h | 4 +- include/asm-alpha/thread_info.h | 24 +- include/asm-arm/Kbuild | 2 + include/asm-arm/a.out.h | 1 + include/asm-arm/arch-at91/at91_dbgu.h | 13 +- include/asm-arm/arch-at91/at91_mci.h | 3 + include/asm-arm/arch-at91/board.h | 1 + include/asm-arm/arch-at91/cpu.h | 5 + include/asm-arm/arch-at91/hardware.h | 17 +- include/asm-arm/arch-at91/irqs.h | 3 + include/asm-arm/arch-at91/timex.h | 5 + include/asm-arm/arch-at91/uncompress.h | 4 + include/asm-arm/arch-davinci/hardware.h | 38 + include/asm-arm/arch-imx/imx-regs.h | 2 + include/asm-arm/arch-iop13xx/iop13xx.h | 81 +- include/asm-arm/arch-iop13xx/system.h | 34 +- include/asm-arm/arch-iop13xx/uncompress.h | 3 +- include/asm-arm/arch-iop32x/uncompress.h | 2 +- include/asm-arm/arch-ixp4xx/ixdp425.h | 4 + include/asm-arm/arch-ixp4xx/udc.h | 22 - include/asm-arm/arch-ixp4xx/uncompress.h | 5 +- include/asm-arm/arch-mxc/dma.h | 11 +- include/asm-arm/arch-mxc/hardware.h | 4 + include/asm-arm/arch-mxc/uncompress.h | 22 +- include/asm-arm/arch-ns9xxx/regs-bbu.h | 28 +- include/asm-arm/arch-ns9xxx/regs-mem.h | 6 +- include/asm-arm/arch-ns9xxx/regs-sys.h | 2 +- include/asm-arm/arch-omap/irda.h | 1 + include/asm-arm/arch-omap/mailbox.h | 2 +- include/asm-arm/arch-pxa/dma.h | 22 +- include/asm-arm/arch-pxa/entry-macro.S | 30 +- include/asm-arm/arch-pxa/hardware.h | 36 + include/asm-arm/arch-pxa/irqs.h | 26 +- include/asm-arm/arch-pxa/pm.h | 17 +- include/asm-arm/arch-pxa/pxa-regs.h | 22 +- include/asm-arm/arch-pxa/udc.h | 33 - include/asm-arm/arch-s3c2410/debug-macro.S | 84 +- include/asm-arm/arch-s3c2410/iic.h | 32 - include/asm-arm/arch-s3c2410/map.h | 85 +- include/asm-arm/arch-s3c2410/memory.h | 13 - include/asm-arm/arch-s3c2410/nand.h | 45 - include/asm-arm/arch-s3c2410/regs-ac97.h | 67 - include/asm-arm/arch-s3c2410/regs-adc.h | 60 - include/asm-arm/arch-s3c2410/regs-iic.h | 56 - include/asm-arm/arch-s3c2410/regs-iis.h | 77 - include/asm-arm/arch-s3c2410/regs-lcd.h | 2 +- include/asm-arm/arch-s3c2410/regs-nand.h | 123 - include/asm-arm/arch-s3c2410/regs-rtc.h | 61 - include/asm-arm/arch-s3c2410/regs-serial.h | 232 - include/asm-arm/arch-s3c2410/regs-spi.h | 54 - include/asm-arm/arch-s3c2410/regs-timer.h | 106 - include/asm-arm/arch-s3c2410/regs-udc.h | 153 - include/asm-arm/arch-s3c2410/regs-watchdog.h | 41 - include/asm-arm/arch-s3c2410/system.h | 2 +- include/asm-arm/arch-s3c2410/udc.h | 36 - include/asm-arm/arch-s3c2410/uncompress.h | 145 +- include/asm-arm/cacheflush.h | 7 + include/asm-arm/elf.h | 24 +- include/asm-arm/floppy.h | 18 +- include/asm-arm/hardware/iop3xx.h | 101 +- include/asm-arm/pci.h | 9 - include/asm-arm/pgtable-nommu.h | 4 +- include/asm-arm/pgtable.h | 12 +- include/asm-arm/ptrace.h | 16 +- include/asm-arm/system.h | 10 - include/asm-arm/thread_info.h | 8 +- include/asm-arm/unaligned.h | 22 +- include/asm-arm/unistd.h | 1 - include/asm-arm/vfp.h | 4 +- include/asm-arm26/a.out.h | 38 - include/asm-arm26/assembler.h | 106 - include/asm-arm26/atomic.h | 123 - include/asm-arm26/auxvec.h | 4 - include/asm-arm26/bitops.h | 207 - include/asm-arm26/bug.h | 19 - include/asm-arm26/bugs.h | 15 - include/asm-arm26/byteorder.h | 24 - include/asm-arm26/cache.h | 12 - include/asm-arm26/cacheflush.h | 53 - include/asm-arm26/checksum.h | 151 - include/asm-arm26/constants.h | 28 - include/asm-arm26/cputime.h | 6 - include/asm-arm26/current.h | 15 - include/asm-arm26/delay.h | 34 - include/asm-arm26/device.h | 7 - include/asm-arm26/div64.h | 1 - include/asm-arm26/dma-mapping.h | 2 - include/asm-arm26/dma.h | 183 - include/asm-arm26/ecard.h | 294 - include/asm-arm26/elf.h | 77 - include/asm-arm26/emergency-restart.h | 6 - include/asm-arm26/errno.h | 6 - include/asm-arm26/fcntl.h | 13 - include/asm-arm26/fiq.h | 37 - include/asm-arm26/floppy.h | 141 - include/asm-arm26/fpstate.h | 29 - include/asm-arm26/futex.h | 6 - include/asm-arm26/hardirq.h | 32 - include/asm-arm26/hardware.h | 109 - include/asm-arm26/ide.h | 34 - include/asm-arm26/io.h | 434 - include/asm-arm26/ioc.h | 72 - include/asm-arm26/ioctl.h | 1 - include/asm-arm26/ioctls.h | 81 - include/asm-arm26/ipc.h | 1 - include/asm-arm26/ipcbuf.h | 29 - include/asm-arm26/irq.h | 48 - include/asm-arm26/irqchip.h | 101 - include/asm-arm26/kdebug.h | 1 - include/asm-arm26/kmap_types.h | 12 - include/asm-arm26/leds.h | 50 - include/asm-arm26/limits.h | 11 - include/asm-arm26/linkage.h | 7 - include/asm-arm26/local.h | 2 - include/asm-arm26/locks.h | 161 - include/asm-arm26/mach-types.h | 36 - include/asm-arm26/map.h | 24 - include/asm-arm26/mc146818rtc.h | 28 - include/asm-arm26/memory.h | 101 - include/asm-arm26/mman.h | 17 - include/asm-arm26/mmu.h | 9 - include/asm-arm26/mmu_context.h | 53 - include/asm-arm26/module.h | 7 - include/asm-arm26/msgbuf.h | 31 - include/asm-arm26/namei.h | 25 - include/asm-arm26/oldlatches.h | 37 - include/asm-arm26/page.h | 102 - include/asm-arm26/param.h | 33 - include/asm-arm26/parport.h | 18 - include/asm-arm26/pci.h | 6 - include/asm-arm26/percpu.h | 6 - include/asm-arm26/pgalloc.h | 70 - include/asm-arm26/pgtable.h | 302 - include/asm-arm26/poll.h | 8 - include/asm-arm26/posix_types.h | 81 - include/asm-arm26/proc-fns.h | 49 - include/asm-arm26/processor.h | 113 - include/asm-arm26/procinfo.h | 56 - include/asm-arm26/ptrace.h | 104 - include/asm-arm26/resource.h | 6 - include/asm-arm26/scatterlist.h | 26 - include/asm-arm26/sections.h | 2 - include/asm-arm26/segment.h | 11 - include/asm-arm26/semaphore-helper.h | 84 - include/asm-arm26/semaphore.h | 100 - include/asm-arm26/sembuf.h | 25 - include/asm-arm26/serial.h | 44 - include/asm-arm26/setup.h | 209 - include/asm-arm26/shmbuf.h | 42 - include/asm-arm26/shmparam.h | 15 - include/asm-arm26/sigcontext.h | 33 - include/asm-arm26/siginfo.h | 6 - include/asm-arm26/signal.h | 176 - include/asm-arm26/sizes.h | 52 - include/asm-arm26/smp.h | 9 - include/asm-arm26/socket.h | 55 - include/asm-arm26/sockios.h | 13 - include/asm-arm26/spinlock.h | 6 - include/asm-arm26/stat.h | 77 - include/asm-arm26/statfs.h | 8 - include/asm-arm26/string.h | 43 - include/asm-arm26/suspend.h | 4 - include/asm-arm26/sysirq.h | 60 - include/asm-arm26/system.h | 257 - include/asm-arm26/termbits.h | 183 - include/asm-arm26/termios.h | 90 - include/asm-arm26/thread_info.h | 140 - include/asm-arm26/timex.h | 29 - include/asm-arm26/tlb.h | 63 - include/asm-arm26/tlbflush.h | 70 - include/asm-arm26/topology.h | 6 - include/asm-arm26/types.h | 59 - include/asm-arm26/uaccess-asm.h | 153 - include/asm-arm26/uaccess.h | 293 - include/asm-arm26/ucontext.h | 12 - include/asm-arm26/unaligned.h | 118 - include/asm-arm26/uncompress.h | 111 - include/asm-arm26/unistd.h | 343 - include/asm-arm26/user.h | 84 - include/asm-arm26/xor.h | 141 - include/asm-avr32/a.out.h | 1 + include/asm-avr32/arch-at32ap/board.h | 15 + include/asm-avr32/arch-at32ap/sm.h | 27 - include/asm-avr32/bug.h | 2 +- include/asm-avr32/io.h | 2 + include/asm-avr32/pgalloc.h | 30 +- include/asm-avr32/pgtable.h | 32 +- include/asm-avr32/termbits.h | 11 + include/asm-avr32/thread_info.h | 18 +- include/asm-avr32/unaligned.h | 15 +- include/asm-blackfin/Kbuild | 2 + include/asm-blackfin/bfin-global.h | 13 + include/asm-blackfin/cplbinit.h | 133 +- include/asm-blackfin/gpio.h | 58 + include/asm-blackfin/hardirq.h | 4 + include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 11 +- include/asm-blackfin/mach-bf533/dma.h | 3 + include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 23 +- include/asm-blackfin/mach-bf537/dma.h | 3 + include/asm-blackfin/mach-bf548/cdefBF54x_base.h | 105 +- include/asm-blackfin/mach-bf548/defBF542.h | 281 - include/asm-blackfin/mach-bf548/defBF544.h | 60 - include/asm-blackfin/mach-bf548/defBF548.h | 341 - include/asm-blackfin/mach-bf548/defBF549.h | 763 +- include/asm-blackfin/mach-bf548/defBF54x_base.h | 1366 +- include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 11 +- include/asm-blackfin/mach-bf561/cdefBF561.h | 15 +- include/asm-blackfin/mach-bf561/defBF561.h | 4 + include/asm-blackfin/mach-bf561/dma.h | 3 + include/asm-blackfin/mach-common/cdef_LPBlackfin.h | 23 +- include/asm-blackfin/mman.h | 2 - include/asm-blackfin/page.h | 4 + include/asm-blackfin/string.h | 129 +- include/asm-blackfin/termbits.h | 11 + include/asm-blackfin/thread_info.h | 26 +- include/asm-blackfin/unistd.h | 56 +- include/asm-cris/a.out.h | 1 + include/asm-cris/ioctls.h | 4 + include/asm-cris/page.h | 3 +- include/asm-cris/pci.h | 36 - include/asm-cris/pgtable.h | 30 - include/asm-cris/termbits.h | 12 + include/asm-cris/termios.h | 6 +- include/asm-cris/thread_info.h | 6 +- include/asm-frv/mb86943a.h | 3 + include/asm-frv/mem-layout.h | 1 + include/asm-frv/pci.h | 7 - include/asm-frv/pgtable.h | 14 - include/asm-frv/termbits.h | 11 + include/asm-frv/thread_info.h | 12 +- include/asm-frv/uaccess.h | 2 + include/asm-frv/unistd.h | 7 +- include/asm-generic/bitops/sched.h | 21 +- include/asm-generic/bug.h | 8 +- include/asm-generic/dma-mapping-broken.h | 82 +- include/asm-generic/fcntl.h | 3 + include/asm-generic/percpu.h | 8 + include/asm-generic/pgtable.h | 117 +- include/asm-generic/termios.h | 2 + include/asm-generic/unaligned.h | 26 +- include/asm-generic/vmlinux.lds.h | 14 +- include/asm-h8300/a.out.h | 1 + include/asm-h8300/dma-mapping.h | 1 - include/asm-h8300/flat.h | 3 +- include/asm-h8300/ioctls.h | 4 + include/asm-h8300/irq.h | 3 - include/asm-h8300/page.h | 3 +- include/asm-h8300/pci.h | 4 - include/asm-h8300/termbits.h | 16 +- include/asm-h8300/termios.h | 6 +- include/asm-h8300/thread_info.h | 12 +- include/asm-i386/a.out.h | 1 + include/asm-i386/acpi.h | 23 +- include/asm-i386/alternative.h | 2 + include/asm-i386/apic.h | 2 + include/asm-i386/boot.h | 6 +- include/asm-i386/cmpxchg.h | 16 +- include/asm-i386/cpufeature.h | 28 +- include/asm-i386/e820.h | 22 +- include/asm-i386/fixmap.h | 2 + include/asm-i386/hpet.h | 126 +- include/asm-i386/i8253.h | 16 +- include/asm-i386/ide.h | 4 +- include/asm-i386/io.h | 4 + include/asm-i386/io_apic.h | 1 - include/asm-i386/irq.h | 1 + include/asm-i386/ist.h | 10 +- include/asm-i386/kprobes.h | 1 - include/asm-i386/mach-default/do_timer.h | 2 +- include/asm-i386/mach-default/io_ports.h | 5 - include/asm-i386/mach-default/irq_vectors_limits.h | 2 +- include/asm-i386/mach-default/mach_reboot.h | 25 +- include/asm-i386/mach-default/mach_wakecpu.h | 3 +- include/asm-i386/mach-es7000/mach_wakecpu.h | 3 +- include/asm-i386/mach-voyager/do_timer.h | 2 +- include/asm-i386/mc146818rtc.h | 5 +- include/asm-i386/mce.h | 4 + include/asm-i386/mmu_context.h | 2 + include/asm-i386/nmi.h | 5 +- include/asm-i386/page.h | 4 +- include/asm-i386/paravirt.h | 38 +- include/asm-i386/pci.h | 45 +- include/asm-i386/percpu.h | 5 + include/asm-i386/pgalloc.h | 6 +- include/asm-i386/pgtable-2level.h | 8 - include/asm-i386/pgtable-3level.h | 17 +- include/asm-i386/pgtable.h | 40 +- include/asm-i386/processor.h | 17 +- include/asm-i386/required-features.h | 41 +- include/asm-i386/setup.h | 14 +- include/asm-i386/smp.h | 5 + include/asm-i386/string.h | 243 +- include/asm-i386/suspend.h | 2 +- include/asm-i386/system.h | 14 - include/asm-i386/thread_info.h | 23 +- include/asm-i386/timer.h | 34 +- include/asm-i386/tlbflush.h | 6 +- include/asm-i386/topology.h | 2 +- include/asm-i386/tsc.h | 1 + include/asm-i386/uaccess.h | 2 +- include/asm-i386/unistd.h | 3 +- include/asm-i386/vmi_time.h | 2 +- include/asm-ia64/acpi.h | 5 + include/asm-ia64/atomic.h | 4 +- include/asm-ia64/compat.h | 2 + include/asm-ia64/hw_irq.h | 23 +- include/asm-ia64/ia32.h | 9 +- include/asm-ia64/ioctls.h | 4 + include/asm-ia64/iosapic.h | 6 +- include/asm-ia64/irq.h | 12 +- include/asm-ia64/kprobes.h | 2 - include/asm-ia64/machvec.h | 8 + include/asm-ia64/machvec_init.h | 1 + include/asm-ia64/machvec_sn2.h | 2 + include/asm-ia64/mca.h | 1 + include/asm-ia64/page.h | 13 +- include/asm-ia64/pci.h | 22 +- include/asm-ia64/percpu.h | 10 + include/asm-ia64/pgtable.h | 26 +- include/asm-ia64/processor.h | 8 +- include/asm-ia64/rwsem.h | 4 + include/asm-ia64/smp.h | 1 - include/asm-ia64/sn/arch.h | 1 + include/asm-ia64/sn/intr.h | 1 + include/asm-ia64/sn/sn_feature_sets.h | 1 + include/asm-ia64/sn/sn_sal.h | 20 + include/asm-ia64/system.h | 1 - include/asm-ia64/termbits.h | 16 +- include/asm-ia64/termios.h | 6 +- include/asm-ia64/thread_info.h | 20 +- include/asm-ia64/unistd.h | 2 +- include/asm-ia64/ustack.h | 1 + include/asm-m32r/a.out.h | 1 + include/asm-m32r/assembler.h | 16 +- include/asm-m32r/dma-mapping.h | 6 - include/asm-m32r/flat.h | 3 +- include/asm-m32r/ioctls.h | 4 + include/asm-m32r/m32r.h | 20 + include/asm-m32r/page.h | 3 +- include/asm-m32r/pgtable.h | 40 - include/asm-m32r/system.h | 10 - include/asm-m32r/termbits.h | 16 +- include/asm-m32r/termios.h | 6 +- include/asm-m32r/thread_info.h | 10 +- include/asm-m68k/a.out.h | 1 + include/asm-m68k/atari_SLM.h | 28 - include/asm-m68k/atari_acsi.h | 37 - include/asm-m68k/io.h | 75 +- include/asm-m68k/ioctls.h | 4 + include/asm-m68k/irq.h | 3 - include/asm-m68k/motorola_pgtable.h | 6 - include/asm-m68k/page.h | 10 +- include/asm-m68k/pci.h | 4 - include/asm-m68k/processor.h | 4 - include/asm-m68k/raw_io.h | 16 +- include/asm-m68k/sun3_pgtable.h | 6 - include/asm-m68k/system.h | 33 +- include/asm-m68k/termbits.h | 16 +- include/asm-m68k/termios.h | 6 +- include/asm-m68k/unistd.h | 12 +- include/asm-m68knommu/flat.h | 3 +- include/asm-m68knommu/hardirq.h | 2 + include/asm-m68knommu/irq.h | 75 +- include/asm-m68knommu/irqnode.h | 36 - include/asm-m68knommu/m68360.h | 8 + include/asm-m68knommu/machdep.h | 38 +- include/asm-m68knommu/mcfdma.h | 2 +- include/asm-m68knommu/page.h | 3 +- include/asm-m68knommu/pci.h | 10 - include/asm-m68knommu/pgtable.h | 3 +- include/asm-m68knommu/system.h | 4 +- include/asm-m68knommu/thread_info.h | 10 +- include/asm-m68knommu/timex.h | 24 +- include/asm-m68knommu/traps.h | 4 + include/asm-m68knommu/uaccess.h | 11 +- include/asm-m68knommu/unistd.h | 12 +- include/asm-mips/a.out.h | 4 +- include/asm-mips/addrspace.h | 29 +- include/asm-mips/atomic.h | 33 +- include/asm-mips/barrier.h | 9 + include/asm-mips/bcache.h | 1 - include/asm-mips/bitops.h | 10 +- include/asm-mips/bootinfo.h | 49 +- include/asm-mips/cacheops.h | 4 + include/asm-mips/compat.h | 5 +- include/asm-mips/compiler.h | 4 +- include/asm-mips/cpu-features.h | 4 + include/asm-mips/cpu.h | 10 +- include/asm-mips/ddb5xxx/ddb5477.h | 342 - include/asm-mips/ddb5xxx/ddb5xxx.h | 263 - include/asm-mips/dec/serial.h | 36 - include/asm-mips/div64.h | 9 +- include/asm-mips/ds1216.h | 31 - include/asm-mips/elf.h | 13 +- include/asm-mips/fcntl.h | 1 + include/asm-mips/futex.h | 8 +- include/asm-mips/gfx.h | 55 - include/asm-mips/gt64240.h | 1235 - include/asm-mips/hazards.h | 8 +- include/asm-mips/io.h | 11 +- include/asm-mips/ioctls.h | 4 + include/asm-mips/irq.h | 32 +- include/asm-mips/jmr3927/jmr3927.h | 3 +- include/asm-mips/jmr3927/tx3927.h | 36 - include/asm-mips/lasat/ds1603.h | 18 - include/asm-mips/lasat/eeprom.h | 17 - include/asm-mips/lasat/head.h | 22 - include/asm-mips/lasat/lasat.h | 253 - include/asm-mips/lasat/lasatint.h | 12 - include/asm-mips/lasat/picvue.h | 15 - include/asm-mips/lasat/serial.h | 13 - include/asm-mips/local.h | 69 +- include/asm-mips/mach-au1x00/au1xxx_gpio.h | 20 - include/asm-mips/mach-au1x00/au1xxx_ide.h | 28 +- include/asm-mips/mach-au1x00/ioremap.h | 11 + include/asm-mips/mach-cobalt/cobalt.h | 5 - .../asm-mips/mach-cobalt/cpu-feature-overrides.h | 4 +- include/asm-mips/mach-ev64120/mach-gt64120.h | 62 - .../asm-mips/mach-excite/cpu-feature-overrides.h | 3 + include/asm-mips/mach-generic/ide.h | 83 +- include/asm-mips/mach-generic/ioremap.h | 11 + include/asm-mips/mach-generic/spaces.h | 64 +- include/asm-mips/mach-ip22/cpu-feature-overrides.h | 4 +- include/asm-mips/mach-ip22/spaces.h | 33 +- include/asm-mips/mach-ip27/cpu-feature-overrides.h | 4 +- include/asm-mips/mach-ip27/spaces.h | 9 +- include/asm-mips/mach-ip32/cpu-feature-overrides.h | 4 +- include/asm-mips/mach-ip32/spaces.h | 36 - include/asm-mips/mach-lasat/mach-gt64120.h | 27 - include/asm-mips/mach-ocelot/mach-gt64120.h | 30 - .../asm-mips/mach-ocelot3/cpu-feature-overrides.h | 48 - include/asm-mips/mach-qemu/cpu-feature-overrides.h | 3 +- include/asm-mips/mach-rm/cpu-feature-overrides.h | 4 +- .../asm-mips/mach-sibyte/cpu-feature-overrides.h | 4 +- include/asm-mips/mach-sim/cpu-feature-overrides.h | 65 - .../asm-mips/mach-yosemite/cpu-feature-overrides.h | 4 +- include/asm-mips/marvell.h | 59 - include/asm-mips/mips-boards/bonito64.h | 7 +- include/asm-mips/mips-boards/generic.h | 1 + include/asm-mips/mips_mt.h | 6 + include/asm-mips/mipsregs.h | 59 +- include/asm-mips/module.h | 2 + include/asm-mips/nile4.h | 310 - include/asm-mips/page.h | 23 +- include/asm-mips/pci.h | 20 +- include/asm-mips/pgtable-32.h | 16 +- include/asm-mips/pgtable.h | 46 +- include/asm-mips/pmon.h | 2 +- include/asm-mips/processor.h | 104 +- include/asm-mips/rtc.h | 73 - include/asm-mips/serial.h | 155 - include/asm-mips/sibyte/bcm1480_regs.h | 35 +- include/asm-mips/sibyte/sb1250_regs.h | 76 +- include/asm-mips/sibyte/sb1250_uart.h | 7 +- include/asm-mips/smp.h | 7 - include/asm-mips/smtc.h | 10 + include/asm-mips/sni.h | 3 - include/asm-mips/spinlock.h | 18 +- include/asm-mips/stacktrace.h | 6 +- include/asm-mips/system.h | 299 +- include/asm-mips/termbits.h | 18 +- include/asm-mips/termios.h | 6 +- include/asm-mips/thread_info.h | 27 +- include/asm-mips/tlbdebug.h | 4 - include/asm-mips/tx3912.h | 361 - include/asm-mips/tx4927/toshiba_rbtx4927.h | 4 +- include/asm-mips/tx4927/tx4927.h | 49 +- include/asm-mips/tx4927/tx4927_pci.h | 23 +- include/asm-mips/tx4938/rbtx4938.h | 31 +- include/asm-mips/tx4938/spi.h | 56 +- include/asm-mips/tx4938/tx4938.h | 41 - include/asm-mips/unistd.h | 15 +- include/asm-mips/vr41xx/giu.h | 9 + include/asm-mips/vr41xx/siu.h | 2 + include/asm-mips/war.h | 23 +- include/asm-mips/watch.h | 35 - include/asm-parisc/a.out.h | 1 + include/asm-parisc/bug.h | 2 +- include/asm-parisc/compat.h | 2 + include/asm-parisc/fcntl.h | 29 +- include/asm-parisc/io.h | 10 + include/asm-parisc/pci.h | 7 - include/asm-parisc/pgtable.h | 20 - include/asm-parisc/system.h | 11 - include/asm-parisc/termbits.h | 11 + include/asm-parisc/thread_info.h | 16 +- include/asm-powerpc/a.out.h | 3 + include/asm-powerpc/bug.h | 4 +- include/asm-powerpc/cache.h | 4 + include/asm-powerpc/compat.h | 2 + include/asm-powerpc/cputable.h | 111 +- include/asm-powerpc/dma-mapping.h | 3 +- include/asm-powerpc/floppy.h | 6 +- include/asm-powerpc/hvcall.h | 1 + include/asm-powerpc/io.h | 26 +- include/asm-powerpc/irq.h | 9 + include/asm-powerpc/kprobes.h | 6 +- include/asm-powerpc/lppaca.h | 2 +- include/asm-powerpc/lv1call.h | 3 + include/asm-powerpc/machdep.h | 2 +- include/asm-powerpc/mmu-hash64.h | 10 +- include/asm-powerpc/mmu.h | 13 +- include/asm-powerpc/mmu_context.h | 202 +- include/asm-powerpc/mpc86xx.h | 6 - include/asm-powerpc/mpc8xx.h | 4 + include/asm-powerpc/mpic.h | 3 + include/asm-powerpc/of_device.h | 22 +- include/asm-powerpc/of_platform.h | 38 +- include/asm-powerpc/oprofile_impl.h | 10 +- include/asm-powerpc/page.h | 1 - include/asm-powerpc/pci-bridge.h | 176 +- include/asm-powerpc/pci.h | 31 +- include/asm-powerpc/percpu.h | 7 + include/asm-powerpc/pgtable-64k.h | 8 +- include/asm-powerpc/pgtable-ppc32.h | 67 - include/asm-powerpc/pgtable-ppc64.h | 91 +- include/asm-powerpc/pgtable.h | 28 + include/asm-powerpc/pmi.h | 8 +- include/asm-powerpc/ppc-pci.h | 9 +- include/asm-powerpc/ppc_asm.h | 12 + include/asm-powerpc/processor.h | 8 - include/asm-powerpc/prom.h | 58 +- include/asm-powerpc/ps3.h | 182 +- include/asm-powerpc/ps3av.h | 48 +- include/asm-powerpc/ps3fb.h | 12 - include/asm-powerpc/ptrace.h | 22 +- include/asm-powerpc/reg.h | 2 + include/asm-powerpc/reg_booke.h | 12 +- include/asm-powerpc/spu.h | 78 +- include/asm-powerpc/spu_csa.h | 8 +- include/asm-powerpc/spu_priv1.h | 7 + include/asm-powerpc/syscalls.h | 7 - include/asm-powerpc/systbl.h | 1 + include/asm-powerpc/system.h | 14 +- include/asm-powerpc/termbits.h | 4 + include/asm-powerpc/thread_info.h | 40 +- include/asm-powerpc/time.h | 9 +- include/asm-powerpc/tlbflush.h | 5 + include/asm-powerpc/unistd.h | 3 +- include/asm-powerpc/vio.h | 5 + include/asm-ppc/mv64x60.h | 8 - include/asm-ppc/pci.h | 8 - include/asm-ppc/pgtable.h | 17 - include/asm-ppc/system.h | 11 +- include/asm-s390/a.out.h | 1 + include/asm-s390/atomic.h | 30 +- include/asm-s390/bug.h | 2 +- include/asm-s390/ccwdev.h | 5 - include/asm-s390/cio.h | 15 - include/asm-s390/cmb.h | 1 - include/asm-s390/compat.h | 2 + include/asm-s390/dma-mapping.h | 12 - include/asm-s390/kprobes.h | 2 - include/asm-s390/page.h | 3 +- include/asm-s390/percpu.h | 7 + include/asm-s390/pgalloc.h | 2 - include/asm-s390/pgtable.h | 66 +- include/asm-s390/processor.h | 4 +- include/asm-s390/s390_ext.h | 2 + include/asm-s390/sclp.h | 47 +- include/asm-s390/sfp-machine.h | 6 +- include/asm-s390/sfp-util.h | 11 + include/asm-s390/smp.h | 11 +- include/asm-s390/system.h | 10 - include/asm-s390/termbits.h | 11 + include/asm-s390/unistd.h | 2 +- include/asm-sh/a.out.h | 1 + include/asm-sh/bug.h | 2 +- include/asm-sh/bugs.h | 8 +- include/asm-sh/cache.h | 4 + include/asm-sh/clock.h | 1 + include/asm-sh/cpu-sh2/cache.h | 20 +- include/asm-sh/cpu-sh3/freq.h | 4 - include/asm-sh/cpu-sh3/mmu_context.h | 1 - include/asm-sh/cpu-sh3/timer.h | 7 +- include/asm-sh/cpu-sh4/freq.h | 4 +- include/asm-sh/cpu-sh4/timer.h | 57 +- include/asm-sh/dma-mapping.h | 27 +- include/asm-sh/dma.h | 1 + include/asm-sh/fixmap.h | 8 +- include/asm-sh/flat.h | 3 +- include/asm-sh/floppy.h | 4 +- include/asm-sh/futex.h | 79 +- include/asm-sh/hd64461.h | 397 +- include/asm-sh/hw_irq.h | 113 + include/asm-sh/io.h | 4 - include/asm-sh/irq.h | 40 - include/asm-sh/machvec.h | 4 +- include/asm-sh/machvec_init.h | 53 - include/asm-sh/page.h | 10 + include/asm-sh/pci.h | 9 - include/asm-sh/pgtable.h | 18 +- include/asm-sh/processor.h | 12 +- include/asm-sh/rts7751r2d.h | 2 +- include/asm-sh/rwsem.h | 6 +- include/asm-sh/saturn/io.h | 19 - include/asm-sh/saturn/smpc.h | 34 - include/asm-sh/se7300.h | 64 - include/asm-sh/se73180.h | 66 - include/asm-sh/se7722.h | 40 +- include/asm-sh/sections.h | 2 +- include/asm-sh/setup.h | 1 + include/asm-sh/sh03/io.h | 4 - include/asm-sh/smp.h | 2 + include/asm-sh/snapgear.h | 4 - include/asm-sh/system.h | 26 +- include/asm-sh/termbits.h | 11 + include/asm-sh/thread_info.h | 10 +- include/asm-sh/topology.h | 30 + include/asm-sh/uaccess.h | 40 +- include/asm-sh/ubc.h | 12 +- include/asm-sh/unistd.h | 3 +- include/asm-sh64/a.out.h | 1 + include/asm-sh64/dma-mapping.h | 26 +- include/asm-sh64/io.h | 4 - include/asm-sh64/irq.h | 4 - include/asm-sh64/pci.h | 9 - include/asm-sh64/pgtable.h | 7 - include/asm-sh64/unistd.h | 3 +- include/asm-sparc/a.out.h | 1 + include/asm-sparc/device.h | 18 +- include/asm-sparc/fcntl.h | 1 + include/asm-sparc/floppy.h | 100 +- include/asm-sparc/irq.h | 173 +- include/asm-sparc/of_device.h | 49 +- include/asm-sparc/oplib.h | 26 - include/asm-sparc/pci.h | 6 - include/asm-sparc/pgtable.h | 5 +- include/asm-sparc/prom.h | 67 +- include/asm-sparc/sbus.h | 1 - include/asm-sparc/system.h | 10 - include/asm-sparc/tlbflush.h | 6 +- include/asm-sparc/unistd.h | 6 +- include/asm-sparc64/a.out.h | 2 + include/asm-sparc64/bugs.h | 5 - include/asm-sparc64/compat.h | 2 + include/asm-sparc64/cpudata.h | 5 +- include/asm-sparc64/delay.h | 32 +- include/asm-sparc64/device.h | 2 - include/asm-sparc64/dma-mapping.h | 347 +- include/asm-sparc64/elf.h | 10 +- include/asm-sparc64/fbio.h | 28 + include/asm-sparc64/fcntl.h | 2 +- include/asm-sparc64/floppy.h | 6 +- include/asm-sparc64/hypervisor.h | 2 +- include/asm-sparc64/io.h | 5 - include/asm-sparc64/iommu.h | 11 +- include/asm-sparc64/irq.h | 27 +- include/asm-sparc64/kprobes.h | 1 - include/asm-sparc64/mdesc.h | 92 +- include/asm-sparc64/mmu_context.h | 3 + include/asm-sparc64/of_device.h | 50 +- include/asm-sparc64/oplib.h | 39 +- include/asm-sparc64/parport.h | 233 +- include/asm-sparc64/pci.h | 199 +- include/asm-sparc64/percpu.h | 9 +- include/asm-sparc64/pgtable.h | 18 - include/asm-sparc64/prom.h | 67 +- include/asm-sparc64/sbus.h | 86 +- include/asm-sparc64/smp.h | 11 +- include/asm-sparc64/spitfire.h | 7 + include/asm-sparc64/system.h | 42 +- include/asm-sparc64/unistd.h | 6 +- include/asm-sparc64/xor.h | 6 +- include/asm-um/a.out.h | 2 + include/asm-um/common.lds.S | 124 +- include/asm-um/elf-x86_64.h | 40 + include/asm-um/pgtable.h | 18 - include/asm-um/thread_info.h | 15 +- include/asm-v850/flat.h | 4 +- include/asm-v850/ioctls.h | 4 + include/asm-v850/irq.h | 10 - include/asm-v850/pci.h | 4 - include/asm-v850/rte_cb.h | 1 - include/asm-v850/termbits.h | 16 +- include/asm-v850/termios.h | 6 +- include/asm-v850/thread_info.h | 10 +- include/asm-x86_64/a.out.h | 3 +- include/asm-x86_64/acpi.h | 33 +- include/asm-x86_64/alternative.h | 70 +- include/asm-x86_64/apic.h | 6 +- include/asm-x86_64/auxvec.h | 2 + include/asm-x86_64/boot.h | 16 +- include/asm-x86_64/calgary.h | 9 +- include/asm-x86_64/cmpxchg.h | 2 +- include/asm-x86_64/compat.h | 2 + include/asm-x86_64/cpufeature.h | 115 +- include/asm-x86_64/dmi.h | 5 +- include/asm-x86_64/e820.h | 4 +- include/asm-x86_64/elf.h | 13 + include/asm-x86_64/fixmap.h | 10 +- include/asm-x86_64/hpet.h | 62 +- include/asm-x86_64/hw_irq.h | 20 + include/asm-x86_64/hypertransport.h | 43 +- include/asm-x86_64/io.h | 1 + include/asm-x86_64/io_apic.h | 6 + include/asm-x86_64/kprobes.h | 1 - include/asm-x86_64/mce.h | 5 + include/asm-x86_64/mmu.h | 1 + include/asm-x86_64/msidef.h | 48 +- include/asm-x86_64/nmi.h | 5 +- include/asm-x86_64/page.h | 3 +- include/asm-x86_64/pci.h | 65 +- include/asm-x86_64/percpu.h | 7 + include/asm-x86_64/pgtable.h | 16 +- include/asm-x86_64/processor.h | 17 +- include/asm-x86_64/proto.h | 20 - include/asm-x86_64/ptrace.h | 1 + include/asm-x86_64/segment.h | 8 + include/asm-x86_64/string.h | 5 +- include/asm-x86_64/suspend.h | 2 - include/asm-x86_64/system.h | 45 +- include/asm-x86_64/tce.h | 6 +- include/asm-x86_64/thread_info.h | 4 +- include/asm-x86_64/timex.h | 1 - include/asm-x86_64/tlbflush.h | 6 +- include/asm-x86_64/topology.h | 2 +- include/asm-x86_64/uaccess.h | 4 +- include/asm-x86_64/unistd.h | 2 + include/asm-x86_64/vsyscall.h | 3 +- include/asm-xtensa/a.out.h | 1 + include/asm-xtensa/bugs.h | 6 +- include/asm-xtensa/cache.h | 9 + include/asm-xtensa/cacheflush.h | 81 +- include/asm-xtensa/elf.h | 50 + include/asm-xtensa/io.h | 2 + include/asm-xtensa/ioctls.h | 4 + include/asm-xtensa/page.h | 106 +- include/asm-xtensa/pci.h | 7 - include/asm-xtensa/pgalloc.h | 107 +- include/asm-xtensa/pgtable.h | 250 +- include/asm-xtensa/processor.h | 2 +- include/asm-xtensa/syscall.h | 24 +- include/asm-xtensa/termbits.h | 16 +- include/asm-xtensa/termios.h | 6 +- include/asm-xtensa/thread_info.h | 14 +- include/asm-xtensa/timex.h | 4 +- include/asm-xtensa/tlb.h | 30 +- include/asm-xtensa/types.h | 9 + include/asm-xtensa/unistd.h | 128 +- include/linux/Kbuild | 5 +- include/linux/acpi.h | 8 +- include/linux/aer.h | 25 +- include/linux/aio.h | 2 +- include/linux/apm_bios.h | 20 +- include/linux/ata.h | 52 + include/linux/attribute_container.h | 1 - include/linux/audit.h | 43 +- include/linux/backing-dev.h | 1 - include/linux/backlight.h | 11 +- include/linux/binfmts.h | 19 +- include/linux/bio.h | 3 + include/linux/blkdev.h | 173 +- include/linux/blktrace_api.h | 5 +- include/linux/buffer_head.h | 2 + include/linux/bug.h | 7 +- include/linux/capability.h | 1 - include/linux/cdrom.h | 4 +- include/linux/clockchips.h | 6 +- include/linux/clocksource.h | 6 + include/linux/cobalt-nvram.h | 109 - include/linux/coda_linux.h | 4 - include/linux/coda_proc.h | 76 - include/linux/coda_psdev.h | 15 +- include/linux/compiler-gcc4.h | 18 + include/linux/compiler.h | 13 +- include/linux/configfs.h | 34 +- include/linux/console.h | 3 +- include/linux/consolemap.h | 5 +- include/linux/cpu.h | 9 +- include/linux/cpufreq.h | 19 +- include/linux/cramfs_fs_sb.h | 4 - include/linux/crypto.h | 20 - include/linux/dcookies.h | 1 + include/linux/debugfs.h | 9 + include/linux/device.h | 18 +- include/linux/dlm.h | 14 +- include/linux/dlm_device.h | 22 +- include/linux/dma-mapping.h | 4 + include/linux/dmaengine.h | 293 +- include/linux/dmi.h | 8 + include/linux/ds17287rtc.h | 1 - include/linux/dvb/video.h | 1 + include/linux/edd.h | 4 - include/linux/efs_fs.h | 1 + include/linux/elevator.h | 76 +- include/linux/elf-em.h | 3 +- include/linux/elfnote.h | 22 +- include/linux/etherdevice.h | 9 +- include/linux/ethtool.h | 5 +- include/linux/ext2_fs_sb.h | 2 + include/linux/ext3_fs_sb.h | 2 + include/linux/ext4_fs.h | 104 +- include/linux/ext4_fs_extents.h | 43 +- include/linux/ext4_fs_i.h | 5 + include/linux/ext4_fs_sb.h | 5 +- include/linux/fb.h | 3 + include/linux/file.h | 1 + include/linux/firewire-cdev.h | 297 +- include/linux/freezer.h | 29 +- include/linux/fs.h | 176 +- include/linux/fsl_devices.h | 20 +- include/linux/fuse.h | 2 +- include/linux/genetlink.h | 13 + include/linux/genhd.h | 2 +- include/linux/gfp.h | 19 +- include/linux/gfs2_ondisk.h | 142 +- include/linux/hardirq.h | 13 + include/linux/hid.h | 56 +- include/linux/highmem.h | 36 +- include/linux/hrtimer.h | 5 +- include/linux/hugetlb.h | 14 +- include/linux/i2c-id.h | 7 +- include/linux/i2c-isa.h | 36 - include/linux/i2c.h | 24 +- include/linux/i2o.h | 8 +- include/linux/ide.h | 70 +- include/linux/idr.h | 32 + include/linux/ieee80211.h | 11 + include/linux/if_link.h | 47 + include/linux/if_ppp.h | 16 + include/linux/if_pppox.h | 16 +- include/linux/if_tun.h | 2 + include/linux/if_vlan.h | 19 +- include/linux/init.h | 12 +- include/linux/init_task.h | 4 +- include/linux/input.h | 31 +- include/linux/interrupt.h | 6 +- include/linux/io.h | 29 +- include/linux/ioprio.h | 8 + include/linux/ip_mp_alg.h | 22 - include/linux/ipc.h | 12 +- include/linux/ipv6.h | 15 +- include/linux/irda.h | 29 + include/linux/irq.h | 2 + include/linux/isa.h | 11 + include/linux/jbd2.h | 6 +- include/linux/kallsyms.h | 6 +- include/linux/kbd_kern.h | 3 + include/linux/kdebug.h | 2 + include/linux/kernel.h | 14 +- include/linux/kernelcapi.h | 2 +- include/linux/keyboard.h | 4 +- include/linux/kmod.h | 52 +- include/linux/kobject.h | 60 +- include/linux/kprobes.h | 6 +- include/linux/ktime.h | 10 + include/linux/lcd.h | 14 +- include/linux/leds.h | 17 +- include/linux/libata.h | 81 +- include/linux/limits.h | 2 - include/linux/linux_logo.h | 8 + include/linux/lockd/bind.h | 9 + include/linux/lockd/lockd.h | 1 + include/linux/lockdep.h | 71 +- include/linux/loop.h | 2 +- include/linux/magic.h | 1 - include/linux/major.h | 2 + include/linux/mempolicy.h | 8 +- include/linux/mlx4/device.h | 2 + include/linux/mlx4/qp.h | 3 + include/linux/mm.h | 189 +- include/linux/mmzone.h | 52 +- include/linux/mnt_namespace.h | 2 +- include/linux/mod_devicetable.h | 7 + include/linux/module.h | 1 - include/linux/msdos_fs.h | 2 +- include/linux/mv643xx.h | 12 +- include/linux/namei.h | 4 +- include/linux/ncp_fs.h | 2 - include/linux/netdevice.h | 141 +- include/linux/netfilter.h | 8 +- include/linux/netfilter/nf_conntrack_pptp.h | 2 + include/linux/netfilter/x_tables.h | 36 +- include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 4 +- include/linux/netfilter_ipv6/ip6_tables.h | 10 +- include/linux/netlink.h | 2 + include/linux/nfs4.h | 1 + include/linux/nfs4_mount.h | 3 +- include/linux/nfs_fs.h | 31 +- include/linux/nfs_fs_sb.h | 8 +- include/linux/nfs_mount.h | 3 +- include/linux/nfs_page.h | 25 +- include/linux/nfs_xdr.h | 37 +- include/linux/nfsd/export.h | 30 +- include/linux/nfsd/interface.h | 13 - include/linux/nfsd/nfsd.h | 9 +- include/linux/nfsd/state.h | 3 +- include/linux/nfsd/xdr4.h | 7 + include/linux/notifier.h | 22 + include/linux/nsproxy.h | 3 +- include/linux/oprofile.h | 35 + include/linux/page-flags.h | 50 +- include/linux/pata_platform.h | 5 + include/linux/pci.h | 25 +- include/linux/pci_ids.h | 114 +- include/linux/percpu.h | 2 +- include/linux/percpu_counter.h | 18 +- include/linux/pid_namespace.h | 2 +- include/linux/pipe_fs_i.h | 117 +- include/linux/pkt_cls.h | 17 +- include/linux/pkt_sched.h | 9 + include/linux/pm.h | 33 +- include/linux/pmu.h | 2 +- include/linux/pnp.h | 191 +- include/linux/pnpbios.h | 60 +- include/linux/poll.h | 2 + include/linux/prctl.h | 4 + include/linux/preempt.h | 44 + include/linux/prefetch.h | 2 +- include/linux/proc_fs.h | 14 +- include/linux/ptrace.h | 2 + include/linux/raid/bitmap.h | 6 +- include/linux/raid/md_k.h | 6 +- include/linux/raid/raid5.h | 97 +- include/linux/raid/xor.h | 5 +- include/linux/rcupdate.h | 1 - include/linux/reboot.h | 5 + include/linux/reiserfs_fs.h | 8 +- include/linux/resume-trace.h | 19 +- include/linux/rtnetlink.h | 22 +- include/linux/sched.h | 326 +- include/linux/screen_info.h | 9 +- include/linux/scx200_gpio.h | 2 - include/linux/seccomp.h | 19 +- include/linux/security.h | 37 +- include/linux/selection.h | 2 + include/linux/seq_file.h | 11 + include/linux/serial.h | 6 - include/linux/serial_8250.h | 8 +- include/linux/serial_core.h | 10 +- include/linux/serial_reg.h | 1 + include/linux/serio.h | 2 + include/linux/signal.h | 4 +- include/linux/signalfd.h | 40 +- include/linux/skbuff.h | 111 +- include/linux/slab.h | 153 +- include/linux/slab_def.h | 38 +- include/linux/slub_def.h | 43 +- include/linux/smp.h | 13 +- include/linux/smp_lock.h | 1 - include/linux/socket.h | 4 + include/linux/sonypi.h | 2 - include/linux/spi/ads7846.h | 14 + include/linux/spi/spi.h | 60 +- include/linux/spi/spi_bitbang.h | 1 + include/linux/spi/spidev.h | 4 + include/linux/spinlock.h | 7 + include/linux/spinlock_types.h | 4 +- include/linux/spinlock_types_up.h | 9 +- include/linux/stacktrace.h | 2 +- include/linux/string.h | 4 + include/linux/sunrpc/auth.h | 48 +- include/linux/sunrpc/auth_gss.h | 6 +- include/linux/sunrpc/clnt.h | 33 +- include/linux/sunrpc/gss_api.h | 3 +- include/linux/sunrpc/rpc_pipe_fs.h | 2 + include/linux/sunrpc/sched.h | 6 - include/linux/sunrpc/svc.h | 4 +- include/linux/sunrpc/svcauth.h | 1 + include/linux/sunrpc/svcauth_gss.h | 1 + include/linux/sunrpc/svcsock.h | 1 + include/linux/sunrpc/xdr.h | 16 + include/linux/sunrpc/xprt.h | 16 +- include/linux/suspend.h | 57 +- include/linux/swap.h | 3 +- include/linux/syscalls.h | 3 +- include/linux/sysctl.h | 2 +- include/linux/sysdev.h | 3 +- include/linux/sysfs.h | 43 +- include/linux/taskstats.h | 5 +- include/linux/time.h | 16 +- include/linux/timer.h | 16 +- include/linux/timex.h | 60 - include/linux/topology.h | 15 +- include/linux/tty.h | 41 + include/linux/udp.h | 6 + include/linux/uio.h | 9 - include/linux/usb.h | 87 +- include/linux/usb/Kbuild | 1 + include/linux/usb/quirks.h | 3 + include/linux/usb/serial.h | 7 + include/linux/usb_gadget.h | 48 - include/linux/usb_gadgetfs.h | 75 - include/linux/utsname.h | 16 +- include/linux/videodev2.h | 3 +- include/linux/vmalloc.h | 14 +- include/linux/vmstat.h | 5 +- include/linux/vt_kern.h | 2 + include/linux/wait.h | 16 +- include/linux/workqueue.h | 15 +- include/linux/writeback.h | 2 +- include/media/saa7146.h | 6 +- include/media/tuner.h | 71 +- include/media/v4l2-dev.h | 5 +- include/mtd/ubi-header.h | 101 +- include/net/act_api.h | 32 - include/net/addrconf.h | 2 +- include/net/af_unix.h | 32 +- include/net/bluetooth/hci.h | 18 +- include/net/bluetooth/hci_core.h | 5 + include/net/bluetooth/l2cap.h | 50 +- include/net/cfg80211.h | 38 + include/net/dn.h | 1 - include/net/dst.h | 1 - include/net/flow.h | 4 - include/net/genetlink.h | 22 + include/net/inet_timewait_sock.h | 3 - include/net/ip_fib.h | 16 - include/net/ip_mp_alg.h | 96 - include/net/ipv6.h | 5 +- include/net/irda/irda.h | 3 + include/net/irda/irlap.h | 2 + include/net/iucv/af_iucv.h | 1 + include/net/mac80211.h | 22 +- include/net/mip6.h | 4 - include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 27 +- include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 3 - include/net/netfilter/nf_conntrack.h | 70 +- include/net/netfilter/nf_conntrack_core.h | 11 +- include/net/netfilter/nf_conntrack_ecache.h | 17 +- include/net/netfilter/nf_conntrack_expect.h | 42 +- include/net/netfilter/nf_conntrack_helper.h | 16 +- include/net/netfilter/nf_conntrack_l3proto.h | 10 +- include/net/netfilter/nf_conntrack_tuple.h | 82 +- include/net/netfilter/nf_nat.h | 28 +- include/net/netfilter/nf_nat_core.h | 1 + include/net/netlabel.h | 64 +- include/net/netlink.h | 84 + include/net/pkt_cls.h | 10 +- include/net/pkt_sched.h | 4 +- include/net/rawv6.h | 9 + include/net/rose.h | 2 +- include/net/route.h | 3 +- include/net/rtnetlink.h | 58 + include/net/sch_generic.h | 2 +- include/net/scm.h | 2 +- include/net/sctp/sctp.h | 11 + include/net/sctp/sm.h | 6 +- include/net/sctp/structs.h | 15 +- include/net/sctp/ulpqueue.h | 1 + include/net/tcp.h | 14 +- include/net/tipc/tipc_port.h | 6 +- include/net/xfrm.h | 21 +- include/pcmcia/ciscode.h | 2 + include/rdma/ib_cm.h | 1 - include/rdma/ib_mad.h | 5 + include/rdma/ib_verbs.h | 7 +- include/scsi/iscsi_if.h | 34 + include/scsi/libiscsi.h | 77 +- include/scsi/libsas.h | 17 +- include/scsi/scsi_cmnd.h | 20 + include/scsi/scsi_device.h | 2 +- include/scsi/scsi_driver.h | 2 - include/scsi/scsi_host.h | 12 +- include/scsi/scsi_transport_fc.h | 186 +- include/scsi/scsi_transport_iscsi.h | 16 +- include/scsi/scsi_transport_sas.h | 11 +- include/scsi/sd.h | 2 - include/sound/ak4xxx-adda.h | 1 + include/sound/cs46xx.h | 4 + include/sound/cs46xx_dsp_spos.h | 2 + include/sound/emu10k1.h | 16 + include/sound/sb.h | 1 + include/sound/version.h | 2 +- include/sound/wavefront_fx.h | 9 - include/video/tgafb.h | 1 + include/video/tx3912.h | 62 - init/Kconfig | 55 +- init/do_mounts.c | 17 - init/do_mounts_initrd.c | 3 +- init/initramfs.c | 2 +- init/main.c | 68 +- ipc/mqueue.c | 2 +- ipc/msg.c | 8 +- ipc/sem.c | 6 +- ipc/shm.c | 14 +- ipc/util.c | 11 +- ipc/util.h | 8 +- kernel/Kconfig.preempt | 3 + kernel/Makefile | 6 +- kernel/acct.c | 2 +- kernel/audit.c | 97 +- kernel/audit.h | 1 - kernel/auditfilter.c | 25 +- kernel/auditsc.c | 144 +- kernel/cpu.c | 20 +- kernel/cpuset.c | 11 +- kernel/delayacct.c | 10 +- kernel/exit.c | 64 +- kernel/fork.c | 37 +- kernel/futex.c | 186 +- kernel/futex_compat.c | 30 +- kernel/hrtimer.c | 23 +- kernel/irq/chip.c | 5 +- kernel/irq/devres.c | 1 + kernel/irq/manage.c | 13 +- kernel/irq/proc.c | 10 +- kernel/irq/resend.c | 7 +- kernel/irq/spurious.c | 12 +- kernel/kallsyms.c | 27 +- kernel/kfifo.c | 3 +- kernel/kmod.c | 303 +- kernel/kprobes.c | 14 + kernel/ksysfs.c | 28 + kernel/kthread.c | 12 +- kernel/lockdep.c | 1729 +- kernel/lockdep_proc.c | 301 +- kernel/module.c | 75 +- kernel/mutex.c | 8 + kernel/nsproxy.c | 72 +- kernel/panic.c | 5 +- kernel/params.c | 8 +- kernel/pid.c | 2 +- kernel/posix-cpu-timers.c | 34 +- kernel/posix-timers.c | 11 +- kernel/power/Kconfig | 91 +- kernel/power/Makefile | 5 +- kernel/power/disk.c | 252 +- kernel/power/main.c | 134 +- kernel/power/power.h | 39 +- kernel/power/process.c | 90 +- kernel/power/swap.c | 20 +- kernel/power/user.c | 154 +- kernel/printk.c | 68 +- kernel/profile.c | 4 +- kernel/ptrace.c | 29 +- kernel/rcutorture.c | 4 +- kernel/relay.c | 223 +- kernel/rtmutex-debug.c | 6 - kernel/rtmutex-tester.c | 1 + kernel/rtmutex.c | 6 - kernel/rtmutex_common.h | 9 +- kernel/rwsem.c | 8 +- kernel/sched.c | 3665 ++- kernel/seccomp.c | 29 + kernel/signal.c | 96 +- kernel/softirq.c | 10 +- kernel/softlockup.c | 2 +- kernel/spinlock.c | 32 +- kernel/stop_machine.c | 8 +- kernel/sys.c | 114 +- kernel/sys_ni.c | 1 + kernel/sysctl.c | 223 +- kernel/taskstats.c | 4 + kernel/time.c | 95 +- kernel/time/clockevents.c | 51 - kernel/time/ntp.c | 71 +- kernel/time/tick-broadcast.c | 52 +- kernel/time/tick-common.c | 16 +- kernel/time/tick-oneshot.c | 15 +- kernel/time/tick-sched.c | 19 +- kernel/time/timekeeping.c | 93 +- kernel/time/timer_list.c | 2 +- kernel/time/timer_stats.c | 21 +- kernel/timer.c | 231 +- kernel/tsacct.c | 2 +- kernel/user.c | 61 +- kernel/utsname.c | 14 +- kernel/utsname_sysctl.c | 5 +- kernel/workqueue.c | 51 +- lib/Kconfig | 17 + lib/Kconfig.debug | 37 +- lib/Makefile | 8 +- lib/bug.c | 5 +- lib/fault-inject.c | 4 + lib/gen_crc32table.c | 4 + lib/genalloc.c | 3 +- lib/hexdump.c | 6 +- lib/idr.c | 436 +- lib/iomap.c | 15 +- lib/kobject.c | 19 +- lib/kobject_uevent.c | 34 +- lib/percpu_counter.c | 68 +- lib/radix-tree.c | 3 +- lib/swiotlb.c | 5 +- lib/vsprintf.c | 208 +- mm/Kconfig | 15 +- mm/Makefile | 4 +- mm/allocpercpu.c | 9 +- mm/backing-dev.c | 16 - mm/bounce.c | 4 +- mm/filemap.c | 445 +- mm/filemap_xip.c | 63 +- mm/fremap.c | 179 +- mm/highmem.c | 7 +- mm/hugetlb.c | 76 +- mm/madvise.c | 6 +- mm/memory.c | 415 +- mm/mempolicy.c | 149 +- mm/mempool.c | 6 +- mm/migrate.c | 34 +- mm/mmap.c | 138 +- mm/mprotect.c | 2 +- mm/mremap.c | 15 +- mm/nommu.c | 59 +- mm/oom_kill.c | 3 +- mm/page-writeback.c | 37 +- mm/page_alloc.c | 660 +- mm/pdflush.c | 1 + mm/readahead.c | 506 +- mm/rmap.c | 6 +- mm/shmem.c | 136 +- mm/slab.c | 157 +- mm/slob.c | 600 +- mm/slub.c | 859 +- mm/sparse.c | 16 +- mm/swap_state.c | 5 +- mm/swapfile.c | 8 +- mm/truncate.c | 59 +- mm/util.c | 74 +- mm/vmalloc.c | 78 +- mm/vmscan.c | 281 +- mm/vmstat.c | 3 +- net/802/tr.c | 2 +- net/8021q/Makefile | 2 +- net/8021q/vlan.c | 496 +- net/8021q/vlan.h | 25 +- net/8021q/vlan_dev.c | 393 +- net/8021q/vlanproc.c | 8 +- net/Kconfig | 1 + net/Makefile | 2 +- net/appletalk/aarp.c | 2 +- net/appletalk/atalk_proc.c | 6 +- net/atm/br2684.c | 28 +- net/atm/clip.c | 2 +- net/atm/lec.c | 3 +- net/atm/mpoa_proc.c | 2 +- net/atm/proc.c | 10 +- net/ax25/af_ax25.c | 4 +- net/ax25/ax25_iface.c | 2 - net/ax25/ax25_route.c | 2 +- net/ax25/ax25_uid.c | 2 +- net/bluetooth/bnep/core.c | 2 +- net/bluetooth/cmtp/core.c | 2 +- net/bluetooth/hci_conn.c | 51 +- net/bluetooth/hci_core.c | 108 +- net/bluetooth/hci_event.c | 29 +- net/bluetooth/hci_sock.c | 28 +- net/bluetooth/hidp/core.c | 2 +- net/bluetooth/l2cap.c | 48 +- net/bluetooth/rfcomm/core.c | 2 +- net/bluetooth/rfcomm/tty.c | 5 +- net/bridge/br_device.c | 7 +- net/bridge/br_fdb.c | 7 +- net/bridge/br_forward.c | 21 +- net/bridge/br_if.c | 41 +- net/bridge/br_input.c | 57 +- net/bridge/br_netfilter.c | 14 +- net/bridge/br_private.h | 8 +- net/bridge/br_stp_if.c | 4 +- net/bridge/br_sysfs_br.c | 33 +- net/bridge/br_sysfs_if.c | 3 +- net/bridge/netfilter/ebt_log.c | 1 - net/bridge/netfilter/ebt_ulog.c | 1 - net/bridge/netfilter/ebtables.c | 5 +- net/compat.c | 3 +- net/core/datagram.c | 3 + net/core/dev.c | 525 +- net/core/dev_mcast.c | 206 +- net/core/ethtool.c | 77 +- net/core/flow.c | 2 +- net/core/neighbour.c | 5 +- net/core/netpoll.c | 8 +- net/core/pktgen.c | 363 +- net/core/rtnetlink.c | 472 +- net/core/scm.c | 3 +- net/core/skbuff.c | 17 +- net/core/sock.c | 180 +- net/core/utils.c | 1 + net/dccp/ackvec.c | 4 +- net/dccp/ccid.c | 3 +- net/dccp/ccids/ccid3.c | 212 +- net/dccp/ccids/ccid3.h | 5 +- net/dccp/ccids/lib/loss_interval.c | 246 +- net/dccp/ccids/lib/loss_interval.h | 46 +- net/dccp/ccids/lib/packet_history.c | 4 +- net/dccp/dccp.h | 4 +- net/dccp/feat.c | 14 +- net/dccp/ipv6.c | 20 - net/dccp/probe.c | 2 +- net/dccp/proto.c | 2 +- net/decnet/af_decnet.c | 2 +- net/decnet/dn_dev.c | 7 +- net/decnet/dn_neigh.c | 2 +- net/decnet/dn_route.c | 8 +- net/decnet/dn_table.c | 2 +- net/econet/af_econet.c | 3 + net/ethernet/eth.c | 12 +- net/ieee80211/ieee80211_rx.c | 6 + net/ieee80211/ieee80211_wx.c | 7 +- net/ieee80211/softmac/ieee80211softmac_assoc.c | 2 - net/ieee80211/softmac/ieee80211softmac_module.c | 32 +- net/ieee80211/softmac/ieee80211softmac_wx.c | 56 +- net/ipv4/Kconfig | 42 - net/ipv4/Makefile | 5 - net/ipv4/af_inet.c | 3 + net/ipv4/ah4.c | 3 +- net/ipv4/arp.c | 2 +- net/ipv4/devinet.c | 7 +- net/ipv4/esp4.c | 1 + net/ipv4/fib_frontend.c | 6 +- net/ipv4/fib_hash.c | 4 +- net/ipv4/fib_semantics.c | 16 - net/ipv4/fib_trie.c | 2 +- net/ipv4/inet_diag.c | 4 + net/ipv4/inet_timewait_sock.c | 5 +- net/ipv4/inetpeer.c | 6 +- net/ipv4/ip_forward.c | 2 +- net/ipv4/ip_gre.c | 3 +- net/ipv4/ip_options.c | 7 +- net/ipv4/ip_output.c | 7 +- net/ipv4/ip_sockglue.c | 4 + net/ipv4/ipcomp.c | 1 + net/ipv4/ipconfig.c | 6 +- net/ipv4/ipip.c | 3 +- net/ipv4/ipmr.c | 2 +- net/ipv4/ipvs/ip_vs_app.c | 2 +- net/ipv4/ipvs/ip_vs_conn.c | 4 +- net/ipv4/ipvs/ip_vs_ctl.c | 6 +- net/ipv4/ipvs/ip_vs_xmit.c | 2 +- net/ipv4/multipath.c | 55 - net/ipv4/multipath_drr.c | 249 - net/ipv4/multipath_random.c | 114 - net/ipv4/multipath_rr.c | 95 - net/ipv4/multipath_wrandom.c | 329 - net/ipv4/netfilter/Kconfig | 2 +- net/ipv4/netfilter/arp_tables.c | 9 +- net/ipv4/netfilter/arpt_mangle.c | 10 +- net/ipv4/netfilter/ip_tables.c | 178 +- net/ipv4/netfilter/ipt_CLUSTERIP.c | 119 +- net/ipv4/netfilter/ipt_ECN.c | 36 +- net/ipv4/netfilter/ipt_LOG.c | 56 +- net/ipv4/netfilter/ipt_MASQUERADE.c | 30 +- net/ipv4/netfilter/ipt_NETMAP.c | 23 +- net/ipv4/netfilter/ipt_REDIRECT.c | 20 +- net/ipv4/netfilter/ipt_REJECT.c | 30 +- net/ipv4/netfilter/ipt_SAME.c | 69 +- net/ipv4/netfilter/ipt_TOS.c | 8 +- net/ipv4/netfilter/ipt_TTL.c | 14 +- net/ipv4/netfilter/ipt_ULOG.c | 68 +- net/ipv4/netfilter/ipt_addrtype.c | 14 +- net/ipv4/netfilter/ipt_ah.c | 25 +- net/ipv4/netfilter/ipt_ecn.c | 59 +- net/ipv4/netfilter/ipt_iprange.c | 50 +- net/ipv4/netfilter/ipt_owner.c | 20 +- net/ipv4/netfilter/ipt_recent.c | 52 +- net/ipv4/netfilter/ipt_tos.c | 6 +- net/ipv4/netfilter/ipt_ttl.c | 26 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 72 +- .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 114 +- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 51 +- net/ipv4/netfilter/nf_nat_amanda.c | 4 +- net/ipv4/netfilter/nf_nat_core.c | 130 +- net/ipv4/netfilter/nf_nat_ftp.c | 18 +- net/ipv4/netfilter/nf_nat_h323.c | 121 +- net/ipv4/netfilter/nf_nat_helper.c | 59 +- net/ipv4/netfilter/nf_nat_irc.c | 17 +- net/ipv4/netfilter/nf_nat_pptp.c | 43 +- net/ipv4/netfilter/nf_nat_proto_gre.c | 17 +- net/ipv4/netfilter/nf_nat_rule.c | 50 +- net/ipv4/netfilter/nf_nat_sip.c | 20 +- net/ipv4/netfilter/nf_nat_snmp_basic.c | 6 - net/ipv4/netfilter/nf_nat_standalone.c | 49 +- net/ipv4/netfilter/nf_nat_tftp.c | 2 +- net/ipv4/raw.c | 4 +- net/ipv4/route.c | 267 +- net/ipv4/tcp.c | 28 +- net/ipv4/tcp_bic.c | 4 +- net/ipv4/tcp_cong.c | 3 +- net/ipv4/tcp_cubic.c | 50 +- net/ipv4/tcp_highspeed.c | 2 +- net/ipv4/tcp_htcp.c | 16 +- net/ipv4/tcp_hybla.c | 4 +- net/ipv4/tcp_illinois.c | 10 +- net/ipv4/tcp_input.c | 93 +- net/ipv4/tcp_ipv4.c | 38 +- net/ipv4/tcp_lp.c | 11 +- net/ipv4/tcp_output.c | 10 +- net/ipv4/tcp_probe.c | 197 +- net/ipv4/tcp_scalable.c | 2 +- net/ipv4/tcp_vegas.c | 12 +- net/ipv4/tcp_vegas.h | 2 +- net/ipv4/tcp_veno.c | 12 +- net/ipv4/tcp_westwood.c | 7 +- net/ipv4/tcp_yeah.c | 6 +- net/ipv4/udp.c | 146 +- net/ipv4/xfrm4_input.c | 114 +- net/ipv4/xfrm4_tunnel.c | 1 + net/ipv6/Kconfig | 2 +- net/ipv6/Makefile | 2 +- net/ipv6/addrconf.c | 22 +- net/ipv6/addrconf_core.c | 3 + net/ipv6/af_inet6.c | 10 +- net/ipv6/ah6.c | 13 +- net/ipv6/anycast.c | 3 +- net/ipv6/datagram.c | 5 +- net/ipv6/esp6.c | 1 + net/ipv6/exthdrs.c | 140 +- net/ipv6/icmp.c | 2 +- net/ipv6/ip6_fib.c | 2 +- net/ipv6/ip6_flowlabel.c | 2 +- net/ipv6/ip6_output.c | 11 +- net/ipv6/ip6_tunnel.c | 21 +- net/ipv6/ipcomp6.c | 2 +- net/ipv6/ipv6_sockglue.c | 19 +- net/ipv6/mcast.c | 4 +- net/ipv6/mip6.c | 24 +- net/ipv6/ndisc.c | 11 +- net/ipv6/netfilter/ip6_tables.c | 203 +- net/ipv6/netfilter/ip6t_HL.c | 14 +- net/ipv6/netfilter/ip6t_LOG.c | 57 +- net/ipv6/netfilter/ip6t_REJECT.c | 45 +- net/ipv6/netfilter/ip6t_ah.c | 82 +- net/ipv6/netfilter/ip6t_eui64.c | 20 +- net/ipv6/netfilter/ip6t_frag.c | 111 +- net/ipv6/netfilter/ip6t_hbh.c | 88 +- net/ipv6/netfilter/ip6t_hl.c | 22 +- net/ipv6/netfilter/ip6t_ipv6header.c | 22 +- net/ipv6/netfilter/ip6t_mh.c | 30 +- net/ipv6/netfilter/ip6t_owner.c | 26 +- net/ipv6/netfilter/ip6t_rt.c | 134 +- net/ipv6/netfilter/ip6table_mangle.c | 6 - net/ipv6/netfilter/ip6table_raw.c | 6 - net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 49 +- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 60 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 52 +- net/ipv6/raw.c | 43 +- net/ipv6/route.c | 7 +- net/ipv6/sit.c | 3 +- net/ipv6/tcp_ipv6.c | 39 +- net/ipv6/udp.c | 6 +- net/ipv6/xfrm6_policy.c | 4 +- net/ipv6/xfrm6_state.c | 4 +- net/ipv6/xfrm6_tunnel.c | 3 +- net/ipx/ipx_proc.c | 6 +- net/irda/Makefile | 2 +- net/irda/af_irda.c | 2 +- net/irda/discovery.c | 2 +- net/irda/ircomm/ircomm_core.c | 2 +- net/irda/irda_device.c | 4 +- net/irda/iriap.c | 4 +- net/irda/irias_object.c | 43 +- net/irda/irlan/irlan_common.c | 2 +- net/irda/irlap.c | 4 +- net/irda/irlap_frame.c | 7 + net/irda/irlmp.c | 4 +- net/irda/irmod.c | 48 +- net/irda/irproc.c | 2 +- net/irda/irsysctl.c | 2 +- net/irda/irttp.c | 33 +- net/iucv/Kconfig | 8 +- net/iucv/af_iucv.c | 16 +- net/iucv/iucv.c | 20 +- net/key/af_key.c | 7 +- net/llc/llc_proc.c | 4 +- net/mac80211/Makefile | 1 + net/mac80211/debugfs_netdev.c | 19 +- net/mac80211/debugfs_sta.c | 2 +- net/mac80211/hostapd_ioctl.h | 8 - net/mac80211/ieee80211.c | 454 +- net/mac80211/ieee80211_common.h | 9 +- net/mac80211/ieee80211_i.h | 19 +- net/mac80211/ieee80211_iface.c | 3 + net/mac80211/ieee80211_ioctl.c | 411 +- net/mac80211/ieee80211_rate.c | 3 +- net/mac80211/ieee80211_sta.c | 113 +- net/mac80211/rc80211_simple.c | 22 +- net/mac80211/wme.c | 2 +- net/netfilter/Kconfig | 43 + net/netfilter/Makefile | 6 +- net/netfilter/core.c | 10 +- net/netfilter/nf_conntrack_amanda.c | 17 +- net/netfilter/nf_conntrack_core.c | 553 +- net/netfilter/nf_conntrack_ecache.c | 16 +- net/netfilter/nf_conntrack_expect.c | 370 +- net/netfilter/nf_conntrack_ftp.c | 143 +- net/netfilter/nf_conntrack_h323_asn1.c | 18 +- net/netfilter/nf_conntrack_h323_main.c | 307 +- net/netfilter/nf_conntrack_helper.c | 131 +- net/netfilter/nf_conntrack_irc.c | 39 +- net/netfilter/nf_conntrack_l3proto_generic.c | 22 +- net/netfilter/nf_conntrack_netbios_ns.c | 12 +- net/netfilter/nf_conntrack_netlink.c | 199 +- net/netfilter/nf_conntrack_pptp.c | 120 +- net/netfilter/nf_conntrack_proto_generic.c | 2 +- net/netfilter/nf_conntrack_proto_gre.c | 30 +- net/netfilter/nf_conntrack_proto_sctp.c | 96 +- net/netfilter/nf_conntrack_proto_tcp.c | 134 +- net/netfilter/nf_conntrack_proto_udp.c | 5 +- net/netfilter/nf_conntrack_sane.c | 45 +- net/netfilter/nf_conntrack_sip.c | 45 +- net/netfilter/nf_conntrack_standalone.c | 52 +- net/netfilter/nf_conntrack_tftp.c | 32 +- net/netfilter/nf_log.c | 4 +- net/netfilter/nf_queue.c | 59 +- net/netfilter/nf_sockopt.c | 36 +- net/netfilter/nfnetlink_log.c | 15 +- net/netfilter/nfnetlink_queue.c | 6 +- net/netfilter/x_tables.c | 11 +- net/netfilter/xt_CLASSIFY.c | 2 +- net/netfilter/xt_CONNMARK.c | 18 +- net/netfilter/xt_CONNSECMARK.c | 18 +- net/netfilter/xt_DSCP.c | 18 +- net/netfilter/xt_MARK.c | 24 +- net/netfilter/xt_NFLOG.c | 12 +- net/netfilter/xt_NFQUEUE.c | 2 +- net/netfilter/xt_NOTRACK.c | 2 +- net/netfilter/xt_SECMARK.c | 26 +- net/netfilter/xt_TCPMSS.c | 28 +- net/netfilter/xt_comment.c | 8 +- net/netfilter/xt_connbytes.c | 32 +- net/netfilter/xt_connmark.c | 26 +- net/netfilter/xt_conntrack.c | 42 +- net/netfilter/xt_dccp.c | 50 +- net/netfilter/xt_dscp.c | 48 +- net/netfilter/xt_esp.c | 24 +- net/netfilter/xt_hashlimit.c | 67 +- net/netfilter/xt_helper.c | 61 +- net/netfilter/xt_length.c | 14 +- net/netfilter/xt_limit.c | 23 +- net/netfilter/xt_mac.c | 16 +- net/netfilter/xt_mark.c | 16 +- net/netfilter/xt_multiport.c | 54 +- net/netfilter/xt_physdev.c | 49 +- net/netfilter/xt_pkttype.c | 10 +- net/netfilter/xt_policy.c | 50 +- net/netfilter/xt_quota.c | 21 +- net/netfilter/xt_realm.c | 8 +- net/netfilter/xt_sctp.c | 61 +- net/netfilter/xt_state.c | 20 +- net/netfilter/xt_statistic.c | 20 +- net/netfilter/xt_string.c | 38 +- net/netfilter/xt_tcpmss.c | 10 +- net/netfilter/xt_tcpudp.c | 65 +- net/netlabel/netlabel_cipso_v4.c | 5 + net/netlabel/netlabel_domainhash.c | 10 +- net/netlabel/netlabel_kapi.c | 21 + net/netlabel/netlabel_mgmt.c | 65 + net/netlabel/netlabel_mgmt.h | 5 + net/netlabel/netlabel_user.c | 8 +- net/netlink/af_netlink.c | 168 +- net/netlink/attr.c | 11 + net/netlink/genetlink.c | 243 +- net/netrom/af_netrom.c | 4 +- net/netrom/nr_route.c | 4 +- net/packet/af_packet.c | 4 +- net/rfkill/rfkill-input.c | 2 +- net/rfkill/rfkill.c | 2 +- net/rose/af_rose.c | 4 +- net/rose/rose_loopback.c | 4 +- net/rose/rose_route.c | 21 +- net/rxrpc/af_rxrpc.c | 14 +- net/rxrpc/ar-connection.c | 6 +- net/rxrpc/ar-proc.c | 52 +- net/rxrpc/ar-transport.c | 4 +- net/rxrpc/rxkad.c | 2 +- net/sched/Kconfig | 37 +- net/sched/Makefile | 1 - net/sched/act_api.c | 31 +- net/sched/act_gact.c | 11 - net/sched/act_ipt.c | 12 - net/sched/act_mirred.c | 12 - net/sched/act_pedit.c | 11 - net/sched/act_police.c | 283 +- net/sched/act_simple.c | 1 - net/sched/cls_api.c | 50 - net/sched/cls_basic.c | 1 - net/sched/cls_fw.c | 19 +- net/sched/cls_route.c | 20 +- net/sched/cls_rsvp.c | 17 +- net/sched/cls_rsvp6.c | 16 - net/sched/cls_tcindex.c | 3 - net/sched/cls_u32.c | 23 +- net/sched/em_cmp.c | 1 + net/sched/em_meta.c | 2 + net/sched/em_nbyte.c | 2 + net/sched/em_text.c | 2 + net/sched/em_u32.c | 2 + net/sched/ematch.c | 15 +- net/sched/sch_api.c | 102 +- net/sched/sch_atm.c | 478 +- net/sched/sch_blackhole.c | 1 - net/sched/sch_cbq.c | 84 +- net/sched/sch_dsmark.c | 35 +- net/sched/sch_fifo.c | 1 - net/sched/sch_generic.c | 219 +- net/sched/sch_gred.c | 1 - net/sched/sch_hfsc.c | 24 +- net/sched/sch_htb.c | 126 +- net/sched/sch_ingress.c | 31 +- net/sched/sch_netem.c | 2 - net/sched/sch_prio.c | 156 +- net/sched/sch_red.c | 1 - net/sched/sch_sfq.c | 71 +- net/sched/sch_tbf.c | 21 +- net/sched/sch_teql.c | 24 +- net/sctp/associola.c | 21 +- net/sctp/bind_addr.c | 70 +- net/sctp/endpointola.c | 27 +- net/sctp/input.c | 10 +- net/sctp/inqueue.c | 8 + net/sctp/ipv6.c | 52 +- net/sctp/outqueue.c | 7 + net/sctp/proc.c | 4 +- net/sctp/protocol.c | 83 +- net/sctp/sm_make_chunk.c | 182 +- net/sctp/sm_sideeffect.c | 8 +- net/sctp/sm_statefuns.c | 375 +- net/sctp/sm_statetable.c | 16 +- net/sctp/socket.c | 170 +- net/sctp/tsnmap.c | 14 +- net/sctp/ulpqueue.c | 75 +- net/socket.c | 10 +- net/sunrpc/auth.c | 362 +- net/sunrpc/auth_gss/auth_gss.c | 358 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- net/sunrpc/auth_gss/gss_krb5_mech.c | 3 +- net/sunrpc/auth_gss/gss_mech_switch.c | 14 + net/sunrpc/auth_gss/gss_spkm3_mech.c | 3 +- net/sunrpc/auth_gss/svcauth_gss.c | 35 +- net/sunrpc/auth_null.c | 10 +- net/sunrpc/auth_unix.c | 54 +- net/sunrpc/cache.c | 5 +- net/sunrpc/clnt.c | 371 +- net/sunrpc/rpc_pipe.c | 101 +- net/sunrpc/rpcb_clnt.c | 65 +- net/sunrpc/sched.c | 224 +- net/sunrpc/sunrpc_syms.c | 8 +- net/sunrpc/svc.c | 2 +- net/sunrpc/svcauth_unix.c | 7 +- net/sunrpc/svcsock.c | 29 +- net/sunrpc/xprt.c | 19 +- net/sunrpc/xprtsock.c | 81 +- net/tipc/eth_media.c | 11 +- net/tipc/handler.c | 2 +- net/tipc/link.c | 46 +- net/tipc/msg.h | 6 +- net/tipc/name_table.c | 5 +- net/tipc/node.c | 2 - net/tipc/port.c | 11 +- net/tipc/port.h | 6 +- net/tipc/socket.c | 80 +- net/unix/af_unix.c | 38 +- net/unix/garbage.c | 325 +- net/wanrouter/wanmain.c | 1 - net/wanrouter/wanproc.c | 4 +- net/wireless/Makefile | 2 +- net/wireless/core.c | 2 +- net/wireless/sysfs.c | 2 + net/x25/x25_proc.c | 6 +- net/xfrm/xfrm_input.c | 2 +- net/xfrm/xfrm_policy.c | 15 +- net/xfrm/xfrm_state.c | 40 +- net/xfrm/xfrm_user.c | 7 + scripts/Kbuild.include | 7 +- scripts/Lindent | 2 +- scripts/Makefile.build | 18 +- scripts/Makefile.headersinst | 14 +- scripts/Makefile.modpost | 24 +- scripts/checkpatch.pl | 605 +- scripts/cleanfile | 54 +- scripts/cleanpatch | 58 +- scripts/gcc-version.sh | 15 +- scripts/gen_initramfs_list.sh | 12 +- scripts/kallsyms.c | 73 +- scripts/kconfig/Makefile | 45 +- scripts/kconfig/conf.c | 52 +- scripts/kconfig/confdata.c | 37 +- scripts/kconfig/expr.h | 4 +- scripts/kconfig/gconf.c | 10 +- scripts/kconfig/kxgettext.c | 8 +- scripts/kconfig/lkc_proto.h | 2 + scripts/kconfig/lxdialog/check-lxdialog.sh | 4 +- scripts/kconfig/mconf.c | 15 +- scripts/kconfig/menu.c | 12 + scripts/kconfig/qconf.cc | 2 +- scripts/kconfig/zconf.tab.c_shipped | 12 +- scripts/kconfig/zconf.y | 12 +- scripts/kernel-doc | 28 +- scripts/mkcompile_h | 27 +- scripts/mod/file2alias.c | 16 +- scripts/mod/modpost.c | 455 +- scripts/mod/modpost.h | 10 + scripts/mod/sumversion.c | 7 +- scripts/ver_linux | 4 +- security/commoncap.c | 6 +- security/dummy.c | 12 +- security/keys/key.c | 2 +- security/keys/request_key.c | 3 +- security/security.c | 1 + security/selinux/avc.c | 29 +- security/selinux/hooks.c | 58 +- security/selinux/include/av_perm_to_string.h | 1 + security/selinux/include/av_permissions.h | 1 + security/selinux/include/avc.h | 6 +- security/selinux/include/class_to_string.h | 1 + security/selinux/include/flask.h | 1 + security/selinux/include/security.h | 4 + security/selinux/netlabel.c | 61 +- security/selinux/nlmsgtab.c | 2 + security/selinux/selinuxfs.c | 269 +- security/selinux/ss/avtab.c | 2 +- security/selinux/ss/policydb.c | 7 + security/selinux/ss/services.c | 152 +- security/selinux/xfrm.c | 3 +- sound/Kconfig | 2 + sound/Makefile | 2 +- sound/aoa/codecs/snd-aoa-codec-onyx.c | 4 +- sound/core/memalloc.c | 68 +- sound/core/pcm_native.c | 2 +- sound/core/seq/seq_instr.c | 6 +- sound/core/seq/seq_virmidi.c | 3 +- sound/core/sound.c | 3 +- sound/core/timer.c | 27 +- sound/drivers/dummy.c | 2 +- sound/drivers/mpu401/mpu401.c | 2 +- sound/drivers/portman2x4.c | 2 +- sound/drivers/serial-u16550.c | 2 +- sound/drivers/virmidi.c | 2 +- sound/i2c/other/ak4xxx-adda.c | 24 +- sound/isa/Kconfig | 32 +- sound/isa/ad1848/ad1848_lib.c | 4 +- sound/isa/opl3sa2.c | 2 + sound/isa/opti9xx/opti92x-ad1848.c | 3 + sound/isa/sb/Makefile | 15 +- sound/isa/sb/sb16_main.c | 10 + sound/isa/sb/sb_common.c | 5 +- sound/isa/sb/sb_mixer.c | 3 + sound/isa/sscape.c | 4 +- sound/isa/wavefront/wavefront_synth.c | 2 +- sound/oss/Kconfig | 88 +- sound/oss/Makefile | 14 - sound/oss/ac97.c | 432 - sound/oss/ac97.h | 201 - sound/oss/aci.c | 712 - sound/oss/aci.h | 57 - sound/oss/ad1816.c | 1368 - sound/oss/ad1889.c | 1101 - sound/oss/ad1889.h | 135 - sound/oss/adlib_card.c | 73 - sound/oss/cs461x.h | 1691 -- sound/oss/cs461x_image.h | 322 - sound/oss/cs46xx.c | 5444 ---- sound/oss/cs46xx_wrapper-24.h | 56 - sound/oss/cs46xxpm.h | 70 - sound/oss/emu10k1/8010.h | 737 - sound/oss/emu10k1/Makefile | 17 - sound/oss/emu10k1/audio.c | 1595 -- sound/oss/emu10k1/audio.h | 44 - sound/oss/emu10k1/cardmi.c | 832 - sound/oss/emu10k1/cardmi.h | 97 - sound/oss/emu10k1/cardmo.c | 229 - sound/oss/emu10k1/cardmo.h | 62 - sound/oss/emu10k1/cardwi.c | 384 - sound/oss/emu10k1/cardwi.h | 91 - sound/oss/emu10k1/cardwo.c | 643 - sound/oss/emu10k1/cardwo.h | 90 - sound/oss/emu10k1/ecard.c | 157 - sound/oss/emu10k1/ecard.h | 113 - sound/oss/emu10k1/efxmgr.c | 220 - sound/oss/emu10k1/efxmgr.h | 270 - sound/oss/emu10k1/emuadxmg.c | 104 - sound/oss/emu10k1/hwaccess.c | 507 - sound/oss/emu10k1/hwaccess.h | 247 - sound/oss/emu10k1/icardmid.h | 163 - sound/oss/emu10k1/icardwav.h | 53 - sound/oss/emu10k1/irqmgr.c | 113 - sound/oss/emu10k1/irqmgr.h | 52 - sound/oss/emu10k1/main.c | 1471 - sound/oss/emu10k1/midi.c | 614 - sound/oss/emu10k1/midi.h | 78 - sound/oss/emu10k1/mixer.c | 690 - sound/oss/emu10k1/passthrough.c | 240 - sound/oss/emu10k1/passthrough.h | 99 - sound/oss/emu10k1/recmgr.c | 147 - sound/oss/emu10k1/recmgr.h | 48 - sound/oss/emu10k1/timer.c | 176 - sound/oss/emu10k1/timer.h | 54 - sound/oss/emu10k1/voicemgr.c | 398 - sound/oss/emu10k1/voicemgr.h | 103 - sound/oss/es1371.c | 2 +- sound/oss/mpu401.c | 7 +- sound/oss/nec_vrc5477.c | 2060 -- sound/oss/nm256.h | 292 - sound/oss/nm256_audio.c | 1662 -- sound/oss/nm256_coeff.h | 4697 --- sound/oss/opl3.c | 14 +- sound/oss/opl3.h | 5 - sound/oss/opl3sa2.c | 1020 - sound/oss/trident.c | 367 +- sound/pci/Kconfig | 11 + sound/pci/Makefile | 2 + sound/pci/ali5451/ali5451.c | 9 +- sound/pci/als300.c | 7 +- sound/pci/atiixp.c | 6 +- sound/pci/atiixp_modem.c | 5 +- sound/pci/au88x0/au88x0.c | 6 +- sound/pci/bt87x.c | 2 + sound/pci/ca0106/ca0106.h | 1 - sound/pci/ca0106/ca0106_main.c | 24 +- sound/pci/cs46xx/cs46xx_lib.c | 77 +- sound/pci/cs46xx/cs46xx_lib.h | 3 + sound/pci/cs46xx/dsp_spos.c | 170 +- sound/pci/emu10k1/emu10k1_main.c | 129 +- sound/pci/emu10k1/emu10k1x.c | 2 +- sound/pci/emu10k1/emufx.c | 78 +- sound/pci/emu10k1/emumixer.c | 16 + sound/pci/emu10k1/emupcm.c | 39 +- sound/pci/ens1370.c | 8 +- sound/pci/fm801.c | 4 +- sound/pci/hda/hda_intel.c | 53 +- sound/pci/hda/hda_proc.c | 6 + sound/pci/hda/patch_analog.c | 630 +- sound/pci/hda/patch_atihdmi.c | 1 + sound/pci/hda/patch_conexant.c | 2 + sound/pci/hda/patch_realtek.c | 961 +- sound/pci/hda/patch_si3054.c | 4 + sound/pci/hda/patch_sigmatel.c | 266 +- sound/pci/ice1712/revo.c | 7 +- sound/pci/mixart/mixart_hwdep.c | 1 + sound/pci/nm256/nm256.c | 3 +- sound/pci/rme9652/rme9652.c | 2 +- sound/pci/via82xx.c | 18 +- sound/pci/via82xx_modem.c | 8 +- sound/pci/ymfpci/ymfpci_main.c | 2 +- sound/ppc/Kconfig | 20 + sound/ppc/Makefile | 3 +- sound/ppc/beep.c | 10 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 2 +- sound/soc/pxa/pxa2xx-ac97.c | 4 +- sound/soc/s3c24xx/Kconfig | 27 + sound/soc/s3c24xx/Makefile | 9 + sound/soc/s3c24xx/s3c24xx-i2s.c | 4 +- sound/sparc/cs4231.c | 42 +- sound/usb/usbaudio.c | 22 +- sound/usb/usbquirks.h | 72 +- sound/usb/usx2y/usbusx2yaudio.c | 7 +- usr/.gitignore | 1 + usr/gen_init_cpio.c | 4 +- 6388 files changed, 195426 insertions(+), 339757 deletions(-) delete mode 100644 Documentation/cdrom/aztcd delete mode 100644 Documentation/cdrom/cdu31a delete mode 100644 Documentation/cdrom/cm206 delete mode 100644 Documentation/cdrom/gscd delete mode 100644 Documentation/cdrom/isp16 delete mode 100644 Documentation/cdrom/mcdx delete mode 100644 Documentation/cdrom/optcd delete mode 100644 Documentation/cdrom/sbpcd delete mode 100644 Documentation/cdrom/sjcd delete mode 100644 Documentation/cdrom/sonycd535 delete mode 100644 Documentation/ecryptfs.txt delete mode 100644 Documentation/fault-injection/failcmd.sh delete mode 100644 Documentation/fault-injection/failmodule.sh delete mode 100644 Documentation/i2c/chips/x1205 delete mode 100644 Documentation/power/kernel_threads.txt delete mode 100644 Documentation/sound/oss/AD1816 delete mode 100644 Documentation/sound/oss/NM256 delete mode 100644 Documentation/sound/oss/OPL3-SA2 delete mode 100644 Documentation/sound/oss/VIA-chipset delete mode 100644 Documentation/sound/oss/cs46xx delete mode 100644 Documentation/time_interpolators.txt delete mode 100644 arch/arm/nwfpe/entry26.S delete mode 100644 arch/arm26/ACKNOWLEDGEMENTS delete mode 100644 arch/arm26/Kconfig delete mode 100644 arch/arm26/Kconfig.debug delete mode 100644 arch/arm26/Makefile delete mode 100644 arch/arm26/boot/Makefile delete mode 100644 arch/arm26/boot/compressed/Makefile delete mode 100644 arch/arm26/boot/compressed/head.S delete mode 100644 arch/arm26/boot/compressed/ll_char_wr.S delete mode 100644 arch/arm26/boot/compressed/misc.c delete mode 100644 arch/arm26/boot/compressed/uncompress.h delete mode 100644 arch/arm26/boot/compressed/vmlinux.lds.in delete mode 100644 arch/arm26/boot/install.sh delete mode 100644 arch/arm26/defconfig delete mode 100644 arch/arm26/kernel/Makefile delete mode 100644 arch/arm26/kernel/armksyms.c delete mode 100644 arch/arm26/kernel/asm-offsets.c delete mode 100644 arch/arm26/kernel/calls.S delete mode 100644 arch/arm26/kernel/compat.c delete mode 100644 arch/arm26/kernel/dma.c delete mode 100644 arch/arm26/kernel/ecard.c delete mode 100644 arch/arm26/kernel/entry.S delete mode 100644 arch/arm26/kernel/fiq.c delete mode 100644 arch/arm26/kernel/head.S delete mode 100644 arch/arm26/kernel/init_task.c delete mode 100644 arch/arm26/kernel/irq.c delete mode 100644 arch/arm26/kernel/process.c delete mode 100644 arch/arm26/kernel/ptrace.c delete mode 100644 arch/arm26/kernel/ptrace.h delete mode 100644 arch/arm26/kernel/semaphore.c delete mode 100644 arch/arm26/kernel/setup.c delete mode 100644 arch/arm26/kernel/signal.c delete mode 100644 arch/arm26/kernel/sys_arm.c delete mode 100644 arch/arm26/kernel/time.c delete mode 100644 arch/arm26/kernel/traps.c delete mode 100644 arch/arm26/kernel/vmlinux-arm26-xip.lds.in delete mode 100644 arch/arm26/kernel/vmlinux-arm26.lds.in delete mode 100644 arch/arm26/kernel/vmlinux.lds.S delete mode 100644 arch/arm26/lib/Makefile delete mode 100644 arch/arm26/lib/ashldi3.c delete mode 100644 arch/arm26/lib/ashrdi3.c delete mode 100644 arch/arm26/lib/backtrace.S delete mode 100644 arch/arm26/lib/changebit.S delete mode 100644 arch/arm26/lib/clearbit.S delete mode 100644 arch/arm26/lib/copy_page.S delete mode 100644 arch/arm26/lib/csumipv6.S delete mode 100644 arch/arm26/lib/csumpartial.S delete mode 100644 arch/arm26/lib/csumpartialcopy.S delete mode 100644 arch/arm26/lib/csumpartialcopygeneric.S delete mode 100644 arch/arm26/lib/csumpartialcopyuser.S delete mode 100644 arch/arm26/lib/delay.S delete mode 100644 arch/arm26/lib/ecard.S delete mode 100644 arch/arm26/lib/findbit.S delete mode 100644 arch/arm26/lib/floppydma.S delete mode 100644 arch/arm26/lib/gcclib.h delete mode 100644 arch/arm26/lib/getuser.S delete mode 100644 arch/arm26/lib/io-acorn.S delete mode 100644 arch/arm26/lib/io-readsb.S delete mode 100644 arch/arm26/lib/io-readsl.S delete mode 100644 arch/arm26/lib/io-readsw.S delete mode 100644 arch/arm26/lib/io-writesb.S delete mode 100644 arch/arm26/lib/io-writesl.S delete mode 100644 arch/arm26/lib/io-writesw.S delete mode 100644 arch/arm26/lib/kbd.c delete mode 100644 arch/arm26/lib/lib1funcs.S delete mode 100644 arch/arm26/lib/longlong.h delete mode 100644 arch/arm26/lib/lshrdi3.c delete mode 100644 arch/arm26/lib/memchr.S delete mode 100644 arch/arm26/lib/memcpy.S delete mode 100644 arch/arm26/lib/memset.S delete mode 100644 arch/arm26/lib/memzero.S delete mode 100644 arch/arm26/lib/muldi3.c delete mode 100644 arch/arm26/lib/putuser.S delete mode 100644 arch/arm26/lib/setbit.S delete mode 100644 arch/arm26/lib/strchr.S delete mode 100644 arch/arm26/lib/strrchr.S delete mode 100644 arch/arm26/lib/testchangebit.S delete mode 100644 arch/arm26/lib/testclearbit.S delete mode 100644 arch/arm26/lib/testsetbit.S delete mode 100644 arch/arm26/lib/uaccess-kernel.S delete mode 100644 arch/arm26/lib/uaccess-user.S delete mode 100644 arch/arm26/lib/ucmpdi2.c delete mode 100644 arch/arm26/lib/udivdi3.c delete mode 100644 arch/arm26/machine/Makefile delete mode 100644 arch/arm26/machine/dma.c delete mode 100644 arch/arm26/machine/irq.c delete mode 100644 arch/arm26/machine/latches.c delete mode 100644 arch/arm26/mm/Makefile delete mode 100644 arch/arm26/mm/extable.c delete mode 100644 arch/arm26/mm/fault.c delete mode 100644 arch/arm26/mm/fault.h delete mode 100644 arch/arm26/mm/init.c delete mode 100644 arch/arm26/mm/memc.c delete mode 100644 arch/arm26/mm/proc-funcs.S delete mode 100644 arch/arm26/mm/small_page.c delete mode 100644 arch/arm26/nwfpe/ARM-gcc.h delete mode 100644 arch/arm26/nwfpe/ChangeLog delete mode 100644 arch/arm26/nwfpe/Makefile delete mode 100644 arch/arm26/nwfpe/double_cpdo.c delete mode 100644 arch/arm26/nwfpe/entry.S delete mode 100644 arch/arm26/nwfpe/extended_cpdo.c delete mode 100644 arch/arm26/nwfpe/fpa11.c delete mode 100644 arch/arm26/nwfpe/fpa11.h delete mode 100644 arch/arm26/nwfpe/fpa11.inl delete mode 100644 arch/arm26/nwfpe/fpa11_cpdo.c delete mode 100644 arch/arm26/nwfpe/fpa11_cpdt.c delete mode 100644 arch/arm26/nwfpe/fpa11_cprt.c delete mode 100644 arch/arm26/nwfpe/fpmodule.c delete mode 100644 arch/arm26/nwfpe/fpmodule.h delete mode 100644 arch/arm26/nwfpe/fpmodule.inl delete mode 100644 arch/arm26/nwfpe/fpopcode.c delete mode 100644 arch/arm26/nwfpe/fpopcode.h delete mode 100644 arch/arm26/nwfpe/fpsr.h delete mode 100644 arch/arm26/nwfpe/milieu.h delete mode 100644 arch/arm26/nwfpe/single_cpdo.c delete mode 100644 arch/arm26/nwfpe/softfloat-macros delete mode 100644 arch/arm26/nwfpe/softfloat-specialize delete mode 100644 arch/arm26/nwfpe/softfloat.c delete mode 100644 arch/arm26/nwfpe/softfloat.h delete mode 100644 arch/avr32/mach-at32ap/sm.h delete mode 100644 arch/h8300/kernel/ints.c delete mode 100644 arch/h8300/platform/h8300h/entry.S delete mode 100644 arch/h8300/platform/h8s/entry.S delete mode 100644 arch/i386/boot/bootsect.S delete mode 100644 arch/i386/boot/edd.S delete mode 100644 arch/i386/boot/setup.S delete mode 100644 arch/i386/boot/video.S delete mode 100644 arch/i386/kernel/cpu/rise.c delete mode 100644 arch/i386/kernel/verify_cpu.S delete mode 100644 arch/m32r/kernel/io_m32104ut.c delete mode 100644 arch/m32r/kernel/io_m32700ut.c delete mode 100644 arch/m32r/kernel/io_mappi.c delete mode 100644 arch/m32r/kernel/io_mappi2.c delete mode 100644 arch/m32r/kernel/io_mappi3.c delete mode 100644 arch/m32r/kernel/io_oaks32r.c delete mode 100644 arch/m32r/kernel/io_opsput.c delete mode 100644 arch/m32r/kernel/io_usrv.c delete mode 100644 arch/m32r/kernel/setup_m32104ut.c delete mode 100644 arch/m32r/kernel/setup_m32700ut.c delete mode 100644 arch/m32r/kernel/setup_mappi.c delete mode 100644 arch/m32r/kernel/setup_mappi2.c delete mode 100644 arch/m32r/kernel/setup_mappi3.c delete mode 100644 arch/m32r/kernel/setup_oaks32r.c delete mode 100644 arch/m32r/kernel/setup_opsput.c delete mode 100644 arch/m32r/kernel/setup_usrv.c delete mode 100644 arch/m32r/m32104ut/defconfig.m32104ut delete mode 100644 arch/m32r/m32700ut/defconfig.m32700ut.smp delete mode 100644 arch/m32r/m32700ut/defconfig.m32700ut.up delete mode 100644 arch/m32r/m32700ut/dot.gdbinit_200MHz_16MB delete mode 100644 arch/m32r/m32700ut/dot.gdbinit_300MHz_32MB delete mode 100644 arch/m32r/m32700ut/dot.gdbinit_400MHz_32MB delete mode 100644 arch/m32r/mappi/defconfig.nommu delete mode 100644 arch/m32r/mappi/defconfig.smp delete mode 100644 arch/m32r/mappi/defconfig.up delete mode 100644 arch/m32r/mappi/dot.gdbinit delete mode 100644 arch/m32r/mappi/dot.gdbinit.nommu delete mode 100644 arch/m32r/mappi/dot.gdbinit.smp delete mode 100644 arch/m32r/mappi2/defconfig.opsp delete mode 100644 arch/m32r/mappi2/defconfig.vdec2 delete mode 100644 arch/m32r/mappi2/dot.gdbinit.vdec2 delete mode 100644 arch/m32r/mappi3/defconfig.smp delete mode 100644 arch/m32r/mappi3/dot.gdbinit delete mode 100644 arch/m32r/oaks32r/defconfig.nommu delete mode 100644 arch/m32r/oaks32r/dot.gdbinit.nommu delete mode 100644 arch/m32r/opsput/defconfig.opsput delete mode 100644 arch/m32r/opsput/dot.gdbinit delete mode 100644 arch/m68knommu/platform/5307/ints.c delete mode 100644 arch/mips/arc/console.c delete mode 100644 arch/mips/configs/ddb5477_defconfig delete mode 100644 arch/mips/configs/ev64120_defconfig delete mode 100644 arch/mips/configs/lasat200_defconfig delete mode 100644 arch/mips/configs/ocelot_3_defconfig delete mode 100644 arch/mips/configs/ocelot_c_defconfig delete mode 100644 arch/mips/configs/ocelot_defconfig delete mode 100644 arch/mips/ddb5xxx/Kconfig delete mode 100644 arch/mips/ddb5xxx/common/Makefile delete mode 100644 arch/mips/ddb5xxx/common/nile4.c delete mode 100644 arch/mips/ddb5xxx/common/prom.c delete mode 100644 arch/mips/ddb5xxx/common/rtc_ds1386.c delete mode 100644 arch/mips/ddb5xxx/ddb5477/Makefile delete mode 100644 arch/mips/ddb5xxx/ddb5477/debug.c delete mode 100644 arch/mips/ddb5xxx/ddb5477/irq.c delete mode 100644 arch/mips/ddb5xxx/ddb5477/irq_5477.c delete mode 100644 arch/mips/ddb5xxx/ddb5477/kgdb_io.c delete mode 100644 arch/mips/ddb5xxx/ddb5477/lcd44780.c delete mode 100644 arch/mips/ddb5xxx/ddb5477/lcd44780.h delete mode 100644 arch/mips/ddb5xxx/ddb5477/setup.c delete mode 100644 arch/mips/gt64120/common/Makefile delete mode 100644 arch/mips/gt64120/common/time.c delete mode 100644 arch/mips/gt64120/ev64120/Kconfig delete mode 100644 arch/mips/gt64120/ev64120/Makefile delete mode 100644 arch/mips/gt64120/ev64120/irq.c delete mode 100644 arch/mips/gt64120/ev64120/promcon.c delete mode 100644 arch/mips/gt64120/ev64120/reset.c delete mode 100644 arch/mips/gt64120/ev64120/serialGT.c delete mode 100644 arch/mips/gt64120/ev64120/setup.c delete mode 100644 arch/mips/gt64120/momenco_ocelot/Makefile delete mode 100644 arch/mips/gt64120/momenco_ocelot/dbg_io.c delete mode 100644 arch/mips/gt64120/momenco_ocelot/irq.c delete mode 100644 arch/mips/gt64120/momenco_ocelot/ocelot_pld.h delete mode 100644 arch/mips/gt64120/momenco_ocelot/prom.c delete mode 100644 arch/mips/gt64120/momenco_ocelot/reset.c delete mode 100644 arch/mips/gt64120/momenco_ocelot/setup.c delete mode 100644 arch/mips/jazz/io.c delete mode 100644 arch/mips/kernel/i8253.c delete mode 100644 arch/mips/kernel/irq-mv6434x.c delete mode 100644 arch/mips/lasat/Kconfig delete mode 100644 arch/mips/lasat/Makefile delete mode 100644 arch/mips/lasat/at93c.c delete mode 100644 arch/mips/lasat/at93c.h delete mode 100644 arch/mips/lasat/ds1603.c delete mode 100644 arch/mips/lasat/ds1603.h delete mode 100644 arch/mips/lasat/image/Makefile delete mode 100644 arch/mips/lasat/image/head.S delete mode 100644 arch/mips/lasat/image/romscript.normal delete mode 100644 arch/mips/lasat/interrupt.c delete mode 100644 arch/mips/lasat/lasat_board.c delete mode 100644 arch/mips/lasat/lasat_models.h delete mode 100644 arch/mips/lasat/picvue.c delete mode 100644 arch/mips/lasat/picvue.h delete mode 100644 arch/mips/lasat/picvue_proc.c delete mode 100644 arch/mips/lasat/prom.c delete mode 100644 arch/mips/lasat/prom.h delete mode 100644 arch/mips/lasat/reset.c delete mode 100644 arch/mips/lasat/setup.c delete mode 100644 arch/mips/lasat/sysctl.c delete mode 100644 arch/mips/lasat/sysctl.h delete mode 100644 arch/mips/lib-32/Makefile delete mode 100644 arch/mips/lib-32/dump_tlb.c delete mode 100644 arch/mips/lib-32/r3k_dump_tlb.c delete mode 100644 arch/mips/lib-32/watch.S delete mode 100644 arch/mips/lib-64/Makefile delete mode 100644 arch/mips/lib-64/dump_tlb.c delete mode 100644 arch/mips/lib-64/watch.S delete mode 100644 arch/mips/mips-boards/sim/Makefile delete mode 100644 arch/mips/mips-boards/sim/sim_cmdline.c delete mode 100644 arch/mips/mips-boards/sim/sim_console.c delete mode 100644 arch/mips/mips-boards/sim/sim_int.c delete mode 100644 arch/mips/mips-boards/sim/sim_mem.c delete mode 100644 arch/mips/mips-boards/sim/sim_platform.c delete mode 100644 arch/mips/mips-boards/sim/sim_setup.c delete mode 100644 arch/mips/mips-boards/sim/sim_smp.c delete mode 100644 arch/mips/mips-boards/sim/sim_time.c delete mode 100644 arch/mips/momentum/ocelot_3/Makefile delete mode 100644 arch/mips/momentum/ocelot_3/irq.c delete mode 100644 arch/mips/momentum/ocelot_3/ocelot_3_fpga.h delete mode 100644 arch/mips/momentum/ocelot_3/platform.c delete mode 100644 arch/mips/momentum/ocelot_3/prom.c delete mode 100644 arch/mips/momentum/ocelot_3/reset.c delete mode 100644 arch/mips/momentum/ocelot_3/setup.c delete mode 100644 arch/mips/momentum/ocelot_c/Makefile delete mode 100644 arch/mips/momentum/ocelot_c/cpci-irq.c delete mode 100644 arch/mips/momentum/ocelot_c/dbg_io.c delete mode 100644 arch/mips/momentum/ocelot_c/irq.c delete mode 100644 arch/mips/momentum/ocelot_c/ocelot_c_fpga.h delete mode 100644 arch/mips/momentum/ocelot_c/platform.c delete mode 100644 arch/mips/momentum/ocelot_c/prom.c delete mode 100644 arch/mips/momentum/ocelot_c/reset.c delete mode 100644 arch/mips/momentum/ocelot_c/setup.c delete mode 100644 arch/mips/momentum/ocelot_c/uart-irq.c delete mode 100644 arch/mips/pci/fixup-ddb5477.c delete mode 100644 arch/mips/pci/fixup-ocelot-c.c delete mode 100644 arch/mips/pci/fixup-ocelot.c delete mode 100644 arch/mips/pci/fixup-ocelot3.c delete mode 100644 arch/mips/pci/ops-ddb5477.c delete mode 100644 arch/mips/pci/ops-marvell.c delete mode 100644 arch/mips/pci/ops-nile4.c delete mode 100644 arch/mips/pci/pci-dac.c delete mode 100644 arch/mips/pci/pci-ddb5477.c delete mode 100644 arch/mips/pci/pci-ev64120.c delete mode 100644 arch/mips/pci/pci-lasat.c delete mode 100644 arch/mips/pci/pci-ocelot-c.c delete mode 100644 arch/mips/pci/pci-ocelot.c delete mode 100644 arch/mips/philips/pnx8550/common/Kconfig delete mode 100644 arch/mips/pmc-sierra/yosemite/i2c-yosemite.c delete mode 100644 arch/mips/sibyte/swarm/time.c delete mode 100644 arch/mips/sni/ds1216.c delete mode 100644 arch/mips/sni/pcimt_scache.c delete mode 100644 arch/mips/tx4938/common/rtc_rx5c348.c delete mode 100644 arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c delete mode 100644 arch/powerpc/kernel/ptrace-common.h delete mode 100644 arch/powerpc/mm/imalloc.c delete mode 100644 arch/powerpc/platforms/85xx/pci.c delete mode 100644 arch/powerpc/platforms/86xx/pci.c delete mode 100644 arch/powerpc/platforms/apus/Kconfig delete mode 100644 arch/powerpc/sysdev/fsl_pcie.c delete mode 100644 arch/powerpc/sysdev/fsl_pcie.h delete mode 100644 arch/sh/boards/hp6xx/mach.c delete mode 100644 arch/sh/boards/saturn/Makefile delete mode 100644 arch/sh/boards/saturn/io.c delete mode 100644 arch/sh/boards/saturn/irq.c delete mode 100644 arch/sh/boards/saturn/setup.c delete mode 100644 arch/sh/boards/saturn/smp.c delete mode 100644 arch/sh/boards/se/7300/Makefile delete mode 100644 arch/sh/boards/se/7300/io.c delete mode 100644 arch/sh/boards/se/7300/irq.c delete mode 100644 arch/sh/boards/se/7300/setup.c delete mode 100644 arch/sh/boards/se/73180/Makefile delete mode 100644 arch/sh/boards/se/73180/io.c delete mode 100644 arch/sh/boards/se/73180/irq.c delete mode 100644 arch/sh/boards/se/73180/setup.c delete mode 100644 arch/sh/boards/unknown/Makefile delete mode 100644 arch/sh/boards/unknown/setup.c delete mode 100644 arch/sh/cchips/hd6446x/hd64461/Makefile delete mode 100644 arch/sh/cchips/hd6446x/hd64461/io.c delete mode 100644 arch/sh/cchips/hd6446x/hd64461/setup.c delete mode 100644 arch/sh/configs/se7300_defconfig delete mode 100644 arch/sh/configs/se73180_defconfig delete mode 100644 arch/sh/kernel/cpu/irq/pint.c delete mode 100644 arch/sh/kernel/cpu/sh3/clock-sh7300.c delete mode 100644 arch/sh/kernel/cpu/sh3/setup-sh7300.c delete mode 100644 arch/sh/kernel/cpu/sh4a/clock-sh73180.c delete mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh73180.c delete mode 100644 arch/sh/mm/pg-dma.c delete mode 100644 arch/sparc64/kernel/pci_iommu.c delete mode 100644 arch/sparc64/lib/delay.c delete mode 100644 arch/um/config.release delete mode 100644 arch/x86_64/boot/bootsect.S delete mode 100644 arch/x86_64/boot/install.sh delete mode 100644 arch/x86_64/boot/mtools.conf.in delete mode 100644 arch/x86_64/boot/setup.S delete mode 100644 arch/x86_64/boot/tools/build.c delete mode 100644 drivers/acorn/README delete mode 100644 drivers/acorn/block/Kconfig delete mode 100644 drivers/acorn/block/Makefile delete mode 100644 drivers/acorn/block/fd1772.c delete mode 100644 drivers/acorn/block/fd1772dma.S delete mode 100644 drivers/acorn/block/mfm.S delete mode 100644 drivers/acorn/block/mfmhd.c delete mode 100644 drivers/acpi/sleep/poweroff.c delete mode 100644 drivers/base/power/runtime.c delete mode 100644 drivers/block/acsi.c delete mode 100644 drivers/block/acsi_slm.c delete mode 100644 drivers/cdrom/Kconfig delete mode 100644 drivers/cdrom/aztcd.c delete mode 100644 drivers/cdrom/aztcd.h delete mode 100644 drivers/cdrom/cdu31a.c delete mode 100644 drivers/cdrom/cdu31a.h delete mode 100644 drivers/cdrom/cm206.c delete mode 100644 drivers/cdrom/cm206.h delete mode 100644 drivers/cdrom/gscd.c delete mode 100644 drivers/cdrom/gscd.h delete mode 100644 drivers/cdrom/isp16.c delete mode 100644 drivers/cdrom/isp16.h delete mode 100644 drivers/cdrom/mcdx.c delete mode 100644 drivers/cdrom/mcdx.h delete mode 100644 drivers/cdrom/optcd.c delete mode 100644 drivers/cdrom/optcd.h delete mode 100644 drivers/cdrom/sbpcd.c delete mode 100644 drivers/cdrom/sbpcd.h delete mode 100644 drivers/cdrom/sjcd.c delete mode 100644 drivers/cdrom/sjcd.h delete mode 100644 drivers/cdrom/sonycd535.c delete mode 100644 drivers/cdrom/sonycd535.h delete mode 100644 drivers/char/decserial.c delete mode 100644 drivers/dma/ioatdma_io.h delete mode 100644 drivers/edac/edac_mc.h delete mode 100644 drivers/i2c/busses/i2c-isa.c delete mode 100644 drivers/i2c/busses/i2c-rpx.c delete mode 100644 drivers/infiniband/hw/ipath/ipath_layer.c delete mode 100644 drivers/infiniband/hw/ipath/ipath_layer.h delete mode 100644 drivers/md/xor.c delete mode 100644 drivers/message/fusion/linux_compat.h delete mode 100644 drivers/message/fusion/lsi/mpi_inb.h delete mode 100644 drivers/mtd/maps/lasat.c delete mode 100644 drivers/net/atari_bionet.c delete mode 100644 drivers/net/atari_pamsnet.c delete mode 100644 drivers/net/wireless/libertas/version.h delete mode 100644 drivers/scsi/53c7xx.c delete mode 100644 drivers/scsi/53c7xx.h delete mode 100644 drivers/scsi/53c7xx.scr delete mode 100644 drivers/scsi/53c7xx_d.h_shipped delete mode 100644 drivers/scsi/53c7xx_u.h_shipped delete mode 100644 drivers/scsi/advansys.h delete mode 100644 drivers/scsi/amiga7xx.c delete mode 100644 drivers/scsi/amiga7xx.h delete mode 100644 drivers/scsi/arm/ecoscsi.c delete mode 100644 drivers/scsi/bvme6000.c delete mode 100644 drivers/scsi/bvme6000.h delete mode 100644 drivers/scsi/ibmmca.h delete mode 100644 drivers/scsi/mvme16x.c delete mode 100644 drivers/scsi/mvme16x.h delete mode 100644 drivers/tc/zs.c delete mode 100644 drivers/tc/zs.h delete mode 100644 drivers/video/tx3912fb.c delete mode 100644 fs/9p/9p.h delete mode 100644 fs/9p/conv.c delete mode 100644 fs/9p/conv.h delete mode 100644 fs/9p/debug.h delete mode 100644 fs/9p/error.c delete mode 100644 fs/9p/error.h delete mode 100644 fs/9p/fcall.c delete mode 100644 fs/9p/fcprint.c delete mode 100644 fs/9p/mux.c delete mode 100644 fs/9p/mux.h delete mode 100644 fs/9p/trans_fd.c delete mode 100644 fs/9p/transport.h delete mode 100644 fs/gfs2/ondisk.c delete mode 100644 fs/gfs2/ops_export.h delete mode 100644 include/asm-arm/arch-s3c2410/iic.h delete mode 100644 include/asm-arm/arch-s3c2410/nand.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-ac97.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-adc.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-iic.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-iis.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-nand.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-rtc.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-serial.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-spi.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-timer.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-udc.h delete mode 100644 include/asm-arm/arch-s3c2410/regs-watchdog.h delete mode 100644 include/asm-arm/arch-s3c2410/udc.h delete mode 100644 include/asm-arm26/a.out.h delete mode 100644 include/asm-arm26/assembler.h delete mode 100644 include/asm-arm26/atomic.h delete mode 100644 include/asm-arm26/auxvec.h delete mode 100644 include/asm-arm26/bitops.h delete mode 100644 include/asm-arm26/bug.h delete mode 100644 include/asm-arm26/bugs.h delete mode 100644 include/asm-arm26/byteorder.h delete mode 100644 include/asm-arm26/cache.h delete mode 100644 include/asm-arm26/cacheflush.h delete mode 100644 include/asm-arm26/checksum.h delete mode 100644 include/asm-arm26/constants.h delete mode 100644 include/asm-arm26/cputime.h delete mode 100644 include/asm-arm26/current.h delete mode 100644 include/asm-arm26/delay.h delete mode 100644 include/asm-arm26/device.h delete mode 100644 include/asm-arm26/div64.h delete mode 100644 include/asm-arm26/dma-mapping.h delete mode 100644 include/asm-arm26/dma.h delete mode 100644 include/asm-arm26/ecard.h delete mode 100644 include/asm-arm26/elf.h delete mode 100644 include/asm-arm26/emergency-restart.h delete mode 100644 include/asm-arm26/errno.h delete mode 100644 include/asm-arm26/fcntl.h delete mode 100644 include/asm-arm26/fiq.h delete mode 100644 include/asm-arm26/floppy.h delete mode 100644 include/asm-arm26/fpstate.h delete mode 100644 include/asm-arm26/futex.h delete mode 100644 include/asm-arm26/hardirq.h delete mode 100644 include/asm-arm26/hardware.h delete mode 100644 include/asm-arm26/ide.h delete mode 100644 include/asm-arm26/io.h delete mode 100644 include/asm-arm26/ioc.h delete mode 100644 include/asm-arm26/ioctl.h delete mode 100644 include/asm-arm26/ioctls.h delete mode 100644 include/asm-arm26/ipc.h delete mode 100644 include/asm-arm26/ipcbuf.h delete mode 100644 include/asm-arm26/irq.h delete mode 100644 include/asm-arm26/irqchip.h delete mode 100644 include/asm-arm26/kdebug.h delete mode 100644 include/asm-arm26/kmap_types.h delete mode 100644 include/asm-arm26/leds.h delete mode 100644 include/asm-arm26/limits.h delete mode 100644 include/asm-arm26/linkage.h delete mode 100644 include/asm-arm26/local.h delete mode 100644 include/asm-arm26/locks.h delete mode 100644 include/asm-arm26/mach-types.h delete mode 100644 include/asm-arm26/map.h delete mode 100644 include/asm-arm26/mc146818rtc.h delete mode 100644 include/asm-arm26/memory.h delete mode 100644 include/asm-arm26/mman.h delete mode 100644 include/asm-arm26/mmu.h delete mode 100644 include/asm-arm26/mmu_context.h delete mode 100644 include/asm-arm26/module.h delete mode 100644 include/asm-arm26/msgbuf.h delete mode 100644 include/asm-arm26/namei.h delete mode 100644 include/asm-arm26/oldlatches.h delete mode 100644 include/asm-arm26/page.h delete mode 100644 include/asm-arm26/param.h delete mode 100644 include/asm-arm26/parport.h delete mode 100644 include/asm-arm26/pci.h delete mode 100644 include/asm-arm26/percpu.h delete mode 100644 include/asm-arm26/pgalloc.h delete mode 100644 include/asm-arm26/pgtable.h delete mode 100644 include/asm-arm26/poll.h delete mode 100644 include/asm-arm26/posix_types.h delete mode 100644 include/asm-arm26/proc-fns.h delete mode 100644 include/asm-arm26/processor.h delete mode 100644 include/asm-arm26/procinfo.h delete mode 100644 include/asm-arm26/ptrace.h delete mode 100644 include/asm-arm26/resource.h delete mode 100644 include/asm-arm26/scatterlist.h delete mode 100644 include/asm-arm26/sections.h delete mode 100644 include/asm-arm26/segment.h delete mode 100644 include/asm-arm26/semaphore-helper.h delete mode 100644 include/asm-arm26/semaphore.h delete mode 100644 include/asm-arm26/sembuf.h delete mode 100644 include/asm-arm26/serial.h delete mode 100644 include/asm-arm26/setup.h delete mode 100644 include/asm-arm26/shmbuf.h delete mode 100644 include/asm-arm26/shmparam.h delete mode 100644 include/asm-arm26/sigcontext.h delete mode 100644 include/asm-arm26/siginfo.h delete mode 100644 include/asm-arm26/signal.h delete mode 100644 include/asm-arm26/sizes.h delete mode 100644 include/asm-arm26/smp.h delete mode 100644 include/asm-arm26/socket.h delete mode 100644 include/asm-arm26/sockios.h delete mode 100644 include/asm-arm26/spinlock.h delete mode 100644 include/asm-arm26/stat.h delete mode 100644 include/asm-arm26/statfs.h delete mode 100644 include/asm-arm26/string.h delete mode 100644 include/asm-arm26/suspend.h delete mode 100644 include/asm-arm26/sysirq.h delete mode 100644 include/asm-arm26/system.h delete mode 100644 include/asm-arm26/termbits.h delete mode 100644 include/asm-arm26/termios.h delete mode 100644 include/asm-arm26/thread_info.h delete mode 100644 include/asm-arm26/timex.h delete mode 100644 include/asm-arm26/tlb.h delete mode 100644 include/asm-arm26/tlbflush.h delete mode 100644 include/asm-arm26/topology.h delete mode 100644 include/asm-arm26/types.h delete mode 100644 include/asm-arm26/uaccess-asm.h delete mode 100644 include/asm-arm26/uaccess.h delete mode 100644 include/asm-arm26/ucontext.h delete mode 100644 include/asm-arm26/unaligned.h delete mode 100644 include/asm-arm26/uncompress.h delete mode 100644 include/asm-arm26/unistd.h delete mode 100644 include/asm-arm26/user.h delete mode 100644 include/asm-arm26/xor.h delete mode 100644 include/asm-avr32/arch-at32ap/sm.h delete mode 100644 include/asm-h8300/dma-mapping.h delete mode 100644 include/asm-m32r/dma-mapping.h delete mode 100644 include/asm-m68k/atari_SLM.h delete mode 100644 include/asm-m68k/atari_acsi.h delete mode 100644 include/asm-m68knommu/irqnode.h delete mode 100644 include/asm-mips/ddb5xxx/ddb5477.h delete mode 100644 include/asm-mips/ddb5xxx/ddb5xxx.h delete mode 100644 include/asm-mips/dec/serial.h delete mode 100644 include/asm-mips/ds1216.h delete mode 100644 include/asm-mips/gfx.h delete mode 100644 include/asm-mips/gt64240.h delete mode 100644 include/asm-mips/lasat/ds1603.h delete mode 100644 include/asm-mips/lasat/eeprom.h delete mode 100644 include/asm-mips/lasat/head.h delete mode 100644 include/asm-mips/lasat/lasat.h delete mode 100644 include/asm-mips/lasat/lasatint.h delete mode 100644 include/asm-mips/lasat/picvue.h delete mode 100644 include/asm-mips/lasat/serial.h delete mode 100644 include/asm-mips/mach-au1x00/au1xxx_gpio.h delete mode 100644 include/asm-mips/mach-ev64120/mach-gt64120.h delete mode 100644 include/asm-mips/mach-ip32/spaces.h delete mode 100644 include/asm-mips/mach-lasat/mach-gt64120.h delete mode 100644 include/asm-mips/mach-ocelot/mach-gt64120.h delete mode 100644 include/asm-mips/mach-ocelot3/cpu-feature-overrides.h delete mode 100644 include/asm-mips/mach-sim/cpu-feature-overrides.h delete mode 100644 include/asm-mips/marvell.h delete mode 100644 include/asm-mips/nile4.h delete mode 100644 include/asm-mips/rtc.h delete mode 100644 include/asm-mips/tx3912.h delete mode 100644 include/asm-mips/watch.h delete mode 100644 include/asm-s390/dma-mapping.h delete mode 100644 include/asm-sh/machvec_init.h delete mode 100644 include/asm-sh/saturn/io.h delete mode 100644 include/asm-sh/saturn/smpc.h delete mode 100644 include/asm-sh/se7300.h delete mode 100644 include/asm-sh/se73180.h delete mode 100644 include/linux/cobalt-nvram.h delete mode 100644 include/linux/coda_proc.h delete mode 100644 include/linux/i2c-isa.h delete mode 100644 include/linux/ip_mp_alg.h delete mode 100644 include/linux/nfsd/interface.h delete mode 100644 include/linux/usb_gadgetfs.h delete mode 100644 include/net/ip_mp_alg.h delete mode 100644 include/sound/wavefront_fx.h delete mode 100644 include/video/tx3912.h delete mode 100644 net/ipv4/multipath.c delete mode 100644 net/ipv4/multipath_drr.c delete mode 100644 net/ipv4/multipath_random.c delete mode 100644 net/ipv4/multipath_rr.c delete mode 100644 net/ipv4/multipath_wrandom.c delete mode 100644 sound/oss/ac97.c delete mode 100644 sound/oss/ac97.h delete mode 100644 sound/oss/aci.c delete mode 100644 sound/oss/aci.h delete mode 100644 sound/oss/ad1816.c delete mode 100644 sound/oss/ad1889.c delete mode 100644 sound/oss/ad1889.h delete mode 100644 sound/oss/adlib_card.c delete mode 100644 sound/oss/cs461x.h delete mode 100644 sound/oss/cs461x_image.h delete mode 100644 sound/oss/cs46xx.c delete mode 100644 sound/oss/cs46xx_wrapper-24.h delete mode 100644 sound/oss/cs46xxpm.h delete mode 100644 sound/oss/emu10k1/8010.h delete mode 100644 sound/oss/emu10k1/Makefile delete mode 100644 sound/oss/emu10k1/audio.c delete mode 100644 sound/oss/emu10k1/audio.h delete mode 100644 sound/oss/emu10k1/cardmi.c delete mode 100644 sound/oss/emu10k1/cardmi.h delete mode 100644 sound/oss/emu10k1/cardmo.c delete mode 100644 sound/oss/emu10k1/cardmo.h delete mode 100644 sound/oss/emu10k1/cardwi.c delete mode 100644 sound/oss/emu10k1/cardwi.h delete mode 100644 sound/oss/emu10k1/cardwo.c delete mode 100644 sound/oss/emu10k1/cardwo.h delete mode 100644 sound/oss/emu10k1/ecard.c delete mode 100644 sound/oss/emu10k1/ecard.h delete mode 100644 sound/oss/emu10k1/efxmgr.c delete mode 100644 sound/oss/emu10k1/efxmgr.h delete mode 100644 sound/oss/emu10k1/emuadxmg.c delete mode 100644 sound/oss/emu10k1/hwaccess.c delete mode 100644 sound/oss/emu10k1/hwaccess.h delete mode 100644 sound/oss/emu10k1/icardmid.h delete mode 100644 sound/oss/emu10k1/icardwav.h delete mode 100644 sound/oss/emu10k1/irqmgr.c delete mode 100644 sound/oss/emu10k1/irqmgr.h delete mode 100644 sound/oss/emu10k1/main.c delete mode 100644 sound/oss/emu10k1/midi.c delete mode 100644 sound/oss/emu10k1/midi.h delete mode 100644 sound/oss/emu10k1/mixer.c delete mode 100644 sound/oss/emu10k1/passthrough.c delete mode 100644 sound/oss/emu10k1/passthrough.h delete mode 100644 sound/oss/emu10k1/recmgr.c delete mode 100644 sound/oss/emu10k1/recmgr.h delete mode 100644 sound/oss/emu10k1/timer.c delete mode 100644 sound/oss/emu10k1/timer.h delete mode 100644 sound/oss/emu10k1/voicemgr.c delete mode 100644 sound/oss/emu10k1/voicemgr.h delete mode 100644 sound/oss/nec_vrc5477.c delete mode 100644 sound/oss/nm256.h delete mode 100644 sound/oss/nm256_audio.c delete mode 100644 sound/oss/nm256_coeff.h delete mode 100644 sound/oss/opl3.h delete mode 100644 sound/oss/opl3sa2.c diff --git a/.gitignore b/.gitignore index 060a71d41ad7..27c3e839b54e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ # .* *.o +*.o.* *.a *.s *.ko @@ -22,6 +23,7 @@ tags TAGS vmlinux* +!vmlinux.lds.S System.map Module.symvers @@ -45,3 +47,6 @@ series # cscope files cscope.* + +*.orig +*.rej diff --git a/CREDITS b/CREDITS index 79fd13dbb8e4..832436e1dd91 100644 --- a/CREDITS +++ b/CREDITS @@ -966,6 +966,7 @@ N: Pekka Enberg E: penberg@cs.helsinki.fi W: http://www.cs.helsinki.fi/u/penberg/ D: Various kernel hacks, fixes, and cleanups. +D: Slab allocators S: Finland N: David Engebretsen @@ -1939,8 +1940,8 @@ D: for Menuconfig's lxdialog. N: Christoph Lameter E: christoph@lameter.com D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA -D: Early protocol filter for bridging code -D: Bug fixes +D: NUMA support, Slab allocators, Page migration +D: Scalability, Time subsystem N: Paul Laufer E: paul@laufernet.com @@ -2212,13 +2213,13 @@ S: 2300 Copenhagen S S: Denmark N: Claudio S. Matsuoka -E: claudio@conectiva.com -E: claudio@helllabs.org +E: cmatsuoka@gmail.com +E: claudio@mandriva.com W: http://helllabs.org/~claudio -D: V4L, OV511 driver hacks +D: V4L, OV511 and HDA-codec hacks S: Conectiva S.A. -S: R. Tocantins 89 -S: 80050-430 Curitiba PR +S: Souza Naves 1250 +S: 80050-040 Curitiba PR S: Brazil N: Heinz Mauelshagen diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index f08ca9535733..43e89b1537d9 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX @@ -12,6 +12,8 @@ Following translations are available on the WWW: 00-INDEX - this file. +ABI/ + - info on kernel <-> userspace ABI and relative interface stability. BUG-HUNTING - brute force method of doing binary search of patches to find bug. Changes @@ -25,37 +27,57 @@ DMA-mapping.txt DocBook/ - directory with DocBook templates etc. for kernel documentation. HOWTO - - The process and procedures of how to do Linux kernel development. + - the process and procedures of how to do Linux kernel development. IO-mapping.txt - how to access I/O mapped memory from within device drivers. IPMI.txt - info on Linux Intelligent Platform Management Interface (IPMI) Driver. IRQ-affinity.txt - how to select which CPU(s) handle which interrupt events on SMP. +IRQ.txt + - description of what an IRQ is. ManagementStyle - how to (attempt to) manage kernel hackers. MSI-HOWTO.txt - the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ. +PCIEBUS-HOWTO.txt + - a guide describing the PCI Express Port Bus driver. RCU/ - directory with info on RCU (read-copy update). README.DAC960 - info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux. +README.cycladesZ + - info on Cyclades-Z firmware loading. SAK.txt - info on Secure Attention Keys. +SecurityBugs + - procedure for reporting security bugs found in the kernel. +SubmitChecklist + - Linux kernel patch submission checklist. SubmittingDrivers - procedure to get a new driver source included into the kernel tree. SubmittingPatches - procedure to get a source patch included into the kernel tree. VGA-softcursor.txt - how to change your VGA cursor from a blinking underscore. +accounting/ + - documentation on accounting and taskstats. +aoe/ + - description of AoE (ATA over Ethernet) along with config examples. applying-patches.txt - description of various trees and how to apply their patches. arm/ - directory with info about Linux on the ARM architecture. +atomic_ops.txt + - semantics and behavior of atomic and bitmask operations. +auxdisplay/ + - misc. LCD driver documentation (cfag12864b, ks0108). basic_profiling.txt - basic instructions for those who wants to profile Linux kernel. binfmt_misc.txt - info on the kernel support for extra binary formats. +blackfin/ + - directory with documentation for the Blackfin arch. block/ - info on the Block I/O (BIO) layer. cachetlb.txt @@ -68,16 +90,32 @@ cli-sti-removal.txt - cli()/sti() removal guide. computone.txt - info on Computone Intelliport II/Plus Multiport Serial Driver. +connector/ + - docs on the netlink based userspace<->kernel space communication mod. +console/ + - documentation on Linux console drivers. cpqarray.txt - info on using Compaq's SMART2 Intelligent Disk Array Controllers. cpu-freq/ - info on CPU frequency and voltage scaling. +cpu-hotplug.txt + - document describing CPU hotplug support in the Linux kernel. +cpu-load.txt + - document describing how CPU load statistics are collected. +cpusets.txt + - documents the cpusets feature; assign CPUs and Mem to a set of tasks. +cputopology.txt + - documentation on how CPU topology info is exported via sysfs. cris/ - directory with info about Linux on CRIS architecture. crypto/ - directory with info on the Crypto API. +dcdbas.txt + - information on the Dell Systems Management Base Driver. debugging-modules.txt - some notes on debugging modules after Linux 2.6.3. +dell_rbu.txt + - document demonstrating the use of the Dell Remote BIOS Update driver. device-mapper/ - directory with info on Device Mapper. devices.txt @@ -86,8 +124,12 @@ digiepca.txt - info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards. dnotify.txt - info about directory notification in Linux. +dontdiff + - file containing a list of files that should never be diff'ed. driver-model/ - directory with info about Linux driver model. +drivers/ + - directory with driver documentation (currently only EDAC). dvb/ - info on Linux Digital Video Broadcast (DVB) subsystem. early-userspace/ @@ -96,22 +138,36 @@ eisa.txt - info on EISA bus support. exception.txt - how Linux v2.2 handles exceptions without verify_area etc. +fault-injection/ + - dir with docs about the fault injection capabilities infrastructure. fb/ - directory with info on the frame buffer graphics abstraction layer. +feature-removal-schedule.txt + - list of files and features that are going to be removed. filesystems/ - directory with info on the various filesystems that Linux supports. firmware_class/ - request_firmware() hotplug interface info. floppy.txt - notes and driver options for the floppy disk driver. +fujitsu/ + - Fujitsu FR-V Linux documentation. +gpio.txt + - overview of GPIO (General Purpose Input/Output) access conventions. hayes-esp.txt - info on using the Hayes ESP serial driver. highuid.txt - notes on the change from 16 bit to 32 bit user/group IDs. hpet.txt - High Precision Event Timer Driver for Linux. +hrtimer/ + - info on the timer_stats debugging facility for timer (ab)use. +hrtimers/ + - info on the hrtimers subsystem for high-resolution kernel timers. hw_random.txt - info on Linux support for random number generator in i8xx chipsets. +hwmon/ + - directory with docs on various hardware monitoring drivers. i2c/ - directory with info about the I2C bus/protocol (2 wire, kHz speed). i2o/ @@ -122,16 +178,22 @@ ia64/ - directory with info about Linux on Intel 64 bit architecture. ide.txt - important info for users of ATA devices (IDE/EIDE disks and CD-ROMS). +infiniband/ + - directory with documents concerning Linux InfiniBand support. initrd.txt - how to use the RAM disk as an initial/temporary root filesystem. input/ - info on Linux input device support. io_ordering.txt - info on ordering I/O writes to memory-mapped addresses. +ioctl/ + - directory with documents describing various IOCTL calls. ioctl-number.txt - how to implement and register device/driver ioctl calls. iostats.txt - info on I/O statistics Linux kernel provides. +irqflags-tracing.txt + - how to use the irq-flags tracing feature. isapnp.txt - info on Linux ISA Plug & Play support. isdn/ @@ -140,26 +202,40 @@ java.txt - info on the in-kernel binary support for Java(tm). kbuild/ - directory with info about the kernel build process. -kdumpt.txt - - mini HowTo on getting the crash dump code to work. +kdump/ + - directory with mini HowTo on getting the crash dump code to work. kernel-doc-nano-HOWTO.txt - mini HowTo on generation and location of kernel documentation files. kernel-docs.txt - listing of various WWW + books that document kernel internals. kernel-parameters.txt - summary listing of command line / boot prompt args for the kernel. +keys-request-key.txt + - description of the kernel key request service. +keys.txt + - description of the kernel key retention service. kobject.txt - info of the kobject infrastructure of the Linux kernel. +kprobes.txt + - documents the kernel probes debugging feature. +kref.txt + - docs on adding reference counters (krefs) to kernel objects. laptop-mode.txt - - How to conserve battery power using laptop-mode. + - how to conserve battery power using laptop-mode. ldm.txt - a brief description of LDM (Windows Dynamic Disks). +leds-class.txt + - documents LED handling under Linux. +local_ops.txt + - semantics and behavior of local atomic operations. +lockdep-design.txt + - documentation on the runtime locking correctness validator. locks.txt - info on file locking implementations, flock() vs. fcntl(), etc. logo.gif - - Full colour GIF image of Linux logo (penguin). + - full colour GIF image of Linux logo (penguin - Tux). logo.txt - - Info on creator of above logo & site to get additional images from. + - info on creator of above logo & site to get additional images from. m68k/ - directory with info about Linux on Motorola 68k architecture. magic-number.txt @@ -170,6 +246,8 @@ mca.txt - info on supporting Micro Channel Architecture (e.g. PS/2) systems. md.txt - info on boot arguments for the multiple devices driver. +memory-barriers.txt + - info on Linux kernel memory barriers. memory.txt - info on typical Linux memory problems. mips/ @@ -177,9 +255,11 @@ mips/ mono.txt - how to execute Mono-based .NET binaries with the help of BINFMT_MISC. moxa-smartio - - info on installing/using Moxa multiport serial driver. + - file with info on installing/using Moxa multiport serial driver. mtrr.txt - how to use PPro Memory Type Range Registers to increase performance. +mutex-design.txt + - info on the generic mutex subsystem. nbd.txt - info on a TCP implementation of a network block device. netlabel/ @@ -190,6 +270,8 @@ nfsroot.txt - short guide on setting up a diskless box with NFS root filesystem. nmi_watchdog.txt - info on NMI watchdog for SMP systems. +nommu-mmap.txt + - documentation about no-mmu memory mapping support. numastat.txt - info on how to read Numa policy hit/miss statistics in sysfs. oops-tracing.txt @@ -202,8 +284,16 @@ parport.txt - how to use the parallel-port driver. parport-lowlevel.txt - description and usage of the low level parallel port functions. +pci-error-recovery.txt + - info on PCI error recovery. pci.txt - info on the PCI subsystem for device driver authors. +pcieaer-howto.txt + - the PCI Express Advanced Error Reporting Driver Guide HOWTO. +pcmcia/ + - info on the Linux PCMCIA driver. +pi-futex.txt + - documentation on lightweight PI-futexes. pm.txt - info on Linux power management support. pnp.txt @@ -214,18 +304,32 @@ powerpc/ - directory with info on using Linux with the PowerPC. preempt-locking.txt - info on locking under a preemptive kernel. +prio_tree.txt + - info on radix-priority-search-tree use for indexing vmas. ramdisk.txt - short guide on how to set up and use the RAM disk. +rbtree.txt + - info on what red-black trees are and what they are for. riscom8.txt - notes on using the RISCom/8 multi-port serial driver. +robust-futex-ABI.txt + - documentation of the robust futex ABI. +robust-futexes.txt + - a description of what robust futexes are. rocket.txt - info on the Comtrol RocketPort multiport serial driver. rpc-cache.txt - introduction to the caching mechanisms in the sunrpc layer. +rt-mutex-design.txt + - description of the RealTime mutex implementation design. +rt-mutex.txt + - desc. of RT-mutex subsystem with PI (Priority Inheritance) support. rtc.txt - notes on how to use the Real Time Clock (aka CMOS clock) driver. s390/ - directory with info on using Linux on the IBM S390. +sched-arch.txt + - CPU Scheduler implementation hints for architecture specific code. sched-coding.txt - reference for various scheduler-related methods in the O(1) scheduler. sched-design.txt @@ -240,22 +344,32 @@ serial/ - directory with info on the low level serial API. serial-console.txt - how to set up Linux with a serial line console as the default. +sgi-ioc4.txt + - description of the SGI IOC4 PCI (multi function) device. sgi-visws.txt - short blurb on the SGI Visual Workstations. sh/ - directory with info on porting Linux to a new architecture. +sharedsubtree.txt + - a description of shared subtrees for namespaces. smart-config.txt - description of the Smart Config makefile feature. smp.txt - a few notes on symmetric multi-processing. +sony-laptop.txt + - Sony Notebook Control Driver (SNC) Readme. sonypi.txt - info on Linux Sony Programmable I/O Device support. sound/ - directory with info on sound card support. sparc/ - directory with info on using Linux on Sparc architecture. +sparse.txt + - info on how to obtain and use the sparse tool for typechecking. specialix.txt - info on hardware/driver for specialix IO8+ multiport serial card. +spi/ + - overview of Linux kernel Serial Peripheral Interface (SPI) support. spinlocks.txt - info on using spinlocks to provide exclusive access in kernel. stable_api_nonsense.txt @@ -274,24 +388,32 @@ sysrq.txt - info on the magic SysRq key. telephony/ - directory with info on telephony (e.g. voice over IP) support. +thinkpad-acpi.txt + - information on the (IBM and Lenovo) ThinkPad ACPI Extras driver. time_interpolators.txt - info on time interpolators. tipar.txt - information about Parallel link cable for Texas Instruments handhelds. tty.txt - guide to the locking policies of the tty layer. -unicode.txt - - info on the Unicode character/font mapping used in Linux. uml/ - directory with information about User Mode Linux. +unicode.txt + - info on the Unicode character/font mapping used in Linux. +unshare.txt + - description of the Linux unshare system call. usb/ - directory with info regarding the Universal Serial Bus. +video-output.txt + - sysfs class driver interface to enable/disable a video output device. video4linux/ - directory with info regarding video/TV/radio cards and linux. vm/ - directory with info on the Linux vm code. voyager.txt - guide to running Linux on the Voyager architecture. +w1/ + - directory with documents regarding the 1-wire (w1) subsystem. watchdog/ - how to auto-reboot Linux if it has "fallen and can't get up". ;-) x86_64/ diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb index f9937add033d..9734577d1711 100644 --- a/Documentation/ABI/testing/sysfs-bus-usb +++ b/Documentation/ABI/testing/sysfs-bus-usb @@ -39,3 +39,16 @@ Description: If you want to suspend a device immediately but leave it free to wake up in response to I/O requests, you should write "0" to power/autosuspend. + +What: /sys/bus/usb/devices/.../power/persist +Date: May 2007 +KernelVersion: 2.6.23 +Contact: Alan Stern +Description: + If CONFIG_USB_PERSIST is set, then each USB device directory + will contain a file named power/persist. The file holds a + boolean value (0 or 1) indicating whether or not the + "USB-Persist" facility is enabled for the device. Since the + facility is inherently dangerous, it is disabled by default + for all devices except hubs. For more information, see + Documentation/usb/persist.txt. diff --git a/Documentation/Changes b/Documentation/Changes index 73a8617f1861..cb2b141b1c3e 100644 --- a/Documentation/Changes +++ b/Documentation/Changes @@ -45,6 +45,7 @@ o nfs-utils 1.0.5 # showmount --version o procps 3.2.0 # ps --version o oprofile 0.9 # oprofiled --version o udev 081 # udevinfo -V +o grub 0.93 # grub --version Kernel compilation ================== diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle index b49b92edb396..7f1730f1a1ae 100644 --- a/Documentation/CodingStyle +++ b/Documentation/CodingStyle @@ -218,6 +218,18 @@ no space after the prefix increment & decrement unary operators: and no space around the '.' and "->" structure member operators. +Do not leave trailing whitespace at the ends of lines. Some editors with +"smart" indentation will insert whitespace at the beginning of new lines as +appropriate, so you can start typing the next line of code right away. +However, some such editors do not remove the whitespace if you end up not +putting a line of code there, such as if you leave a blank line. As a result, +you end up with lines containing trailing whitespace. + +Git will warn you about patches that introduce trailing whitespace, and can +optionally strip the trailing whitespace for you; however, if applying a series +of patches, this may make later patches in the series fail by changing their +context lines. + Chapter 4: Naming @@ -621,12 +633,27 @@ covers RTL which is used frequently with assembly language in the kernel. Kernel developers like to be seen as literate. Do mind the spelling of kernel messages to make a good impression. Do not use crippled -words like "dont" and use "do not" or "don't" instead. +words like "dont"; use "do not" or "don't" instead. Make the messages +concise, clear, and unambiguous. Kernel messages do not have to be terminated with a period. Printing numbers in parentheses (%d) adds no value and should be avoided. +There are a number of driver model diagnostic macros in +which you should use to make sure messages are matched to the right device +and driver, and are tagged with the right level: dev_err(), dev_warn(), +dev_info(), and so forth. For messages that aren't associated with a +particular device, defines pr_debug() and pr_info(). + +Coming up with good debugging messages can be quite a challenge; and once +you have them, they can be a huge help for remote troubleshooting. Such +messages should be compiled out when the DEBUG symbol is not defined (that +is, by default they are not included). When you use dev_dbg() or pr_debug(), +that's automatic. Many subsystems have Kconfig options to turn on -DDEBUG. +A related convention uses VERBOSE_DEBUG to add dev_vdbg() messages to the +ones already enabled by DEBUG. + Chapter 14: Allocating memory @@ -726,6 +753,33 @@ need them. Feel free to peruse that header file to see what else is already defined that you shouldn't reproduce in your code. + Chapter 18: Editor modelines and other cruft + +Some editors can interpret configuration information embedded in source files, +indicated with special markers. For example, emacs interprets lines marked +like this: + +-*- mode: c -*- + +Or like this: + +/* +Local Variables: +compile-command: "gcc -DMAGIC_DEBUG_FLAG foo.c" +End: +*/ + +Vim interprets markers that look like this: + +/* vim:set sw=8 noet */ + +Do not include any of these in source files. People have their own personal +editor configurations, and your source files should not override them. This +includes markers for indentation and mode configuration. People may use their +own custom mode, or may have some other magic method for making indentation +work correctly. + + Appendix I: References @@ -751,4 +805,5 @@ Kernel CodingStyle, by greg@kroah.com at OLS 2002: http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/ -- -Last updated on 2006-December-06. +Last updated on 2007-July-13. + diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt index 805db4b2cba6..cc7a8c39fb6f 100644 --- a/Documentation/DMA-API.txt +++ b/Documentation/DMA-API.txt @@ -26,7 +26,7 @@ Part Ia - Using large dma-coherent buffers void * dma_alloc_coherent(struct device *dev, size_t size, - dma_addr_t *dma_handle, int flag) + dma_addr_t *dma_handle, gfp_t flag) void * pci_alloc_consistent(struct pci_dev *dev, size_t size, dma_addr_t *dma_handle) @@ -38,7 +38,7 @@ to make sure to flush the processor's write buffers before telling devices to read that memory.) This routine allocates a region of bytes of consistent memory. -it also returns a which may be cast to an unsigned +It also returns a which may be cast to an unsigned integer the same width as the bus and used as the physical address base of the region. @@ -52,21 +52,21 @@ The simplest way to do that is to use the dma_pool calls (see below). The flag parameter (dma_alloc_coherent only) allows the caller to specify the GFP_ flags (see kmalloc) for the allocation (the -implementation may chose to ignore flags that affect the location of +implementation may choose to ignore flags that affect the location of the returned memory, like GFP_DMA). For pci_alloc_consistent, you must assume GFP_ATOMIC behaviour. void -dma_free_coherent(struct device *dev, size_t size, void *cpu_addr +dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle) void -pci_free_consistent(struct pci_dev *dev, size_t size, void *cpu_addr +pci_free_consistent(struct pci_dev *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle) Free the region of consistent memory you previously allocated. dev, size and dma_handle must all be the same as those passed into the consistent allocate. cpu_addr must be the virtual address returned by -the consistent allocate +the consistent allocate. Part Ib - Using small dma-coherent buffers @@ -77,9 +77,9 @@ To get this part of the dma_ API, you must #include Many drivers need lots of small dma-coherent memory regions for DMA descriptors or I/O buffers. Rather than allocating in units of a page or more using dma_alloc_coherent(), you can use DMA pools. These work -much like a struct kmem_cache, except that they use the dma-coherent allocator +much like a struct kmem_cache, except that they use the dma-coherent allocator, not __get_free_pages(). Also, they understand common hardware constraints -for alignment, like queue heads needing to be aligned on N byte boundaries. +for alignment, like queue heads needing to be aligned on N-byte boundaries. struct dma_pool * @@ -102,15 +102,15 @@ crossing restrictions, pass 0 for alloc; passing 4096 says memory allocated from this pool must not cross 4KByte boundaries. - void *dma_pool_alloc(struct dma_pool *pool, int gfp_flags, + void *dma_pool_alloc(struct dma_pool *pool, gfp_t gfp_flags, dma_addr_t *dma_handle); - void *pci_pool_alloc(struct pci_pool *pool, int gfp_flags, + void *pci_pool_alloc(struct pci_pool *pool, gfp_t gfp_flags, dma_addr_t *dma_handle); This allocates memory from the pool; the returned memory will meet the size and alignment requirements specified at creation time. Pass GFP_ATOMIC to -prevent blocking, or if it's permitted (not in_interrupt, not holding SMP locks) +prevent blocking, or if it's permitted (not in_interrupt, not holding SMP locks), pass GFP_KERNEL to allow blocking. Like dma_alloc_coherent(), this returns two values: an address usable by the cpu, and the dma address usable by the pool's device. @@ -123,7 +123,7 @@ pool's device. dma_addr_t addr); This puts memory back into the pool. The pool is what was passed to -the pool allocation routine; the cpu and dma addresses are what +the pool allocation routine; the cpu (vaddr) and dma addresses are what were returned when that routine allocated the memory being freed. @@ -209,18 +209,18 @@ Notes: Not all memory regions in a machine can be mapped by this API. Further, regions that appear to be physically contiguous in kernel virtual space may not be contiguous as physical memory. Since this API does not provide any scatter/gather capability, it will fail -if the user tries to map a non physically contiguous piece of memory. +if the user tries to map a non-physically contiguous piece of memory. For this reason, it is recommended that memory mapped by this API be -obtained only from sources which guarantee to be physically contiguous +obtained only from sources which guarantee it to be physically contiguous (like kmalloc). Further, the physical address of the memory must be within the dma_mask of the device (the dma_mask represents a bit mask of the -addressable region for the device. i.e. if the physical address of +addressable region for the device. I.e., if the physical address of the memory anded with the dma_mask is still equal to the physical address, then the device can perform DMA to the memory). In order to ensure that the memory allocated by kmalloc is within the dma_mask, -the driver may specify various platform dependent flags to restrict +the driver may specify various platform-dependent flags to restrict the physical memory range of the allocation (e.g. on x86, GFP_DMA guarantees to be within the first 16Mb of available physical memory, as required by ISA devices). @@ -244,14 +244,14 @@ are guaranteed also to be cache line boundaries). DMA_TO_DEVICE synchronisation must be done after the last modification of the memory region by the software and before it is handed off to -the driver. Once this primitive is used. Memory covered by this -primitive should be treated as read only by the device. If the device +the driver. Once this primitive is used, memory covered by this +primitive should be treated as read-only by the device. If the device may write to it at any point, it should be DMA_BIDIRECTIONAL (see below). DMA_FROM_DEVICE synchronisation must be done before the driver accesses data that may be changed by the device. This memory should -be treated as read only by the driver. If the driver needs to write +be treated as read-only by the driver. If the driver needs to write to it at any point, it should be DMA_BIDIRECTIONAL (see below). DMA_BIDIRECTIONAL requires special handling: it means that the driver @@ -261,7 +261,7 @@ you must always sync bidirectional memory twice: once before the memory is handed off to the device (to make sure all memory changes are flushed from the processor) and once before the data may be accessed after being used by the device (to make sure any processor -cache lines are updated with data that the device may have changed. +cache lines are updated with data that the device may have changed). void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, @@ -302,8 +302,8 @@ pci_dma_mapping_error(dma_addr_t dma_addr) In some circumstances dma_map_single and dma_map_page will fail to create a mapping. A driver can check for these errors by testing the returned -dma address with dma_mapping_error(). A non zero return value means the mapping -could not be created and the driver should take appropriate action (eg +dma address with dma_mapping_error(). A non-zero return value means the mapping +could not be created and the driver should take appropriate action (e.g. reduce current DMA mapping usage or delay and try again later). int @@ -315,7 +315,7 @@ reduce current DMA mapping usage or delay and try again later). Maps a scatter gather list from the block layer. -Returns: the number of physical segments mapped (this may be shorted +Returns: the number of physical segments mapped (this may be shorter than passed in if the block layer determines that some elements of the scatter/gather list are physically adjacent and thus may be mapped with a single entry). @@ -357,7 +357,7 @@ accessed sg->address and sg->length as shown above. pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents, int direction) -unmap the previously mapped scatter/gather list. All the parameters +Unmap the previously mapped scatter/gather list. All the parameters must be the same as those and passed in to the scatter/gather mapping API. @@ -377,7 +377,7 @@ void pci_dma_sync_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nelems, int direction) -synchronise a single contiguous or scatter/gather mapping. All the +Synchronise a single contiguous or scatter/gather mapping. All the parameters must be the same as those passed into the single mapping API. @@ -406,7 +406,7 @@ API at all. void * dma_alloc_noncoherent(struct device *dev, size_t size, - dma_addr_t *dma_handle, int flag) + dma_addr_t *dma_handle, gfp_t flag) Identical to dma_alloc_coherent() except that the platform will choose to return either consistent or non-consistent memory as it sees @@ -426,34 +426,34 @@ void dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle) -free memory allocated by the nonconsistent API. All parameters must +Free memory allocated by the nonconsistent API. All parameters must be identical to those passed in (and returned by dma_alloc_noncoherent()). int dma_is_consistent(struct device *dev, dma_addr_t dma_handle) -returns true if the device dev is performing consistent DMA on the memory +Returns true if the device dev is performing consistent DMA on the memory area pointed to by the dma_handle. int dma_get_cache_alignment(void) -returns the processor cache alignment. This is the absolute minimum +Returns the processor cache alignment. This is the absolute minimum alignment *and* width that you must observe when either mapping memory or doing partial flushes. Notes: This API may return a number *larger* than the actual cache line, but it will guarantee that one or more cache lines fit exactly into the width returned by this call. It will also always be a power -of two for easy alignment +of two for easy alignment. void dma_sync_single_range(struct device *dev, dma_addr_t dma_handle, unsigned long offset, size_t size, enum dma_data_direction direction) -does a partial sync. starting at offset and continuing for size. You +Does a partial sync, starting at offset and continuing for size. You must be careful to observe the cache alignment and width when doing anything like this. You must also be extra careful about accessing memory you intend to sync partially. @@ -472,21 +472,20 @@ dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, dma_addr_t device_addr, size_t size, int flags) - Declare region of memory to be handed out by dma_alloc_coherent when it's asked for coherent memory for this device. bus_addr is the physical address to which the memory is currently assigned in the bus responding region (this will be used by the -platform to perform the mapping) +platform to perform the mapping). device_addr is the physical address the device needs to be programmed with actually to address this memory (this will be handed out as the -dma_addr_t in dma_alloc_coherent()) +dma_addr_t in dma_alloc_coherent()). size is the size of the area (must be multiples of PAGE_SIZE). -flags can be or'd together and are +flags can be or'd together and are: DMA_MEMORY_MAP - request that the memory returned from dma_alloc_coherent() be directly writable. @@ -494,7 +493,7 @@ dma_alloc_coherent() be directly writable. DMA_MEMORY_IO - request that the memory returned from dma_alloc_coherent() be addressable using read/write/memcpy_toio etc. -One or both of these flags must be present +One or both of these flags must be present. DMA_MEMORY_INCLUDES_CHILDREN - make the declared memory be allocated by dma_alloc_coherent of any child devices of this one (for memory residing @@ -528,7 +527,7 @@ dma_release_declared_memory(struct device *dev) Remove the memory region previously declared from the system. This API performs *no* in-use checking for this region and will return unconditionally having removed all the required structures. It is the -drivers job to ensure that no parts of this memory region are +driver's job to ensure that no parts of this memory region are currently in use. void * @@ -538,12 +537,10 @@ dma_mark_declared_memory_occupied(struct device *dev, This is used to occupy specific regions of the declared space (dma_alloc_coherent() will hand out the first free region it finds). -device_addr is the *device* address of the region requested +device_addr is the *device* address of the region requested. -size is the size (and should be a page sized multiple). +size is the size (and should be a page-sized multiple). The return value will be either a pointer to the processor virtual address of the memory, or an error (via PTR_ERR()) if any part of the region is occupied. - - diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt index 028614cdd062..e07f2530326b 100644 --- a/Documentation/DMA-mapping.txt +++ b/Documentation/DMA-mapping.txt @@ -664,109 +664,6 @@ It is that simple. Well, not for some odd devices. See the next section for information about that. - DAC Addressing for Address Space Hungry Devices - -There exists a class of devices which do not mesh well with the PCI -DMA mapping API. By definition these "mappings" are a finite -resource. The number of total available mappings per bus is platform -specific, but there will always be a reasonable amount. - -What is "reasonable"? Reasonable means that networking and block I/O -devices need not worry about using too many mappings. - -As an example of a problematic device, consider compute cluster cards. -They can potentially need to access gigabytes of memory at once via -DMA. Dynamic mappings are unsuitable for this kind of access pattern. - -To this end we've provided a small API by which a device driver -may use DAC cycles to directly address all of physical memory. -Not all platforms support this, but most do. It is easy to determine -whether the platform will work properly at probe time. - -First, understand that there may be a SEVERE performance penalty for -using these interfaces on some platforms. Therefore, you MUST only -use these interfaces if it is absolutely required. %99 of devices can -use the normal APIs without any problems. - -Note that for streaming type mappings you must either use these -interfaces, or the dynamic mapping interfaces above. You may not mix -usage of both for the same device. Such an act is illegal and is -guaranteed to put a banana in your tailpipe. - -However, consistent mappings may in fact be used in conjunction with -these interfaces. Remember that, as defined, consistent mappings are -always going to be SAC addressable. - -The first thing your driver needs to do is query the PCI platform -layer if it is capable of handling your devices DAC addressing -capabilities: - - int pci_dac_dma_supported(struct pci_dev *hwdev, u64 mask); - -You may not use the following interfaces if this routine fails. - -Next, DMA addresses using this API are kept track of using the -dma64_addr_t type. It is guaranteed to be big enough to hold any -DAC address the platform layer will give to you from the following -routines. If you have consistent mappings as well, you still -use plain dma_addr_t to keep track of those. - -All mappings obtained here will be direct. The mappings are not -translated, and this is the purpose of this dialect of the DMA API. - -All routines work with page/offset pairs. This is the _ONLY_ way to -portably refer to any piece of memory. If you have a cpu pointer -(which may be validly DMA'd too) you may easily obtain the page -and offset using something like this: - - struct page *page = virt_to_page(ptr); - unsigned long offset = offset_in_page(ptr); - -Here are the interfaces: - - dma64_addr_t pci_dac_page_to_dma(struct pci_dev *pdev, - struct page *page, - unsigned long offset, - int direction); - -The DAC address for the tuple PAGE/OFFSET are returned. The direction -argument is the same as for pci_{map,unmap}_single(). The same rules -for cpu/device access apply here as for the streaming mapping -interfaces. To reiterate: - - The cpu may touch the buffer before pci_dac_page_to_dma. - The device may touch the buffer after pci_dac_page_to_dma - is made, but the cpu may NOT. - -When the DMA transfer is complete, invoke: - - void pci_dac_dma_sync_single_for_cpu(struct pci_dev *pdev, - dma64_addr_t dma_addr, - size_t len, int direction); - -This must be done before the CPU looks at the buffer again. -This interface behaves identically to pci_dma_sync_{single,sg}_for_cpu(). - -And likewise, if you wish to let the device get back at the buffer after -the cpu has read/written it, invoke: - - void pci_dac_dma_sync_single_for_device(struct pci_dev *pdev, - dma64_addr_t dma_addr, - size_t len, int direction); - -before letting the device access the DMA area again. - -If you need to get back to the PAGE/OFFSET tuple from a dma64_addr_t -the following interfaces are provided: - - struct page *pci_dac_dma_to_page(struct pci_dev *pdev, - dma64_addr_t dma_addr); - unsigned long pci_dac_dma_to_offset(struct pci_dev *pdev, - dma64_addr_t dma_addr); - -This is possible with the DAC interfaces purely because they are -not translated in any way. - Optimizing Unmap State Space Consumption On many platforms, pci_unmap_{single,page}() is simply a nop. diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 6fd1646d3204..08687e45e19d 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -15,11 +15,11 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ ### # The build process is as follows (targets): -# (xmldocs) -# file.tmpl --> file.xml +--> file.ps (psdocs) -# +--> file.pdf (pdfdocs) -# +--> DIR=file (htmldocs) -# +--> man/ (mandocs) +# (xmldocs) [by docproc] +# file.tmpl --> file.xml +--> file.ps (psdocs) [by db2ps or xmlto] +# +--> file.pdf (pdfdocs) [by db2pdf or xmlto] +# +--> DIR=file (htmldocs) [by xmlto] +# +--> man/ (mandocs) [by xmlto] # for PDF and PS output you can choose between xmlto and docbook-utils tools diff --git a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl index 90ed23df1f68..c917de681ccd 100644 --- a/Documentation/DocBook/deviceiobook.tmpl +++ b/Documentation/DocBook/deviceiobook.tmpl @@ -316,7 +316,8 @@ CPU B: spin_unlock_irqrestore(&dev_lock, flags) Public Functions Provided -!Einclude/asm-i386/io.h +!Iinclude/asm-i386/io.h +!Elib/iomap.c diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl index 38f88b6ae405..b886f52a9aac 100644 --- a/Documentation/DocBook/kernel-api.tmpl +++ b/Documentation/DocBook/kernel-api.tmpl @@ -139,8 +139,10 @@ X!Ilib/string.c !Elib/cmdline.c - CRC Functions + CRC Functions +!Elib/crc7.c !Elib/crc16.c +!Elib/crc-itu-t.c !Elib/crc32.c !Elib/crc-ccitt.c @@ -157,7 +159,6 @@ X!Ilib/string.c !Earch/i386/lib/usercopy.c More Memory Management Functions -!Iinclude/linux/rmap.h !Emm/readahead.c !Emm/filemap.c !Emm/memory.c @@ -379,7 +380,6 @@ X!Edrivers/base/interface.c !Edrivers/base/bus.c Device Drivers Power Management -!Edrivers/base/power/main.c !Edrivers/base/power/resume.c !Edrivers/base/power/suspend.c @@ -397,15 +397,19 @@ X!Edrivers/acpi/pci_bind.c --> Device drivers PnP support -!Edrivers/pnp/core.c +!Idrivers/pnp/core.c !Edrivers/pnp/card.c -!Edrivers/pnp/driver.c +!Idrivers/pnp/driver.c !Edrivers/pnp/manager.c !Edrivers/pnp/support.c + Userspace IO devices +!Edrivers/uio/uio.c +!Iinclude/linux/uio_driver.h + @@ -643,4 +647,78 @@ X!Idrivers/video/console/fonts.c !Edrivers/spi/spi.c + + I<superscript>2</superscript>C and SMBus Subsystem + + + I2C (or without fancy typography, "I2C") + is an acronym for the "Inter-IC" bus, a simple bus protocol which is + widely used where low data rate communications suffice. + Since it's also a licensed trademark, some vendors use another + name (such as "Two-Wire Interface", TWI) for the same bus. + I2C only needs two signals (SCL for clock, SDA for data), conserving + board real estate and minimizing signal quality issues. + Most I2C devices use seven bit addresses, and bus speeds of up + to 400 kHz; there's a high speed extension (3.4 MHz) that's not yet + found wide use. + I2C is a multi-master bus; open drain signaling is used to + arbitrate between masters, as well as to handshake and to + synchronize clocks from slower clients. + + + + The Linux I2C programming interfaces support only the master + side of bus interactions, not the slave side. + The programming interface is structured around two kinds of driver, + and two kinds of device. + An I2C "Adapter Driver" abstracts the controller hardware; it binds + to a physical device (perhaps a PCI device or platform_device) and + exposes a struct i2c_adapter representing + each I2C bus segment it manages. + On each I2C bus segment will be I2C devices represented by a + struct i2c_client. Those devices will + be bound to a struct i2c_driver, + which should follow the standard Linux driver model. + (At this writing, a legacy model is more widely used.) + There are functions to perform various I2C protocol operations; at + this writing all such functions are usable only from task context. + + + + The System Management Bus (SMBus) is a sibling protocol. Most SMBus + systems are also I2C conformant. The electrical constraints are + tighter for SMBus, and it standardizes particular protocol messages + and idioms. Controllers that support I2C can also support most + SMBus operations, but SMBus controllers don't support all the protocol + options that an I2C controller will. + There are functions to perform various SMBus protocol operations, + either using I2C primitives or by issuing SMBus commands to + i2c_adapter devices which don't support those I2C operations. + + +!Iinclude/linux/i2c.h +!Fdrivers/i2c/i2c-boardinfo.c i2c_register_board_info +!Edrivers/i2c/i2c-core.c + + + + splice API + + splice is a method for moving blocks of data around inside the + kernel, without continually transferring them between the kernel + and user space. + +!Ffs/splice.c + + + + pipes API + + Pipe interfaces are all for in-kernel (builtin image) use. + They are not exported for use by modules. + +!Iinclude/linux/pipe_fs_i.h +!Ffs/pipe.c + + diff --git a/Documentation/DocBook/kernel-locking.tmpl b/Documentation/DocBook/kernel-locking.tmpl index 0a441f73261a..01825ee7db64 100644 --- a/Documentation/DocBook/kernel-locking.tmpl +++ b/Documentation/DocBook/kernel-locking.tmpl @@ -219,7 +219,7 @@ - Two Main Types of Kernel Locks: Spinlocks and Semaphores + Three Main Types of Kernel Locks: Spinlocks, Mutexes and Semaphores There are three main types of kernel locks. The fundamental type diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl index e2e24b4778d4..ba9975771503 100644 --- a/Documentation/DocBook/libata.tmpl +++ b/Documentation/DocBook/libata.tmpl @@ -456,8 +456,9 @@ void (*irq_clear) (struct ata_port *); SATA phy read/write -u32 (*scr_read) (struct ata_port *ap, unsigned int sc_reg); -void (*scr_write) (struct ata_port *ap, unsigned int sc_reg, +int (*scr_read) (struct ata_port *ap, unsigned int sc_reg, + u32 *val); +int (*scr_write) (struct ata_port *ap, unsigned int sc_reg, u32 val); diff --git a/Documentation/DocBook/procfs-guide.tmpl b/Documentation/DocBook/procfs-guide.tmpl index 45cad23efefa..2de84dc195a8 100644 --- a/Documentation/DocBook/procfs-guide.tmpl +++ b/Documentation/DocBook/procfs-guide.tmpl @@ -352,49 +352,93 @@ entry->write_proc = write_proc_foo; int read_func - char* page + char* buffer char** start off_t off int count - int* eof + int* peof void* data The read function should write its information into the - page. For proper use, the function - should start writing at an offset of - off in page and - write at most count bytes, but because - most read functions are quite simple and only return a small - amount of information, these two parameters are usually - ignored (it breaks pagers like more and - less, but cat still - works). + buffer, which will be exactly + PAGE_SIZE bytes long. - If the off and - count parameters are properly used, - eof should be used to signal that the + The parameter + peof should be used to signal that the end of the file has been reached by writing 1 to the memory location - eof points to. + peof points to. - The parameter start doesn't seem to be - used anywhere in the kernel. The data + The data parameter can be used to create a single call back function for several files, see . - The read_func function must return the - number of bytes written into the page. + The rest of the parameters and the return value are described + by a comment in fs/proc/generic.c as follows: +
+ + You have three ways to return data: + + + + + Leave *start = NULL. (This is the default.) + Put the data of the requested offset at that + offset within the buffer. Return the number (n) + of bytes there are from the beginning of the + buffer up to the last byte of data. If the + number of supplied bytes (= n - offset) is + greater than zero and you didn't signal eof + and the reader is prepared to take more data + you will be called again with the requested + offset advanced by the number of bytes + absorbed. This interface is useful for files + no larger than the buffer. + + + + + Set *start to an unsigned long value less than + the buffer address but greater than zero. + Put the data of the requested offset at the + beginning of the buffer. Return the number of + bytes of data placed there. If this number is + greater than zero and you didn't signal eof + and the reader is prepared to take more data + you will be called again with the requested + offset advanced by *start. This interface is + useful when you have a large file consisting + of a series of blocks which you want to count + and return as wholes. + (Hack by Paul.Russell@rustcorp.com.au) + + + + + Set *start to an address within the buffer. + Put the data of the requested offset at *start. + Return the number of bytes of data placed there. + If this number is greater than zero and you + didn't signal eof and the reader is prepared to + take more data you will be called again with the + requested offset advanced by the number of bytes + absorbed. + + + +
+ shows how to use a read call back function. diff --git a/Documentation/HOWTO b/Documentation/HOWTO index 98e2701c746f..c64e969dc33b 100644 --- a/Documentation/HOWTO +++ b/Documentation/HOWTO @@ -208,7 +208,7 @@ tools. One such tool that is particularly recommended is the Linux Cross-Reference project, which is able to present source code in a self-referential, indexed webpage format. An excellent up-to-date repository of the kernel code may be found at: - http://sosdg.org/~coywolf/lxr/ + http://users.sosdg.org/~qiyong/lxr/ The development process @@ -249,6 +249,9 @@ process is as follows: release a new -rc kernel every week. - Process continues until the kernel is considered "ready", the process should last around 6 weeks. + - A list of known regressions present in each -rc release is + tracked at the following URI: + http://kernelnewbies.org/known_regressions It is worth mentioning what Andrew Morton wrote on the linux-kernel mailing list about kernel releases: @@ -381,7 +384,7 @@ One of the best ways to put into practice your hacking skills is by fixing bugs reported by other people. Not only you will help to make the kernel more stable, you'll learn to fix real world problems and you will improve your skills, and other developers will be aware of your presence. Fixing -bugs is one of the best ways to earn merit amongst the developers, because +bugs is one of the best ways to get merits among other developers, because not many people like wasting time fixing other people's bugs. To work in the already reported bug reports, go to http://bugzilla.kernel.org. diff --git a/Documentation/ManagementStyle b/Documentation/ManagementStyle index cbbebfb51ffe..49a8efa5afeb 100644 --- a/Documentation/ManagementStyle +++ b/Documentation/ManagementStyle @@ -166,7 +166,7 @@ To solve this problem, you really only have two options: The option of being unfailingly polite really doesn't exist. Nobody will trust somebody who is so clearly hiding his true character. -(*) Paul Simon sang "Fifty Ways to Lose Your Lover", because quite +(*) Paul Simon sang "Fifty Ways to Leave Your Lover", because quite frankly, "A Million Ways to Tell a Developer He Is a D*ckhead" doesn't scan nearly as well. But I'm sure he thought about it. diff --git a/Documentation/RCU/checklist.txt b/Documentation/RCU/checklist.txt index f4dffadbcb00..42b01bc2e1b4 100644 --- a/Documentation/RCU/checklist.txt +++ b/Documentation/RCU/checklist.txt @@ -222,7 +222,15 @@ over a rather long period of time, but improvements are always welcome! deadlock as soon as the RCU callback happens to interrupt that acquisition's critical section. -13. SRCU (srcu_read_lock(), srcu_read_unlock(), and synchronize_srcu()) +13. RCU callbacks can be and are executed in parallel. In many cases, + the callback code simply wrappers around kfree(), so that this + is not an issue (or, more accurately, to the extent that it is + an issue, the memory-allocator locking handles it). However, + if the callbacks do manipulate a shared data structure, they + must use whatever locking or other synchronization is required + to safely access and/or modify that data structure. + +14. SRCU (srcu_read_lock(), srcu_read_unlock(), and synchronize_srcu()) may only be invoked from process context. Unlike other forms of RCU, it -is- permissible to block in an SRCU read-side critical section (demarked by srcu_read_lock() and srcu_read_unlock()), diff --git a/Documentation/SubmitChecklist b/Documentation/SubmitChecklist index 6ebffb57e3db..19e7f65c269f 100644 --- a/Documentation/SubmitChecklist +++ b/Documentation/SubmitChecklist @@ -1,4 +1,4 @@ -Linux Kernel patch sumbittal checklist +Linux Kernel patch submission checklist ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Here are some basic things that developers should do if they want to see their @@ -9,7 +9,6 @@ Documentation/SubmittingPatches and elsewhere regarding submitting Linux kernel patches. - 1: Builds cleanly with applicable or modified CONFIG options =y, =m, and =n. No gcc warnings/errors, no linker warnings/errors. diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 0958e97d4bf4..a30dd4480ad4 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -122,11 +122,11 @@ then only post say 15 or so at a time and wait for review and integration. Check your patch for basic style violations, details of which can be found in Documentation/CodingStyle. Failure to do so simply wastes -the reviewers time and will get your patch rejected, probabally +the reviewers time and will get your patch rejected, probably without even being read. At a minimum you should check your patches with the patch style -checker prior to submission (scripts/patchcheck.pl). You should +checker prior to submission (scripts/checkpatch.pl). You should be able to justify all violations that remain in your patch. @@ -464,9 +464,25 @@ section Linus Computer Science 101. Nuff said. If your code deviates too much from this, it is likely to be rejected without further review, and without comment. +Once significant exception is when moving code from one file to +another in this case you should not modify the moved code at all in +the same patch which moves it. This clearly delineates the act of +moving the code and your changes. This greatly aids review of the +actual differences and allows tools to better track the history of +the code itself. + Check your patches with the patch style checker prior to submission -(scripts/checkpatch.pl). You should be able to justify all -violations that remain in your patch. +(scripts/checkpatch.pl). The style checker should be viewed as +a guide not as the final word. If your code looks better with +a violation then its probably best left alone. + +The checker reports at three levels: + - ERROR: things that are very likely to be wrong + - WARNING: things requiring careful review + - CHECK: things requiring thought + +You should be able to justify all violations that remain in your +patch. @@ -544,7 +560,7 @@ NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people! Kernel Documentation/CodingStyle: - + Linus Torvalds's mail on the canonical patch format: diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c index 71acc28ed0d1..cbee3a27f768 100644 --- a/Documentation/accounting/getdelays.c +++ b/Documentation/accounting/getdelays.c @@ -49,6 +49,7 @@ char name[100]; int dbg; int print_delays; int print_io_accounting; +int print_task_context_switch_counts; __u64 stime, utime; #define PRINTF(fmt, arg...) { \ @@ -195,7 +196,7 @@ void print_delayacct(struct taskstats *t) "IO %15s%15s\n" " %15llu%15llu\n" "MEM %15s%15s\n" - " %15llu%15llu\n\n", + " %15llu%15llu\n", "count", "real total", "virtual total", "delay total", t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total, t->cpu_delay_total, @@ -204,6 +205,14 @@ void print_delayacct(struct taskstats *t) "count", "delay total", t->swapin_count, t->swapin_delay_total); } +void task_context_switch_counts(struct taskstats *t) +{ + printf("\n\nTask %15s%15s\n" + " %15lu%15lu\n", + "voluntary", "nonvoluntary", + t->nvcsw, t->nivcsw); +} + void print_ioacct(struct taskstats *t) { printf("%s: read=%llu, write=%llu, cancelled_write=%llu\n", @@ -235,7 +244,7 @@ int main(int argc, char *argv[]) struct msgtemplate msg; while (1) { - c = getopt(argc, argv, "diw:r:m:t:p:vl"); + c = getopt(argc, argv, "qdiw:r:m:t:p:vl"); if (c < 0) break; @@ -248,6 +257,10 @@ int main(int argc, char *argv[]) printf("printing IO accounting\n"); print_io_accounting = 1; break; + case 'q': + printf("printing task/process context switch rates\n"); + print_task_context_switch_counts = 1; + break; case 'w': logfile = strdup(optarg); printf("write to file %s\n", logfile); @@ -389,6 +402,8 @@ int main(int argc, char *argv[]) print_delayacct((struct taskstats *) NLA_DATA(na)); if (print_io_accounting) print_ioacct((struct taskstats *) NLA_DATA(na)); + if (print_task_context_switch_counts) + task_context_switch_counts((struct taskstats *) NLA_DATA(na)); if (fd) { if (write(fd, NLA_DATA(na), na->nla_len) < 0) { err(1,"write error\n"); diff --git a/Documentation/accounting/taskstats-struct.txt b/Documentation/accounting/taskstats-struct.txt index 661c797eaf79..8aa7529f8258 100644 --- a/Documentation/accounting/taskstats-struct.txt +++ b/Documentation/accounting/taskstats-struct.txt @@ -22,6 +22,8 @@ There are three different groups of fields in the struct taskstats: /* Extended accounting fields end */ Their values are collected if CONFIG_TASK_XACCT is set. +4) Per-task and per-thread context switch count statistics + Future extension should add fields to the end of the taskstats struct, and should not change the relative position of each field within the struct. @@ -158,4 +160,8 @@ struct taskstats { /* Extended accounting fields end */ +4) Per-task and per-thread statistics + __u64 nvcsw; /* Context voluntary switch counter */ + __u64 nivcsw; /* Context involuntary switch counter */ + } diff --git a/Documentation/block/barrier.txt b/Documentation/block/barrier.txt index a272c3db8094..2c2f24f634e4 100644 --- a/Documentation/block/barrier.txt +++ b/Documentation/block/barrier.txt @@ -79,36 +79,26 @@ and how to prepare flush requests. Note that the term 'ordered' is used to indicate the whole sequence of performing barrier requests including draining and flushing. -typedef void (prepare_flush_fn)(request_queue_t *q, struct request *rq); +typedef void (prepare_flush_fn)(struct request_queue *q, struct request *rq); -int blk_queue_ordered(request_queue_t *q, unsigned ordered, - prepare_flush_fn *prepare_flush_fn, - unsigned gfp_mask); - -int blk_queue_ordered_locked(request_queue_t *q, unsigned ordered, - prepare_flush_fn *prepare_flush_fn, - unsigned gfp_mask); - -The only difference between the two functions is whether or not the -caller is holding q->queue_lock on entry. The latter expects the -caller is holding the lock. +int blk_queue_ordered(struct request_queue *q, unsigned ordered, + prepare_flush_fn *prepare_flush_fn); @q : the queue in question @ordered : the ordered mode the driver/device supports @prepare_flush_fn : this function should prepare @rq such that it flushes cache to physical medium when executed -@gfp_mask : gfp_mask used when allocating data structures - for ordered processing For example, SCSI disk driver's prepare_flush_fn looks like the following. -static void sd_prepare_flush(request_queue_t *q, struct request *rq) +static void sd_prepare_flush(struct request_queue *q, struct request *rq) { memset(rq->cmd, 0, sizeof(rq->cmd)); - rq->flags |= REQ_BLOCK_PC; + rq->cmd_type = REQ_TYPE_BLOCK_PC; rq->timeout = SD_TIMEOUT; rq->cmd[0] = SYNCHRONIZE_CACHE; + rq->cmd_len = 10; } The following seven ordered modes are supported. The following table diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt index 3adaace328a6..8af392fc6ef0 100644 --- a/Documentation/block/biodoc.txt +++ b/Documentation/block/biodoc.txt @@ -740,12 +740,12 @@ Block now offers some simple generic functionality to help support command queueing (typically known as tagged command queueing), ie manage more than one outstanding command on a queue at any given time. - blk_queue_init_tags(request_queue_t *q, int depth) + blk_queue_init_tags(struct request_queue *q, int depth) Initialize internal command tagging structures for a maximum depth of 'depth'. - blk_queue_free_tags((request_queue_t *q) + blk_queue_free_tags((struct request_queue *q) Teardown tag info associated with the queue. This will be done automatically by block if blk_queue_cleanup() is called on a queue @@ -754,7 +754,7 @@ one outstanding command on a queue at any given time. The above are initialization and exit management, the main helpers during normal operations are: - blk_queue_start_tag(request_queue_t *q, struct request *rq) + blk_queue_start_tag(struct request_queue *q, struct request *rq) Start tagged operation for this request. A free tag number between 0 and 'depth' is assigned to the request (rq->tag holds this number), @@ -762,7 +762,7 @@ normal operations are: for this queue is already achieved (or if the tag wasn't started for some other reason), 1 is returned. Otherwise 0 is returned. - blk_queue_end_tag(request_queue_t *q, struct request *rq) + blk_queue_end_tag(struct request_queue *q, struct request *rq) End tagged operation on this request. 'rq' is removed from the internal book keeping structures. @@ -781,7 +781,7 @@ queue. For instance, on IDE any tagged request error needs to clear both the hardware and software block queue and enable the driver to sanely restart all the outstanding requests. There's a third helper to do that: - blk_queue_invalidate_tags(request_queue_t *q) + blk_queue_invalidate_tags(struct request_queue *q) Clear the internal block tag queue and re-add all the pending requests to the request queue. The driver will receive them again on the diff --git a/Documentation/block/request.txt b/Documentation/block/request.txt index 75924e2a6975..fff58acb40a3 100644 --- a/Documentation/block/request.txt +++ b/Documentation/block/request.txt @@ -83,6 +83,6 @@ struct bio *bio DBI First bio in request struct bio *biotail DBI Last bio in request -request_queue_t *q DB Request queue this request belongs to +struct request_queue *q DB Request queue this request belongs to struct request_list *rl B Request list this request came from diff --git a/Documentation/cachetlb.txt b/Documentation/cachetlb.txt index debf6813934a..866b76139420 100644 --- a/Documentation/cachetlb.txt +++ b/Documentation/cachetlb.txt @@ -253,7 +253,7 @@ Here are the routines, one by one: The first of these two routines is invoked after map_vm_area() has installed the page table entries. The second is invoked - before unmap_vm_area() deletes the page table entries. + before unmap_kernel_range() deletes the page table entries. There exists another whole class of cpu cache issues which currently require a whole different set of interfaces to handle properly. diff --git a/Documentation/cdrom/00-INDEX b/Documentation/cdrom/00-INDEX index 916dafe29d3f..433edf23dc49 100644 --- a/Documentation/cdrom/00-INDEX +++ b/Documentation/cdrom/00-INDEX @@ -2,32 +2,10 @@ - this file (info on CD-ROMs and Linux) Makefile - only used to generate TeX output from the documentation. -aztcd - - info on Aztech/Orchid/Okano/Wearnes/Conrad/CyCDROM driver. cdrom-standard.tex - LaTeX document on standardizing the CD-ROM programming interface. -cdu31a - - info on the Sony CDU31A/CDU33A CD-ROM driver. -cm206 - - info on the Philips/LMS cm206/cm260 CD-ROM driver. -gscd - - info on the Goldstar R420 CD-ROM driver. ide-cd - info on setting up and using ATAPI (aka IDE) CD-ROMs. -isp16 - - info on the CD-ROM interface on ISP16, MAD16 or Mozart sound card. -mcd - - info on limitations of standard Mitsumi CD-ROM driver. -mcdx - - info on improved Mitsumi CD-ROM driver. -optcd - - info on the Optics Storage 8000 AT CD-ROM driver packet-writing.txt - Info on the CDRW packet writing module -sbpcd - - info on the SoundBlaster/Panasonic CD-ROM interface driver. -sjcd - - info on the SANYO CDR-H94A CD-ROM interface driver. -sonycd535 - - info on the Sony CDU-535 (and 531) CD-ROM driver. diff --git a/Documentation/cdrom/aztcd b/Documentation/cdrom/aztcd deleted file mode 100644 index 6bf0290ef7ce..000000000000 --- a/Documentation/cdrom/aztcd +++ /dev/null @@ -1,822 +0,0 @@ -$Id: README.aztcd,v 2.60 1997/11/29 09:51:25 root Exp root $ - Readme-File Documentation/cdrom/aztcd - for - AZTECH CD-ROM CDA268-01A, ORCHID CD-3110, - OKANO/WEARNES CDD110, CONRAD TXC, CyCDROM CR520, CR540 - CD-ROM Drives - Version 2.6 and newer - (for other drives see 6.-8.) - -NOTE: THIS DRIVER WILL WORK WITH THE CD-ROM DRIVES LISTED, WHICH HAVE - A PROPRIETARY INTERFACE (implemented on a sound card or on an - ISA-AT-bus card). - IT WILL DEFINITELY NOT WORK WITH CD-ROM DRIVES WITH *IDE*-INTERFACE, - such as the Aztech CDA269-031SE !!! (The only known exceptions are - 'faked' IDE drives like the CyCDROM CR520ie which work with aztcd - under certain conditions, see 7.). IF YOU'RE USING A CD-ROM DRIVE - WITH IDE-INTERFACE, SOMETIMES ALSO CALLED ATAPI-COMPATIBLE, PLEASE - USE THE ide-cd.c DRIVER, WRITTEN BY MARK LORD AND SCOTT SNYDER ! - THE STANDARD-KERNEL 1.2.x NOW ALSO SUPPORTS IDE-CDROM-DRIVES, SEE THE - HARDDISK (!) SECTION OF make config, WHEN COMPILING A NEW KERNEL!!! ----------------------------------------------------------------------------- - -Contents of this file: - 1. NOTE - 2. INSTALLATION - 3. CONFIGURING YOUR KERNEL - 4. RECOMPILING YOUR KERNEL - 4.1 AZTCD AS A RUN-TIME LOADABLE MODULE - 4.2 CDROM CONNECTED TO A SOUNDCARD - 5. KNOWN PROBLEMS, FUTURE DEVELOPMENTS - 5.1 MULTISESSION SUPPORT - 5.2 STATUS RECOGNITION - 5.3 DOSEMU's CDROM SUPPORT - 6. BUG REPORTS - 7. OTHER DRIVES - 8. IF YOU DON'T SUCCEED ... DEBUGGING - 9. TECHNICAL HISTORY OF THE DRIVER - 10. ACKNOWLEDGMENTS - 11. PROGRAMMING ADD ONS: CDPLAY.C - APPENDIX: Source code of cdplay.c ----------------------------------------------------------------------------- - -1. NOTE -This software has been successfully in alpha and beta test and is part of -the standard kernel since kernel 1.1.8x since December 1994. It works with -AZTECH CDA268-01A, ORCHID CDS-3110, ORCHID/WEARNES CDD110 and CONRAD TXC -(Nr.99 31 23 -series 04) and has proven to be stable with kernel -versions 1.0.9 and newer. But with any software there still may be bugs in it. -So if you encounter problems, you are invited to help us improve this software. -Please send me a detailed bug report (see chapter BUG REPORTS). You are also -invited in helping us to increase the number of drives, which are supported. - -Please read the README-files carefully and always keep a backup copy of your -old kernel, in order to reboot if something goes wrong! - -2. INSTALLATION -The driver consists of a header file 'aztcd.h', which normally should reside -in /usr/src/linux/drivers/cdrom and the source code 'aztcd.c', which normally -resides in the same place. It uses /dev/aztcd (/dev/aztcd0 in some distri- -butions), which must be a valid block device with major number 29 and reside -in directory /dev. To mount a CD-ROM, your kernel needs to have the ISO9660- -filesystem support included. - -PLEASE NOTE: aztcd.c has been developed in parallel to the linux kernel, -which had and is having many major and minor changes which are not backward -compatible. Quite definitely aztcd.c version 1.80 and newer will NOT work -in kernels older than 1.3.33. So please always use the most recent version -of aztcd.c with the appropriate linux-kernel. - -3. CONFIGURING YOUR KERNEL -If your kernel is already configured for using the AZTECH driver you will -see the following message while Linux boots: - Aztech CD-ROM Init: DriverVersion= BaseAddress= - Aztech CD-ROM Init: FirmwareVersion=>> - Aztech CD-ROM Init: detected - Aztech CD-ROM Init: End -If the message looks different and you are sure to have a supported drive, -it may have a different base address. The Aztech driver does look for the -CD-ROM drive at the base address specified in aztcd.h at compile time. This -address can be overwritten by boot parameter aztcd=....You should reboot and -start Linux with boot parameter aztcd=, e.g. aztcd=0x320. If -you do not know the base address, start your PC with DOS and look at the boot -message of your CD-ROM's DOS driver. If that still does not help, use boot -parameter aztcd=,0x79 , this tells aztcd to try a little harder. -aztcd may be configured to use autoprobing the base address by recompiling -it (see chapter 4.). - -If the message looks correct, as user 'root' you should be able to mount the -drive by - mount -t iso9660 -r /dev/aztcd0 /mnt -and use it as any other filesystem. (If this does not work, check if -/dev/aztcd0 and /mnt do exist and create them, if necessary by doing - mknod /dev/aztcd0 b 29 0 - mkdir /mnt - -If you still get a different message while Linux boots or when you get the -message, that the ISO9660-filesystem is not supported by your kernel, when -you try to mount the CD-ROM drive, you have to recompile your kernel. - -If you do *not* have an Aztech/Orchid/Okano/Wearnes/TXC drive and want to -bypass drive detection during Linux boot up, start with boot parameter aztcd=0. - -Most distributions nowadays do contain a boot disk image containing aztcd. -Please note, that this driver will not work with IDE/ATAPI drives! With these -you must use ide-cd.c instead. - -4. RECOMPILING YOUR KERNEL -If your kernel is not yet configured for the AZTECH driver and the ISO9660- -filesystem, you have to recompile your kernel: - -- Edit aztcd.h to set the I/O-address to your I/O-Base address (AZT_BASE_ADDR), - the driver does not use interrupts or DMA, so if you are using an AZTECH - CD268, an ORCHID CD-3110 or ORCHID/WEARNES CDD110 that's the only item you - have to set up. If you have a soundcard, read chapter 4.2. - Users of other drives should read chapter OTHER DRIVES of this file. - You also can configure that address by kernel boot parameter aztcd=... -- aztcd may be configured to use autoprobing the base address by setting - AZT_BASE_ADDR to '-1'. In that case aztcd probes the addresses listed - under AZT_BASE_AUTO. But please remember, that autoprobing always may - incorrectly influence other hardware components too! -- There are some other points, which may be configured, e.g. auto-eject the - CD when unmounting a drive, tray locking etc., see aztcd.h for details. -- If you're using a linux kernel version prior to 2.1.0, in aztcd.h - uncomment the line '#define AZT_KERNEL_PRIOR_2_1' -- Build a new kernel, configure it for 'Aztech/Orchid/Okano/Wearnes support' - (if you want aztcd to be part of the kernel). Do not configure it for - 'Aztech... support', if you want to use aztcd as a run time loadable module. - But in any case you must have the ISO9660-filesystem included in your - kernel. -- Activate the new kernel, normally this is done by running LILO (don't for- - get to configure it before and to keep a copy of your old kernel in case - something goes wrong!). -- Reboot -- If you've included aztcd in your kernel, you now should see during boot - some messages like - Aztech CD-ROM Init: DriverVersion= BaseAddress= - Aztech CD-ROM Init: FirmwareVersion= - Aztech CD-ROM Init: detected - Aztech CD-ROM Init: End -- If you have not included aztcd in your kernel, but want to load aztcd as a - run time loadable module see 4.1. -- If the message looks correct, as user 'root' you should be able to mount - the drive by - mount -t iso9660 -r /dev/aztcd0 /mnt - and use it as any other filesystem. (If this does not work, check if - /dev/aztcd0 and /mnt do exist and create them, if necessary by doing - mknod /dev/aztcd0 b 29 0 - mkdir /mnt -- If this still does not help, see chapters OTHER DRIVES and DEBUGGING. - -4.1 AZTCD AS A RUN-TIME LOADABLE MODULE -If you do not need aztcd permanently, you can also load and remove the driver -during runtime via insmod and rmmod. To build aztcd as a loadable module you -must configure your kernel for AZTECH module support (answer 'm' when con- -figuring the kernel). Anyhow, you may run into problems, if the version of -your boot kernel is not the same than the source kernel version, from which -you create the modules. So rebuild your kernel, if necessary. - -Now edit the base address of your AZTECH interface card in -/usr/src/linux/drivers/cdrom/aztcd.h to the appropriate value. -aztcd may be configured to use autoprobing the base address by setting -AZT_BASE_ADDR to '-1'. In that case aztcd probes the addresses listed -under AZT_BASE_AUTO. But please remember, that autoprobing always may -incorrectly influence other hardware components too! -There are also some special features which may be configured, e.g. -auto-eject a CD when unmounting the drive etc; see aztcd.h for details. -Then change to /usr/src/linux and do a - make modules - make modules_install -After that you can run-time load the driver via - insmod /lib/modules/X.X.X/misc/aztcd.o -and remove it via rmmod aztcd. -If you did not set the correct base address in aztcd.h, you can also supply the -base address when loading the driver via - insmod /lib/modules/X.X.X/misc/aztcd.o aztcd= -Again specifying aztcd=-1 will cause autoprobing. -If you do not have the iso9660-filesystem in your boot kernel, you also have -to load it before you can mount the CDROM: - insmod /lib/modules/X.X.X/fs/isofs.o -The mount procedure works as described in 4. above. -(In all commands 'X.X.X' is the current linux kernel version number) - -4.2 CDROM CONNECTED TO A SOUNDCARD -Most soundcards do have a bus interface to the CDROM-drive. In many cases -this soundcard needs to be configured, before the CDROM can be used. This -configuration procedure consists of writing some kind of initialization -data to the soundcard registers. The AZTECH-CDROM driver in the moment does -only support one type of soundcard (SoundWave32). Users of other soundcards -should try to boot DOS first and let their DOS drivers initialize the -soundcard and CDROM, then warm boot (or use loadlin) their PC to start -Linux. -Support for the CDROM-interface of SoundWave32-soundcards is directly -implemented in the AZTECH driver. Please edit linux/drivers/cdrom/aztdc.h, -uncomment line '#define AZT_SW32' and set the appropriate value for -AZT_BASE_ADDR and AZT_SW32_BASE_ADDR. This support was tested with an Orchid -CDS-3110 connected to a SoundWave32. -If you want your soundcard to be supported, find out, how it needs to be -configured and mail me (see 6.) the appropriate information. - -5. KNOWN PROBLEMS, FUTURE DEVELOPMENTS -5.1 MULTISESSION SUPPORT -Multisession support for CD's still is a myth. I implemented and tested a basic -support for multisession and XA CDs, but I still have not enough CDs and appli- -cations to test it rigorously. So if you'd like to help me, please contact me -(Email address see below). As of version 1.4 and newer you can enable the -multisession support in aztcd.h by setting AZT_MULTISESSION to 1. Doing so -will cause the ISO9660-filesystem to deal with multisession CDs, ie. redirect -requests to the Table of Contents (TOC) information from the last session, -which contains the info of all previous sessions etc.. If you do set -AZT_MULTISESSION to 0, you can use multisession CDs anyway. In that case the -drive's firmware will do automatic redirection. For the ISO9660-filesystem any -multisession CD will then look like a 'normal' single session CD. But never- -theless the data of all sessions are viewable and accessible. So with practical- -ly all real world applications you won't notice the difference. But as future -applications may make use of advanced multisession features, I've started to -implement the interface for the ISO9660 multisession interface via ioctl -CDROMMULTISESSION. - -5.2 STATUS RECOGNITION -The drive status recognition does not work correctly in all cases. Changing -a disk or having the door open, when a drive is already mounted, is detected -by the Aztech driver itself, but nevertheless causes multiple read attempts -by the different layers of the ISO9660-filesystem driver, which finally timeout, -so you have to wait quite a little... But isn't it bad style to change a disk -in a mounted drive, anyhow ?! - -The driver uses busy wait in most cases for the drive handshake (macros -STEN_LOW and DTEN_LOW). I tested with a 486/DX2 at 66MHz and a Pentium at -60MHz and 90MHz. Whenever you use a much faster machine you are likely to get -timeout messages. In that case edit aztcd.h and increase the timeout value -AZT_TIMEOUT. - -For some 'slow' drive commands I implemented waiting with a timer waitqueue -(macro STEN_LOW_WAIT). If you get this timeout message, you may also edit -aztcd.h and increase the timeout value AZT_STATUS_DELAY. The waitqueue has -shown to be a little critical. If you get kernel panic messages, edit aztcd.c -and substitute STEN_LOW_WAIT by STEN_LOW. Busy waiting with STEN_LOW is more -stable, but also causes CPU overhead. - -5.3 DOSEMU's CD-ROM SUPPORT -With release 1.20 aztcd was modified to allow access to CD-ROMS when running -under dosemu-0.60.0 aztcd-versions before 1.20 are most likely to crash -Linux, when a CD-ROM is accessed under dosemu. This problem has partly been -fixed, but still when accessing a directory for the first time the system -might hang for some 30sec. So be patient, when using dosemu's CD-ROM support -in combination with aztcd :-) ! -This problem has now (July 1995) been fixed by a modification to dosemu's -CD-ROM driver. The new version came with dosemu-0.60.2, see dosemu's -README.CDROM. - -6. BUG REPORTS -Please send detailed bug reports and bug fixes via EMail to - - Werner.Zimmermann@fht-esslingen.de - -Please include a description of your CD-ROM drive type and interface card, -the exact firmware message during Linux bootup, the version number of the -AZTECH-CDROM-driver and the Linux kernel version. Also a description of your -system's other hardware could be of interest, especially microprocessor type, -clock frequency, other interface cards such as soundcards, ethernet adapter, -game cards etc.. - -I will try to collect the reports and make the necessary modifications from -time to time. I may also come back to you directly with some bug fixes and -ask you to do further testing and debugging. - -Editors of CD-ROMs are invited to send a 'cooperation' copy of their -CD-ROMs to the volunteers, who provided the CD-ROM support for Linux. My -snail mail address for such 'stuff' is - Prof. Dr. W. Zimmermann - Fachhochschule fuer Technik Esslingen - Fachbereich IT - Flandernstrasse 101 - D-73732 Esslingen - Germany - - -7. OTHER DRIVES -The following drives ORCHID CDS3110, OKANO CDD110, WEARNES CDD110 and Conrad -TXC Nr. 993123-series 04 nearly look the same as AZTECH CDA268-01A, especially -they seem to use the same command codes. So it was quite simple to make the -AZTECH driver work with these drives. - -Unfortunately I do not have any of these drives available, so I couldn't test -it myself. In some installations, it seems necessary to initialize the drive -with the DOS driver before (especially if combined with a sound card) and then -do a warm boot (CTRL-ALT-RESET) or start Linux from DOS, e.g. with 'loadlin'. - -If you do not succeed, read chapter DEBUGGING. Thanks in advance! - -Sorry for the inconvenience, but it is difficult to develop for hardware, -which you don't have available for testing. So if you like, please help us. - -If you do have a CyCDROM CR520ie thanks to Hilmar Berger's help your chances -are good, that it will work with aztcd. The CR520ie is sold as an IDE-drive -and really is connected to the IDE interface (primary at 0x1F0 or secondary -at 0x170, configured as slave, not as master). Nevertheless it is not ATAPI -compatible but still uses Aztech's command codes. - - -8. DEBUGGING : IF YOU DON'T SUCCEED, TRY THE FOLLOWING --reread the complete README file --make sure, that your drive is hardware configured for - transfer mode: polled - IRQ: not used - DMA: not used - Base Address: something like 300, 320 ... - You can check this, when you start the DOS driver, which came with your - drive. By appropriately configuring the drive and the DOS driver you can - check, whether your drive does operate in this mode correctly under DOS. If - it does not operate under DOS, it won't under Linux. - If your drive's base address is something like 0x170 or 0x1F0 (and it is - not a CyCDROM CR520ie or CR 940ie) you most likely are having an IDE/ATAPI- - compatible drive, which is not supported by aztcd.c, use ide-cd.c instead. - Make sure the Base Address is configured correctly in aztcd.h, also make - sure, that /dev/aztcd0 exists with the correct major number (compare it with - the entry in file /usr/include/linux/major.h for the Aztech drive). --insert a CD-ROM and close the tray --cold boot your PC (i.e. via the power on switch or the reset button) --if you start Linux via DOS, e.g. using loadlin, make sure, that the DOS - driver for the CD-ROM drive is not loaded (comment out the calling lines - in DOS' config.sys!) --look for the aztcd: init message during Linux init and note them exactly --log in as root and do a mount -t iso9660 /dev/aztcd0 /mnt --if you don't succeed in the first time, try several times. Try also to open - and close the tray, then mount again. Please note carefully all commands - you typed in and the aztcd-messages, which you get. --if you get an 'Aztech CD-ROM init: aborted' message, read the remarks about - the version string below. - -If this does not help, do the same with the following differences --start DOS before; make now sure, that the DOS driver for the CD-ROM is - loaded under DOS (i.e. uncomment it again in config.sys) --warm boot your PC (i.e. via CTRL-ALT-DEL) - if you have it, you can also start via loadlin (try both). - ... - Again note all commands and the aztcd-messages. - -If you see STEN_LOW or STEN_LOW_WAIT error messages, increase the timeout -values. - -If this still does not help, --look in aztcd.c for the lines #if 0 - #define AZT_TEST1 - ... - #endif - and substitute '#if 0' by '#if 1'. --recompile your kernel and repeat the above two procedures. You will now get - a bundle of debugging messages from the driver. Again note your commands - and the appropriate messages. If you have syslogd running, these messages - may also be found in syslogd's kernel log file. Nevertheless in some - installations syslogd does not yet run, when init() is called, thus look for - the aztcd-messages during init, before the login-prompt appears. - Then look in aztcd.c, to find out, what happened. The normal calling sequence - is: aztcd_init() during Linux bootup procedure init() - after doing a 'mount -t iso9660 /dev/aztcd0 /mnt' the normal calling sequence is - aztcd_open() -> Status 2c after cold reboot with CDROM or audio CD inserted - -> Status 8 after warm reboot with CDROM inserted - -> Status 2e after cold reboot with no disk, closed tray - -> Status 6e after cold reboot, mount with door open - aztUpdateToc() - aztGetDiskInfo() - aztGetQChannelInfo() repeated several times - aztGetToc() - aztGetQChannelInfo() repeated several times - a list of track information - do_aztcd_request() } - azt_transfer() } repeated several times - azt_poll } - Check, if there is a difference in the calling sequence or the status flags! - - There are a lot of other messages, eg. the ACMD-command code (defined in - aztcd.h), status info from the getAztStatus-command and the state sequence of - the finite state machine in azt_poll(). The most important are the status - messages, look how they are defined and try to understand, if they make - sense in the context where they appear. With a CD-ROM inserted the status - should always be 8, except in aztcd_open(). Try to open the tray, insert an - audio disk, insert no disk or reinsert the CD-ROM and check, if the status - bits change accordingly. The status bits are the most likely point, where - the drive manufacturers may implement changes. - -If you still don't succeed, a good point to start is to look in aztcd.c in -function aztcd_init, where the drive should be detected during init. Do the -following: --reboot the system with boot parameter 'aztcd=,0x79'. With - parameter 0x79 most of the drive version detection is bypassed. After that - you should see the complete version string including leading and trailing - blanks during init. - Now adapt the statement - if ((result[1]=='A')&&(result[2]=='Z' ...) - in aztcd_init() to exactly match the first 3 or 4 letters you have seen. --Another point is the 'smart' card detection feature in aztcd_init(). Normally - the CD-ROM drive is ready, when aztcd_init is trying to read the version - string and a time consuming ACMD_SOFT_RESET command can be avoided. This is - detected by looking, if AFL_OP_OK can be read correctly. If the CD-ROM drive - hangs in some unknown state, e.g. because of an error before a warm start or - because you first operated under DOS, even the version string may be correct, - but the following commands will not. Then change the code in such a way, - that the ACMD_SOFT_RESET is issued in any case, by substituting the - if-statement 'if ( ...=AFL_OP_OK)' by 'if (1)'. - -If you succeed, please mail me the exact version string of your drive and -the code modifications, you have made together with a short explanation. -If you don't succeed, you may mail me the output of the debugging messages. -But remember, they are only useful, if they are exact and complete and you -describe in detail your hardware setup and what you did (cold/warm reboot, -with/without DOS, DOS-driver started/not started, which Linux-commands etc.) - - -9. TECHNICAL HISTORY OF THE DRIVER -The AZTECH-Driver is a rework of the Mitsumi-Driver. Four major items had to -be reworked: - -a) The Mitsumi drive does issue complete status information acknowledging -each command, the Aztech drive does only signal that the command was -processed. So whenever the complete status information is needed, an extra -ACMD_GET_STATUS command is issued. The handshake procedure for the drive -can be found in the functions aztSendCmd(), sendAztCmd() and getAztStatus(). - -b) The Aztech Drive does not have a ACMD_GET_DISK_INFO command, so the -necessary info about the number of tracks (firstTrack, lastTrack), disk -length etc. has to be read from the TOC in the lead in track (see function -aztGetDiskInfo()). - -c) Whenever data is read from the drive, the Mitsumi drive is started with a -command to read an indefinite (0xffffff) number of sectors. When the appropriate -number of sectors is read, the drive is stopped by a ACDM_STOP command. This -does not work with the Aztech drive. I did not find a way to stop it. The -stop and pause commands do only work in AUDIO mode but not in DATA mode. -Therefore I had to modify the 'finite state machine' in function azt_poll to -only read a certain number of sectors and then start a new read on demand. As I -have not completely understood, how the buffer/caching scheme of the Mitsumi -driver was implemented, I am not sure, if I have covered all cases correctly, -whenever you get timeout messages, the bug is most likely to be in that -function azt_poll() around switch(cmd) .... case ACD_S_DATA. - -d) I did not get information about changing drive mode. So I doubt, that the -code around function azt_poll() case AZT_S_MODE does work. In my test I have -not been able to switch to reading in raw mode. For reading raw mode, Aztech -uses a different command than for cooked mode, which I only have implemen- -ted in the ioctl-section but not in the section which is used by the ISO9660. - -The driver was developed on an AST PC with Intel 486/DX2, 8MB RAM, 340MB IDE -hard disk and on an AST PC with Intel Pentium 60MHz, 16MB RAM, 520MB IDE -running Linux kernel version 1.0.9 from the LST 1.8 Distribution. The kernel -was compiled with gcc.2.5.8. My CD-ROM drive is an Aztech CDA268-01A. My -drive says, that it has Firmware Version AZT26801A1.3. It came with an ISA-bus -interface card and works with polled I/O without DMA and without interrupts. -The code for all other drives was 'remote' tested and debugged by a number of -volunteers on the Internet. - -Points, where I feel that possible problems might be and all points where I -did not completely understand the drive's behaviour or trust my own code are -marked with /*???*/ in the source code. There are also some parts in the -Mitsumi driver, where I did not completely understand their code. - - -10. ACKNOWLEDGMENTS -Without the help of P.Bush, Aztech, who delivered technical information -about the Aztech Drive and without the help of E.Moenkeberg, GWDG, who did a -great job in analyzing the command structure of various CD-ROM drives, this -work would not have been possible. E.Moenkeberg was also a great help in -making the software 'kernel ready' and in answering many of the CDROM-related -questions in the newsgroups. He really is *the* Linux CD-ROM guru. Thanks -also to all the guys on the Internet, who collected valuable technical -information about CDROMs. - -Joe Nardone (joe@access.digex.net) was a patient tester even for my first -trial, which was more than slow, and made suggestions for code improvement. -Especially the 'finite state machine' azt_poll() was rewritten by Joe to get -clean C code and avoid the ugly 'gotos', which I copied from mcd.c. - -Robby Schirmer (schirmer@fmi.uni-passau.de) tested the audio stuff (ioctls) -and suggested a lot of patches for them. - -Joseph Piskor and Peter Nugent were the first users with the ORCHID CD3110 -and also were very patient with the problems which occurred. - -Reinhard Max delivered the information for the CDROM-interface of the -SoundWave32 soundcards. - -Jochen Kunz and Olaf Kaluza delivered the information for supporting Conrad's -TXC drive. - -Hilmar Berger delivered the patches for supporting CyCDROM CR520ie. - -Anybody, who is interested in these items should have a look at 'ftp.gwdg.de', -directory 'pub/linux/cdrom' and at 'ftp.cdrom.com', directory 'pub/cdrom'. - -11. PROGRAMMING ADD ONs: cdplay.c -You can use the ioctl-functions included in aztcd.c in your own programs. As -an example on how to do this, you will find a tiny CD Player for audio CDs -named 'cdplay.c'. It allows you to play audio CDs. You can play a specified -track, pause and resume or skip tracks forward and backwards. If you quit the -program without stopping the drive, playing is continued. You can also -(mis)use cdplay to read and hexdump data disks. You can find the code in the -APPENDIX of this file, which you should cut out with an editor and store in a -separate file 'cdplay.c'. To compile it and make it executable, do - gcc -s -Wall -O2 -L/usr/lib cdplay.c -o /usr/local/bin/cdplay # compiles it - chmod +755 /usr/local/bin/cdplay # makes it executable - ln -s /dev/aztcd0 /dev/cdrom # creates a link - (for /usr/lib substitute the top level directory, where your include files - reside, and for /usr/local/bin the directory, where you want the executable - binary to reside ) - -You have to set the correct permissions for cdplay *and* for /dev/mcd0 or -/dev/aztcd0 in order to use it. Remember, that you should not have /dev/cdrom -mounted, when you're playing audio CDs. - -This program is just a hack for testing the ioctl-functions in aztcd.c. I will -not maintain it, so if you run into problems, discard it or have a look into -the source code 'cdplay.c'. The program does only contain a minimum of user -protection and input error detection. If you use the commands in the wrong -order or if you try to read a CD at wrong addresses, you may get error messages -or even hang your machine. If you get STEN_LOW, STEN_LOW_WAIT or segment violation -error messages when using cdplay, after that, the system might not be stable -any more, so you'd better reboot. As the ioctl-functions run in kernel mode, -most normal Linux-multitasking protection features do not work. By using -uninitialized 'wild' pointers etc., it is easy to write to other users' data -and program areas, destroy kernel tables etc.. So if you experiment with ioctls -as always when you are doing systems programming and kernel hacking, you -should have a backup copy of your system in a safe place (and you also -should try restoring from a backup copy first)! - -A reworked and improved version called 'cdtester.c', which has yet more -features for testing CDROM-drives can be found in -Documentation/cdrom/sbpcd, written by E.Moenkeberg. - -Werner Zimmermann -Fachhochschule fuer Technik Esslingen -(EMail: Werner.Zimmermann@fht-esslingen.de) -October, 1997 - ---------------------------------------------------------------------------- -APPENDIX: Source code of cdplay.c - -/* Tiny Audio CD Player - - Copyright 1994, 1995, 1996 Werner Zimmermann (Werner.Zimmermann@fht-esslingen.de) - -This program originally was written to test the audio functions of the -AZTECH.CDROM-driver, but it should work with every CD-ROM drive. Before -using it, you should set a symlink from /dev/cdrom to your real CDROM -device. - -The GNU General Public License applies to this program. - -History: V0.1 W.Zimmermann: First release. Nov. 8, 1994 - V0.2 W.Zimmermann: Enhanced functionality. Nov. 9, 1994 - V0.3 W.Zimmermann: Additional functions. Nov. 28, 1994 - V0.4 W.Zimmermann: fixed some bugs. Dec. 17, 1994 - V0.5 W.Zimmermann: clean 'scanf' commands without compiler warnings - Jan. 6, 1995 - V0.6 W.Zimmermann: volume control (still experimental). Jan. 24, 1995 - V0.7 W.Zimmermann: read raw modified. July 26, 95 -*/ - -#include -#include -#include -#include -#include -#include -#include -#include - -void help(void) -{ printf("Available Commands: STOP s EJECT/CLOSE e QUIT q\n"); - printf(" PLAY TRACK t PAUSE p RESUME r\n"); - printf(" NEXT TRACK n REPEAT LAST l HELP h\n"); - printf(" SUB CHANNEL c TRACK INFO i PLAY AT a\n"); - printf(" READ d READ RAW w VOLUME v\n"); -} - -int main(void) -{ int handle; - unsigned char command=' ', ini=0, first=1, last=1; - unsigned int cmd, i,j,k, arg1,arg2,arg3; - struct cdrom_ti ti; - struct cdrom_tochdr tocHdr; - struct cdrom_subchnl subchnl; - struct cdrom_tocentry entry; - struct cdrom_msf msf; - union { struct cdrom_msf msf; - unsigned char buf[CD_FRAMESIZE_RAW]; - } azt; - struct cdrom_volctrl volctrl; - - printf("\nMini-Audio CD-Player V0.72 (C) 1994,1995,1996 W.Zimmermann\n"); - handle=open("/dev/cdrom",O_RDWR); - ioctl(handle,CDROMRESUME); - - if (handle<=0) - { printf("Drive Error: already playing, no audio disk, door open\n"); - printf(" or no permission (you must be ROOT in order to use this program)\n"); - } - else - { help(); - while (1) - { printf("Type command (h = help): "); - scanf("%s",&command); - switch (command) - { case 'e': cmd=CDROMEJECT; - ioctl(handle,cmd); - break; - case 'p': if (!ini) - { printf("Command not allowed - play track first\n"); - } - else - { cmd=CDROMPAUSE; - if (ioctl(handle,cmd)) printf("Drive Error\n"); - } - break; - case 'r': if (!ini) - { printf("Command not allowed - play track first\n"); - } - else - { cmd=CDROMRESUME; - if (ioctl(handle,cmd)) printf("Drive Error\n"); - } - break; - case 's': cmd=CDROMPAUSE; - if (ioctl(handle,cmd)) printf("Drive error or already stopped\n"); - cmd=CDROMSTOP; - if (ioctl(handle,cmd)) printf("Drive error\n"); - break; - case 't': cmd=CDROMREADTOCHDR; - if (ioctl(handle,cmd,&tocHdr)) printf("Drive Error\n"); - first=tocHdr.cdth_trk0; - last= tocHdr.cdth_trk1; - if ((first==0)||(first>last)) - { printf ("--could not read TOC\n"); - } - else - { printf("--first track: %d --last track: %d --enter track number: ",first,last); - cmd=CDROMPLAYTRKIND; - scanf("%i",&arg1); - ti.cdti_trk0=arg1; - if (ti.cdti_trk0last) ti.cdti_trk0=last; - ti.cdti_ind0=0; - ti.cdti_trk1=last; - ti.cdti_ind1=0; - if (ioctl(handle,cmd,&ti)) printf("Drive Error\n"); - ini=1; - } - break; - case 'n': if (!ini++) - { if (ioctl(handle,CDROMREADTOCHDR,&tocHdr)) printf("Drive Error\n"); - first=tocHdr.cdth_trk0; - last= tocHdr.cdth_trk1; - ti.cdti_trk0=first-1; - } - if ((first==0)||(first>last)) - { printf ("--could not read TOC\n"); - } - else - { cmd=CDROMPLAYTRKIND; - if (++ti.cdti_trk0 > last) ti.cdti_trk0=last; - ti.cdti_ind0=0; - ti.cdti_trk1=last; - ti.cdti_ind1=0; - if (ioctl(handle,cmd,&ti)) printf("Drive Error\n"); - ini=1; - } - break; - case 'l': if (!ini++) - { if (ioctl(handle,CDROMREADTOCHDR,&tocHdr)) printf("Drive Error\n"); - first=tocHdr.cdth_trk0; - last= tocHdr.cdth_trk1; - ti.cdti_trk0=first+1; - } - if ((first==0)||(first>last)) - { printf ("--could not read TOC\n"); - } - else - { cmd=CDROMPLAYTRKIND; - if (--ti.cdti_trk0 < first) ti.cdti_trk0=first; - ti.cdti_ind0=0; - ti.cdti_trk1=last; - ti.cdti_ind1=0; - if (ioctl(handle,cmd,&ti)) printf("Drive Error\n"); - ini=1; - } - break; - case 'c': subchnl.cdsc_format=CDROM_MSF; - if (ioctl(handle,CDROMSUBCHNL,&subchnl)) - printf("Drive Error\n"); - else - { printf("AudioStatus:%s Track:%d Mode:%d MSF=%d:%d:%d\n", \ - subchnl.cdsc_audiostatus==CDROM_AUDIO_PLAY ? "PLAYING":"NOT PLAYING",\ - subchnl.cdsc_trk,subchnl.cdsc_adr, \ - subchnl.cdsc_absaddr.msf.minute, subchnl.cdsc_absaddr.msf.second, \ - subchnl.cdsc_absaddr.msf.frame); - } - break; - case 'i': if (!ini) - { printf("Command not allowed - play track first\n"); - } - else - { cmd=CDROMREADTOCENTRY; - printf("Track No.: "); - scanf("%d",&arg1); - entry.cdte_track=arg1; - if (entry.cdte_tracklast) entry.cdte_track=last; - entry.cdte_format=CDROM_MSF; - if (ioctl(handle,cmd,&entry)) - { printf("Drive error or invalid track no.\n"); - } - else - { printf("Mode %d Track, starts at %d:%d:%d\n", \ - entry.cdte_adr,entry.cdte_addr.msf.minute, \ - entry.cdte_addr.msf.second,entry.cdte_addr.msf.frame); - } - } - break; - case 'a': cmd=CDROMPLAYMSF; - printf("Address (min:sec:frame) "); - scanf("%d:%d:%d",&arg1,&arg2,&arg3); - msf.cdmsf_min0 =arg1; - msf.cdmsf_sec0 =arg2; - msf.cdmsf_frame0=arg3; - if (msf.cdmsf_sec0 > 59) msf.cdmsf_sec0 =59; - if (msf.cdmsf_frame0> 74) msf.cdmsf_frame0=74; - msf.cdmsf_min1=60; - msf.cdmsf_sec1=00; - msf.cdmsf_frame1=00; - if (ioctl(handle,cmd,&msf)) - { printf("Drive error or invalid address\n"); - } - break; -#ifdef AZT_PRIVATE_IOCTLS /*not supported by every CDROM driver*/ - case 'd': cmd=CDROMREADCOOKED; - printf("Address (min:sec:frame) "); - scanf("%d:%d:%d",&arg1,&arg2,&arg3); - azt.msf.cdmsf_min0 =arg1; - azt.msf.cdmsf_sec0 =arg2; - azt.msf.cdmsf_frame0=arg3; - if (azt.msf.cdmsf_sec0 > 59) azt.msf.cdmsf_sec0 =59; - if (azt.msf.cdmsf_frame0> 74) azt.msf.cdmsf_frame0=74; - if (ioctl(handle,cmd,&azt.msf)) - { printf("Drive error, invalid address or unsupported command\n"); - } - k=0; - getchar(); - for (i=0;i<128;i++) - { printf("%4d:",i*16); - for (j=0;j<16;j++) - { printf("%2x ",azt.buf[i*16+j]); - } - for (j=0;j<16;j++) - { if (isalnum(azt.buf[i*16+j])) - printf("%c",azt.buf[i*16+j]); - else - printf("."); - } - printf("\n"); - k++; - if (k>=20) - { printf("press ENTER to continue\n"); - getchar(); - k=0; - } - } - break; - case 'w': cmd=CDROMREADRAW; - printf("Address (min:sec:frame) "); - scanf("%d:%d:%d",&arg1,&arg2,&arg3); - azt.msf.cdmsf_min0 =arg1; - azt.msf.cdmsf_sec0 =arg2; - azt.msf.cdmsf_frame0=arg3; - if (azt.msf.cdmsf_sec0 > 59) azt.msf.cdmsf_sec0 =59; - if (azt.msf.cdmsf_frame0> 74) azt.msf.cdmsf_frame0=74; - if (ioctl(handle,cmd,&azt)) - { printf("Drive error, invalid address or unsupported command\n"); - } - k=0; - for (i=0;i<147;i++) - { printf("%4d:",i*16); - for (j=0;j<16;j++) - { printf("%2x ",azt.buf[i*16+j]); - } - for (j=0;j<16;j++) - { if (isalnum(azt.buf[i*16+j])) - printf("%c",azt.buf[i*16+j]); - else - printf("."); - } - printf("\n"); - k++; - if (k>=20) - { getchar(); - k=0; - } - } - break; -#endif - case 'v': cmd=CDROMVOLCTRL; - printf("--Channel 0 Left (0-255): "); - scanf("%d",&arg1); - printf("--Channel 1 Right (0-255): "); - scanf("%d",&arg2); - volctrl.channel0=arg1; - volctrl.channel1=arg2; - volctrl.channel2=0; - volctrl.channel3=0; - if (ioctl(handle,cmd,&volctrl)) - { printf("Drive error or unsupported command\n"); - } - break; - case 'q': if (close(handle)) printf("Drive Error: CLOSE\n"); - exit(0); - case 'h': help(); - break; - default: printf("unknown command\n"); - break; - } - } - } - return 0; -} diff --git a/Documentation/cdrom/cdu31a b/Documentation/cdrom/cdu31a deleted file mode 100644 index c0667da09c00..000000000000 --- a/Documentation/cdrom/cdu31a +++ /dev/null @@ -1,196 +0,0 @@ - - CDU31A/CDU33A Driver Info - ------------------------- - -Information on the Sony CDU31A/CDU33A CDROM driver for the Linux -kernel. - - Corey Minyard (minyard@metronet.com) - - Colossians 3:17 - -Crude Table of Contents ------------------------ - - Setting Up the Hardware - Configuring the Kernel - Configuring as a Module - Driver Special Features - - -This device driver handles Sony CDU31A/CDU33A CDROM drives and -provides a complete block-level interface as well as an ioctl() -interface as specified in include/linux/cdrom.h). With this -interface, CDROMs can be accessed, standard audio CDs can be played -back normally, and CD audio information can be read off the drive. - -Note that this will only work for CDU31A/CDU33A drives. Some vendors -market their drives as CDU31A compatible. They lie. Their drives are -really CDU31A hardware interface compatible (they can plug into the -same card). They are not software compatible. - -Setting Up the Hardware ------------------------ - -The CDU31A driver is unable to safely tell if an interface card is -present that it can use because the interface card does not announce -its presence in any way besides placing 4 I/O locations in memory. It -used to just probe memory and attempt commands, but Linus wisely asked -me to remove that because it could really screw up other hardware in -the system. - -Because of this, you must tell the kernel where the drive interface -is, what interrupts are used, and possibly if you are on a PAS-16 -soundcard. - -If you have the Sony CDU31A/CDU33A drive interface card, the following -diagram will help you set it up. If you have another card, you are on -your own. You need to make sure that the I/O address and interrupt is -not used by another card in the system. You will need to know the I/O -address and interrupt you have set. Note that use of interrupts is -highly recommended, if possible, it really cuts down on CPU used. -Unfortunately, most soundcards do not support interrupts for their -CDROM interfaces. By default, the Sony interface card comes with -interrupts disabled. - - +----------+-----------------+----------------------+ - | JP1 | 34 Pin Conn | | - | JP2 +-----------------+ | - | JP3 | - | JP4 | - | +--+ - | | +-+ - | | | | External - | | | | Connector - | | | | - | | +-+ - | +--+ - | | - | +--------+ - | | - +------------------------------------------+ - - JP1 sets the Base Address, using the following settings: - - Address Pin 1 Pin 2 - ------- ----- ----- - 0x320 Short Short - 0x330 Short Open - 0x340 Open Short - 0x360 Open Open - - JP2 and JP3 configure the DMA channel; they must be set the same. - - DMA Pin 1 Pin 2 Pin 3 - --- ----- ----- ----- - 1 On Off On - 2 Off On Off - 3 Off Off On - - JP4 Configures the IRQ: - - IRQ Pin 1 Pin 2 Pin 3 Pin 4 - --- ----- ----- ----- ----- - 3 Off Off On Off - 4 Off Off* Off On - 5 On Off Off Off - 6 Off On Off Off - - The documentation states to set this for interrupt - 4, but I think that is a mistake. - -Note that if you have another interface card, you will need to look at -the documentation to find the I/O base address. This is specified to -the SLCD.SYS driver for DOS with the /B: parameter, so you can look at -you DOS driver setup to find the address, if necessary. - -Configuring the Kernel ----------------------- - -You must tell the kernel where the drive is at boot time. This can be -done at the Linux boot prompt, by using LILO, or by using Bootlin. -Note that this is no substitute for HOWTOs and LILO documentation, if -you are confused please read those for info on bootline configuration -and LILO. - -At the linux boot prompt, press the ALT key and add the following line -after the boot name (you can let the kernel boot, it will tell you the -default boot name while booting): - - cdu31a=,[,PAS] - -The base address needs to have "0x" in front of it, since it is in -hex. For instance, to configure a drive at address 320 on interrupt 5, -use the following: - - cdu31a=0x320,5 - -I use the following boot line: - - cdu31a=0x1f88,0,PAS - -because I have a PAS-16 which does not support interrupt for the -CDU31A interface. - -Adding this as an append line at the beginning of the /etc/lilo.conf -file will set it for lilo configurations. I have the following as the -first line in my lilo.conf file: - - append="cdu31a=0x1f88,0" - -I'm not sure how to set up Bootlin (I have never used it), if someone -would like to fill in this section please do. - - -Configuring as a Module ------------------------ - -The driver supports loading as a module. However, you must specify -the boot address and interrupt on the boot line to insmod. You can't -use modprobe to load it, since modprobe doesn't support setting -variables. - -Anyway, I use the following line to load my driver as a module - - /sbin/insmod /lib/modules/`uname -r`/misc/cdu31a.o cdu31a_port=0x1f88 - -You can set the following variables in the driver: - - cdu31a_port= - sets the base I/O. If hex, put 0x in - front of it. This must be specified. - - cdu31a_irq= - Sets the interrupt number. Leaving this - off will turn interrupts off. - - -Driver Special Features ------------------------ - -This section describes features beyond the normal audio and CD-ROM -functions of the drive. - -2048 byte buffer mode - -If a disk is mounted with -o block=2048, data is copied straight from -the drive data port to the buffer. Otherwise, the readahead buffer -must be involved to hold the other 1K of data when a 1K block -operation is done. Note that with 2048 byte blocks you cannot execute -files from the CD. - -XA compatibility - -The driver should support XA disks for both the CDU31A and CDU33A. It -does this transparently, the using program doesn't need to set it. - -Multi-Session - -A multi-session disk looks just like a normal disk to the user. Just -mount one normally, and all the data should be there. A special -thanks to Koen for help with this! - -Raw sector I/O - -Using the CDROMREADAUDIO it is possible to read raw audio and data -tracks. Both operations return 2352 bytes per sector. On the data -tracks, the first 12 bytes is not returned by the drive and the value -of that data is indeterminate. diff --git a/Documentation/cdrom/cm206 b/Documentation/cdrom/cm206 deleted file mode 100644 index 810368f4f7c4..000000000000 --- a/Documentation/cdrom/cm206 +++ /dev/null @@ -1,185 +0,0 @@ -This is the readme file for the driver for the Philips/LMS cdrom drive -cm206 in combination with the cm260 host adapter card. - - (c) 1995 David A. van Leeuwen - -Changes since version 0.99 --------------------------- -- Interfacing to the kernel is routed though an extra interface layer, - cdrom.c. This allows runtime-configurable `behavior' of the cdrom-drive, - independent of the driver. - -Features since version 0.33 ---------------------------- -- Full audio support, that is, both workman, workbone and cdp work - now reasonably. Reading TOC still takes some time. xmcd has been - reported to run successfully. -- Made auto-probe code a little better, I hope - -Features since version 0.28 ---------------------------- -- Full speed transfer rate (300 kB/s). -- Minimum kernel memory usage for buffering (less than 3 kB). -- Multisession support. -- Tray locking. -- Statistics of driver accessible to the user. -- Module support. -- Auto-probing of adapter card's base port and irq line, - also configurable at boot time or module load time. - - -Decide how you are going to use the driver. There are two -options: - - (a) installing the driver as a resident part of the kernel - (b) compiling the driver as a loadable module - - Further, you must decide if you are going to specify the base port - address and the interrupt request line of the adapter card cm260 as - boot options for (a), module parameters for (b), use automatic - probing of these values, or hard-wire your adaptor card's settings - into the source code. If you don't care, you can choose - autoprobing, which is the default. In that case you can move on to - the next step. - -Compiling the kernel --------------------- -1) move to /usr/src/linux and do a - - make config - - If you have chosen option (a), answer yes to CONFIG_CM206 and - CONFIG_ISO9660_FS. - - If you have chosen option (b), answer yes to CONFIG_MODVERSIONS - and no (!) to CONFIG_CM206 and CONFIG_ISO9660_FS. - -2) then do a - - make clean; make zImage; make modules - -3) do the usual things to install a new image (backup the old one, run - `rdev -R zImage 1', copy the new image in place, run lilo). Might - be `make zlilo'. - -Using the driver as a module ----------------------------- -If you will only occasionally use the cd-rom driver, you can choose -option (b), install as a loadable module. You may have to re-compile -the module when you upgrade the kernel to a new version. - -Since version 0.96, much of the functionality has been transferred to -a generic cdrom interface in the file cdrom.c. The module cm206.o -depends on cdrom.o. If the latter is not compiled into the kernel, -you must explicitly load it before cm206.o: - - insmod /usr/src/linux/modules/cdrom.o - -To install the module, you use the command, as root - - insmod /usr/src/linux/modules/cm206.o - -You can specify the base address on the command line as well as the irq -line to be used, e.g. - - insmod /usr/src/linux/modules/cm206.o cm206=0x300,11 - -The order of base port and irq line doesn't matter; if you specify only -one, the other will have the value of the compiled-in default. You -may also have to install the file-system module `iso9660.o', if you -didn't compile that into the kernel. - - -Using the driver as part of the kernel --------------------------------------- -If you have chosen option (a), you can specify the base-port -address and irq on the lilo boot command line, e.g.: - - LILO: linux cm206=0x340,11 - -This assumes that your linux kernel image keyword is `linux'. -If you specify either IRQ (3--11) or base port (0x300--0x370), -auto probing is turned off for both settings, thus setting the -other value to the compiled-in default. - -Note that you can also put these parameters in the lilo configuration file: - -# linux config -image = /vmlinuz - root = /dev/hda1 - label = Linux - append = "cm206=0x340,11" - read-only - - -If module parameters and LILO config options don't work -------------------------------------------------------- -If autoprobing does not work, you can hard-wire the default values -of the base port address (CM206_BASE) and interrupt request line -(CM206_IRQ) into the file /usr/src/linux/drivers/cdrom/cm206.h. Change -the defines of CM206_IRQ and CM206_BASE. - - -Mounting the cdrom ------------------- -1) Make sure that the right device is installed in /dev. - - mknod /dev/cm206cd b 32 0 - -2) Make sure there is a mount point, e.g., /cdrom - - mkdir /cdrom - -3) mount using a command like this (run as root): - - mount -rt iso9660 /dev/cm206cd /cdrom - -4) For user-mounts, add a line in /etc/fstab - - /dev/cm206cd /cdrom iso9660 ro,noauto,user - - This will allow users to give the commands - - mount /cdrom - umount /cdrom - -If things don't work --------------------- - -- Try to do a `dmesg' to find out if the driver said anything about - what is going wrong during the initialization. - -- Try to do a `dd if=/dev/cm206cd | od -tc | less' to read from the - CD. - -- Look in the /proc directory to see if `cm206' shows up under one of - `interrupts', `ioports', `devices' or `modules' (if applicable). - - -DISCLAIMER ----------- -I cannot guarantee that this driver works, or that the hardware will -not be harmed, although I consider it most unlikely. - -I hope that you'll find this driver in some way useful. - - David van Leeuwen - david@tm.tno.nl - -Note for Linux CDROM vendors ------------------------------ -You are encouraged to include this driver on your Linux CDROM. If -you do, you might consider sending me a free copy of that cd-rom. -You can contact me through my e-mail address, david@tm.tno.nl. -If this driver is compiled into a kernel to boot off a cdrom, -you should actually send me a free copy of that cd-rom. - -Copyright ---------- -The copyright of the cm206 driver for Linux is - - (c) 1995 David A. van Leeuwen - -The driver is released under the conditions of the GNU general public -license, which can be found in the file COPYING in the root of this -source tree. diff --git a/Documentation/cdrom/gscd b/Documentation/cdrom/gscd deleted file mode 100644 index d01ca36b5c43..000000000000 --- a/Documentation/cdrom/gscd +++ /dev/null @@ -1,60 +0,0 @@ - Goldstar R420 CD-Rom device driver README - -For all kind of other information about the GoldStar R420 CDROM -and this Linux device driver see the WWW page: - - http://linux.rz.fh-hannover.de/~raupach - - - If you are the editor of a Linux CD, you should - enable gscd.c within your boot floppy kernel. Please, - send me one of your CDs for free. - - -This current driver version 0.4a only supports reading data from the disk. -Currently we have no audio and no multisession or XA support. -The polling interface is used, no DMA. - - -Sometimes the GoldStar R420 is sold in a 'Reveal Multimedia Kit'. This kit's -drive interface is compatible, too. - - -Installation ------------- - -Change to '/usr/src/linux/drivers/cdrom' and edit the file 'gscd.h'. Insert -the i/o address of your interface card. - -The default base address is 0x340. This will work for most applications. -Address selection is accomplished by jumpers PN801-1 to PN801-4 on the -GoldStar Interface Card. -Appropriate settings are: 0x300, 0x310, 0x320, 0x330, 0x340, 0x350, 0x360 -0x370, 0x380, 0x390, 0x3A0, 0x3B0, 0x3C0, 0x3D0, 0x3E0, 0x3F0 - -Then go back to '/usr/src/linux/' and 'make config' to build the new -configuration for your kernel. If you want to use the GoldStar driver -like a module, don't select 'GoldStar CDROM support'. By the way, you -have to include the iso9660 filesystem. - -Now start compiling the kernel with 'make zImage'. -If you want to use the driver as a module, you have to do 'make modules' -and 'make modules_install', additionally. -Install your new kernel as usual - maybe you do it with 'make zlilo'. - -Before you can use the driver, you have to - mknod /dev/gscd0 b 16 0 -to create the appropriate device file (you only need to do this once). - -If you use modules, you can try to insert the driver. -Say: 'insmod /usr/src/linux/modules/gscd.o' -or: 'insmod /usr/src/linux/modules/gscd.o gscd=
' -The driver should report its results. - -That's it! Mount a disk, i.e. 'mount -rt iso9660 /dev/gscd0 /cdrom' - -Feel free to report errors and suggestions to the following address. -Be sure, I'm very happy to receive your comments! - - Oliver Raupach Hannover, Juni 1995 -(raupach@nwfs1.rz.fh-hannover.de) diff --git a/Documentation/cdrom/isp16 b/Documentation/cdrom/isp16 deleted file mode 100644 index cc86533ac9f3..000000000000 --- a/Documentation/cdrom/isp16 +++ /dev/null @@ -1,100 +0,0 @@ - -- Documentation/cdrom/isp16 - -Docs by Eric van der Maarel - -This is the README for version 0.6 of the cdrom interface on an -ISP16, MAD16 or Mozart sound card. - -The detection and configuration of this interface used to be included -in both the sjcd and optcd cdrom driver. Drives supported by these -drivers came packed with Media Magic's multi media kit, which also -included the ISP16 card. The idea (thanks Leo Spiekman) -to move it from these drivers into a separate module and moreover, not to -rely on the MAD16 sound driver, are as follows: --duplication of code in the kernel is a waste of resources and should - be avoided; --however, kernels and notably those included with Linux distributions - (cf Slackware 3.0 included version 0.5 of the isp16 configuration - code included in the drivers) don't always come with sound support - included. Especially when they already include a bunch of cdrom drivers. - Hence, the cdrom interface should be configurable _independently_ of - sound support. - -The ISP16, MAD16 and Mozart sound cards have an OPTi 82C928 or an -OPTi 82C929 chip. The interface on these cards should work with -any cdrom attached to the card, which is 'electrically' compatible -with Sanyo/Panasonic, Sony or Mitsumi non-ide drives. However, the -command sets for any proprietary drives may differ -(and hence may not be supported in the kernel) from these four types. -For a fact I know the interface works and the way of configuration -as described in this documentation works in combination with the -sjcd (in Sanyo/Panasonic compatibility mode) cdrom drivers -(probably with the optcd (in Sony compatibility mode) as well). -If you have such an OPTi based sound card and you want to use the -cdrom interface with a cdrom drive supported by any of the other cdrom -drivers, it will probably work. Please let me know any experience you -might have). -I understand that cards based on the OPTi 82C929 chips may be configured -(hardware jumpers that is) as an IDE interface. Initialisation of such a -card in this mode is not supported (yet?). - -The suggestion to configure the ISP16 etc. sound card by booting DOS and -do a warm reboot to boot Linux somehow doesn't work, at least not -on my machine (IPC P90), with the OPTi 82C928 based card. - -Booting the kernel through the boot manager LILO allows the use -of some command line options on the 'LILO boot:' prompt. At boot time -press Alt or Shift while the LILO prompt is written on the screen and enter -any kernel options. Alternatively these options may be used in -the appropriate section in /etc/lilo.conf. Adding 'append=""' -will do the trick as well. -The syntax of 'cmd_line_options' is - - isp16=[[,[,]]][[,]] - -If there is no ISP16 or compatibles detected, there's probably no harm done. -These options indicate the values that your cdrom drive has been (or will be) -configured to use. -Valid values for the base i/o address are: - port=0x340,0x320,0x330,0x360 -for the interrupt request number - irq=0,3,5,7,9,10,11 -for the direct memory access line - dma=0,3,5,6,7 -and for the type of drive - drive_type=noisp16,Sanyo,Panasonic,Sony,Mitsumi. -Note that these options are case sensitive. -The values 0 for irq and dma indicate that they are not used, and -the drive will be used in 'polling' mode. The values 5 and 7 for irq -should be avoided in order to avoid any conflicts with optional -sound card configuration. -The syntax of the command line does not allow the specification of -irq when there's nothing specified for the base address and no -specification of dma when there is no specification of irq. -The value 'noisp16' for drive_type, which may be used as the first -non-integer option value (e.g. 'isp16=noisp16'), makes sure that probing -for and subsequent configuration of an ISP16-compatible card is skipped -all together. This can be useful to overcome possible conflicts which -may arise while the kernel is probing your hardware. -The default values are - port=0x340 - irq=0 - dma=0 - drive_type=Sanyo -reflecting my own configuration. The defaults can be changed in -the file linux/drivers/cdrom/ips16.h. - -The cdrom interface can be configured at run time by loading the -initialisation driver as a module. In that case, the interface -parameters can be set by giving appropriate values on the command -line. Configuring the driver can then be done by the following -command (assuming you have iso16.o installed in a proper place): - - insmod isp16.o isp16_cdrom_base= isp16_cdrom_irq= \ - isp16_cdrom_dma= isp16_cdrom_type= - -where port, irq, dma and drive_type can have any of the values mentioned -above. - - -Have fun! diff --git a/Documentation/cdrom/mcdx b/Documentation/cdrom/mcdx deleted file mode 100644 index 2bac4b7ff6da..000000000000 --- a/Documentation/cdrom/mcdx +++ /dev/null @@ -1,29 +0,0 @@ -If you are using the driver as a module, you can specify your ports and IRQs -like - - # insmod mcdx.o mcdx=0x300,11,0x304,5 - -and so on ("address,IRQ" pairs). -This will override the configuration in mcdx.h. - -This driver: - - o handles XA and (hopefully) multi session CDs as well as - ordinary CDs; - o supports up to 5 drives (of course, you'll need free - IRQs, i/o ports and slots); - o plays audio - -This version doesn't support yet: - - o shared IRQs (but it seems to be possible - I've successfully - connected two drives to the same irq. So it's `only' a - problem of the driver.) - -This driver never will: - - o Read digital audio (i.e. copy directly), due to missing - hardware features. - - -heiko@lotte.sax.de diff --git a/Documentation/cdrom/optcd b/Documentation/cdrom/optcd deleted file mode 100644 index 6f46c7adb243..000000000000 --- a/Documentation/cdrom/optcd +++ /dev/null @@ -1,57 +0,0 @@ -This is the README file for the Optics Storage 8000 AT CDROM device driver. - -This is the driver for the so-called 'DOLPHIN' drive, with the 34-pin -Sony-compatible interface. For the IDE-compatible Optics Storage 8001 -drive, you will want the ATAPI CDROM driver. The driver also seems to -work with the Lasermate CR328A. If you have a drive that works with -this driver, and that doesn't report itself as DOLPHIN, please drop me -a mail. - -The support for multisession CDs is in ALPHA stage. If you use it, -please mail me your experiences. Multisession support can be disabled -at compile time. - -You can find some older versions of the driver at - dutette.et.tudelft.nl:/pub/linux/ -and at Eberhard's mirror - ftp.gwdg.de:/pub/linux/cdrom/drivers/optics/ - -Before you can use the driver, you have to create the device file once: - # mknod /dev/optcd0 b 17 0 - -To specify the base address if the driver is "compiled-in" to your kernel, -you can use the kernel command line item (LILO option) - optcd=0x340 -with the right address. - -If you have compiled optcd as a module, you can load it with - # insmod /usr/src/linux/modules/optcd.o -or - # insmod /usr/src/linux/modules/optcd.o optcd=0x340 -with the matching address value of your interface card. - -The driver employs a number of buffers to do read-ahead and block size -conversion. The number of buffers is configurable in optcd.h, and has -influence on the driver performance. For my machine (a P75), 6 buffers -seems optimal, as can be seen from this table: - -#bufs kb/s %cpu -1 97 0.1 -2 191 0.3 -3 188 0.2 -4 246 0.3 -5 189 19 -6 280 0.4 -7 281 7.0 -8 246 2.8 -16 281 3.4 - -If you get a throughput significantly below 300 kb/s, try tweaking -N_BUFS, and don't forget to mail me your results! - -I'd appreciate success/failure reports. If you find a bug, try -recompiling the driver with some strategically chosen debug options -(these can be found in optcd.h) and include the messages generated in -your bug report. Good luck. - -Leo Spiekman (spiekman@dutette.et.tudelft.nl) diff --git a/Documentation/cdrom/sbpcd b/Documentation/cdrom/sbpcd deleted file mode 100644 index b3ba63f4ce3e..000000000000 --- a/Documentation/cdrom/sbpcd +++ /dev/null @@ -1,1061 +0,0 @@ -This README belongs to release 4.2 or newer of the SoundBlaster Pro -(Matsushita, Kotobuki, Panasonic, CreativeLabs, Longshine and Teac) -CD-ROM driver for Linux. - -sbpcd really, really is NOT for ANY IDE/ATAPI drive! -Not even if you have an "original" SoundBlaster card with an IDE interface! -So, you'd better have a look into README.ide if your port address is 0x1F0, -0x170, 0x1E8, 0x168 or similar. -I get tons of mails from IDE/ATAPI drive users - I really can't continue -any more to answer them all. So, if your drive/interface information sheets -mention "IDE" (primary, secondary, tertiary, quaternary) and the DOS driver -invoking line within your CONFIG.SYS is using an address below 0x230: -DON'T ROB MY LAST NERVE - jumper your interface to address 0x170 and IRQ 15 -(that is the "secondary IDE" configuration), set your drive to "master" and -use ide-cd as your driver. If you do not have a second IDE hard disk, use the -LILO commands - hdb=noprobe hdc=cdrom -and get lucky. -To make it fully clear to you: if you mail me about IDE/ATAPI drive problems, -my answer is above, and I simply will discard your mail, hoping to stop the -flood and to find time to lead my 12-year old son towards happy computing. - -The driver is able to drive the whole family of "traditional" AT-style (that -is NOT the new "Enhanced IDE" or "ATAPI" drive standard) Matsushita, -Kotobuki, Panasonic drives, sometimes labelled as "CreativeLabs". The -well-known drives are CR-521, CR-522, CR-523, CR-562, CR-563. -CR-574 is an IDE/ATAPI drive. - -The Longshine LCS-7260 is a double-speed drive which uses the "old" -Matsushita command set. It is supported - with help by Serge Robyns. -Vertos ("Elitegroup Computer Systems", ECS) has a similar drive - support -has started; get in contact if you have such a "Vertos 100" or "ECS-AT" -drive. - -There exists an "IBM External ISA CD-ROM Drive" which in fact is a CR-563 -with a special controller board. This drive is supported (the interface is -of the "LaserMate" type), and it is possibly the best buy today (cheaper than -an internal drive, and you can use it as an internal, too - e.g. plug it into -a soundcard). - -CreativeLabs has a new drive "CD200" and a similar drive "CD200F". The latter -is made by Funai and sometimes named "E2550UA", newer models may be named -"MK4015". The CD200F drives should fully work. -CD200 drives without "F" are still giving problems: drive detection and -playing audio should work, data access will result in errors. I need qualified -feedback about the bugs within the data functions or a drive (I never saw a -CD200). - -The quad-speed Teac CD-55A drive is supported, but still does not reach "full -speed". The data rate already reaches 500 kB/sec if you set SBP_BUFFER_FRAMES -to 64 (it is not recommended to do that for normal "file access" usage, but it -can speed up things a lot if you use something like "dd" to read from the -drive; I use it for verifying self-written CDs this way). -The drive itself is able to deliver 600 kB/sec, so this needs -work; with the normal setup, the performance currently is not even as good as -double-speed. - -This driver is NOT for Mitsumi or Sony or Aztech or Philips or XXX drives, -and again: this driver is in no way usable for any IDE/ATAPI drive. If you -think your drive should work and it doesn't: send me the DOS driver for your -beast (gzipped + uuencoded) and your CONFIG.SYS if you want to ask me for help, -and include an original log message excerpt, and try to give all information -a complete idiot needs to understand your hassle already with your first -mail. And if you want to say "as I have mailed you before", be sure that I -don't remember your "case" by such remarks; at the moment, I have some -hundreds of open correspondences about Linux CDROM questions (hope to reduce if -the IDE/ATAPI user questions disappear). - - -This driver will work with the soundcard interfaces (SB Pro, SB 16, Galaxy, -SoundFX, Mozart, MAD16 ...) and with the "no-sound" cards (Panasonic CI-101P, -LaserMate, WDH-7001C, Longshine LCS-6853, Teac ...). - -It works with the "configurable" interface "Sequoia S-1000", too, which is -used on the Spea Media FX and Ensonic Soundscape sound cards. You have to -specify the type "SBPRO 2" and the true CDROM port address with it, not the -"configuration port" address. - -If you have a sound card which needs a "configuration driver" instead of -jumpers for interface types and addresses (like Mozart cards) - those -drivers get invoked before the DOS CDROM driver in your CONFIG.SYS, typical -names are "cdsetup.sys" and "mztinit.sys" - let the sound driver do the -CDROM port configuration (the leading comments in linux/drivers/sound/mad16.c -are just for you!). Hannu Savolainen's mad16.c code is able to set up my -Mozart card - I simply had to add - #define MAD16_CONF 0x06 - #define MAD16_CDSEL 0x03 -to configure the CDROM interface for type "Panasonic" (LaserMate) and address -0x340. - -The interface type has to get configured in linux/drivers/cdrom/sbpcd.h, -because the register layout is different between the "SoundBlaster" and the -"LaserMate" type. - -I got a report that the Teac interface card "I/F E117098" is of type -"SoundBlaster" (i.e. you have to set SBPRO to 1) even with the addresses -0x300 and above. This is unusual, and it can't get covered by the auto -probing scheme. -The Teac 16-bit interface cards (like P/N E950228-00A, default address 0x2C0) -need the SBPRO 3 setup. - -If auto-probing found the drive, the address is correct. The reported type -may be wrong. A "mount" will give success only if the interface type is set -right. Playing audio should work with a wrong set interface type, too. - -With some Teac and some CD200 drives I have seen interface cards which seem -to lack the "drive select" lines; always drive 0 gets addressed. To avoid -"mirror drives" (four drives detected where you only have one) with such -interface cards, set MAX_DRIVES to 1 and jumper your drive to ID 0 (if -possible). - - -Up to 4 drives per interface card, and up to 4 interface cards are supported. -All supported drive families can be mixed, but the CR-521 drives are -hard-wired to drive ID 0. The drives have to use different drive IDs, and each -drive has to get a unique minor number (0...3), corresponding indirectly to -its drive ID. -The drive IDs may be selected freely from 0 to 3 - they do not have to be in -consecutive order. - -As Don Carroll, don@ds9.us.dell.com or FIDO 1:382/14, told me, it is possible -to change old drives to any ID, too. He writes in this sense: - "In order to be able to use more than one single speed drive - (they do not have the ID jumpers) you must add a DIP switch - and two resistors. The pads are already on the board next to - the power connector. You will see the silkscreen for the - switch if you remove the top cover. - 1 2 3 4 - ID 0 = x F F x O = "on" - ID 1 = x O F x F = "off" - ID 2 = x F O x x = "don't care" - ID 3 = x O O x - Next to the switch are the positions for R76 (7k) and R78 - (12k). I had to play around with the resistor values - ID 3 - did not work with other values. If the values are not good, - ID 3 behaves like ID 0." - -To use more than 4 drives, you simply need a second controller card at a -different address and a second cable. - -The driver supports reading of data from the CD and playing of audio tracks. -The audio part should run with WorkMan, xcdplayer, with the "non-X11" products -CDplayer and WorkBone - tell me if it is not compatible with other software. -The only accepted measure for correctness with the audio functions is the -"cdtester" utility (appended) - most audio player programmers seem to be -better musicians than programmers. ;-) - -With the CR-56x and the CD200 drives, the reading of audio frames is possible. -This is implemented by an IOCTL function which reads READ_AUDIO frames of -2352 bytes at once (configurable with the "READ_AUDIO" define, default is 0). -Reading the same frame a second time gives different data; the frame data -start at a different position, but all read bytes are valid, and we always -read 98 consecutive chunks (of 24 Bytes) as a frame. Reading more than 1 frame -at once possibly misses some chunks at each frame boundary. This lack has to -get corrected by external, "higher level" software which reads the same frame -again and tries to find and eliminate overlapping chunks (24-byte-pieces). - -The transfer rate with reading audio (1-frame-pieces) currently is very slow. -This can be better reading bigger chunks, but the "missing" chunks possibly -occur at the beginning of each single frame. -The software interface possibly may change a bit the day the SCSI driver -supports it too. - -With all but the CR-52x drives, MultiSession is supported. -Photo CDs work (the "old" drives like CR-521 can access only the first -session of a photoCD). -At ftp.gwdg.de:/pub/linux/hpcdtoppm/ you will find Hadmut Danisch's package to -convert photo CD image files and Gerd Knorr's viewing utility. - -The transfer rate will reach 150 kB/sec with CR-52x drives, 300 kB/sec with -CR-56x drives, and currently not more than 500 kB/sec (usually less than -250 kB/sec) with the Teac quad speed drives. -XA (PhotoCD) disks with "old" drives give only 50 kB/sec. - -This release consists of -- this README file -- the driver file linux/drivers/cdrom/sbpcd.c -- the stub files linux/drivers/cdrom/sbpcd[234].c -- the header file linux/drivers/cdrom/sbpcd.h. - - -To install: ------------ - -1. Setup your hardware parameters. Though the driver does "auto-probing" at a - lot of (not all possible!) addresses, this step is recommended for - everyday use. You should let sbpcd auto-probe once and use the reported - address if a drive got found. The reported type may be incorrect; it is - correct if you can mount a data CD. There is no choice for you with the - type; only one is right, the others are deadly wrong. - - a. Go into /usr/src/linux/drivers/cdrom/sbpcd.h and configure it for your - hardware (near the beginning): - a1. Set it up for the appropriate type of interface board. - "Original" CreativeLabs sound cards need "SBPRO 1". - Most "compatible" sound cards (almost all "non-CreativeLabs" cards) - need "SBPRO 0". - The "no-sound" board from OmniCd needs the "SBPRO 1" setup. - The Teac 8-bit "no-sound" boards need the "SBPRO 1" setup. - The Teac 16-bit "no-sound" boards need the "SBPRO 3" setup. - All other "no-sound" boards need the "SBPRO 0" setup. - The Spea Media FX and Ensoniq SoundScape cards need "SBPRO 2". - sbpcd.c holds some examples in its auto-probe list. - If you configure "SBPRO" wrong, the playing of audio CDs will work, - but you will not be able to mount a data CD. - a2. Tell the address of your CDROM_PORT (not of the sound port). - a3. If 4 drives get found, but you have only one, set MAX_DRIVES to 1. - a4. Set DISTRIBUTION to 0. - b. Additionally for 2.a1 and 2.a2, the setup may be done during - boot time (via the "kernel command line" or "LILO option"): - sbpcd=0x320,LaserMate - or - sbpcd=0x230,SoundBlaster - or - sbpcd=0x338,SoundScape - or - sbpcd=0x2C0,Teac16bit - This is especially useful if you install a fresh distribution. - If the second parameter is a number, it gets taken as the type - setting; 0 is "LaserMate", 1 is "SoundBlaster", 2 is "SoundScape", - 3 is "Teac16bit". - So, for example - sbpcd=0x230,1 - is equivalent to - sbpcd=0x230,SoundBlaster - -2. "cd /usr/src/linux" and do a "make config" and select "y" for Matsushita - CD-ROM support and for ISO9660 FileSystem support. If you do not have a - second, third, or fourth controller installed, do not say "y" to the - secondary Matsushita CD-ROM questions. - -3. Then make the kernel image ("make zlilo" or similar). - -4. Make the device file(s). This step usually already has been done by the - MAKEDEV script. - The driver uses MAJOR 25, so, if necessary, do - mknod /dev/sbpcd b 25 0 (if you have only one drive) - and/or - mknod /dev/sbpcd0 b 25 0 - mknod /dev/sbpcd1 b 25 1 - mknod /dev/sbpcd2 b 25 2 - mknod /dev/sbpcd3 b 25 3 - to make the node(s). - - The "first found" drive gets MINOR 0 (regardless of its jumpered ID), the - "next found" (at the same cable) gets MINOR 1, ... - - For a second interface board, you have to make nodes like - mknod /dev/sbpcd4 b 26 0 - mknod /dev/sbpcd5 b 26 1 - and so on. Use the MAJORs 26, 27, 28. - - If you further make a link like - ln -s sbpcd /dev/cdrom - you can use the name /dev/cdrom, too. - -5. Reboot with the new kernel. - -You should now be able to do - mkdir /CD -and - mount -rt iso9660 /dev/sbpcd /CD -or - mount -rt iso9660 -o block=2048 /dev/sbpcd /CD -and see the contents of your CD in the /CD directory. -To use audio CDs, a mounting is not recommended (and it would fail if the -first track is not a data track). - - -Using sbpcd as a "loadable module": ------------------------------------ - -If you do NOT select "Matsushita/Panasonic CDROM driver support" during the -"make config" of your kernel, you can build the "loadable module" sbpcd.o. - -If sbpcd gets used as a module, the support of more than one interface -card (i.e. drives 4...15) is disabled. - -You can specify interface address and type with the "insmod" command like: - # insmod /usr/src/linux/modules/sbpcd.o sbpcd=0x340,0 -or - # insmod /usr/src/linux/modules/sbpcd.o sbpcd=0x230,1 -or - # insmod /usr/src/linux/modules/sbpcd.o sbpcd=0x338,2 -where the last number represents the SBPRO setting (no strings allowed here). - - -Things of interest: -------------------- - -The driver is configured to try the LaserMate type of interface at I/O port -0x0340 first. If this is not appropriate, sbpcd.h should get changed -(you will find the right place - just at the beginning). - -No DMA and no IRQ is used. - -To reduce or increase the amount of kernel messages, edit sbpcd.c and play -with the "DBG_xxx" switches (initialization of the variable "sbpcd_debug"). -Don't forget to reflect on what you do; enabling all DBG_xxx switches at once -may crash your system, and each message line is accompanied by a delay. - -The driver uses the "variable BLOCK_SIZE" feature. To use it, you have to -specify "block=2048" as a mount option. Doing this will disable the direct -execution of a binary from the CD; you have to copy it to a device with the -standard BLOCK_SIZE (1024) first. So, do not use this if your system is -directly "running from the CDROM" (like some of Yggdrasil's installation -variants). There are CDs on the market (like the German "unifix" Linux -distribution) which MUST get handled with a block_size of 1024. Generally, -one can say all the CDs which hold files of the name YMTRANS.TBL are defective; -do not use block=2048 with those. - -Within sbpcd.h, you will find some "#define"s (e.g. EJECT and JUKEBOX). With -these, you can configure the driver for some special things. -You can use the appended program "cdtester" to set the auto-eject feature -during runtime. Jeff Tranter's "eject" utility can do this, too (and more) -for you. - -There is an ioctl CDROMMULTISESSION to obtain with a user program if -the CD is an XA disk and - if it is - where the last session starts. The -"cdtester" program illustrates how to call it. - - -Auto-probing at boot time: --------------------------- - -The driver does auto-probing at many well-known interface card addresses, -but not all: -Some probings can cause a hang if an NE2000 ethernet card gets touched, because -SBPCD's auto-probing happens before the initialization of the net drivers. -Those "hazardous" addresses are excluded from auto-probing; the "kernel -command line" feature has to be used during installation if you have your -drive at those addresses. The "module" version is allowed to probe at those -addresses, too. - -The auto-probing looks first at the configured address resp. the address -submitted by the kernel command line. With this, it is possible to use this -driver within installation boot floppies, and for any non-standard address, -too. - -Auto-probing will make an assumption about the interface type ("SBPRO" or not), -based upon the address. That assumption may be wrong (initialization will be -o.k., but you will get I/O errors during mount). In that case, use the "kernel -command line" feature and specify address & type at boot time to find out the -right setup. - -For everyday use, address and type should get configured within sbpcd.h. That -will stop the auto-probing due to success with the first try. - -The kernel command "sbpcd=0" suppresses each auto-probing and causes -the driver not to find any drive; it is meant for people who love sbpcd -so much that they do not want to miss it, even if they miss the drives. ;-) - -If you configure "#define CDROM_PORT 0" in sbpcd.h, the auto-probing is -initially disabled and needs an explicit kernel command to get activated. -Once activated, it does not stop before success or end-of-list. This may be -useful within "universal" CDROM installation boot floppies (but using the -loadable module would be better because it allows an "extended" auto-probing -without fearing NE2000 cards). - -To shorten the auto-probing list to a single entry, set DISTRIBUTION 0 within -sbpcd.h. - - -Setting up address and interface type: --------------------------------------- - -If your I/O port address is not 0x340, you have to look for the #defines near -the beginning of sbpcd.h and configure them: set SBPRO to 0 or 1 or 2, and -change CDROM_PORT to the address of your CDROM I/O port. - -Almost all of the "SoundBlaster compatible" cards behave like the no-sound -interfaces, i.e. need SBPRO 0! - -With "original" SB Pro cards, an initial setting of CD_volume through the -sound card's MIXER register gets done. -If you are using a "compatible" sound card of types "LaserMate" or "SPEA", -you can set SOUND_BASE (in sbpcd.h) to get it done with your card, too... - - -Using audio CDs: ----------------- - -Workman, WorkBone, xcdplayer, cdplayer and the nice little tool "cdplay" (see -README.aztcd from the Aztech driver package) should work. - -The program CDplayer likes to talk to "/dev/mcd" only, xcdplayer wants -"/dev/rsr0", workman loves "/dev/sr0" or "/dev/cdrom" - so, make the -appropriate links to use them without the need to supply parameters. - - -Copying audio tracks: ---------------------- - -The following program will copy track 1 (or a piece of it) from an audio CD -into the file "track01": - -/*=================== begin program ========================================*/ -/* - * read an audio track from a CD - * - * (c) 1994 Eberhard Moenkeberg - * may be used & enhanced freely - * - * Due to non-existent sync bytes at the beginning of each audio frame (or due - * to a firmware bug within all known drives?), it is currently a kind of - * fortune if two consecutive frames fit together. - * Usually, they overlap, or a little piece is missing. This happens in units - * of 24-byte chunks. It has to get fixed by higher-level software (reading - * until an overlap occurs, and then eliminate the overlapping chunks). - * ftp.gwdg.de:/pub/linux/misc/cdda2wav-sbpcd.*.tar.gz holds an example of - * such an algorithm. - * This example program further is missing to obtain the SubChannel data - * which belong to each frame. - * - * This is only an example of the low-level access routine. The read data are - * pure 16-bit CDDA values; they have to get converted to make sound out of - * them. - * It is no fun to listen to it without prior overlap/underlap correction! - */ -#include -#include -#include -#include - -static struct cdrom_tochdr hdr; -static struct cdrom_tocentry entry[101]; -static struct cdrom_read_audio arg; -static u_char buffer[CD_FRAMESIZE_RAW]; -static int datafile, drive; -static int i, j, limit, track, err; -static char filename[32]; - -int main(int argc, char *argv[]) -{ -/* - * open /dev/cdrom - */ - drive=open("/dev/cdrom", 0); - if (drive<0) - { - fprintf(stderr, "can't open drive.\n"); - exit (-1); - } -/* - * get TocHeader - */ - fprintf(stdout, "getting TocHeader...\n"); - err=ioctl(drive, CDROMREADTOCHDR, &hdr); - if (err!=0) - { - fprintf(stderr, "can't get TocHeader (error %d).\n", err); - exit (-1); - } - else - fprintf(stdout, "TocHeader: %d %d\n", hdr.cdth_trk0, hdr.cdth_trk1); -/* - * get and display all TocEntries - */ - fprintf(stdout, "getting TocEntries...\n"); - for (i=1;i<=hdr.cdth_trk1+1;i++) - { - if (i!=hdr.cdth_trk1+1) entry[i].cdte_track = i; - else entry[i].cdte_track = CDROM_LEADOUT; - entry[i].cdte_format = CDROM_LBA; - err=ioctl(drive, CDROMREADTOCENTRY, &entry[i]); - if (err!=0) - { - fprintf(stderr, "can't get TocEntry #%d (error %d).\n", i, err); - exit (-1); - } - else - { - fprintf(stdout, "TocEntry #%d: %1X %1X %06X %02X\n", - entry[i].cdte_track, - entry[i].cdte_adr, - entry[i].cdte_ctrl, - entry[i].cdte_addr.lba, - entry[i].cdte_datamode); - } - } - fprintf(stdout, "got all TocEntries.\n"); -/* - * ask for track number (not implemented here) - */ -track=1; -#if 0 /* just read a little piece (4 seconds) */ -entry[track+1].cdte_addr.lba=entry[track].cdte_addr.lba+300; -#endif -/* - * read track into file - */ - sprintf(filename, "track%02d\0", track); - datafile=creat(filename, 0755); - if (datafile<0) - { - fprintf(stderr, "can't open datafile %s.\n", filename); - exit (-1); - } - arg.addr.lba=entry[track].cdte_addr.lba; - arg.addr_format=CDROM_LBA; /* CDROM_MSF would be possible here, too. */ - arg.nframes=1; - arg.buf=&buffer[0]; - limit=entry[track+1].cdte_addr.lba; - for (;arg.addr.lba - * published under the GPL - * - * made under heavy use of the "Tiny Audio CD Player" - * from Werner Zimmermann - * (see linux/drivers/block/README.aztcd) - */ -#undef AZT_PRIVATE_IOCTLS /* not supported by every CDROM driver */ -#define SBP_PRIVATE_IOCTLS /* not supported by every CDROM driver */ - -#include -#include -#include -#include -#include -#include - -#ifdef AZT_PRIVATE_IOCTLS -#include -#endif /* AZT_PRIVATE_IOCTLS */ -#ifdef SBP_PRIVATE_IOCTLS -#include -#include -#endif /* SBP_PRIVATE_IOCTLS */ - -struct cdrom_tochdr hdr; -struct cdrom_tochdr tocHdr; -struct cdrom_tocentry TocEntry[101]; -struct cdrom_tocentry entry; -struct cdrom_multisession ms_info; -struct cdrom_read_audio read_audio; -struct cdrom_ti ti; -struct cdrom_subchnl subchnl; -struct cdrom_msf msf; -struct cdrom_volctrl volctrl; -#ifdef AZT_PRIVATE_IOCTLS -union -{ - struct cdrom_msf msf; - unsigned char buf[CD_FRAMESIZE_RAW]; -} azt; -#endif /* AZT_PRIVATE_IOCTLS */ -int i, i1, i2, i3, j, k; -unsigned char sequence=0; -unsigned char command[80]; -unsigned char first=1, last=1; -char *default_device="/dev/cdrom"; -char dev[20]; -char filename[20]; -int drive; -int datafile; -int rc; - -void help(void) -{ - printf("Available Commands:\n"); - printf("STOP s EJECT e QUIT q\n"); - printf("PLAY TRACK t PAUSE p RESUME r\n"); - printf("NEXT TRACK n REPEAT LAST l HELP h\n"); - printf("SUBCHANNEL_Q c TRACK INFO i PLAY AT a\n"); - printf("READ d READ RAW w READ AUDIO A\n"); - printf("MS-INFO M TOC T START S\n"); - printf("SET EJECTSW X DEVICE D DEBUG Y\n"); - printf("AUDIO_BUFSIZ Z RESET R SET VOLUME v\n"); - printf("GET VOLUME V\n"); -} - -/* - * convert MSF number (3 bytes only) to Logical_Block_Address - */ -int msf2lba(u_char *msf) -{ - int i; - - i=(msf[0] * CD_SECS + msf[1]) * CD_FRAMES + msf[2] - CD_BLOCK_OFFSET; - if (i<0) return (0); - return (i); -} -/* - * convert logical_block_address to m-s-f_number (3 bytes only) - */ -void lba2msf(int lba, unsigned char *msf) -{ - lba += CD_BLOCK_OFFSET; - msf[0] = lba / (CD_SECS*CD_FRAMES); - lba %= CD_SECS*CD_FRAMES; - msf[1] = lba / CD_FRAMES; - msf[2] = lba % CD_FRAMES; -} - -int init_drive(char *dev) -{ - unsigned char msf_ent[3]; - - /* - * open the device - */ - drive=open(dev,0); - if (drive<0) return (-1); - /* - * get TocHeader - */ - printf("getting TocHeader...\n"); - rc=ioctl(drive,CDROMREADTOCHDR,&hdr); - if (rc!=0) - { - printf("can't get TocHeader (error %d).\n",rc); - return (-2); - } - else - first=hdr.cdth_trk0; - last=hdr.cdth_trk1; - printf("TocHeader: %d %d\n",hdr.cdth_trk0,hdr.cdth_trk1); - /* - * get and display all TocEntries - */ - printf("getting TocEntries...\n"); - for (i=1;i<=hdr.cdth_trk1+1;i++) - { - if (i!=hdr.cdth_trk1+1) TocEntry[i].cdte_track = i; - else TocEntry[i].cdte_track = CDROM_LEADOUT; - TocEntry[i].cdte_format = CDROM_LBA; - rc=ioctl(drive,CDROMREADTOCENTRY,&TocEntry[i]); - if (rc!=0) - { - printf("can't get TocEntry #%d (error %d).\n",i,rc); - } - else - { - lba2msf(TocEntry[i].cdte_addr.lba,&msf_ent[0]); - if (TocEntry[i].cdte_track==CDROM_LEADOUT) - { - printf("TocEntry #%02X: %1X %1X %02d:%02d:%02d (lba: 0x%06X) %02X\n", - TocEntry[i].cdte_track, - TocEntry[i].cdte_adr, - TocEntry[i].cdte_ctrl, - msf_ent[0], - msf_ent[1], - msf_ent[2], - TocEntry[i].cdte_addr.lba, - TocEntry[i].cdte_datamode); - } - else - { - printf("TocEntry #%02d: %1X %1X %02d:%02d:%02d (lba: 0x%06X) %02X\n", - TocEntry[i].cdte_track, - TocEntry[i].cdte_adr, - TocEntry[i].cdte_ctrl, - msf_ent[0], - msf_ent[1], - msf_ent[2], - TocEntry[i].cdte_addr.lba, - TocEntry[i].cdte_datamode); - } - } - } - return (hdr.cdth_trk1); /* number of tracks */ -} - -void display(int size,unsigned char *buffer) -{ - k=0; - getchar(); - for (i=0;i<(size+1)/16;i++) - { - printf("%4d:",i*16); - for (j=0;j<16;j++) - { - printf(" %02X",buffer[i*16+j]); - } - printf(" "); - for (j=0;j<16;j++) - { - if (isalnum(buffer[i*16+j])) - printf("%c",buffer[i*16+j]); - else - printf("."); - } - printf("\n"); - k++; - if (k>=20) - { - printf("press ENTER to continue\n"); - getchar(); - k=0; - } - } -} - -int main(int argc, char *argv[]) -{ - printf("\nTesting tool for a CDROM driver's audio functions V0.1\n"); - printf("(C) 1995 Eberhard Moenkeberg \n"); - printf("initializing...\n"); - - rc=init_drive(default_device); - if (rc<0) printf("could not open %s (rc=%d).\n",default_device,rc); - help(); - while (1) - { - printf("Give a one-letter command (h = help): "); - scanf("%s",command); - command[1]=0; - switch (command[0]) - { - case 'D': - printf("device name (f.e. /dev/sbpcd3): ? "); - scanf("%s",&dev); - close(drive); - rc=init_drive(dev); - if (rc<0) printf("could not open %s (rc %d).\n",dev,rc); - break; - case 'e': - rc=ioctl(drive,CDROMEJECT); - if (rc<0) printf("CDROMEJECT: rc=%d.\n",rc); - break; - case 'p': - rc=ioctl(drive,CDROMPAUSE); - if (rc<0) printf("CDROMPAUSE: rc=%d.\n",rc); - break; - case 'r': - rc=ioctl(drive,CDROMRESUME); - if (rc<0) printf("CDROMRESUME: rc=%d.\n",rc); - break; - case 's': - rc=ioctl(drive,CDROMSTOP); - if (rc<0) printf("CDROMSTOP: rc=%d.\n",rc); - break; - case 'S': - rc=ioctl(drive,CDROMSTART); - if (rc<0) printf("CDROMSTART: rc=%d.\n",rc); - break; - case 't': - rc=ioctl(drive,CDROMREADTOCHDR,&tocHdr); - if (rc<0) - { - printf("CDROMREADTOCHDR: rc=%d.\n",rc); - break; - } - first=tocHdr.cdth_trk0; - last= tocHdr.cdth_trk1; - if ((first==0)||(first>last)) - { - printf ("--got invalid TOC data.\n"); - } - else - { - printf("--enter track number(first=%d, last=%d): ",first,last); - scanf("%d",&i1); - ti.cdti_trk0=i1; - if (ti.cdti_trk0last) ti.cdti_trk0=last; - ti.cdti_ind0=0; - ti.cdti_trk1=last; - ti.cdti_ind1=0; - rc=ioctl(drive,CDROMSTOP); - rc=ioctl(drive,CDROMPLAYTRKIND,&ti); - if (rc<0) printf("CDROMPLAYTRKIND: rc=%d.\n",rc); - } - break; - case 'n': - rc=ioctl(drive,CDROMSTOP); - if (++ti.cdti_trk0>last) ti.cdti_trk0=last; - ti.cdti_ind0=0; - ti.cdti_trk1=last; - ti.cdti_ind1=0; - rc=ioctl(drive,CDROMPLAYTRKIND,&ti); - if (rc<0) printf("CDROMPLAYTRKIND: rc=%d.\n",rc); - break; - case 'l': - rc=ioctl(drive,CDROMSTOP); - if (--ti.cdti_trk0last) entry.cdte_track=last; - entry.cdte_format=CDROM_MSF; - rc=ioctl(drive,CDROMREADTOCENTRY,&entry); - if (rc<0) printf("CDROMREADTOCENTRY: rc=%d.\n",rc); - else - { - printf("Mode %d Track, starts at %02d:%02d:%02d\n", - entry.cdte_adr, - entry.cdte_addr.msf.minute, - entry.cdte_addr.msf.second, - entry.cdte_addr.msf.frame); - } - break; - case 'a': - printf("Address (min:sec:frm) "); - scanf("%d:%d:%d",&i1,&i2,&i3); - msf.cdmsf_min0=i1; - msf.cdmsf_sec0=i2; - msf.cdmsf_frame0=i3; - if (msf.cdmsf_sec0>59) msf.cdmsf_sec0=59; - if (msf.cdmsf_frame0>74) msf.cdmsf_frame0=74; - lba2msf(TocEntry[last+1].cdte_addr.lba-1,&msf.cdmsf_min1); - rc=ioctl(drive,CDROMSTOP); - rc=ioctl(drive,CDROMPLAYMSF,&msf); - if (rc<0) printf("CDROMPLAYMSF: rc=%d.\n",rc); - break; - case 'V': - rc=ioctl(drive,CDROMVOLREAD,&volctrl); - if (rc<0) printf("CDROMVOLCTRL: rc=%d.\n",rc); - printf("Volume: channel 0 (left) %d, channel 1 (right) %d\n",volctrl.channel0,volctrl.channel1); - break; - case 'R': - rc=ioctl(drive,CDROMRESET); - if (rc<0) printf("CDROMRESET: rc=%d.\n",rc); - break; -#ifdef AZT_PRIVATE_IOCTLS /*not supported by every CDROM driver*/ - case 'd': - printf("Address (min:sec:frm) "); - scanf("%d:%d:%d",&i1,&i2,&i3); - azt.msf.cdmsf_min0=i1; - azt.msf.cdmsf_sec0=i2; - azt.msf.cdmsf_frame0=i3; - if (azt.msf.cdmsf_sec0>59) azt.msf.cdmsf_sec0=59; - if (azt.msf.cdmsf_frame0>74) azt.msf.cdmsf_frame0=74; - rc=ioctl(drive,CDROMREADMODE1,&azt.msf); - if (rc<0) printf("CDROMREADMODE1: rc=%d.\n",rc); - else display(CD_FRAMESIZE,azt.buf); - break; - case 'w': - printf("Address (min:sec:frame) "); - scanf("%d:%d:%d",&i1,&i2,&i3); - azt.msf.cdmsf_min0=i1; - azt.msf.cdmsf_sec0=i2; - azt.msf.cdmsf_frame0=i3; - if (azt.msf.cdmsf_sec0>59) azt.msf.cdmsf_sec0=59; - if (azt.msf.cdmsf_frame0>74) azt.msf.cdmsf_frame0=74; - rc=ioctl(drive,CDROMREADMODE2,&azt.msf); - if (rc<0) printf("CDROMREADMODE2: rc=%d.\n",rc); - else display(CD_FRAMESIZE_RAW,azt.buf); /* currently only 2336 */ - break; -#endif - case 'v': - printf("--Channel 0 (Left) (0-255): "); - scanf("%d",&i1); - volctrl.channel0=i1; - printf("--Channel 1 (Right) (0-255): "); - scanf("%d",&i1); - volctrl.channel1=i1; - volctrl.channel2=0; - volctrl.channel3=0; - rc=ioctl(drive,CDROMVOLCTRL,&volctrl); - if (rc<0) printf("CDROMVOLCTRL: rc=%d.\n",rc); - break; - case 'q': - close(drive); - exit(0); - case 'h': - help(); - break; - case 'T': /* display TOC entry - without involving the driver */ - scanf("%d",&i); - if ((ihdr.cdth_trk1)) - printf("invalid track number.\n"); - else - printf("TocEntry %02d: adr=%01X ctrl=%01X msf=%02d:%02d:%02d mode=%02X\n", - TocEntry[i].cdte_track, - TocEntry[i].cdte_adr, - TocEntry[i].cdte_ctrl, - TocEntry[i].cdte_addr.msf.minute, - TocEntry[i].cdte_addr.msf.second, - TocEntry[i].cdte_addr.msf.frame, - TocEntry[i].cdte_datamode); - break; - case 'A': /* read audio data into file */ - printf("Address (min:sec:frm) ? "); - scanf("%d:%d:%d",&i1,&i2,&i3); - read_audio.addr.msf.minute=i1; - read_audio.addr.msf.second=i2; - read_audio.addr.msf.frame=i3; - read_audio.addr_format=CDROM_MSF; - printf("# of frames ? "); - scanf("%d",&i1); - read_audio.nframes=i1; - k=read_audio.nframes*CD_FRAMESIZE_RAW; - read_audio.buf=malloc(k); - if (read_audio.buf==NULL) - { - printf("can't malloc %d bytes.\n",k); - break; - } - sprintf(filename,"audio_%02d%02d%02d_%02d.%02d\0", - read_audio.addr.msf.minute, - read_audio.addr.msf.second, - read_audio.addr.msf.frame, - read_audio.nframes, - ++sequence); - datafile=creat(filename, 0755); - if (datafile<0) - { - printf("can't open datafile %s.\n",filename); - break; - } - rc=ioctl(drive,CDROMREADAUDIO,&read_audio); - if (rc!=0) - { - printf("CDROMREADAUDIO: rc=%d.\n",rc); - } - else - { - rc=write(datafile,&read_audio.buf,k); - if (rc!=k) printf("datafile I/O error (%d).\n",rc); - } - close(datafile); - break; - case 'X': /* set EJECT_SW (0: disable, 1: enable auto-ejecting) */ - scanf("%d",&i); - rc=ioctl(drive,CDROMEJECT_SW,i); - if (rc!=0) - printf("CDROMEJECT_SW: rc=%d.\n",rc); - else - printf("EJECT_SW set to %d\n",i); - break; - case 'M': /* get the multisession redirection info */ - ms_info.addr_format=CDROM_LBA; - rc=ioctl(drive,CDROMMULTISESSION,&ms_info); - if (rc!=0) - { - printf("CDROMMULTISESSION(lba): rc=%d.\n",rc); - } - else - { - if (ms_info.xa_flag) printf("MultiSession offset (lba): %d (0x%06X)\n",ms_info.addr.lba,ms_info.addr.lba); - else - { - printf("this CD is not an XA disk.\n"); - break; - } - } - ms_info.addr_format=CDROM_MSF; - rc=ioctl(drive,CDROMMULTISESSION,&ms_info); - if (rc!=0) - { - printf("CDROMMULTISESSION(msf): rc=%d.\n",rc); - } - else - { - if (ms_info.xa_flag) - printf("MultiSession offset (msf): %02d:%02d:%02d (0x%02X%02X%02X)\n", - ms_info.addr.msf.minute, - ms_info.addr.msf.second, - ms_info.addr.msf.frame, - ms_info.addr.msf.minute, - ms_info.addr.msf.second, - ms_info.addr.msf.frame); - else printf("this CD is not an XA disk.\n"); - } - break; -#ifdef SBP_PRIVATE_IOCTLS - case 'Y': /* set the driver's message level */ -#if 0 /* not implemented yet */ - printf("enter switch name (f.e. DBG_CMD): "); - scanf("%s",&dbg_switch); - j=get_dbg_num(dbg_switch); -#else - printf("enter DDIOCSDBG switch number: "); - scanf("%d",&j); -#endif - printf("enter 0 for \"off\", 1 for \"on\": "); - scanf("%d",&i); - if (i==0) j|=0x80; - printf("calling \"ioctl(drive,DDIOCSDBG,%d)\"\n",j); - rc=ioctl(drive,DDIOCSDBG,j); - printf("DDIOCSDBG: rc=%d.\n",rc); - break; - case 'Z': /* set the audio buffer size */ - printf("# frames wanted: ? "); - scanf("%d",&j); - rc=ioctl(drive,CDROMAUDIOBUFSIZ,j); - printf("%d frames granted.\n",rc); - break; -#endif /* SBP_PRIVATE_IOCTLS */ - default: - printf("unknown command: \"%s\".\n",command); - break; - } - } - return 0; -} -/*==========================================================================*/ - diff --git a/Documentation/cdrom/sjcd b/Documentation/cdrom/sjcd deleted file mode 100644 index 74a14847b93a..000000000000 --- a/Documentation/cdrom/sjcd +++ /dev/null @@ -1,60 +0,0 @@ - -- Documentation/cdrom/sjcd - 80% of the work takes 20% of the time, - 20% of the work takes 80% of the time... - (Murphy's law) - - Once started, training can not be stopped... - (Star Wars) - -This is the README for the sjcd cdrom driver, version 1.6. - -This file is meant as a tips & tricks edge for the usage of the SANYO CDR-H94A -cdrom drive. It will grow as the questions arise. ;-) -For info on configuring the ISP16 sound card look at Documentation/cdrom/isp16. - -The driver should work with any of the Panasonic, Sony or Mitsumi style -CDROM interfaces. -The cdrom interface on Media Magic's soft configurable sound card ISP16, -which used to be included in the driver, is now supported in a separate module. -This initialisation module will probably also work with other interfaces -based on an OPTi 82C928 or 82C929 chip (like MAD16 and Mozart): see the -documentation Documentation/cdrom/isp16. - -The device major for sjcd is 18, and minor is 0. Create a block special -file in your /dev directory (e.g., /dev/sjcd) with these numbers. -(For those who don't know, being root and doing the following should do -the trick: - mknod -m 644 /dev/sjcd b 18 0 -and mount the cdrom by /dev/sjcd). - -The default configuration parameters are: - base address 0x340 - no irq - no dma -(Actually the CDR-H94A doesn't know how to use irq and dma.) -As of version 1.2, setting base address at boot time is supported -through the use of command line options: type at the "boot:" prompt: - linux sjcd= -(where you would use the kernel labeled "linux" in lilo's configuration -file /etc/lilo.conf). You could also use 'append="sjcd="' -in the appropriate section of /etc/lilo.conf -If you're building a kernel yourself you can set your default base -i/o address with SJCD_BASE_ADDR in /usr/src/linux/drivers/cdrom/sjcd.h. - -The sjcd driver supports being loaded as a module. The following -command will set the base i/o address on the fly (assuming you -have installed the module in an appropriate place). - insmod sjcd.o sjcd_base= - - -Have fun! - -If something is wrong, please email to vadim@rbrf.ru - or vadim@ipsun.ras.ru - or model@cecmow.enet.dec.com - or H.T.M.v.d.Maarel@marin.nl - -It happens sometimes that Vadim is not reachable by mail. For these -instances, Eric van der Maarel will help too. - - Vadim V. Model, Eric van der Maarel, Eberhard Moenkeberg diff --git a/Documentation/cdrom/sonycd535 b/Documentation/cdrom/sonycd535 deleted file mode 100644 index b81e109970aa..000000000000 --- a/Documentation/cdrom/sonycd535 +++ /dev/null @@ -1,122 +0,0 @@ - README FOR LINUX SONY CDU-535/531 DRIVER - ======================================== - -This is the Sony CDU-535 (and 531) driver version 0.7 for Linux. -I do not think I have the documentation to add features like DMA support -so if anyone else wants to pursue it or help me with it, please do. -(I need to see what was done for the CDU-31A driver -- perhaps I can -steal some of that code.) - -This is a Linux device driver for the Sony CDU-535 CDROM drive. This is -one of the older Sony drives with its own interface card (Sony bus). -The DOS driver for this drive is named SONY_CDU.SYS - when you boot DOS -your drive should be identified as a SONY CDU-535. The driver works -with a CDU-531 also. One user reported that the driver worked on drives -OEM'ed by Procomm, drive and interface board were labelled Procomm. - -The Linux driver is based on Corey Minyard's sonycd 0.3 driver for -the CDU-31A. Ron Jeppesen just changed the commands that were sent -to the drive to correspond to the CDU-535 commands and registers. -There were enough changes to let bugs creep in but it seems to be stable. -Ron was able to tar an entire CDROM (should read all blocks) and built -ghostview and xfig off Walnut Creek's X11R5/GNU CDROM. xcdplayer and -workman work with the driver. Others have used the driver without -problems except those dealing with wait loops (fixed in third release). -Like Minyard's original driver this one uses a polled interface (this -is also the default setup for the DOS driver). It has not been tried -with interrupts or DMA enabled on the board. - -REQUIREMENTS -============ - - - Sony CDU-535 drive, preferably without interrupts and DMA - enabled on the card. - - - Drive must be set up as unit 1. Only the first unit will be - recognized - - - You must enter your interface address into - /usr/src/linux/drivers/cdrom/sonycd535.h and build the - appropriate kernel or use the "kernel command line" parameter - sonycd535=0x320 - with the correct interface address. - -NOTES: -====== - -1) The drive MUST be turned on when booting or it will not be recognized! - (but see comments on modularized version below) - -2) when the cdrom device is opened the eject button is disabled to keep the - user from ejecting a mounted disk and replacing it with another. - Unfortunately xcdplayer and workman also open the cdrom device so you - have to use the eject button in the software. Keep this in mind if your - cdrom player refuses to give up its disk -- exit workman or xcdplayer, or - umount the drive if it has been mounted. - -THANKS -====== - -Many thanks to Ron Jeppesen (ronj.an@site007.saic.com) for getting -this project off the ground. He wrote the initial release -and the first two patches to this driver (0.1, 0.2, and 0.3). -Thanks also to Eberhard Moenkeberg (emoenke@gwdg.de) for prodding -me to place this code into the mainstream Linux source tree -(as of Linux version 1.1.91), as well as some patches to make -it a better device citizen. Further thanks to Joel Katz - for his MODULE patches (see details below), -Porfiri Claudio for patches -to make the driver work with the older CDU-510/515 series, and -Heiko Eissfeldt for pointing out that -the verify_area() checks were ignoring the results of said checks -(note: verify_area() has since been replaced by access_ok()). - -(Acknowledgments from Ron Jeppesen in the 0.3 release:) -Thanks to Corey Minyard who wrote the original CDU-31A driver on which -this driver is based. Thanks to Ken Pizzini and Bob Blair who provided -patches and feedback on the first release of this driver. - -Ken Pizzini -ken@halcyon.com - ------------------------------------------------------------------------------- -(The following is from Joel Katz .) - - To build a version of sony535.o that can be installed as a module, -use the following command: - -gcc -c -D__KERNEL__ -DMODULE -O2 sonycd535.c -o sonycd535.o - - To install the module, simply type: - -insmod sony535.o - or -insmod sony535.o sonycd535=
- - And to remove it: - -rmmod sony535 - - The code checks to see if MODULE is defined and behaves as it used -to if MODULE is not defined. That means your patched file should behave -exactly as it used to if compiled into the kernel. - - I have an external drive, and I usually leave it powered off. I used -to have to reboot if I needed to use the CDROM drive. Now I don't. - - Even if you have an internal drive, why waste the 96K of memory -(unswappable) that the driver uses if you use your CD-ROM drive infrequently? - - This driver will not install (whether compiled in or loaded as a -module) if the CDROM drive is not available during its initialization. This -means that you can have the driver compiled into the kernel and still load -the module later (assuming the driver doesn't install itself during -power-on). This only wastes 12K when you boot with the CDROM drive off. - - This is what I usually do; I leave the driver compiled into the -kernel, but load it as a module if I powered the system up with the drive -off and then later decided to use the CDROM drive. - - Since the driver only uses a single page to point to the chunks, -attempting to set the buffer cache to more than 2 Megabytes would be very -bad; don't do that. diff --git a/Documentation/connector/cn_test.c b/Documentation/connector/cn_test.c index 3e73231695b3..be7af146dd30 100644 --- a/Documentation/connector/cn_test.c +++ b/Documentation/connector/cn_test.c @@ -124,9 +124,8 @@ static void cn_test_timer_func(unsigned long __data) struct cn_msg *m; char data[32]; - m = kmalloc(sizeof(*m) + sizeof(data), GFP_ATOMIC); + m = kzalloc(sizeof(*m) + sizeof(data), GFP_ATOMIC); if (m) { - memset(m, 0, sizeof(*m) + sizeof(data)); memcpy(&m->id, &cn_test_id, sizeof(m->id)); m->seq = cn_test_timer_counter; diff --git a/Documentation/console/console.txt b/Documentation/console/console.txt index d3e17447321c..877a1b26cc3d 100644 --- a/Documentation/console/console.txt +++ b/Documentation/console/console.txt @@ -29,7 +29,7 @@ In newer kernels, the following are also available: If sysfs is enabled, the contents of /sys/class/vtconsole can be examined. This shows the console backends currently registered by the -system which are named vtcon where is an integer fro 0 to 15. Thus: +system which are named vtcon where is an integer from 0 to 15. Thus: ls /sys/class/vtconsole . .. vtcon0 vtcon1 diff --git a/Documentation/devices.txt b/Documentation/devices.txt index 8de132a02ba9..6c46730c631a 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt @@ -94,6 +94,8 @@ Your cooperation is appreciated. 9 = /dev/urandom Faster, less secure random number gen. 10 = /dev/aio Asynchronous I/O notification interface 11 = /dev/kmsg Writes to this come out as printk's + 12 = /dev/oldmem Used by crashdump kernels to access + the memory of the kernel that crashed. 1 block RAM disk 0 = /dev/ram0 First RAM disk diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 595a5ea4c690..7b9551fc6fe3 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff @@ -18,6 +18,7 @@ *.moc *.mod.c *.o +*.o.* *.orig *.out *.pdf @@ -163,6 +164,8 @@ raid6tables.c relocs series setup +setup.bin +setup.elf sim710_d.h* sImage sm_tbl* diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index 6c8d8f27db34..8569072fa387 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@ -207,7 +207,7 @@ responsibility. This is usually non-issue because bus ops and resource allocations already do the job. For an example of single-instance devres type, read pcim_iomap_table() -in lib/iomap.c. +in lib/devres.c. All devres interface functions can be called without context if the right gfp mask is given. diff --git a/Documentation/drivers/edac/edac.txt b/Documentation/drivers/edac/edac.txt index 3c5a9e4297b4..a5c36842ecef 100644 --- a/Documentation/drivers/edac/edac.txt +++ b/Documentation/drivers/edac/edac.txt @@ -2,22 +2,42 @@ EDAC - Error Detection And Correction -Written by Doug Thompson +Written by Doug Thompson 7 Dec 2005 +17 Jul 2007 Updated -EDAC was written by: - Thayne Harbaugh, - modified by Dave Peterson, Doug Thompson, et al, - from the bluesmoke.sourceforge.net project. +EDAC is maintained and written by: + Doug Thompson, Dave Jiang, Dave Peterson et al, + original author: Thayne Harbaugh, + +Contact: + website: bluesmoke.sourceforge.net + mailing list: bluesmoke-devel@lists.sourceforge.net + +"bluesmoke" was the name for this device driver when it was "out-of-tree" +and maintained at sourceforge.net. When it was pushed into 2.6.16 for the +first time, it was renamed to 'EDAC'. + +The bluesmoke project at sourceforge.net is now utilized as a 'staging area' +for EDAC development, before it is sent upstream to kernel.org + +At the bluesmoke/EDAC project site, is a series of quilt patches against +recent kernels, stored in a SVN respository. For easier downloading, there +is also a tarball snapshot available. ============================================================================ EDAC PURPOSE The 'edac' kernel module goal is to detect and report errors that occur -within the computer system. In the initial release, memory Correctable Errors -(CE) and Uncorrectable Errors (UE) are the primary errors being harvested. +within the computer system running under linux. + +MEMORY + +In the initial release, memory Correctable Errors (CE) and Uncorrectable +Errors (UE) are the primary errors being harvested. These types of errors +are harvested by the 'edac_mc' class of device. Detecting CE events, then harvesting those events and reporting them, CAN be a predictor of future UE events. With CE events, the system can @@ -25,9 +45,27 @@ continue to operate, but with less safety. Preventive maintenance and proactive part replacement of memory DIMMs exhibiting CEs can reduce the likelihood of the dreaded UE events and system 'panics'. +NON-MEMORY + +A new feature for EDAC, the edac_device class of device, was added in +the 2.6.23 version of the kernel. + +This new device type allows for non-memory type of ECC hardware detectors +to have their states harvested and presented to userspace via the sysfs +interface. + +Some architectures have ECC detectors for L1, L2 and L3 caches, along with DMA +engines, fabric switches, main data path switches, interconnections, +and various other hardware data paths. If the hardware reports it, then +a edac_device device probably can be constructed to harvest and present +that to userspace. + + +PCI BUS SCANNING In addition, PCI Bus Parity and SERR Errors are scanned for on PCI devices in order to determine if errors are occurring on data transfers. + The presence of PCI Parity errors must be examined with a grain of salt. There are several add-in adapters that do NOT follow the PCI specification with regards to Parity generation and reporting. The specification says @@ -35,11 +73,17 @@ the vendor should tie the parity status bits to 0 if they do not intend to generate parity. Some vendors do not do this, and thus the parity bit can "float" giving false positives. -[There are patches in the kernel queue which will allow for storage of -quirks of PCI devices reporting false parity positives. The 2.6.18 -kernel should have those patches included. When that becomes available, -then EDAC will be patched to utilize that information to "skip" such -devices.] +In the kernel there is a pci device attribute located in sysfs that is +checked by the EDAC PCI scanning code. If that attribute is set, +PCI parity/error scannining is skipped for that device. The attribute +is: + + broken_parity_status + +as is located in /sys/devices/pci/0000:XX:YY.Z directorys for +PCI devices. + +FUTURE HARDWARE SCANNING EDAC will have future error detectors that will be integrated with EDAC or added to it, in the following list: @@ -57,13 +101,14 @@ and the like. ============================================================================ EDAC VERSIONING -EDAC is composed of a "core" module (edac_mc.ko) and several Memory +EDAC is composed of a "core" module (edac_core.ko) and several Memory Controller (MC) driver modules. On a given system, the CORE is loaded and one MC driver will be loaded. Both the CORE and -the MC driver have individual versions that reflect current release -level of their respective modules. Thus, to "report" on what version -a system is running, one must report both the CORE's and the -MC driver's versions. +the MC driver (or edac_device driver) have individual versions that reflect +current release level of their respective modules. + +Thus, to "report" on what version a system is running, one must report both +the CORE's and the MC driver's versions. LOADING @@ -88,8 +133,9 @@ EDAC sysfs INTERFACE EDAC presents a 'sysfs' interface for control, reporting and attribute reporting purposes. -EDAC lives in the /sys/devices/system/edac directory. Within this directory -there currently reside 2 'edac' components: +EDAC lives in the /sys/devices/system/edac directory. + +Within this directory there currently reside 2 'edac' components: mc memory controller(s) system pci PCI control and status system @@ -188,7 +234,7 @@ In directory 'mc' are EDAC system overall control and attribute files: Panic on UE control file: - 'panic_on_ue' + 'edac_mc_panic_on_ue' An uncorrectable error will cause a machine panic. This is usually desirable. It is a bad idea to continue when an uncorrectable error @@ -199,12 +245,12 @@ Panic on UE control file: LOAD TIME: module/kernel parameter: panic_on_ue=[0|1] - RUN TIME: echo "1" >/sys/devices/system/edac/mc/panic_on_ue + RUN TIME: echo "1" >/sys/devices/system/edac/mc/edac_mc_panic_on_ue Log UE control file: - 'log_ue' + 'edac_mc_log_ue' Generate kernel messages describing uncorrectable errors. These errors are reported through the system message log system. UE statistics @@ -212,12 +258,12 @@ Log UE control file: LOAD TIME: module/kernel parameter: log_ue=[0|1] - RUN TIME: echo "1" >/sys/devices/system/edac/mc/log_ue + RUN TIME: echo "1" >/sys/devices/system/edac/mc/edac_mc_log_ue Log CE control file: - 'log_ce' + 'edac_mc_log_ce' Generate kernel messages describing correctable errors. These errors are reported through the system message log system. @@ -225,12 +271,12 @@ Log CE control file: LOAD TIME: module/kernel parameter: log_ce=[0|1] - RUN TIME: echo "1" >/sys/devices/system/edac/mc/log_ce + RUN TIME: echo "1" >/sys/devices/system/edac/mc/edac_mc_log_ce Polling period control file: - 'poll_msec' + 'edac_mc_poll_msec' The time period, in milliseconds, for polling for error information. Too small a value wastes resources. Too large a value might delay @@ -241,7 +287,7 @@ Polling period control file: LOAD TIME: module/kernel parameter: poll_msec=[0|1] - RUN TIME: echo "1000" >/sys/devices/system/edac/mc/poll_msec + RUN TIME: echo "1000" >/sys/devices/system/edac/mc/edac_mc_poll_msec ============================================================================ @@ -587,3 +633,95 @@ Parity Count: ======================================================================= + + +EDAC_DEVICE type of device + +In the header file, edac_core.h, there is a series of edac_device structures +and APIs for the EDAC_DEVICE. + +User space access to an edac_device is through the sysfs interface. + +At the location /sys/devices/system/edac (sysfs) new edac_device devices will +appear. + +There is a three level tree beneath the above 'edac' directory. For example, +the 'test_device_edac' device (found at the bluesmoke.sourceforget.net website) +installs itself as: + + /sys/devices/systm/edac/test-instance + +in this directory are various controls, a symlink and one or more 'instance' +directorys. + +The standard default controls are: + + log_ce boolean to log CE events + log_ue boolean to log UE events + panic_on_ue boolean to 'panic' the system if an UE is encountered + (default off, can be set true via startup script) + poll_msec time period between POLL cycles for events + +The test_device_edac device adds at least one of its own custom control: + + test_bits which in the current test driver does nothing but + show how it is installed. A ported driver can + add one or more such controls and/or attributes + for specific uses. + One out-of-tree driver uses controls here to allow + for ERROR INJECTION operations to hardware + injection registers + +The symlink points to the 'struct dev' that is registered for this edac_device. + +INSTANCES + +One or more instance directories are present. For the 'test_device_edac' case: + + test-instance0 + + +In this directory there are two default counter attributes, which are totals of +counter in deeper subdirectories. + + ce_count total of CE events of subdirectories + ue_count total of UE events of subdirectories + +BLOCKS + +At the lowest directory level is the 'block' directory. There can be 0, 1 +or more blocks specified in each instance. + + test-block0 + + +In this directory the default attributes are: + + ce_count which is counter of CE events for this 'block' + of hardware being monitored + ue_count which is counter of UE events for this 'block' + of hardware being monitored + + +The 'test_device_edac' device adds 4 attributes and 1 control: + + test-block-bits-0 for every POLL cycle this counter + is incremented + test-block-bits-1 every 10 cycles, this counter is bumped once, + and test-block-bits-0 is set to 0 + test-block-bits-2 every 100 cycles, this counter is bumped once, + and test-block-bits-1 is set to 0 + test-block-bits-3 every 1000 cycles, this counter is bumped once, + and test-block-bits-2 is set to 0 + + + reset-counters writing ANY thing to this control will + reset all the above counters. + + +Use of the 'test_device_edac' driver should any others to create their own +unique drivers for their hardware systems. + +The 'test_device_edac' sample driver is located at the +bluesmoke.sourceforge.net project site for EDAC. + diff --git a/Documentation/dvb/bt8xx.txt b/Documentation/dvb/bt8xx.txt index 4e7614e606c5..ecb47adda063 100644 --- a/Documentation/dvb/bt8xx.txt +++ b/Documentation/dvb/bt8xx.txt @@ -9,19 +9,29 @@ for accessing the i2c bus and the gpio pins of the bt8xx chipset. Please see Documentation/dvb/cards.txt => o Cards based on the Conexant Bt8xx PCI bridge: Compiling kernel please enable: -a.)"Device drivers" => "Multimedia devices" => "Video For Linux" => "BT848 Video For Linux" -b.)"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices" - => "DVB for Linux" "DVB Core Support" "Bt8xx based PCI Cards" +a.)"Device drivers" => "Multimedia devices" => "Video For Linux" => "Enable Video for Linux API 1 (DEPRECATED)" +b.)"Device drivers" => "Multimedia devices" => "Video For Linux" => "Video Capture Adapters" => "BT848 Video For Linux" +c.)"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices" => "DVB for Linux" "DVB Core Support" "Bt8xx based PCI Cards" -2) Loading Modules -================== +Please use the following options with care as deselection of drivers which are in fact necessary +may result in DVB devices that cannot be tuned due to lack of driver support: +You can save RAM by deselecting every frontend module that your DVB card does not need. + +First please remove the static dependency of DVB card drivers on all frontend modules for all possible card variants by enabling: +d.) "Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices" + => "DVB for Linux" "DVB Core Support" "Load and attach frontend modules as needed" -In default cases bttv is loaded automatically. -To load the backend either place dvb-bt8xx in etc/modules, or apply manually: +If you know the frontend driver that your card needs please enable: +e.)"Device drivers" => "Multimedia devices" => "Digital Video Broadcasting Devices" + => "DVB for Linux" "DVB Core Support" "Customise DVB Frontends" => "Customise the frontend modules to build" + Then please select your card-specific frontend module. - $ modprobe dvb-bt8xx +2) Loading Modules +================== -All frontends will be loaded automatically. +Regular case: If the bttv driver detects a bt8xx-based DVB card, all frontend and backend modules will be loaded automatically. +Exceptions are: +- Old TwinHan DST cards or clones with or without CA slot and not containing an Eeprom. People running udev please see Documentation/dvb/udev.txt. In the following cases overriding the PCI type detection for dvb-bt8xx might be necessary: @@ -30,7 +40,6 @@ In the following cases overriding the PCI type detection for dvb-bt8xx might be ------------------------------ $ modprobe bttv card=113 - $ modprobe dvb-bt8xx $ modprobe dst Useful parameters for verbosity level and debugging the dst module: @@ -65,10 +74,9 @@ DViCO FusionHDTV 5 Lite: 135 Notice: The order of the card ID should be uprising: Example: $ modprobe bttv card=113 card=135 - $ modprobe dvb-bt8xx For a full list of card ID's please see Documentation/video4linux/CARDLIST.bttv. -In case of further problems send questions to the mailing list: www.linuxdvb.org. +In case of further problems please subscribe and send questions to the mailing list: linux-dvb@linuxtv.org. Authors: Richard Walker, Jamie Honan, diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware index 4820366b6ae8..f2e908d7f90d 100644 --- a/Documentation/dvb/get_dvb_firmware +++ b/Documentation/dvb/get_dvb_firmware @@ -24,7 +24,8 @@ use IO::Handle; @components = ( "sp8870", "sp887x", "tda10045", "tda10046", "tda10046lifeview", "av7110", "dec2000t", "dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004", - "or51211", "or51132_qam", "or51132_vsb", "bluebird"); + "or51211", "or51132_qam", "or51132_vsb", "bluebird", + "opera1"); # Check args syntax() if (scalar(@ARGV) != 1); @@ -56,7 +57,7 @@ syntax(); sub sp8870 { my $sourcefile = "tt_Premium_217g.zip"; - my $url = "http://www.technotrend.de/new/217g/$sourcefile"; + my $url = "http://www.softwarepatch.pl/9999ccd06a4813cb827dbb0005071c71/$sourcefile"; my $hash = "53970ec17a538945a6d8cb608a7b3899"; my $outfile = "dvb-fe-sp8870.fw"; my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1); @@ -110,21 +111,21 @@ sub tda10045 { } sub tda10046 { - my $sourcefile = "tt_budget_217g.zip"; - my $url = "http://www.technotrend.de/new/217g/$sourcefile"; - my $hash = "6a7e1e2f2644b162ff0502367553c72d"; - my $outfile = "dvb-fe-tda10046.fw"; - my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1); + my $sourcefile = "TT_PCI_2.19h_28_11_2006.zip"; + my $url = "http://technotrend-online.com/download/software/219/$sourcefile"; + my $hash = "6a7e1e2f2644b162ff0502367553c72d"; + my $outfile = "dvb-fe-tda10046.fw"; + my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1); - checkstandard(); + checkstandard(); - wgetfile($sourcefile, $url); - unzip($sourcefile, $tmpdir); - extract("$tmpdir/software/OEM/PCI/App/ttlcdacc.dll", 0x3f731, 24478, "$tmpdir/fwtmp"); - verify("$tmpdir/fwtmp", $hash); - copy("$tmpdir/fwtmp", $outfile); + wgetfile($sourcefile, $url); + unzip($sourcefile, $tmpdir); + extract("$tmpdir/TT_PCI_2.19h_28_11_2006/software/OEM/PCI/App/ttlcdacc.dll", 0x65389, 24478, "$tmpdir/fwtmp"); + verify("$tmpdir/fwtmp", $hash); + copy("$tmpdir/fwtmp", $outfile); - $outfile; + $outfile; } sub tda10046lifeview { @@ -210,6 +211,45 @@ sub dec3000s { $outfile; } +sub opera1{ + my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 0); + + checkstandard(); + my $fwfile1="dvb-usb-opera1-fpga-01.fw"; + my $fwfile2="dvb-usb-opera-01.fw"; + extract("2830SCap2.sys", 0x62e8, 55024, "$tmpdir/opera1-fpga.fw"); + extract("2830SLoad2.sys",0x3178,0x3685-0x3178,"$tmpdir/fw1part1"); + extract("2830SLoad2.sys",0x0980,0x3150-0x0980,"$tmpdir/fw1part2"); + delzero("$tmpdir/fw1part1","$tmpdir/fw1part1-1"); + delzero("$tmpdir/fw1part2","$tmpdir/fw1part2-1"); + verify("$tmpdir/fw1part1-1","5e0909858fdf0b5b09ad48b9fe622e70"); + verify("$tmpdir/fw1part2-1","d6e146f321427e931df2c6fcadac37a1"); + verify("$tmpdir/opera1-fpga.fw","0f8133f5e9051f5f3c1928f7e5a1b07d"); + + my $RES1="\x01\x92\x7f\x00\x01\x00"; + my $RES0="\x01\x92\x7f\x00\x00\x00"; + my $DAT1="\x01\x00\xe6\x00\x01\x00"; + my $DAT0="\x01\x00\xe6\x00\x00\x00"; + open FW,">$tmpdir/opera.fw"; + print FW "$RES1"; + print FW "$DAT1"; + print FW "$RES1"; + print FW "$DAT1"; + appendfile(FW,"$tmpdir/fw1part1-1"); + print FW "$RES0"; + print FW "$DAT0"; + print FW "$RES1"; + print FW "$DAT1"; + appendfile(FW,"$tmpdir/fw1part2-1"); + print FW "$RES1"; + print FW "$DAT1"; + print FW "$RES0"; + print FW "$DAT0"; + copy ("$tmpdir/opera1-fpga.fw",$fwfile1); + copy ("$tmpdir/opera.fw",$fwfile2); + + $fwfile1.",".$fwfile2; +} sub vp7041 { my $sourcefile = "2.422.zip"; @@ -440,6 +480,25 @@ sub appendfile { close(INFILE); } +sub delzero{ + my ($infile,$outfile) =@_; + + open INFILE,"<$infile"; + open OUTFILE,">$outfile"; + while (1){ + $rcount=sysread(INFILE,$buf,22); + $len=ord(substr($buf,0,1)); + print OUTFILE substr($buf,0,1); + print OUTFILE substr($buf,2,$len+3); + last if ($rcount<1); + printf OUTFILE "%c",0; +#print $len." ".length($buf)."\n"; + + } + close(INFILE); + close(OUTFILE); +} + sub syntax() { print STDERR "syntax: get_dvb_firmware \n"; print STDERR "Supported components:\n"; diff --git a/Documentation/ecryptfs.txt b/Documentation/ecryptfs.txt deleted file mode 100644 index 01d8a08351ac..000000000000 --- a/Documentation/ecryptfs.txt +++ /dev/null @@ -1,77 +0,0 @@ -eCryptfs: A stacked cryptographic filesystem for Linux - -eCryptfs is free software. Please see the file COPYING for details. -For documentation, please see the files in the doc/ subdirectory. For -building and installation instructions please see the INSTALL file. - -Maintainer: Phillip Hellewell -Lead developer: Michael A. Halcrow -Developers: Michael C. Thompson - Kent Yoder -Web Site: http://ecryptfs.sf.net - -This software is currently undergoing development. Make sure to -maintain a backup copy of any data you write into eCryptfs. - -eCryptfs requires the userspace tools downloadable from the -SourceForge site: - -http://sourceforge.net/projects/ecryptfs/ - -Userspace requirements include: - - David Howells' userspace keyring headers and libraries (version - 1.0 or higher), obtainable from - http://people.redhat.com/~dhowells/keyutils/ - - Libgcrypt - - -NOTES - -In the beta/experimental releases of eCryptfs, when you upgrade -eCryptfs, you should copy the files to an unencrypted location and -then copy the files back into the new eCryptfs mount to migrate the -files. - - -MOUNT-WIDE PASSPHRASE - -Create a new directory into which eCryptfs will write its encrypted -files (i.e., /root/crypt). Then, create the mount point directory -(i.e., /mnt/crypt). Now it's time to mount eCryptfs: - -mount -t ecryptfs /root/crypt /mnt/crypt - -You should be prompted for a passphrase and a salt (the salt may be -blank). - -Try writing a new file: - -echo "Hello, World" > /mnt/crypt/hello.txt - -The operation will complete. Notice that there is a new file in -/root/crypt that is at least 12288 bytes in size (depending on your -host page size). This is the encrypted underlying file for what you -just wrote. To test reading, from start to finish, you need to clear -the user session keyring: - -keyctl clear @u - -Then umount /mnt/crypt and mount again per the instructions given -above. - -cat /mnt/crypt/hello.txt - - -NOTES - -eCryptfs version 0.1 should only be mounted on (1) empty directories -or (2) directories containing files only created by eCryptfs. If you -mount a directory that has pre-existing files not created by eCryptfs, -then behavior is undefined. Do not run eCryptfs in higher verbosity -levels unless you are doing so for the sole purpose of debugging or -development, since secret values will be written out to the system log -in that case. - - -Mike Halcrow -mhalcrow@us.ibm.com diff --git a/Documentation/fault-injection/failcmd.sh b/Documentation/fault-injection/failcmd.sh deleted file mode 100644 index 63177aba8106..000000000000 --- a/Documentation/fault-injection/failcmd.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -echo 1 > /proc/self/make-it-fail -exec $* diff --git a/Documentation/fault-injection/failmodule.sh b/Documentation/fault-injection/failmodule.sh deleted file mode 100644 index 474a8b971f9c..000000000000 --- a/Documentation/fault-injection/failmodule.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# Usage: failmodule [stacktrace-depth] -# -# : "failslab", "fail_alloc_page", or "fail_make_request" -# -# : module name that you want to inject faults. -# -# [stacktrace-depth]: the maximum number of stacktrace walking allowed -# - -STACKTRACE_DEPTH=5 -if [ $# -gt 2 ]; then - STACKTRACE_DEPTH=$3 -fi - -if [ ! -d /debug/$1 ]; then - echo "Fault-injection $1 does not exist" >&2 - exit 1 -fi -if [ ! -d /sys/module/$2 ]; then - echo "Module $2 does not exist" >&2 - exit 1 -fi - -# Disable any fault injection -echo 0 > /debug/$1/stacktrace-depth - -echo `cat /sys/module/$2/sections/.text` > /debug/$1/require-start -echo `cat /sys/module/$2/sections/.exit.text` > /debug/$1/require-end -echo $STACKTRACE_DEPTH > /debug/$1/stacktrace-depth diff --git a/Documentation/fault-injection/fault-injection.txt b/Documentation/fault-injection/fault-injection.txt index b7ca560b9340..4bc374a14345 100644 --- a/Documentation/fault-injection/fault-injection.txt +++ b/Documentation/fault-injection/fault-injection.txt @@ -103,6 +103,11 @@ configuration of fault-injection capabilities. default is 'N', setting it to 'Y' will inject failures only into non-sleep allocations (GFP_ATOMIC allocations). +- /debug/fail_page_alloc/min-order: + + specifies the minimum page allocation order to be injected + failures. + o Boot option In order to inject faults while debugfs is not available (early boot time), @@ -156,70 +161,77 @@ o add a hook to insert failures Application Examples -------------------- -o inject slab allocation failures into module init/cleanup code +o Inject slab allocation failures into module init/exit code ------------------------------------------------------------------------------- #!/bin/bash -FAILCMD=Documentation/fault-injection/failcmd.sh -BLACKLIST="root_plug evbug" - -FAILNAME=failslab -echo Y > /debug/$FAILNAME/task-filter -echo 10 > /debug/$FAILNAME/probability -echo 100 > /debug/$FAILNAME/interval -echo -1 > /debug/$FAILNAME/times -echo 2 > /debug/$FAILNAME/verbose -echo 1 > /debug/$FAILNAME/ignore-gfp-wait +FAILTYPE=failslab +echo Y > /debug/$FAILTYPE/task-filter +echo 10 > /debug/$FAILTYPE/probability +echo 100 > /debug/$FAILTYPE/interval +echo -1 > /debug/$FAILTYPE/times +echo 0 > /debug/$FAILTYPE/space +echo 2 > /debug/$FAILTYPE/verbose +echo 1 > /debug/$FAILTYPE/ignore-gfp-wait -blacklist() +faulty_system() { - echo $BLACKLIST | grep $1 > /dev/null 2>&1 + bash -c "echo 1 > /proc/self/make-it-fail && exec $*" } -oops() -{ - dmesg | grep BUG > /dev/null 2>&1 -} +if [ $# -eq 0 ] +then + echo "Usage: $0 modulename [ modulename ... ]" + exit 1 +fi + +for m in $* +do + echo inserting $m... + faulty_system modprobe $m -find /lib/modules/`uname -r` -name '*.ko' -exec basename {} .ko \; | - while read i - do - oops && exit 1 - - if ! blacklist $i - then - echo inserting $i... - bash $FAILCMD modprobe $i - fi - done - -lsmod | awk '{ if ($3 == 0) { print $1 } }' | - while read i - do - oops && exit 1 - - if ! blacklist $i - then - echo removing $i... - bash $FAILCMD modprobe -r $i - fi - done + echo removing $m... + faulty_system modprobe -r $m +done ------------------------------------------------------------------------------ -o inject slab allocation failures only for a specific module +o Inject page allocation failures only for a specific module ------------------------------------------------------------------------------- #!/bin/bash -FAILMOD=Documentation/fault-injection/failmodule.sh +FAILTYPE=fail_page_alloc +module=$1 -echo injecting errors into the module $1... +if [ -z $module ] +then + echo "Usage: $0 " + exit 1 +fi -modprobe $1 -bash $FAILMOD failslab $1 10 -echo 25 > /debug/failslab/probability +modprobe $module ------------------------------------------------------------------------------- +if [ ! -d /sys/module/$module/sections ] +then + echo Module $module is not loaded + exit 1 +fi + +cat /sys/module/$module/sections/.text > /debug/$FAILTYPE/require-start +cat /sys/module/$module/sections/.data > /debug/$FAILTYPE/require-end + +echo N > /debug/$FAILTYPE/task-filter +echo 10 > /debug/$FAILTYPE/probability +echo 100 > /debug/$FAILTYPE/interval +echo -1 > /debug/$FAILTYPE/times +echo 0 > /debug/$FAILTYPE/space +echo 2 > /debug/$FAILTYPE/verbose +echo 1 > /debug/$FAILTYPE/ignore-gfp-wait +echo 1 > /debug/$FAILTYPE/ignore-gfp-highmem +echo 10 > /debug/$FAILTYPE/stacktrace-depth + +trap "echo 0 > /debug/$FAILTYPE/probability" SIGINT SIGTERM EXIT + +echo "Injecting errors into the module $module... (interrupt to stop)" +sleep 1000000 diff --git a/Documentation/fb/pvr2fb.txt b/Documentation/fb/pvr2fb.txt index 2bf6c2321c2d..36bdeff585e2 100644 --- a/Documentation/fb/pvr2fb.txt +++ b/Documentation/fb/pvr2fb.txt @@ -9,14 +9,13 @@ one found in the Dreamcast. Advantages: * It provides a nice large console (128 cols + 48 lines with 1024x768) - without using tiny, unreadable fonts. + without using tiny, unreadable fonts (NOT on the Dreamcast) * You can run XF86_FBDev on top of /dev/fb0 * Most important: boot logo :-) Disadvantages: - * Driver is currently limited to the Dreamcast PowerVR 2 implementation - at the time of this writing. + * Driver is largely untested on non-Dreamcast systems. Configuration ============= @@ -29,11 +28,16 @@ Accepted options: font:X - default font to use. All fonts are supported, including the SUN12x22 font which is very nice at high resolutions. -mode:X - default video mode. The following video modes are supported: - 640x240-60, 640x480-60. +mode:X - default video mode with format [xres]x[yres]-@ + The following video modes are supported: + 640x640-16@60, 640x480-24@60, 640x480-32@60. The Dreamcast + defaults to 640x480-16@60. At the time of writing the + 24bpp and 32bpp modes function poorly. Work to fix that is + ongoing + Note: the 640x240 mode is currently broken, and should not be - used for any reason. It is only mentioned as a reference. + used for any reason. It is only mentioned here as a reference. inverse - invert colors on screen (for LCD displays) @@ -52,10 +56,10 @@ output:X - output type. This can be any of the following: pal, ntsc, and X11 === -XF86_FBDev should work, in theory. At the time of this writing it is -totally untested and may or may not even portray the beginnings of -working. If you end up testing this, please let me know! +XF86_FBDev has been shown to work on the Dreamcast in the past - though not yet +on any 2.6 series kernel. -- Paul Mundt +Updated by Adrian McMenamin diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 7d3f205b0ba5..00928d2ecfb2 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -26,9 +26,7 @@ Who: Hans Verkuil and --------------------------- -What: /sys/devices/.../power/state - dev->power.power_state - dpm_runtime_{suspend,resume)() +What: dev->power.power_state When: July 2007 Why: Broken design for runtime control over driver power states, confusing driver-internal runtime power management with: mechanisms to support @@ -41,24 +39,6 @@ Who: Pavel Machek --------------------------- -What: RAW driver (CONFIG_RAW_DRIVER) -When: December 2005 -Why: declared obsolete since kernel 2.6.3 - O_DIRECT can be used instead -Who: Adrian Bunk - ---------------------------- - -What: raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN -When: June 2007 -Why: Deprecated in favour of the more efficient and robust rawiso interface. - Affected are applications which use the deprecated part of libraw1394 - (raw1394_iso_write, raw1394_start_iso_write, raw1394_start_iso_rcv, - raw1394_stop_iso_rcv) or bypass libraw1394. -Who: Dan Dennedy , Stefan Richter - ---------------------------- - What: old NCR53C9x driver When: October 2007 Why: Replaced by the much better esp_scsi driver. Actual low-level @@ -71,6 +51,7 @@ Who: David Miller What: Video4Linux API 1 ioctls and video_decoder.h from Video devices. When: December 2006 Files: include/linux/video_decoder.h +Check: include/linux/video_decoder.h Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6 series. The old API have lots of drawbacks and don't provide enough means to work with all video and audio standards. The newer API is @@ -104,7 +85,7 @@ Who: Dominik Brodowski What: remove EXPORT_SYMBOL(kernel_thread) When: August 2006 Files: arch/*/kernel/*_ksyms.c -Funcs: kernel_thread +Check: kernel_thread Why: kernel_thread is a low-level implementation detail. Drivers should use the API instead which shields them from implementation details and provides a higherlevel interface that @@ -129,13 +110,6 @@ Who: Adrian Bunk --------------------------- -What: drivers depending on OSS_OBSOLETE_DRIVER -When: options in 2.6.20, code in 2.6.22 -Why: OSS drivers with ALSA replacements -Who: Adrian Bunk - ---------------------------- - What: Unused EXPORT_SYMBOL/EXPORT_SYMBOL_GPL exports (temporary transition config option provided until then) The transition config option will also be removed at the same time. @@ -162,6 +136,15 @@ Who: Greg Kroah-Hartman --------------------------- +What: vm_ops.nopage +When: Soon, provided in-kernel callers have been converted +Why: This interface is replaced by vm_ops.fault, but it has been around + forever, is used by a lot of drivers, and doesn't cost much to + maintain. +Who: Nick Piggin + +--------------------------- + What: Interrupt only SA_* flags When: September 2007 Why: The interrupt related SA_* flags are replaced by IRQF_* to move them @@ -181,15 +164,6 @@ Who: Kay Sievers --------------------------- -What: i2c-isa -When: December 2006 -Why: i2c-isa is a non-sense and doesn't fit in the device driver - model. Drivers relying on it are better implemented as platform - drivers. -Who: Jean Delvare - ---------------------------- - What: i2c_adapter.list When: July 2007 Why: Superfluous, this list duplicates the one maintained by the driver @@ -206,46 +180,11 @@ Who: Adrian Bunk --------------------------- -What: ACPI hooks (X86_SPEEDSTEP_CENTRINO_ACPI) in speedstep-centrino driver -When: December 2006 -Why: Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are - functionally very much similar. They talk to ACPI in same way. Only - difference between them is the way they do frequency transitions. - One uses MSRs and the other one uses IO ports. Functionaliy of - speedstep_centrino with ACPI hooks is now merged into acpi-cpufreq. - That means one common driver will support all Intel Enhanced Speedstep - capable CPUs. That means less confusion over name of - speedstep-centrino driver (with that driver supposed to be used on - non-centrino platforms). That means less duplication of code and - less maintenance effort and no possibility of these two drivers - going out of sync. - Current users of speedstep_centrino with ACPI hooks are requested to - switch over to acpi-cpufreq driver. speedstep-centrino will continue - to work using older non-ACPI static table based scheme even after this - date. - -Who: Venkatesh Pallipadi - ---------------------------- - -What: /sys/firmware/acpi/namespace -When: 2.6.21 -Why: The ACPI namespace is effectively the symbol list for - the BIOS. The device names are completely arbitrary - and have no place being exposed to user-space. - - For those interested in the BIOS ACPI namespace, - the BIOS can be extracted and disassembled with acpidump - and iasl as documented in the pmtools package here: - http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils -Who: Len Brown - ---------------------------- - What: ACPI procfs interface -When: July 2007 -Why: After ACPI sysfs conversion, ACPI attributes will be duplicated - in sysfs and the ACPI procfs interface should be removed. +When: July 2008 +Why: ACPI sysfs conversion should be finished by January 2008. + ACPI procfs interface will be removed in July 2008 so that + there is enough time for the user space to catch up. Who: Zhang Rui --------------------------- @@ -258,11 +197,11 @@ Who: Len Brown --------------------------- -What: sk98lin network driver -When: July 2007 -Why: In kernel tree version of driver is unmaintained. Sk98lin driver - replaced by the skge driver. -Who: Stephen Hemminger +What: /proc/acpi/event +When: February 2008 +Why: /proc/acpi/event has been replaced by events via the input layer + and netlink since 2.6.23. +Who: Len Brown --------------------------- @@ -280,41 +219,6 @@ Who: Richard Purdie --------------------------- -What: Multipath cached routing support in ipv4 -When: in 2.6.23 -Why: Code was merged, then submitter immediately disappeared leaving - us with no maintainer and lots of bugs. The code should not have - been merged in the first place, and many aspects of it's - implementation are blocking more critical core networking - development. It's marked EXPERIMENTAL and no distribution - enables it because it cause obscure crashes due to unfixable bugs - (interfaces don't return errors so memory allocation can't be - handled, calling contexts of these interfaces make handling - errors impossible too because they get called after we've - totally commited to creating a route object, for example). - This problem has existed for years and no forward progress - has ever been made, and nobody steps up to try and salvage - this code, so we're going to finally just get rid of it. -Who: David S. Miller - ---------------------------- - -What: read_dev_chars(), read_conf_data{,_lpm}() (s390 common I/O layer) -When: December 2007 -Why: These functions are a leftover from 2.4 times. They have several - problems: - - Duplication of checks that are done in the device driver's - interrupt handler - - common I/O layer can't do device specific error recovery - - device driver can't be notified for conditions happening during - execution of the function - Device drivers should issue the read device characteristics and read - configuration data ccws and do the appropriate error handling - themselves. -Who: Cornelia Huck - ---------------------------- - What: i2c-ixp2000, i2c-ixp4xx and scx200_i2c drivers When: September 2007 Why: Obsolete. The new i2c-gpio driver replaces all hardware-specific @@ -323,6 +227,14 @@ Who: Jean Delvare --------------------------- +What: 'time' kernel boot parameter +When: January 2008 +Why: replaced by 'printk.time=' so that printk timestamps can be + enabled or disabled as needed +Who: Randy Dunlap + +--------------------------- + What: drivers depending on OSS_OBSOLETE When: options in 2.6.23, code in 2.6.25 Why: obsolete OSS drivers @@ -348,3 +260,49 @@ Who: Tejun Heo --------------------------- +What: Legacy RTC drivers (under drivers/i2c/chips) +When: November 2007 +Why: Obsolete. We have a RTC subsystem with better drivers. +Who: Jean Delvare + +--------------------------- + +What: iptables SAME target +When: 1.1. 2008 +Files: net/ipv4/netfilter/ipt_SAME.c, include/linux/netfilter_ipv4/ipt_SAME.h +Why: Obsolete for multiple years now, NAT core provides the same behaviour. + Unfixable broken wrt. 32/64 bit cleanness. +Who: Patrick McHardy + +--------------------------- + +What: The arch/ppc and include/asm-ppc directories +When: Jun 2008 +Why: The arch/powerpc tree is the merged architecture for ppc32 and ppc64 + platforms. Currently there are efforts underway to port the remaining + arch/ppc platforms to the merged tree. New submissions to the arch/ppc + tree have been frozen with the 2.6.22 kernel release and that tree will + remain in bug-fix only mode until its scheduled removal. Platforms + that are not ported by June 2008 will be removed due to the lack of an + interested maintainer. +Who: linuxppc-dev@ozlabs.org + +--------------------------- + +What: mthca driver's MSI support +When: January 2008 +Files: drivers/infiniband/hw/mthca/*.[ch] +Why: All mthca hardware also supports MSI-X, which provides + strictly more functionality than MSI. So there is no point in + having both MSI-X and MSI support in the driver. +Who: Roland Dreier + +--------------------------- + +What: sk98lin network driver +When: Feburary 2008 +Why: In kernel tree version of driver is unmaintained. Sk98lin driver + replaced by the skge driver. +Who: Stephen Hemminger + +--------------------------- diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX index 571785887a4f..59db1bca7027 100644 --- a/Documentation/filesystems/00-INDEX +++ b/Documentation/filesystems/00-INDEX @@ -32,6 +32,8 @@ directory-locking - info about the locking scheme used for directory operations. dlmfs.txt - info on the userspace interface to the OCFS2 DLM. +ecryptfs.txt + - docs on eCryptfs: stacked cryptographic filesystem for Linux. ext2.txt - info, mount options and specifications for the Ext2 filesystem. ext3.txt diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt index bbd8b28c13de..cda6905cbe49 100644 --- a/Documentation/filesystems/9p.txt +++ b/Documentation/filesystems/9p.txt @@ -6,12 +6,26 @@ ABOUT v9fs is a Unix implementation of the Plan 9 9p remote filesystem protocol. -This software was originally developed by Ron Minnich -and Maya Gokhale . Additional development by Greg Watson +This software was originally developed by Ron Minnich +and Maya Gokhale. Additional development by Greg Watson and most recently Eric Van Hensbergen , Latchesar Ionkov and Russ Cox . +The best detailed explanation of the Linux implementation and applications of +the 9p client is available in the form of a USENIX paper: + http://www.usenix.org/events/usenix05/tech/freenix/hensbergen.html + +Other applications are described in the following papers: + * XCPU & Clustering + http://www.xcpu.org/xcpu-talk.pdf + * KVMFS: control file system for KVM + http://www.xcpu.org/kvmfs.pdf + * CellFS: A New ProgrammingModel for the Cell BE + http://www.xcpu.org/cellfs-talk.pdf + * PROSE I/O: Using 9p to enable Application Partitions + http://plan9.escet.urjc.es/iwp9/cready/PROSE_iwp9_2006.pdf + USAGE ===== @@ -90,9 +104,9 @@ subset of the namespace by extending the path: '#U*'/tmp would just export and export. A Linux version of the 9p server is now maintained under the npfs project -on sourceforge (http://sourceforge.net/projects/npfs). There is also a -more stable single-threaded version of the server (named spfs) available from -the same CVS repository. +on sourceforge (http://sourceforge.net/projects/npfs). The currently +maintained version is the single-threaded version of the server (named spfs) +available from the same CVS repository. There are user and developer mailing lists available through the v9fs project on sourceforge (http://sourceforge.net/projects/v9fs). diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index d866551be037..f0f825808ca4 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking @@ -510,13 +510,24 @@ More details about quota locking can be found in fs/dquot.c. prototypes: void (*open)(struct vm_area_struct*); void (*close)(struct vm_area_struct*); + int (*fault)(struct vm_area_struct*, struct vm_fault *); struct page *(*nopage)(struct vm_area_struct*, unsigned long, int *); + int (*page_mkwrite)(struct vm_area_struct *, struct page *); locking rules: - BKL mmap_sem + BKL mmap_sem PageLocked(page) open: no yes close: no yes +fault: no yes nopage: no yes +page_mkwrite: no yes no + + ->page_mkwrite() is called when a previously read-only page is +about to become writeable. The file system is responsible for +protecting against truncate races. Once appropriate action has been +taking to lock out truncate, the page range should be verified to be +within i_size. The page mapping should also be checked that it is not +NULL. ================================================================================ Dubious stuff diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt index b34cdb50eab4..d1b98257d000 100644 --- a/Documentation/filesystems/configfs/configfs.txt +++ b/Documentation/filesystems/configfs/configfs.txt @@ -238,6 +238,8 @@ config_item_type. struct config_group *(*make_group)(struct config_group *group, const char *name); int (*commit_item)(struct config_item *item); + void (*disconnect_notify)(struct config_group *group, + struct config_item *item); void (*drop_item)(struct config_group *group, struct config_item *item); }; @@ -268,6 +270,16 @@ the item in other threads, the memory is safe. It may take some time for the item to actually disappear from the subsystem's usage. But it is gone from configfs. +When drop_item() is called, the item's linkage has already been torn +down. It no longer has a reference on its parent and has no place in +the item hierarchy. If a client needs to do some cleanup before this +teardown happens, the subsystem can implement the +ct_group_ops->disconnect_notify() method. The method is called after +configfs has removed the item from the filesystem view but before the +item is removed from its parent group. Like drop_item(), +disconnect_notify() is void and cannot fail. Client subsystems should +not drop any references here, as they still must do it in drop_item(). + A config_group cannot be removed while it still has child items. This is implemented in the configfs rmdir(2) code. ->drop_item() will not be called, as the item has not been dropped. rmdir(2) will fail, as the @@ -280,18 +292,18 @@ tells configfs to make the subsystem appear in the file tree. struct configfs_subsystem { struct config_group su_group; - struct semaphore su_sem; + struct mutex su_mutex; }; int configfs_register_subsystem(struct configfs_subsystem *subsys); void configfs_unregister_subsystem(struct configfs_subsystem *subsys); - A subsystem consists of a toplevel config_group and a semaphore. + A subsystem consists of a toplevel config_group and a mutex. The group is where child config_items are created. For a subsystem, this group is usually defined statically. Before calling configfs_register_subsystem(), the subsystem must have initialized the group via the usual group _init() functions, and it must also have -initialized the semaphore. +initialized the mutex. When the register call returns, the subsystem is live, and it will be visible via configfs. At that point, mkdir(2) can be called and the subsystem must be ready for it. @@ -303,7 +315,7 @@ subsystem/group and the simple_child item in configfs_example.c It shows a trivial object displaying and storing an attribute, and a simple group creating and destroying these children. -[Hierarchy Navigation and the Subsystem Semaphore] +[Hierarchy Navigation and the Subsystem Mutex] There is an extra bonus that configfs provides. The config_groups and config_items are arranged in a hierarchy due to the fact that they @@ -314,19 +326,19 @@ and config_item->ci_parent structure members. A subsystem can navigate the cg_children list and the ci_parent pointer to see the tree created by the subsystem. This can race with configfs' -management of the hierarchy, so configfs uses the subsystem semaphore to +management of the hierarchy, so configfs uses the subsystem mutex to protect modifications. Whenever a subsystem wants to navigate the hierarchy, it must do so under the protection of the subsystem -semaphore. +mutex. -A subsystem will be prevented from acquiring the semaphore while a newly +A subsystem will be prevented from acquiring the mutex while a newly allocated item has not been linked into this hierarchy. Similarly, it -will not be able to acquire the semaphore while a dropping item has not +will not be able to acquire the mutex while a dropping item has not yet been unlinked. This means that an item's ci_parent pointer will never be NULL while the item is in configfs, and that an item will only be in its parent's cg_children list for the same duration. This allows a subsystem to trust ci_parent and cg_children while they hold the -semaphore. +mutex. [Item Aggregation Via symlink(2)] @@ -386,6 +398,33 @@ As a consequence of this, default_groups cannot be removed directly via rmdir(2). They also are not considered when rmdir(2) on the parent group is checking for children. +[Dependant Subsystems] + +Sometimes other drivers depend on particular configfs items. For +example, ocfs2 mounts depend on a heartbeat region item. If that +region item is removed with rmdir(2), the ocfs2 mount must BUG or go +readonly. Not happy. + +configfs provides two additional API calls: configfs_depend_item() and +configfs_undepend_item(). A client driver can call +configfs_depend_item() on an existing item to tell configfs that it is +depended on. configfs will then return -EBUSY from rmdir(2) for that +item. When the item is no longer depended on, the client driver calls +configfs_undepend_item() on it. + +These API cannot be called underneath any configfs callbacks, as +they will conflict. They can block and allocate. A client driver +probably shouldn't calling them of its own gumption. Rather it should +be providing an API that external subsystems call. + +How does this work? Imagine the ocfs2 mount process. When it mounts, +it asks for a heartbeat region item. This is done via a call into the +heartbeat code. Inside the heartbeat code, the region item is looked +up. Here, the heartbeat code calls configfs_depend_item(). If it +succeeds, then heartbeat knows the region is safe to give to ocfs2. +If it fails, it was being torn down anyway, and heartbeat can gracefully +pass up an error. + [Committable Items] NOTE: Committable items are currently unimplemented. diff --git a/Documentation/filesystems/configfs/configfs_example.c b/Documentation/filesystems/configfs/configfs_example.c index 2d6a14a463e0..25151fd5c2c6 100644 --- a/Documentation/filesystems/configfs/configfs_example.c +++ b/Documentation/filesystems/configfs/configfs_example.c @@ -277,11 +277,10 @@ static struct config_item *simple_children_make_item(struct config_group *group, { struct simple_child *simple_child; - simple_child = kmalloc(sizeof(struct simple_child), GFP_KERNEL); + simple_child = kzalloc(sizeof(struct simple_child), GFP_KERNEL); if (!simple_child) return NULL; - memset(simple_child, 0, sizeof(struct simple_child)); config_item_init_type_name(&simple_child->item, name, &simple_child_type); @@ -364,12 +363,11 @@ static struct config_group *group_children_make_group(struct config_group *group { struct simple_children *simple_children; - simple_children = kmalloc(sizeof(struct simple_children), + simple_children = kzalloc(sizeof(struct simple_children), GFP_KERNEL); if (!simple_children) return NULL; - memset(simple_children, 0, sizeof(struct simple_children)); config_group_init_type_name(&simple_children->group, name, &simple_children_type); @@ -453,7 +451,7 @@ static int __init configfs_example_init(void) subsys = example_subsys[i]; config_group_init(&subsys->su_group); - init_MUTEX(&subsys->su_sem); + mutex_init(&subsys->su_mutex); ret = configfs_register_subsystem(subsys); if (ret) { printk(KERN_ERR "Error %d while registering subsystem %s\n", diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt index 8ccf0c1b58ed..ed55238023a9 100644 --- a/Documentation/filesystems/ocfs2.txt +++ b/Documentation/filesystems/ocfs2.txt @@ -28,11 +28,7 @@ Manish Singh Caveats ======= Features which OCFS2 does not support yet: - - sparse files - extended attributes - - shared writable mmap - - loopback is supported, but data written will not - be cluster coherent. - quotas - cluster aware flock - cluster aware lockf @@ -57,3 +53,12 @@ nointr Do not allow signals to interrupt cluster atime_quantum=60(*) OCFS2 will not update atime unless this number of seconds has passed since the last update. Set to zero to always update atime. +data=ordered (*) All data are forced directly out to the main file + system prior to its metadata being committed to the + journal. +data=writeback Data ordering is not preserved, data may be written + into the main file system after its metadata has been + committed to the journal. +preferred_slot=0(*) During mount, try to use this filesystem slot first. If + it is in use by another node, the first empty one found + will be chosen. Invalid values will be ignored. diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 8756a07f4dc3..4a37e25e694c 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt @@ -42,6 +42,7 @@ Table of Contents 2.12 /proc//oom_adj - Adjust the oom-killer score 2.13 /proc//oom_score - Display current oom-killer score 2.14 /proc//io - Display the IO accounting fields + 2.15 /proc//coredump_filter - Core dump filtering settings ------------------------------------------------------------------------------ Preface @@ -171,7 +172,9 @@ read the file /proc/PID/status: This shows you nearly the same information you would get if you viewed it with the ps command. In fact, ps uses the proc file system to obtain its information. The statm file contains more detailed information about the -process memory usage. Its seven fields are explained in Table 1-2. +process memory usage. Its seven fields are explained in Table 1-2. The stat +file contains details information about the process itself. Its fields are +explained in Table 1-3. Table 1-2: Contents of the statm files (as of 2.6.8-rc3) @@ -188,16 +191,65 @@ Table 1-2: Contents of the statm files (as of 2.6.8-rc3) dt number of dirty pages (always 0 on 2.6) .............................................................................. + +Table 1-3: Contents of the stat files (as of 2.6.22-rc3) +.............................................................................. + Field Content + pid process id + tcomm filename of the executable + state state (R is running, S is sleeping, D is sleeping in an + uninterruptible wait, Z is zombie, T is traced or stopped) + ppid process id of the parent process + pgrp pgrp of the process + sid session id + tty_nr tty the process uses + tty_pgrp pgrp of the tty + flags task flags + min_flt number of minor faults + cmin_flt number of minor faults with child's + maj_flt number of major faults + cmaj_flt number of major faults with child's + utime user mode jiffies + stime kernel mode jiffies + cutime user mode jiffies with child's + cstime kernel mode jiffies with child's + priority priority level + nice nice level + num_threads number of threads + start_time time the process started after system boot + vsize virtual memory size + rss resident set memory size + rsslim current limit in bytes on the rss + start_code address above which program text can run + end_code address below which program text can run + start_stack address of the start of the stack + esp current value of ESP + eip current value of EIP + pending bitmap of pending signals (obsolete) + blocked bitmap of blocked signals (obsolete) + sigign bitmap of ignored signals (obsolete) + sigcatch bitmap of catched signals (obsolete) + wchan address where process went to sleep + 0 (place holder) + 0 (place holder) + exit_signal signal to send to parent thread on exit + task_cpu which CPU the task is scheduled on + rt_priority realtime priority + policy scheduling policy (man sched_setscheduler) + blkio_ticks time spent waiting for block IO +.............................................................................. + + 1.2 Kernel data --------------- Similar to the process entries, the kernel data files give information about the running kernel. The files used to obtain this information are contained in -/proc and are listed in Table 1-3. Not all of these will be present in your +/proc and are listed in Table 1-4. Not all of these will be present in your system. It depends on the kernel configuration and the loaded modules, which files are there, and which are missing. -Table 1-3: Kernel info in /proc +Table 1-4: Kernel info in /proc .............................................................................. File Content apm Advanced power management info @@ -473,10 +525,10 @@ IDE devices: More detailed information can be found in the controller specific subdirectories. These are named ide0, ide1 and so on. Each of these -directories contains the files shown in table 1-4. +directories contains the files shown in table 1-5. -Table 1-4: IDE controller info in /proc/ide/ide? +Table 1-5: IDE controller info in /proc/ide/ide? .............................................................................. File Content channel IDE channel (0 or 1) @@ -486,11 +538,11 @@ Table 1-4: IDE controller info in /proc/ide/ide? .............................................................................. Each device connected to a controller has a separate subdirectory in the -controllers directory. The files listed in table 1-5 are contained in these +controllers directory. The files listed in table 1-6 are contained in these directories. -Table 1-5: IDE device information +Table 1-6: IDE device information .............................................................................. File Content cache The cache @@ -1014,6 +1066,13 @@ check the amount of free space (value is in seconds). Default settings are: 4, resume it if we have a value of 3 or more percent; consider information about the amount of free space valid for 30 seconds +audit_argv_kb +------------- + +The file contains a single value denoting the limit on the argv array size +for execve (in KiB). This limit is only applied when system call auditing for +execve is enabled, otherwise the value is ignored. + ctrl-alt-del ------------ @@ -1297,6 +1356,21 @@ nr_hugepages configures number of hugetlb page reserved for the system. hugetlb_shm_group contains group id that is allowed to create SysV shared memory segment using hugetlb page. +hugepages_treat_as_movable +-------------------------- + +This parameter is only useful when kernelcore= is specified at boot time to +create ZONE_MOVABLE for pages that may be reclaimed or migrated. Huge pages +are not movable so are not normally allocated from ZONE_MOVABLE. A non-zero +value written to hugepages_treat_as_movable allows huge pages to be allocated +from ZONE_MOVABLE. + +Once enabled, the ZONE_MOVABLE is treated as an area of memory the huge +pages pool can easily grow or shrink within. Assuming that applications are +not running that mlock() a lot of memory, it is likely the huge pages pool +can grow to the size of ZONE_MOVABLE by repeatedly entering the desired value +into nr_hugepages and triggering page reclaim. + laptop_mode ----------- @@ -2111,4 +2185,41 @@ those 64-bit counters, process A could see an intermediate result. More information about this can be found within the taskstats documentation in Documentation/accounting. +2.15 /proc//coredump_filter - Core dump filtering settings +--------------------------------------------------------------- +When a process is dumped, all anonymous memory is written to a core file as +long as the size of the core file isn't limited. But sometimes we don't want +to dump some memory segments, for example, huge shared memory. Conversely, +sometimes we want to save file-backed memory segments into a core file, not +only the individual files. + +/proc//coredump_filter allows you to customize which memory segments +will be dumped when the process is dumped. coredump_filter is a bitmask +of memory types. If a bit of the bitmask is set, memory segments of the +corresponding memory type are dumped, otherwise they are not dumped. + +The following 4 memory types are supported: + - (bit 0) anonymous private memory + - (bit 1) anonymous shared memory + - (bit 2) file-backed private memory + - (bit 3) file-backed shared memory + + Note that MMIO pages such as frame buffer are never dumped and vDSO pages + are always dumped regardless of the bitmask status. + +Default value of coredump_filter is 0x3; this means all anonymous memory +segments are dumped. + +If you don't want to dump all shared memory segments attached to pid 1234, +write 1 to the process's proc file. + + $ echo 0x1 > /proc/1234/coredump_filter + +When a new process is created, the process inherits the bitmask status from its +parent. It is useful to set up coredump_filter before the program runs. +For example: + + $ echo 0x7 > /proc/self/coredump_filter + $ ./some_program + ------------------------------------------------------------------------------ diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index a47cc819f37b..045f3e055a28 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt @@ -3,7 +3,7 @@ Original author: Richard Gooch - Last updated on October 28, 2005 + Last updated on June 24, 2007. Copyright (C) 1999 Richard Gooch Copyright (C) 2005 Pekka Enberg @@ -107,7 +107,7 @@ file /proc/filesystems. struct file_system_type ----------------------- -This describes the filesystem. As of kernel 2.6.13, the following +This describes the filesystem. As of kernel 2.6.22, the following members are defined: struct file_system_type { @@ -119,6 +119,8 @@ struct file_system_type { struct module *owner; struct file_system_type * next; struct list_head fs_supers; + struct lock_class_key s_lock_key; + struct lock_class_key s_umount_key; }; name: the name of the filesystem type, such as "ext2", "iso9660", @@ -137,11 +139,12 @@ struct file_system_type { next: for internal VFS use: you should initialize this to NULL + s_lock_key, s_umount_key: lockdep-specific + The get_sb() method has the following arguments: - struct super_block *sb: the superblock structure. This is partially - initialized by the VFS and the rest must be initialized by the - get_sb() method + struct file_system_type *fs_type: decribes the filesystem, partly initialized + by the specific filesystem code int flags: mount flags @@ -150,12 +153,13 @@ The get_sb() method has the following arguments: void *data: arbitrary mount options, usually comes as an ASCII string - int silent: whether or not to be silent on error + struct vfsmount *mnt: a vfs-internal representation of a mount point The get_sb() method must determine if the block device specified -in the superblock contains a filesystem of the type the method -supports. On success the method returns the superblock pointer, on -failure it returns NULL. +in the dev_name and fs_type contains a filesystem of the type the method +supports. If it succeeds in opening the named block device, it initializes a +struct super_block descriptor for the filesystem contained by the block device. +On failure it returns an error. The most interesting member of the superblock structure that the get_sb() method fills in is the "s_op" field. This is a pointer to @@ -193,7 +197,7 @@ struct super_operations ----------------------- This describes how the VFS can manipulate the superblock of your -filesystem. As of kernel 2.6.13, the following members are defined: +filesystem. As of kernel 2.6.22, the following members are defined: struct super_operations { struct inode *(*alloc_inode)(struct super_block *sb); @@ -216,8 +220,6 @@ struct super_operations { void (*clear_inode) (struct inode *); void (*umount_begin) (struct super_block *); - void (*sync_inodes) (struct super_block *sb, - struct writeback_control *wbc); int (*show_options)(struct seq_file *, struct vfsmount *); ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t); @@ -300,9 +302,6 @@ or bottom half). umount_begin: called when the VFS is unmounting a filesystem. - sync_inodes: called when the VFS is writing out dirty data associated with - a superblock. - show_options: called by the VFS to show mount options for /proc//mounts. quota_read: called by the VFS to read from filesystem quota file. @@ -324,7 +323,7 @@ struct inode_operations ----------------------- This describes how the VFS can manipulate an inode in your -filesystem. As of kernel 2.6.13, the following members are defined: +filesystem. As of kernel 2.6.22, the following members are defined: struct inode_operations { int (*create) (struct inode *,struct dentry *,int, struct nameidata *); @@ -348,6 +347,7 @@ struct inode_operations { ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t); int (*removexattr) (struct dentry *, const char *); + void (*truncate_range)(struct inode *, loff_t, loff_t); }; Again, all methods are called without any locks being held, unless @@ -444,6 +444,9 @@ otherwise noted. removexattr: called by the VFS to remove an extended attribute from a file. This method is called by removexattr(2) system call. + truncate_range: a method provided by the underlying filesystem to truncate a + range of blocks , i.e. punch a hole somewhere in a file. + The Address Space Object ======================== @@ -522,7 +525,7 @@ struct address_space_operations ------------------------------- This describes how the VFS can manipulate mapping of a file to page cache in -your filesystem. As of kernel 2.6.16, the following members are defined: +your filesystem. As of kernel 2.6.22, the following members are defined: struct address_space_operations { int (*writepage)(struct page *page, struct writeback_control *wbc); @@ -543,6 +546,7 @@ struct address_space_operations { int); /* migrate the contents of a page to the specified target */ int (*migratepage) (struct page *, struct page *); + int (*launder_page) (struct page *); }; writepage: called by the VM to write a dirty page to backing store. @@ -689,6 +693,10 @@ struct address_space_operations { transfer any private data across and update any references that it has to the page. + launder_page: Called before freeing a page - it writes back the dirty page. To + prevent redirtying the page, it is kept locked during the whole + operation. + The File Object =============== @@ -699,9 +707,10 @@ struct file_operations ---------------------- This describes how the VFS can manipulate an open file. As of kernel -2.6.17, the following members are defined: +2.6.22, the following members are defined: struct file_operations { + struct module *owner; loff_t (*llseek) (struct file *, loff_t, int); ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); @@ -728,10 +737,8 @@ struct file_operations { int (*check_flags)(int); int (*dir_notify)(struct file *filp, unsigned long arg); int (*flock) (struct file *, int, struct file_lock *); - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned -int); - ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned -int); + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned int); + ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int); }; Again, all methods are called without any locks being held, unless diff --git a/Documentation/firmware_class/firmware_sample_firmware_class.c b/Documentation/firmware_class/firmware_sample_firmware_class.c index 4994f1f28f8c..fba943aacf93 100644 --- a/Documentation/firmware_class/firmware_sample_firmware_class.c +++ b/Documentation/firmware_class/firmware_sample_firmware_class.c @@ -78,6 +78,7 @@ static CLASS_DEVICE_ATTR(loading, 0644, firmware_loading_show, firmware_loading_store); static ssize_t firmware_data_read(struct kobject *kobj, + struct bin_attribute *bin_attr, char *buffer, loff_t offset, size_t count) { struct class_device *class_dev = to_class_dev(kobj); @@ -88,6 +89,7 @@ static ssize_t firmware_data_read(struct kobject *kobj, return count; } static ssize_t firmware_data_write(struct kobject *kobj, + struct bin_attribute *bin_attr, char *buffer, loff_t offset, size_t count) { struct class_device *class_dev = to_class_dev(kobj); diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt index 36af58eba136..6bc2ba215df9 100644 --- a/Documentation/gpio.txt +++ b/Documentation/gpio.txt @@ -75,6 +75,9 @@ using the include file: If you stick to this convention then it'll be easier for other developers to see what your code is doing, and help maintain it. +Note that these operations include I/O barriers on platforms which need to +use them; drivers don't need to add them explicitly. + Identifying GPIOs ----------------- @@ -145,7 +148,7 @@ pin ... that won't always match the specified output value, because of issues including wire-OR and output latencies. The get/set calls have no error returns because "invalid GPIO" should have -been reported earlier in gpio_set_direction(). However, note that not all +been reported earlier from gpio_direction_*(). However, note that not all platforms can read the value of output pins; those that can't should always return zero. Also, using these calls for GPIOs that can't safely be accessed without sleeping (see below) is an error. @@ -236,7 +239,7 @@ map between them using calls like: Those return either the corresponding number in the other namespace, or else a negative errno code if the mapping can't be done. (For example, some GPIOs can't used as IRQs.) It is an unchecked error to use a GPIO -number that hasn't been marked as an input using gpio_set_direction(), or +number that wasn't set up as an input using gpio_direction_input(), or to use an IRQ number that didn't originally come from gpio_to_irq(). These two mapping calls are expected to cost on the order of a single diff --git a/Documentation/hpet.txt b/Documentation/hpet.txt index b7a3dc38dd52..6ad52d9dad6c 100644 --- a/Documentation/hpet.txt +++ b/Documentation/hpet.txt @@ -5,7 +5,7 @@ for the 8254 and Real Time Clock (RTC) periodic timer functionality. Each HPET can have up to 32 timers. It is possible to configure the first two timers as legacy replacements for 8254 and RTC periodic timers. A specification done by Intel and Microsoft can be found at -. +. The driver supports detection of HPET driver allocation and initialization of the HPET before the driver module_init routine is called. This enables diff --git a/Documentation/hrtimer/timer_stats.txt b/Documentation/hrtimer/timer_stats.txt index 22b0814d0ad0..20d368c59814 100644 --- a/Documentation/hrtimer/timer_stats.txt +++ b/Documentation/hrtimer/timer_stats.txt @@ -67,3 +67,7 @@ executed on expiry. Thomas, Ingo +Added flag to indicate 'deferrable timer' in /proc/timer_stats. A deferrable +timer will appear as follows + 10D, 1 swapper queue_delayed_work_on (delayed_work_timer_fn) + diff --git a/Documentation/hwmon/abituguru b/Documentation/hwmon/abituguru index b2c0d61b39a2..87ffa0f5ec70 100644 --- a/Documentation/hwmon/abituguru +++ b/Documentation/hwmon/abituguru @@ -2,7 +2,7 @@ Kernel driver abituguru ======================= Supported chips: - * Abit uGuru revision 1-3 (Hardware Monitor part only) + * Abit uGuru revision 1 & 2 (Hardware Monitor part only) Prefix: 'abituguru' Addresses scanned: ISA 0x0E0 Datasheet: Not available, this driver is based on reverse engineering. @@ -20,8 +20,8 @@ Supported chips: uGuru 2.1.0.0 ~ 2.1.2.8 (AS8, AV8, AA8, AG8, AA8XE, AX8) uGuru 2.2.0.0 ~ 2.2.0.6 (AA8 Fatal1ty) uGuru 2.3.0.0 ~ 2.3.0.9 (AN8) - uGuru 3.0.0.0 ~ 3.0.1.2 (AW8, AL8, NI8) - uGuru 4.xxxxx? (AT8 32X) (2) + uGuru 3.0.0.0 ~ 3.0.x.x (AW8, AL8, AT8, NI8 SLI, AT8 32X, AN8 32X, + AW9D-MAX) (2) 1) For revisions 2 and 3 uGuru's the driver can autodetect the sensortype (Volt or Temp) for bank1 sensors, for revision 1 uGuru's this doesnot always work. For these uGuru's the autodection can @@ -30,8 +30,9 @@ Supported chips: bank1_types=1,1,0,0,0,0,0,2,0,0,0,0,2,0,0,1 You may also need to specify the fan_sensors option for these boards fan_sensors=5 - 2) The current version of the abituguru driver is known to NOT work - on these Motherboards + 2) There is a seperate abituguru3 driver for these motherboards, + the abituguru (without the 3 !) driver will not work on these + motherboards (and visa versa)! Authors: Hans de Goede , @@ -43,8 +44,10 @@ Module Parameters ----------------- * force: bool Force detection. Note this parameter only causes the - detection to be skipped, if the uGuru can't be read - the module initialization (insmod) will still fail. + detection to be skipped, and thus the insmod to + succeed. If the uGuru can't be read the actual hwmon + driver will not load and thus no hwmon device will get + registered. * bank1_types: int[] Bank1 sensortype autodetection override: -1 autodetect (default) 0 volt sensor @@ -69,13 +72,15 @@ dmesg | grep abituguru Description ----------- -This driver supports the hardware monitoring features of the Abit uGuru chip -found on Abit uGuru featuring motherboards (most modern Abit motherboards). +This driver supports the hardware monitoring features of the first and +second revision of the Abit uGuru chip found on Abit uGuru featuring +motherboards (most modern Abit motherboards). -The uGuru chip in reality is a Winbond W83L950D in disguise (despite Abit -claiming it is "a new microprocessor designed by the ABIT Engineers"). -Unfortunatly this doesn't help since the W83L950D is a generic -microcontroller with a custom Abit application running on it. +The first and second revision of the uGuru chip in reality is a Winbond +W83L950D in disguise (despite Abit claiming it is "a new microprocessor +designed by the ABIT Engineers"). Unfortunatly this doesn't help since the +W83L950D is a generic microcontroller with a custom Abit application running +on it. Despite Abit not releasing any information regarding the uGuru, Olle Sandberg has managed to reverse engineer the sensor part diff --git a/Documentation/hwmon/adm1031 b/Documentation/hwmon/adm1031 index 130a38382b98..be92a77da1d5 100644 --- a/Documentation/hwmon/adm1031 +++ b/Documentation/hwmon/adm1031 @@ -6,13 +6,13 @@ Supported chips: Prefix: 'adm1030' Addresses scanned: I2C 0x2c to 0x2e Datasheet: Publicly available at the Analog Devices website - http://products.analog.com/products/info.asp?product=ADM1030 + http://www.analog.com/en/prod/0%2C2877%2CADM1030%2C00.html * Analog Devices ADM1031 Prefix: 'adm1031' Addresses scanned: I2C 0x2c to 0x2e Datasheet: Publicly available at the Analog Devices website - http://products.analog.com/products/info.asp?product=ADM1031 + http://www.analog.com/en/prod/0%2C2877%2CADM1031%2C00.html Authors: Alexandre d'Alton diff --git a/Documentation/hwmon/f71805f b/Documentation/hwmon/f71805f index bfd0f154959c..94e0d2cbd3d2 100644 --- a/Documentation/hwmon/f71805f +++ b/Documentation/hwmon/f71805f @@ -5,11 +5,11 @@ Supported chips: * Fintek F71805F/FG Prefix: 'f71805f' Addresses scanned: none, address read from Super I/O config space - Datasheet: Provided by Fintek on request + Datasheet: Available from the Fintek website * Fintek F71872F/FG Prefix: 'f71872f' Addresses scanned: none, address read from Super I/O config space - Datasheet: Provided by Fintek on request + Datasheet: Available from the Fintek website Author: Jean Delvare @@ -128,7 +128,9 @@ it. When the PWM method is used, you can select the operating frequency, from 187.5 kHz (default) to 31 Hz. The best frequency depends on the fan model. As a rule of thumb, lower frequencies seem to give better -control, but may generate annoying high-pitch noise. Fintek recommends +control, but may generate annoying high-pitch noise. So a frequency just +above the audible range, such as 25 kHz, may be a good choice; if this +doesn't give you good linear control, try reducing it. Fintek recommends not going below 1 kHz, as the fan tachometers get confused by lower frequencies as well. @@ -136,16 +138,23 @@ When the DC method is used, Fintek recommends not going below 5 V, which corresponds to a pwm value of 106 for the driver. The driver doesn't enforce this limit though. -Three different fan control modes are supported: +Three different fan control modes are supported; the mode number is written +to the pwm_enable file. -* Manual mode - You ask for a specific PWM duty cycle or DC voltage. +* 1: Manual mode + You ask for a specific PWM duty cycle or DC voltage by writing to the + pwm file. -* Fan speed mode - You ask for a specific fan speed. This mode assumes that pwm1 - corresponds to fan1, pwm2 to fan2 and pwm3 to fan3. +* 2: Temperature mode + You define 3 temperature/fan speed trip points using the + pwm_auto_point_temp and _fan files. These define a staircase + relationship between temperature and fan speed with two additional points + interpolated between the values that you define. When the temperature + is below auto_point1_temp the fan is switched off. -* Temperature mode - You define 3 temperature/fan speed trip points, and the fan speed is - adjusted depending on the measured temperature, using interpolation. - This mode is not yet supported by the driver. +* 3: Fan speed mode + You ask for a specific fan speed by writing to the fan_target file. + +Both of the automatic modes require that pwm1 corresponds to fan1, pwm2 to +fan2 and pwm3 to fan3. Temperature mode also requires that temp1 corresponds +to pwm1 and fan1, etc. diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87 index c0528d6f9ace..81ecc7e41c50 100644 --- a/Documentation/hwmon/it87 +++ b/Documentation/hwmon/it87 @@ -12,11 +12,12 @@ Supported chips: Addresses scanned: from Super I/O config space (8 I/O ports) Datasheet: Publicly available at the ITE website http://www.ite.com.tw/ - * IT8716F + * IT8716F/IT8726F Prefix: 'it8716' Addresses scanned: from Super I/O config space (8 I/O ports) Datasheet: Publicly available at the ITE website http://www.ite.com.tw/product_info/file/pc/IT8716F_V0.3.ZIP + http://www.ite.com.tw/product_info/file/pc/IT8726F_V0.3.pdf * IT8718F Prefix: 'it8718' Addresses scanned: from Super I/O config space (8 I/O ports) @@ -68,7 +69,7 @@ Description ----------- This driver implements support for the IT8705F, IT8712F, IT8716F, -IT8718F and SiS950 chips. +IT8718F, IT8726F and SiS950 chips. These chips are 'Super I/O chips', supporting floppy disks, infrared ports, joysticks and other miscellaneous stuff. For hardware monitoring, they @@ -97,6 +98,10 @@ clock divider mess) but not compatible with the older chips and revisions. For now, the driver only uses the 16-bit mode on the IT8716F and IT8718F. +The IT8726F is just bit enhanced IT8716F with additional hardware +for AMD power sequencing. Therefore the chip will appear as IT8716F +to userspace applications. + Temperatures are measured in degrees Celsius. An alarm is triggered once when the Overtemperature Shutdown limit is crossed. diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90 index 438cb24cee5b..aa4a0ec20081 100644 --- a/Documentation/hwmon/lm90 +++ b/Documentation/hwmon/lm90 @@ -48,6 +48,18 @@ Supported chips: Addresses scanned: I2C 0x4c, 0x4d (unsupported 0x4e) Datasheet: Publicly available at the Maxim website http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578 + * Maxim MAX6680 + Prefix: 'max6680' + Addresses scanned: I2C 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, + 0x4c, 0x4d and 0x4e + Datasheet: Publicly available at the Maxim website + http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370 + * Maxim MAX6681 + Prefix: 'max6680' + Addresses scanned: I2C 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, + 0x4c, 0x4d and 0x4e + Datasheet: Publicly available at the Maxim website + http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370 Author: Jean Delvare @@ -59,11 +71,15 @@ Description The LM90 is a digital temperature sensor. It senses its own temperature as well as the temperature of up to one external diode. It is compatible with many other devices such as the LM86, the LM89, the LM99, the ADM1032, -the MAX6657, MAX6658 and the MAX6659 all of which are supported by this driver. -Note that there is no easy way to differentiate between the last three -variants. The extra address and features of the MAX6659 are not supported by -this driver. Additionally, the ADT7461 is supported if found in ADM1032 -compatibility mode. +the MAX6657, MAX6658, MAX6659, MAX6680 and the MAX6681 all of which are +supported by this driver. + +Note that there is no easy way to differentiate between the MAX6657, +MAX6658 and MAX6659 variants. The extra address and features of the +MAX6659 are not supported by this driver. The MAX6680 and MAX6681 only +differ in their pinout, therefore they obviously can't (and don't need to) +be distinguished. Additionally, the ADT7461 is supported if found in +ADM1032 compatibility mode. The specificity of this family of chipsets over the ADM1021/LM84 family is that it features critical limits with hysteresis, and an @@ -93,18 +109,22 @@ ADM1032: * ALERT is triggered by open remote sensor. * SMBus PEC support for Write Byte and Receive Byte transactions. -ADT7461 +ADT7461: * Extended temperature range (breaks compatibility) * Lower resolution for remote temperature MAX6657 and MAX6658: * Remote sensor type selection -MAX6659 +MAX6659: * Selectable address * Second critical temperature limit * Remote sensor type selection +MAX6680 and MAX6681: + * Selectable address + * Remote sensor type selection + All temperature values are given in degrees Celsius. Resolution is 1.0 degree for the local temperature, 0.125 degree for the remote temperature. @@ -141,7 +161,7 @@ SMBus Read Byte, and PEC will work properly. Additionally, the ADM1032 doesn't support SMBus Send Byte with PEC. Instead, it will try to write the PEC value to the register (because the SMBus Send Byte transaction with PEC is similar to a Write Byte transaction -without PEC), which is not what we want. Thus, PEC is explicitely disabled +without PEC), which is not what we want. Thus, PEC is explicitly disabled on SMBus Send Byte transactions in the lm90 driver. PEC on byte data transactions represents a significant increase in bandwidth diff --git a/Documentation/hwmon/smsc47b397 b/Documentation/hwmon/smsc47b397 index 20682f15ae41..3a43b6948924 100644 --- a/Documentation/hwmon/smsc47b397 +++ b/Documentation/hwmon/smsc47b397 @@ -4,6 +4,7 @@ Kernel driver smsc47b397 Supported chips: * SMSC LPC47B397-NC * SMSC SCH5307-NS + * SMSC SCH5317 Prefix: 'smsc47b397' Addresses scanned: none, address read from Super I/O config space Datasheet: In this file @@ -18,8 +19,8 @@ The following specification describes the SMSC LPC47B397-NC[1] sensor chip provided by Craig Kelly (In-Store Broadcast Network) and edited/corrected by Mark M. Hoffman . -[1] And SMSC SCH5307-NS, which has a different device ID but is otherwise -compatible. +[1] And SMSC SCH5307-NS and SCH5317, which have different device IDs but are +otherwise compatible. * * * * * @@ -131,7 +132,7 @@ OUT DX,AL The registers of interest for identifying the SIO on the dc7100 are Device ID (0x20) and Device Rev (0x21). -The Device ID will read 0x6F (for SCH5307-NS, 0x81) +The Device ID will read 0x6F (0x81 for SCH5307-NS, and 0x85 for SCH5317) The Device Rev currently reads 0x01 Obtaining the HWM Base Address. diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface index a9a18ad0d17a..b3a9e1b9dbda 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface @@ -172,11 +172,10 @@ pwm[1-*] Pulse width modulation fan control. 255 is max or 100%. pwm[1-*]_enable - Switch PWM on and off. - Not always present even if pwmN is. - 0: turn off - 1: turn on in manual mode - 2+: turn on in automatic mode + Fan speed control method: + 0: no fan speed control (i.e. fan at full speed) + 1: manual fan speed control enabled (using pwm[1-*]) + 2+: automatic fan speed control enabled Check individual chip documentation files for automatic mode details. RW @@ -343,9 +342,9 @@ to notify open diodes, unconnected fans etc. where the hardware supports it. When this boolean has value 1, the measurement for that channel should not be trusted. -in[0-*]_input_fault -fan[1-*]_input_fault -temp[1-*]_input_fault +in[0-*]_fault +fan[1-*]_fault +temp[1-*]_fault Input fault condition 0: no fault occured 1: fault condition diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf index 030fac6cec7a..ccc2bcb61068 100644 --- a/Documentation/hwmon/w83627ehf +++ b/Documentation/hwmon/w83627ehf @@ -22,9 +22,9 @@ This driver implements support for the Winbond W83627EHF, W83627EHG, and W83627DHG super I/O chips. We will refer to them collectively as Winbond chips. The chips implement three temperature sensors, five fan rotation -speed sensors, ten analog voltage sensors (only nine for the 627DHG), alarms -with beep warnings (control unimplemented), and some automatic fan regulation -strategies (plus manual fan control mode). +speed sensors, ten analog voltage sensors (only nine for the 627DHG), one +VID (6 pins), alarms with beep warnings (control unimplemented), and +some automatic fan regulation strategies (plus manual fan control mode). Temperatures are measured in degrees Celsius and measurement resolution is 1 degC for temp1 and 0.5 degC for temp2 and temp3. An alarm is triggered when diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801 index c34f0db78a30..fe6406f2f9a6 100644 --- a/Documentation/i2c/busses/i2c-i801 +++ b/Documentation/i2c/busses/i2c-i801 @@ -5,8 +5,8 @@ Supported adapters: '810' and '810E' chipsets) * Intel 82801BA (ICH2 - part of the '815E' chipset) * Intel 82801CA/CAM (ICH3) - * Intel 82801DB (ICH4) (HW PEC supported, 32 byte buffer not supported) - * Intel 82801EB/ER (ICH5) (HW PEC supported, 32 byte buffer not supported) + * Intel 82801DB (ICH4) (HW PEC supported) + * Intel 82801EB/ER (ICH5) (HW PEC supported) * Intel 6300ESB * Intel 82801FB/FR/FW/FRW (ICH6) * Intel 82801G (ICH7) diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/i2c/busses/i2c-piix4 index 7cbe43fa2701..cf6b6cb02aa1 100644 --- a/Documentation/i2c/busses/i2c-piix4 +++ b/Documentation/i2c/busses/i2c-piix4 @@ -6,7 +6,7 @@ Supported adapters: Datasheet: Publicly available at the Intel website * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges Datasheet: Only available via NDA from ServerWorks - * ATI IXP200, IXP300, IXP400 and SB600 southbridges + * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges Datasheet: Not publicly available * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge Datasheet: Publicly available at the SMSC website http://www.smsc.com diff --git a/Documentation/i2c/chips/max6875 b/Documentation/i2c/chips/max6875 index 96fec562a8e9..a0cd8af2f408 100644 --- a/Documentation/i2c/chips/max6875 +++ b/Documentation/i2c/chips/max6875 @@ -99,7 +99,7 @@ And then read the data or - count = i2c_smbus_read_i2c_block_data(fd, 0x84, buffer); + count = i2c_smbus_read_i2c_block_data(fd, 0x84, 16, buffer); The block read should read 16 bytes. 0x84 is the block read command. diff --git a/Documentation/i2c/chips/x1205 b/Documentation/i2c/chips/x1205 deleted file mode 100644 index 09407c991fe5..000000000000 --- a/Documentation/i2c/chips/x1205 +++ /dev/null @@ -1,38 +0,0 @@ -Kernel driver x1205 -=================== - -Supported chips: - * Xicor X1205 RTC - Prefix: 'x1205' - Addresses scanned: none - Datasheet: http://www.intersil.com/cda/deviceinfo/0,1477,X1205,00.html - -Authors: - Karen Spearel , - Alessandro Zummo - -Description ------------ - -This module aims to provide complete access to the Xicor X1205 RTC. -Recently Xicor has merged with Intersil, but the chip is -still sold under the Xicor brand. - -This chip is located at address 0x6f and uses a 2-byte register addressing. -Two bytes need to be written to read a single register, while most -other chips just require one and take the second one as the data -to be written. To prevent corrupting unknown chips, the user must -explicitely set the probe parameter. - -example: - -modprobe x1205 probe=0,0x6f - -The module supports one more option, hctosys, which is used to set the -software clock from the x1205. On systems where the x1205 is the -only hardware rtc, this parameter could be used to achieve a correct -date/time earlier in the system boot sequence. - -example: - -modprobe x1205 probe=0,0x6f hctosys=1 diff --git a/Documentation/i2c/summary b/Documentation/i2c/summary index aea60bf7e8f0..003c7319b8c7 100644 --- a/Documentation/i2c/summary +++ b/Documentation/i2c/summary @@ -67,7 +67,6 @@ i2c-proc: The /proc/sys/dev/sensors interface for device (client) drivers Algorithm drivers ----------------- -i2c-algo-8xx: An algorithm for CPM's I2C device in Motorola 8xx processors (NOT BUILT BY DEFAULT) i2c-algo-bit: A bit-banging algorithm i2c-algo-pcf: A PCF 8584 style algorithm i2c-algo-ibm_ocp: An algorithm for the I2C device in IBM 4xx processors (NOT BUILT BY DEFAULT) @@ -81,6 +80,5 @@ i2c-pcf-epp: PCF8584 on a EPP parallel port (uses i2c-algo-pcf) (NOT mkpatch i2c-philips-par: Philips style parallel port adapter (uses i2c-algo-bit) i2c-adap-ibm_ocp: IBM 4xx processor I2C device (uses i2c-algo-ibm_ocp) (NOT BUILT BY DEFAULT) i2c-pport: Primitive parallel port adapter (uses i2c-algo-bit) -i2c-rpx: RPX board Motorola 8xx I2C device (uses i2c-algo-8xx) (NOT BUILT BY DEFAULT) i2c-velleman: Velleman K8000 parallel port adapter (uses i2c-algo-bit) diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients index 3d8d36b0ad12..2c170032bf37 100644 --- a/Documentation/i2c/writing-clients +++ b/Documentation/i2c/writing-clients @@ -571,7 +571,7 @@ SMBus communication u8 command, u8 length, u8 *values); extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client, - u8 command, u8 *values); + u8 command, u8 length, u8 *values); These ones were removed in Linux 2.6.10 because they had no users, but could be added back later if needed: diff --git a/Documentation/i386/zero-page.txt b/Documentation/i386/zero-page.txt index c04a421f4a7c..6c0817c45683 100644 --- a/Documentation/i386/zero-page.txt +++ b/Documentation/i386/zero-page.txt @@ -1,3 +1,13 @@ +--------------------------------------------------------------------------- +!!!!!!!!!!!!!!!WARNING!!!!!!!! +The zero page is a kernel internal data structure, not a stable ABI. It might change +without warning and the kernel has no way to detect old version of it. +If you're writing some external code like a boot loader you should only use +the stable versioned real mode boot protocol described in boot.txt. Otherwise the kernel +might break you at any time. +!!!!!!!!!!!!!WARNING!!!!!!!!!!! +---------------------------------------------------------------------------- + Summary of boot_params layout (kernel point of view) ( collected by Hans Lermen and Martin Mares ) @@ -37,6 +47,7 @@ Offset Type Description 0x1d0 unsigned long EFI memory descriptor map pointer 0x1d4 unsigned long EFI memory descriptor map size 0x1e0 unsigned long ALT_MEM_K, alternative mem check, in Kb +0x1e4 unsigned long Scratch field for the kernel setup code 0x1e8 char number of entries in E820MAP (below) 0x1e9 unsigned char number of entries in EDDBUF (below) 0x1ea unsigned char number of entries in EDD_MBR_SIG_BUFFER (below) diff --git a/Documentation/ia64/aliasing-test.c b/Documentation/ia64/aliasing-test.c index d485256ee1ce..773a814d4093 100644 --- a/Documentation/ia64/aliasing-test.c +++ b/Documentation/ia64/aliasing-test.c @@ -19,6 +19,7 @@ #include #include #include +#include int sum; @@ -34,13 +35,19 @@ int map_mem(char *path, off_t offset, size_t length, int touch) return -1; } + if (fnmatch("/proc/bus/pci/*", path, 0) == 0) { + rc = ioctl(fd, PCIIOC_MMAP_IS_MEM); + if (rc == -1) + perror("PCIIOC_MMAP_IS_MEM ioctl"); + } + addr = mmap(NULL, length, PROT_READ|PROT_WRITE, MAP_SHARED, fd, offset); if (addr == MAP_FAILED) return 1; if (touch) { c = (int *) addr; - while (c < (int *) (offset + length)) + while (c < (int *) (addr + length)) sum += *c++; } @@ -54,7 +61,7 @@ int map_mem(char *path, off_t offset, size_t length, int touch) return 0; } -int scan_sysfs(char *path, char *file, off_t offset, size_t length, int touch) +int scan_tree(char *path, char *file, off_t offset, size_t length, int touch) { struct dirent **namelist; char *name, *path2; @@ -93,7 +100,7 @@ int scan_sysfs(char *path, char *file, off_t offset, size_t length, int touch) } else { r = lstat(path2, &buf); if (r == 0 && S_ISDIR(buf.st_mode)) { - rc = scan_sysfs(path2, file, offset, length, touch); + rc = scan_tree(path2, file, offset, length, touch); if (rc < 0) return rc; } @@ -238,10 +245,15 @@ int main() else fprintf(stderr, "FAIL: /dev/mem 0x0-0x100000 not accessible\n"); - scan_sysfs("/sys/class/pci_bus", "legacy_mem", 0, 0xA0000, 1); - scan_sysfs("/sys/class/pci_bus", "legacy_mem", 0xA0000, 0x20000, 0); - scan_sysfs("/sys/class/pci_bus", "legacy_mem", 0xC0000, 0x40000, 1); - scan_sysfs("/sys/class/pci_bus", "legacy_mem", 0, 1024*1024, 0); + scan_tree("/sys/class/pci_bus", "legacy_mem", 0, 0xA0000, 1); + scan_tree("/sys/class/pci_bus", "legacy_mem", 0xA0000, 0x20000, 0); + scan_tree("/sys/class/pci_bus", "legacy_mem", 0xC0000, 0x40000, 1); + scan_tree("/sys/class/pci_bus", "legacy_mem", 0, 1024*1024, 0); scan_rom("/sys/devices", "rom"); + + scan_tree("/proc/bus/pci", "??.?", 0, 0xA0000, 1); + scan_tree("/proc/bus/pci", "??.?", 0xA0000, 0x20000, 0); + scan_tree("/proc/bus/pci", "??.?", 0xC0000, 0x40000, 1); + scan_tree("/proc/bus/pci", "??.?", 0, 1024*1024, 0); } diff --git a/Documentation/ia64/aliasing.txt b/Documentation/ia64/aliasing.txt index 9a431a7d0f5d..aa3e953f0f7b 100644 --- a/Documentation/ia64/aliasing.txt +++ b/Documentation/ia64/aliasing.txt @@ -112,6 +112,18 @@ POTENTIAL ATTRIBUTE ALIASING CASES The /dev/mem mmap constraints apply. + mmap of /proc/bus/pci/.../??.? + + This is an MMIO mmap of PCI functions, which additionally may or + may not be requested as using the WC attribute. + + If WC is requested, and the region in kern_memmap is either WC + or UC, and the EFI memory map designates the region as WC, then + the WC mapping is allowed. + + Otherwise, the user mapping must use the same attribute as the + kernel mapping. + read/write of /dev/mem This uses copy_from_user(), which implicitly uses a kernel diff --git a/Documentation/input/iforce-protocol.txt b/Documentation/input/iforce-protocol.txt index 95df4ca70e71..8777d2d321e3 100644 --- a/Documentation/input/iforce-protocol.txt +++ b/Documentation/input/iforce-protocol.txt @@ -1,254 +1,254 @@ -** Introduction -This document describes what I managed to discover about the protocol used to -specify force effects to I-Force 2.0 devices. None of this information comes -from Immerse. That's why you should not trust what is written in this -document. This document is intended to help understanding the protocol. -This is not a reference. Comments and corrections are welcome. To contact me, -send an email to: deneux@ifrance.com - -** WARNING ** -I may not be held responsible for any dammage or harm caused if you try to -send data to your I-Force device based on what you read in this document. - -** Preliminary Notes: -All values are hexadecimal with big-endian encoding (msb on the left). Beware, -values inside packets are encoded using little-endian. Bytes whose roles are -unknown are marked ??? Information that needs deeper inspection is marked (?) - -** General form of a packet ** -This is how packets look when the device uses the rs232 to communicate. -2B OP LEN DATA CS -CS is the checksum. It is equal to the exclusive or of all bytes. - -When using USB: -OP DATA -The 2B, LEN and CS fields have disappeared, probably because USB handles frames and -data corruption is handled or unsignificant. - -First, I describe effects that are sent by the device to the computer - -** Device input state -This packet is used to indicate the state of each button and the value of each -axis -OP= 01 for a joystick, 03 for a wheel -LEN= Varies from device to device -00 X-Axis lsb -01 X-Axis msb -02 Y-Axis lsb, or gas pedal for a wheel -03 Y-Axis msb, or brake pedal for a wheel -04 Throttle -05 Buttons -06 Lower 4 bits: Buttons - Upper 4 bits: Hat -07 Rudder - -** Device effects states -OP= 02 -LEN= Varies -00 ? Bit 1 (Value 2) is the value of the deadman switch -01 Bit 8 is set if the effect is playing. Bits 0 to 7 are the effect id. -02 ?? -03 Address of parameter block changed (lsb) -04 Address of parameter block changed (msb) -05 Address of second parameter block changed (lsb) -... depending on the number of parameter blocks updated - -** Force effect ** -OP= 01 -LEN= 0e -00 Channel (when playing several effects at the same time, each must be assigned a channel) -01 Wave form - Val 00 Constant - Val 20 Square - Val 21 Triangle - Val 22 Sine - Val 23 Sawtooth up - Val 24 Sawtooth down - Val 40 Spring (Force = f(pos)) - Val 41 Friction (Force = f(velocity)) and Inertia (Force = f(acceleration)) - - -02 Axes affected and trigger - Bits 4-7: Val 2 = effect along one axis. Byte 05 indicates direction - Val 4 = X axis only. Byte 05 must contain 5a - Val 8 = Y axis only. Byte 05 must contain b4 - Val c = X and Y axes. Bytes 05 must contain 60 - Bits 0-3: Val 0 = No trigger - Val x+1 = Button x triggers the effect - When the whole byte is 0, cancel the previously set trigger - -03-04 Duration of effect (little endian encoding, in ms) - -05 Direction of effect, if applicable. Else, see 02 for value to assign. - -06-07 Minimum time between triggering. - -08-09 Address of periodicity or magnitude parameters -0a-0b Address of attack and fade parameters, or ffff if none. -*or* -08-09 Address of interactive parameters for X-axis, or ffff if not applicable -0a-0b Address of interactive parameters for Y-axis, or ffff if not applicable - -0c-0d Delay before execution of effect (little endian encoding, in ms) - - -** Time based parameters ** - -*** Attack and fade *** -OP= 02 -LEN= 08 -00-01 Address where to store the parameteres -02-03 Duration of attack (little endian encoding, in ms) -04 Level at end of attack. Signed byte. -05-06 Duration of fade. -07 Level at end of fade. - -*** Magnitude *** -OP= 03 -LEN= 03 -00-01 Address -02 Level. Signed byte. - -*** Periodicity *** -OP= 04 -LEN= 07 -00-01 Address -02 Magnitude. Signed byte. -03 Offset. Signed byte. -04 Phase. Val 00 = 0 deg, Val 40 = 90 degs. -05-06 Period (little endian encoding, in ms) - -** Interactive parameters ** -OP= 05 -LEN= 0a -00-01 Address -02 Positive Coeff -03 Negative Coeff -04+05 Offset (center) -06+07 Dead band (Val 01F4 = 5000 (decimal)) -08 Positive saturation (Val 0a = 1000 (decimal) Val 64 = 10000 (decimal)) -09 Negative saturation - -The encoding is a bit funny here: For coeffs, these are signed values. The -maximum value is 64 (100 decimal), the min is 9c. -For the offset, the minimum value is FE0C, the maximum value is 01F4. -For the deadband, the minimum value is 0, the max is 03E8. - -** Controls ** -OP= 41 -LEN= 03 -00 Channel -01 Start/Stop - Val 00: Stop - Val 01: Start and play once. - Val 41: Start and play n times (See byte 02 below) -02 Number of iterations n. - -** Init ** - -*** Querying features *** -OP= ff -Query command. Length varies according to the query type. -The general format of this packet is: -ff 01 QUERY [INDEX] CHECKSUM -reponses are of the same form: -FF LEN QUERY VALUE_QUERIED CHECKSUM2 -where LEN = 1 + length(VALUE_QUERIED) - -**** Query ram size **** -QUERY = 42 ('B'uffer size) -The device should reply with the same packet plus two additionnal bytes -containing the size of the memory: -ff 03 42 03 e8 CS would mean that the device has 1000 bytes of ram available. - -**** Query number of effects **** -QUERY = 4e ('N'umber of effects) -The device should respond by sending the number of effects that can be played -at the same time (one byte) -ff 02 4e 14 CS would stand for 20 effects. - -**** Vendor's id **** -QUERY = 4d ('M'anufacturer) -Query the vendors'id (2 bytes) - -**** Product id ***** -QUERY = 50 ('P'roduct) -Query the product id (2 bytes) - -**** Open device **** -QUERY = 4f ('O'pen) -No data returned. - -**** Close device ***** -QUERY = 43 ('C')lose -No data returned. - -**** Query effect **** -QUERY = 45 ('E') -Send effect type. -Returns nonzero if supported (2 bytes) - -**** Firmware Version **** -QUERY = 56 ('V'ersion) -Sends back 3 bytes - major, minor, subminor - -*** Initialisation of the device *** - -**** Set Control **** -!!! Device dependent, can be different on different models !!! -OP= 40 [] -LEN= 2 or 3 -00 Idx - Idx 00 Set dead zone (0..2048) - Idx 01 Ignore Deadman sensor (0..1) - Idx 02 Enable comm watchdog (0..1) - Idx 03 Set the strength of the spring (0..100) - Idx 04 Enable or disable the spring (0/1) - Idx 05 Set axis saturation threshold (0..2048) - -**** Set Effect State **** -OP= 42 -LEN= 1 -00 State - Bit 3 Pause force feedback - Bit 2 Enable force feedback - Bit 0 Stop all effects - -**** Set overall gain **** -OP= 43 -LEN= 1 -00 Gain - Val 00 = 0% - Val 40 = 50% - Val 80 = 100% - -** Parameter memory ** - -Each device has a certain amount of memory to store parameters of effects. -The amount of RAM may vary, I encountered values from 200 to 1000 bytes. Below -is the amount of memory apparently needed for every set of parameters: - - period : 0c - - magnitude : 02 - - attack and fade : 0e - - interactive : 08 - -** Appendix: How to study the protocol ? ** - -1. 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) -2. Start a soft spying RS232 or USB (depending on where you connected your joystick/wheel). I used ComPortSpy from fCoder (alpha version!) -3. Play the effect, and watch what happens on the spy screen. - -A few words about ComPortSpy: -At 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. -Remember it's free (as in free beer) and alpha! - -** URLS ** -Check www.immerse.com for Immersion Studio, and www.fcoder.com for ComPortSpy. - -** Author of this document ** -Johann Deneux -Home page at http://www.esil.univ-mrs.fr/~jdeneux/projects/ff/ - -Additions by Vojtech Pavlik. - -I-Force is trademark of Immersion Corp. +** Introduction +This document describes what I managed to discover about the protocol used to +specify force effects to I-Force 2.0 devices. None of this information comes +from Immerse. That's why you should not trust what is written in this +document. This document is intended to help understanding the protocol. +This is not a reference. Comments and corrections are welcome. To contact me, +send an email to: deneux@ifrance.com + +** WARNING ** +I may not be held responsible for any dammage or harm caused if you try to +send data to your I-Force device based on what you read in this document. + +** Preliminary Notes: +All values are hexadecimal with big-endian encoding (msb on the left). Beware, +values inside packets are encoded using little-endian. Bytes whose roles are +unknown are marked ??? Information that needs deeper inspection is marked (?) + +** General form of a packet ** +This is how packets look when the device uses the rs232 to communicate. +2B OP LEN DATA CS +CS is the checksum. It is equal to the exclusive or of all bytes. + +When using USB: +OP DATA +The 2B, LEN and CS fields have disappeared, probably because USB handles frames and +data corruption is handled or unsignificant. + +First, I describe effects that are sent by the device to the computer + +** Device input state +This packet is used to indicate the state of each button and the value of each +axis +OP= 01 for a joystick, 03 for a wheel +LEN= Varies from device to device +00 X-Axis lsb +01 X-Axis msb +02 Y-Axis lsb, or gas pedal for a wheel +03 Y-Axis msb, or brake pedal for a wheel +04 Throttle +05 Buttons +06 Lower 4 bits: Buttons + Upper 4 bits: Hat +07 Rudder + +** Device effects states +OP= 02 +LEN= Varies +00 ? Bit 1 (Value 2) is the value of the deadman switch +01 Bit 8 is set if the effect is playing. Bits 0 to 7 are the effect id. +02 ?? +03 Address of parameter block changed (lsb) +04 Address of parameter block changed (msb) +05 Address of second parameter block changed (lsb) +... depending on the number of parameter blocks updated + +** Force effect ** +OP= 01 +LEN= 0e +00 Channel (when playing several effects at the same time, each must be assigned a channel) +01 Wave form + Val 00 Constant + Val 20 Square + Val 21 Triangle + Val 22 Sine + Val 23 Sawtooth up + Val 24 Sawtooth down + Val 40 Spring (Force = f(pos)) + Val 41 Friction (Force = f(velocity)) and Inertia (Force = f(acceleration)) + + +02 Axes affected and trigger + Bits 4-7: Val 2 = effect along one axis. Byte 05 indicates direction + Val 4 = X axis only. Byte 05 must contain 5a + Val 8 = Y axis only. Byte 05 must contain b4 + Val c = X and Y axes. Bytes 05 must contain 60 + Bits 0-3: Val 0 = No trigger + Val x+1 = Button x triggers the effect + When the whole byte is 0, cancel the previously set trigger + +03-04 Duration of effect (little endian encoding, in ms) + +05 Direction of effect, if applicable. Else, see 02 for value to assign. + +06-07 Minimum time between triggering. + +08-09 Address of periodicity or magnitude parameters +0a-0b Address of attack and fade parameters, or ffff if none. +*or* +08-09 Address of interactive parameters for X-axis, or ffff if not applicable +0a-0b Address of interactive parameters for Y-axis, or ffff if not applicable + +0c-0d Delay before execution of effect (little endian encoding, in ms) + + +** Time based parameters ** + +*** Attack and fade *** +OP= 02 +LEN= 08 +00-01 Address where to store the parameteres +02-03 Duration of attack (little endian encoding, in ms) +04 Level at end of attack. Signed byte. +05-06 Duration of fade. +07 Level at end of fade. + +*** Magnitude *** +OP= 03 +LEN= 03 +00-01 Address +02 Level. Signed byte. + +*** Periodicity *** +OP= 04 +LEN= 07 +00-01 Address +02 Magnitude. Signed byte. +03 Offset. Signed byte. +04 Phase. Val 00 = 0 deg, Val 40 = 90 degs. +05-06 Period (little endian encoding, in ms) + +** Interactive parameters ** +OP= 05 +LEN= 0a +00-01 Address +02 Positive Coeff +03 Negative Coeff +04+05 Offset (center) +06+07 Dead band (Val 01F4 = 5000 (decimal)) +08 Positive saturation (Val 0a = 1000 (decimal) Val 64 = 10000 (decimal)) +09 Negative saturation + +The encoding is a bit funny here: For coeffs, these are signed values. The +maximum value is 64 (100 decimal), the min is 9c. +For the offset, the minimum value is FE0C, the maximum value is 01F4. +For the deadband, the minimum value is 0, the max is 03E8. + +** Controls ** +OP= 41 +LEN= 03 +00 Channel +01 Start/Stop + Val 00: Stop + Val 01: Start and play once. + Val 41: Start and play n times (See byte 02 below) +02 Number of iterations n. + +** Init ** + +*** Querying features *** +OP= ff +Query command. Length varies according to the query type. +The general format of this packet is: +ff 01 QUERY [INDEX] CHECKSUM +reponses are of the same form: +FF LEN QUERY VALUE_QUERIED CHECKSUM2 +where LEN = 1 + length(VALUE_QUERIED) + +**** Query ram size **** +QUERY = 42 ('B'uffer size) +The device should reply with the same packet plus two additionnal bytes +containing the size of the memory: +ff 03 42 03 e8 CS would mean that the device has 1000 bytes of ram available. + +**** Query number of effects **** +QUERY = 4e ('N'umber of effects) +The device should respond by sending the number of effects that can be played +at the same time (one byte) +ff 02 4e 14 CS would stand for 20 effects. + +**** Vendor's id **** +QUERY = 4d ('M'anufacturer) +Query the vendors'id (2 bytes) + +**** Product id ***** +QUERY = 50 ('P'roduct) +Query the product id (2 bytes) + +**** Open device **** +QUERY = 4f ('O'pen) +No data returned. + +**** Close device ***** +QUERY = 43 ('C')lose +No data returned. + +**** Query effect **** +QUERY = 45 ('E') +Send effect type. +Returns nonzero if supported (2 bytes) + +**** Firmware Version **** +QUERY = 56 ('V'ersion) +Sends back 3 bytes - major, minor, subminor + +*** Initialisation of the device *** + +**** Set Control **** +!!! Device dependent, can be different on different models !!! +OP= 40 [] +LEN= 2 or 3 +00 Idx + Idx 00 Set dead zone (0..2048) + Idx 01 Ignore Deadman sensor (0..1) + Idx 02 Enable comm watchdog (0..1) + Idx 03 Set the strength of the spring (0..100) + Idx 04 Enable or disable the spring (0/1) + Idx 05 Set axis saturation threshold (0..2048) + +**** Set Effect State **** +OP= 42 +LEN= 1 +00 State + Bit 3 Pause force feedback + Bit 2 Enable force feedback + Bit 0 Stop all effects + +**** Set overall gain **** +OP= 43 +LEN= 1 +00 Gain + Val 00 = 0% + Val 40 = 50% + Val 80 = 100% + +** Parameter memory ** + +Each device has a certain amount of memory to store parameters of effects. +The amount of RAM may vary, I encountered values from 200 to 1000 bytes. Below +is the amount of memory apparently needed for every set of parameters: + - period : 0c + - magnitude : 02 + - attack and fade : 0e + - interactive : 08 + +** Appendix: How to study the protocol ? ** + +1. 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) +2. Start a soft spying RS232 or USB (depending on where you connected your joystick/wheel). I used ComPortSpy from fCoder (alpha version!) +3. Play the effect, and watch what happens on the spy screen. + +A few words about ComPortSpy: +At 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. +Remember it's free (as in free beer) and alpha! + +** URLS ** +Check www.immerse.com for Immersion Studio, and www.fcoder.com for ComPortSpy. + +** Author of this document ** +Johann Deneux +Home page at http://www.esil.univ-mrs.fr/~jdeneux/projects/ff/ + +Additions by Vojtech Pavlik. + +I-Force is trademark of Immersion Corp. diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt index 3de7d379cf07..5c7fbf9d96b4 100644 --- a/Documentation/ioctl-number.txt +++ b/Documentation/ioctl-number.txt @@ -67,7 +67,7 @@ Code Seq# Include File Comments 0x00 00-1F linux/wavefront.h conflict! 0x02 all linux/fd.h 0x03 all linux/hdreg.h -0x04 all linux/umsdos_fs.h +0x04 D2-DC linux/umsdos_fs.h Dead since 2.6.11, but don't reuse these. 0x06 all linux/lp.h 0x09 all linux/md.h 0x12 all linux/fs.h diff --git a/Documentation/iostats.txt b/Documentation/iostats.txt index 09a1bafe2528..b963c3b4afa5 100644 --- a/Documentation/iostats.txt +++ b/Documentation/iostats.txt @@ -79,7 +79,7 @@ Field 8 -- # of milliseconds spent writing measured from __make_request() to end_that_request_last()). Field 9 -- # of I/Os currently in progress The only field that should go to zero. Incremented as requests are - given to appropriate request_queue_t and decremented as they finish. + given to appropriate struct request_queue and decremented as they finish. Field 10 -- # of milliseconds spent doing I/Os This field is increases so long as field 9 is nonzero. Field 11 -- weighted # of milliseconds spent doing I/Os diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt index 536d5bfbdb8d..fe8b0c4892cf 100644 --- a/Documentation/kbuild/kconfig-language.txt +++ b/Documentation/kbuild/kconfig-language.txt @@ -98,6 +98,15 @@ applicable everywhere (see syntax). times, the limit is set to the largest selection. Reverse dependencies can only be used with boolean or tristate symbols. + Note: + select is evil.... select will by brute force set a symbol + equal to 'y' without visiting the dependencies. So abusing + select you are able to select a symbol FOO even if FOO depends + on BAR that is not set. In general use select only for + non-visible symbols (no promts anywhere) and for symbols with + no dependencies. That will limit the usefulness but on the + other hand avoid the illegal configurations all over. kconfig + should one day warn about such things. - numerical ranges: "range" ["if" ] This allows to limit the range of possible input values for int diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index bb5306e9a5c3..e08ef8759a07 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -501,6 +501,20 @@ more details, with real examples. The third parameter may be a text as in this example, but it may also be an expanded variable or a macro. + cc-fullversion + cc-fullversion is useful when the exact version of gcc is needed. + One typical use-case is when a specific GCC version is broken. + cc-fullversion points out a more specific version than cc-version does. + + Example: + #arch/powerpc/Makefile + $(Q)if test "$(call cc-fullversion)" = "040200" ; then \ + echo -n '*** GCC-4.2.0 cannot compile the 64-bit powerpc ' ; \ + false ; \ + fi + + In this example for a specific GCC version the build will error out explaining + to the user why it stops. === 4 Host Program support diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 92b30af3fdf6..4d175c751246 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -30,18 +30,17 @@ the beginning of each description states the restrictions within which a parameter is applicable: ACPI ACPI support is enabled. + AGP AGP (Accelerated Graphics Port) is enabled. ALSA ALSA sound support is enabled. APIC APIC support is enabled. APM Advanced Power Management support is enabled. AX25 Appropriate AX.25 support is enabled. - CD Appropriate CD support is enabled. DRM Direct Rendering Management support is enabled. EDD BIOS Enhanced Disk Drive Services (EDD) is enabled EFI EFI Partitioning (GPT) is enabled EIDE EIDE/ATAPI support is enabled. FB The frame buffer device is enabled. HW Appropriate hardware is enabled. - IA-32 IA-32 aka i386 architecture is enabled. IA-64 IA-64 architecture is enabled. IOSCHED More than one I/O scheduler is enabled. IP_PNP IP DHCP, BOOTP, or RARP is enabled. @@ -58,14 +57,14 @@ parameter is applicable: MDA MDA console support is enabled. MOUSE Appropriate mouse support is enabled. MSI Message Signaled Interrupts (PCI). - MTD MTD support is enabled. + MTD MTD (Memory Technology Device) support is enabled. NET Appropriate network support is enabled. NUMA NUMA support is enabled. GENERIC_TIME The generic timeofday code is enabled. NFS Appropriate NFS support is enabled. OSS OSS sound support is enabled. - PV_OPS A paravirtualized kernel - PARIDE The ParIDE subsystem is enabled. + PV_OPS A paravirtualized kernel is enabled. + PARIDE The ParIDE (parallel port IDE) subsystem is enabled. PARISC The PA-RISC architecture is enabled. PCI PCI bus support is enabled. PCMCIA The PCMCIA subsystem is enabled. @@ -92,6 +91,7 @@ parameter is applicable: VT Virtual terminal support is enabled. WDT Watchdog support is enabled. XT IBM PC/XT MFM hard disk support is enabled. + X86-32 X86-32, aka i386 architecture is enabled. X86-64 X86-64 architecture is enabled. More X86-64 boot options can be found in Documentation/x86_64/boot-options.txt . @@ -123,10 +123,6 @@ and is between 256 and 4096 characters. It is defined in the file ./include/asm/setup.h as COMMAND_LINE_SIZE. - 53c7xx= [HW,SCSI] Amiga SCSI controllers - See header of drivers/scsi/53c7xx.c. - See also Documentation/scsi/ncr53c7xx.txt. - acpi= [HW,ACPI,X86-64,i386] Advanced Configuration and Power Interface Format: { force | off | ht | strict | noirq } @@ -167,6 +163,8 @@ and is between 256 and 4096 characters. It is defined in the file acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA Format: ,... + acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT + acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS Format: To spoof as Windows 98: ="Microsoft Windows" @@ -223,11 +221,17 @@ and is between 256 and 4096 characters. It is defined in the file acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT - acpi_pm_good [IA-32,X86-64] + acpi_pm_good [X86-32,X86-64] Override the pmtimer bug detection: force the kernel to assume that this machine's pmtimer latches its value and always returns good values. + agp= [AGP] + { off | try_unsupported } + off: disable AGP support + try_unsupported: try to drive unsupported chipsets + (may crash computer or cause data corruption) + enable_timer_pin_1 [i386,x86-64] Enable PIN 1 of APIC timer Can be useful to work around chipset bugs @@ -238,16 +242,9 @@ and is between 256 and 4096 characters. It is defined in the file Disable PIN 1 of APIC timer Can be useful to work around chipset bugs. - ad1816= [HW,OSS] - Format: ,,, - See also Documentation/sound/oss/AD1816. - ad1848= [HW,OSS] Format: ,,,, - adlib= [HW,OSS] - Format: - advansys= [HW,SCSI] See header of drivers/scsi/advansys.c. @@ -287,7 +284,8 @@ and is between 256 and 4096 characters. It is defined in the file not play well with APC CPU idle - disable it if you have APC and your system crashes randomly. - apic= [APIC,i386] Change the output verbosity whilst booting + apic= [APIC,i386] Advanced Programmable Interrupt Controller + Change the output verbosity whilst booting Format: { quiet (default) | verbose | debug } Change the amount of debugging information output when initialising the APIC and IO-APIC components. @@ -326,9 +324,6 @@ and is between 256 and 4096 characters. It is defined in the file autotest [IA64] - aztcd= [HW,CD] Aztech CD268 CDROM driver - Format: ,0x79 (?) - baycom_epp= [HW,AX25] Format: , @@ -364,17 +359,13 @@ and is between 256 and 4096 characters. It is defined in the file c101= [NET] Moxa C101 synchronous serial card - cachesize= [BUGS=IA-32] Override level 2 CPU cache size detection. + cachesize= [BUGS=X86-32] Override level 2 CPU cache size detection. Sometimes CPU hardware bugs make them report the cache size incorrectly. The kernel will attempt work arounds to fix known problems, but for some CPUs it is not possible to determine what the correct size should be. This option provides an override for these situations. - cdu31a= [HW,CD] - Format: ,[,PAS] - See header of drivers/cdrom/cdu31a.c. - chandev= [HW,NET] Generic channel device initialisation checkreqprot [SELINUX] Set initial checkreqprot flag value. @@ -387,7 +378,7 @@ and is between 256 and 4096 characters. It is defined in the file Value can be changed at runtime via /selinux/checkreqprot. - clock= [BUGS=IA-32, HW] gettimeofday clocksource override. + clock= [BUGS=X86-32, HW] gettimeofday clocksource override. [Deprecated] Forces specified clocksource (if available) to be used when calculating gettimeofday(). If specified @@ -405,7 +396,7 @@ and is between 256 and 4096 characters. It is defined in the file [ARM] imx_timer1,OSTS,netx_timer,mpu_timer2, pxa_timer,timer3,32k_counter,timer0_1 [AVR32] avr32 - [IA-32] pit,hpet,tsc,vmi-timer; + [X86-32] pit,hpet,tsc,vmi-timer; scx200_hrt on Geode; cyclone on IBM x440 [MIPS] MIPS [PARISC] cr16 @@ -425,12 +416,9 @@ and is between 256 and 4096 characters. It is defined in the file over the 8254 in addition to over the IO-APIC. The kernel tries to set a sensible default. - hpet= [IA-32,HPET] option to disable HPET and use PIT. + hpet= [X86-32,HPET] option to disable HPET and use PIT. Format: disable - cm206= [HW,CD] - Format: { auto | [,][] } - com20020= [HW,NET] ARCnet - COM20020 chipset Format: [,[,[,[,[,]]]]] @@ -462,20 +450,24 @@ and is between 256 and 4096 characters. It is defined in the file Documentation/networking/netconsole.txt for an alternative. - uart,io,[,options] - uart,mmio,[,options] + uart[8250],io,[,options] + uart[8250],mmio,[,options] Start an early, polled-mode console on the 8250/16550 UART at the specified I/O port or MMIO address, switching to the matching ttyS device later. The options are the same as for ttyS, above. + earlycon= [KNL] Output early console device and options. + uart[8250],io,[,options] + uart[8250],mmio,[,options] + Start an early, polled-mode console on the 8250/16550 + UART at the specified I/O port or MMIO address. + The options are the same as for ttyS, above. + cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver Format: ,,,[,] - cpia_pp= [HW,PPT] - Format: { parport | auto | none } - crashkernel=nn[KMG]@ss[KMG] [KNL] Reserve a chunk of physical memory to hold a kernel to switch to with kexec on panic. @@ -558,7 +550,7 @@ and is between 256 and 4096 characters. It is defined in the file dtc3181e= [HW,SCSI] - earlyprintk= [IA-32,X86-64,SH] + earlyprintk= [X86-32,X86-64,SH] earlyprintk=vga earlyprintk=serial[,ttySn[,baudrate]] @@ -596,7 +588,7 @@ and is between 256 and 4096 characters. It is defined in the file eisa_irq_edge= [PARISC,HW] See header of drivers/parisc/eisa.c. - elanfreq= [IA-32] + elanfreq= [X86-32] See comment before function elanfreq_setup() in arch/i386/kernel/cpu/cpufreq/elanfreq.c. @@ -605,7 +597,7 @@ and is between 256 and 4096 characters. It is defined in the file See Documentation/block/as-iosched.txt and Documentation/block/deadline-iosched.txt for details. - elfcorehdr= [IA-32, X86_64] + elfcorehdr= [X86-32, X86_64] Specifies physical address of start of kernel core image elf header. Generally kexec loader will pass this option to capture kernel. @@ -660,9 +652,6 @@ and is between 256 and 4096 characters. It is defined in the file gpt [EFI] Forces disk with valid GPT signature but invalid Protective MBR to be treated as GPT. - gscd= [HW,CD] - Format: - gvp11= [HW,SCSI] hashdist= [KNL,NUMA] Large hashes allocated during boot @@ -690,7 +679,7 @@ and is between 256 and 4096 characters. It is defined in the file hisax= [HW,ISDN] See Documentation/isdn/README.HiSax. - hugepages= [HW,IA-32,IA-64] Maximal number of HugeTLB pages. + hugepages= [HW,X86-32,IA-64] Maximal number of HugeTLB pages. i8042.direct [HW] Put keyboard port into non-translated mode i8042.dumbkbd [HW] Pretend that controller can only read data from @@ -782,7 +771,8 @@ and is between 256 and 4096 characters. It is defined in the file See Documentation/nfsroot.txt. ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards - See comment before ip2_setup() in drivers/char/ip2.c. + See comment before ip2_setup() in + drivers/char/ip2/ip2base.c. ips= [HW,SCSI] Adaptec / IBM ServeRAID controller See header of drivers/scsi/ips.c. @@ -826,33 +816,53 @@ and is between 256 and 4096 characters. It is defined in the file tasks in the system -- can cause problems and suboptimal load balancer performance. - isp16= [HW,CD] - Format: ,,, - iucv= [HW,NET] js= [HW,JOY] Analog joystick See Documentation/input/joystick.txt. + kernelcore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter + specifies the amount of memory usable by the kernel + for non-movable allocations. The requested amount is + spread evenly throughout all nodes in the system. The + remaining memory in each node is used for Movable + pages. In the event, a node is too small to have both + kernelcore and Movable pages, kernelcore pages will + take priority and other nodes will have a larger number + of kernelcore pages. The Movable zone is used for the + allocation of pages that may be reclaimed or moved + by the page migration subsystem. This means that + HugeTLB pages may not be allocated from this zone. + Note that allocations like PTEs-from-HighMem still + use the HighMem zone if it exists, and the Normal + zone if it does not. + + movablecore=nn[KMG] [KNL,X86-32,IA-64,PPC,X86-64] This parameter + is similar to kernelcore except it specifies the + amount of memory used for migratable allocations. + If both kernelcore and movablecore is specified, + then kernelcore will be at *least* the specified + value but may be more. If movablecore on its own + is specified, the administrator must be careful + that the amount of memory usable for all allocations + is not too small. + keepinitrd [HW,ARM] - kstack=N [IA-32,X86-64] Print N words from the kernel stack + kstack=N [X86-32,X86-64] Print N words from the kernel stack in oops dumps. l2cr= [PPC] - lapic [IA-32,APIC] Enable the local APIC even if BIOS + lapic [X86-32,APIC] Enable the local APIC even if BIOS disabled it. - lapic_timer_c2_ok [IA-32,x86-64,APIC] trust the local apic timer in + lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer in C2 power state. lasi= [HW,SCSI] PARISC LASI driver for the 53c700 chip Format: addr:,irq: - llsc*= [IA64] See function print_params() in - arch/ia64/sn/kernel/llsc4.c. - load_ramdisk= [RAM] List of ramdisks to load from floppy See Documentation/ramdisk.txt. @@ -939,14 +949,10 @@ and is between 256 and 4096 characters. It is defined in the file Format: <1-256> maxcpus= [SMP] Maximum number of processors that an SMP kernel - should make use of. - Using "nosmp" or "maxcpus=0" will disable SMP - entirely (the MPS table probe still happens, though). - A command-line option of "maxcpus=", where - is an integer greater than 0, limits the maximum number - of CPUs activated in SMP mode to . - Using "maxcpus=1" on an SMP kernel is the trivial - case of an SMP kernel with only one CPU. + should make use of. maxcpus=n : n >= 0 limits the + kernel to using 'n' processors. n=0 is a special case, + it is equivalent to "nosmp", which also disables + the IO APIC. max_addr=[KMG] [KNL,BOOT,ia64] All physical memory greater than or equal to this physical address is ignored. @@ -958,16 +964,11 @@ and is between 256 and 4096 characters. It is defined in the file [SCSI] Maximum number of LUNs received. Should be between 1 and 16384. - mca-pentium [BUGS=IA-32] + mca-pentium [BUGS=X86-32] mcatest= [IA-64] - mcd= [HW,CD] - Format: ,, - - mcdx= [HW,CD] - - mce [IA-32] Machine Check Exception + mce [X86-32] Machine Check Exception md= [HW] RAID subsystems devices and level See Documentation/md.txt. @@ -979,14 +980,14 @@ and is between 256 and 4096 characters. It is defined in the file mem=nn[KMG] [KNL,BOOT] Force usage of a specific amount of memory Amount of memory to be used when the kernel is not able to see the whole system memory or for test. - [IA-32] Use together with memmap= to avoid physical + [X86-32] Use together with memmap= to avoid physical address space collisions. Without memmap= PCI devices could be placed at addresses belonging to unused RAM. - mem=nopentium [BUGS=IA-32] Disable usage of 4MB pages for kernel + mem=nopentium [BUGS=X86-32] Disable usage of 4MB pages for kernel memory. - memmap=exactmap [KNL,IA-32,X86_64] Enable setting of an exact + memmap=exactmap [KNL,X86-32,X86_64] Enable setting of an exact E820 memory map, as specified by the user. Such memmap=exactmap lines can be constructed based on BIOS output or other requirements. See the memmap=nn@ss @@ -1009,49 +1010,6 @@ and is between 256 and 4096 characters. It is defined in the file mga= [HW,DRM] - migration_cost= - [KNL,SMP] debug: override scheduler migration costs - Format: ,,... - This debugging option can be used to override the - default scheduler migration cost matrix. The numbers - are indexed by 'CPU domain distance'. - E.g. migration_cost=1000,2000,3000 on an SMT NUMA - box will set up an intra-core migration cost of - 1 msec, an inter-core migration cost of 2 msecs, - and an inter-node migration cost of 3 msecs. - - WARNING: using the wrong values here can break - scheduler performance, so it's only for scheduler - development purposes, not production environments. - - migration_debug= - [KNL,SMP] migration cost auto-detect verbosity - Format=<0|1|2> - If a system's migration matrix reported at bootup - seems erroneous then this option can be used to - increase verbosity of the detection process. - We default to 0 (no extra messages), 1 will print - some more information, and 2 will be really - verbose (probably only useful if you also have a - serial console attached to the system). - - migration_factor= - [KNL,SMP] multiply/divide migration costs by a factor - Format= - This debug option can be used to proportionally - increase or decrease the auto-detected migration - costs for all entries of the migration matrix. - E.g. migration_factor=150 will increase migration - costs by 50%. (and thus the scheduler will be less - eager migrating cache-hot tasks) - migration_factor=80 will decrease migration costs - by 20%. (thus the scheduler will be more eager to - migrate tasks) - - WARNING: using the wrong values here can break - scheduler performance, so it's only for scheduler - development purposes, not production environments. - mousedev.tap_time= [MOUSE] Maximum time between finger touching and leaving touchpad surface for touch to be considered @@ -1073,7 +1031,7 @@ and is between 256 and 4096 characters. It is defined in the file ,[,,,,] mtdparts= [MTD] - See drivers/mtd/cmdline.c. + See drivers/mtd/cmdlinepart.c. mtouchusb.raw_coordinates= [HW] Make the MicroTouch USB driver use raw coordinates @@ -1115,9 +1073,9 @@ and is between 256 and 4096 characters. It is defined in the file [NFS] set the maximum lifetime for idmapper cache entries. - nmi_watchdog= [KNL,BUGS=IA-32] Debugging features for SMP kernels + nmi_watchdog= [KNL,BUGS=X86-32] Debugging features for SMP kernels - no387 [BUGS=IA-32] Tells the kernel to use the 387 maths + no387 [BUGS=X86-32] Tells the kernel to use the 387 maths emulation library even if a 387 maths coprocessor is present. @@ -1148,17 +1106,17 @@ and is between 256 and 4096 characters. It is defined in the file noexec [IA-64] - noexec [IA-32,X86-64] + noexec [X86-32,X86-64] noexec=on: enable non-executable mappings (default) noexec=off: disable nn-executable mappings - nofxsr [BUGS=IA-32] Disables x86 floating point extended + nofxsr [BUGS=X86-32] Disables x86 floating point extended register save and restore. The kernel will only save legacy floating-point registers on task switch. nohlt [BUGS=ARM] - no-hlt [BUGS=IA-32] Tells the kernel that the hlt + no-hlt [BUGS=X86-32] Tells the kernel that the hlt instruction doesn't work correctly and not to use it. @@ -1173,12 +1131,12 @@ and is between 256 and 4096 characters. It is defined in the file Valid arguments: on, off Default: on - noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing + noirqbalance [X86-32,SMP,KNL] Disable kernel irq balancing - noirqdebug [IA-32] Disables the code which attempts to detect and + noirqdebug [X86-32] Disables the code which attempts to detect and disable unhandled interrupt sources. - no_timer_check [IA-32,X86_64,APIC] Disables the code which tests for + no_timer_check [X86-32,X86_64,APIC] Disables the code which tests for broken timer IRQ sources. noisapnp [ISAPNP] Disables ISA PnP code. @@ -1188,20 +1146,22 @@ and is between 256 and 4096 characters. It is defined in the file nointroute [IA-64] - nolapic [IA-32,APIC] Do not enable or use the local APIC. + nojitter [IA64] Disables jitter checking for ITC timers. + + nolapic [X86-32,APIC] Do not enable or use the local APIC. - nolapic_timer [IA-32,APIC] Do not use the local APIC timer. + nolapic_timer [X86-32,APIC] Do not use the local APIC timer. noltlbs [PPC] Do not use large page/tlb entries for kernel lowmem mapping on PPC40x. nomca [IA-64] Disable machine check abort handling - nomce [IA-32] Machine Check Exception + nomce [X86-32] Machine Check Exception - noreplace-paravirt [IA-32,PV_OPS] Don't patch paravirt_ops + noreplace-paravirt [X86-32,PV_OPS] Don't patch paravirt_ops - noreplace-smp [IA-32,SMP] Don't replace SMP instructions + noreplace-smp [X86-32,SMP] Don't replace SMP instructions with UP alternatives noresidual [PPC] Don't use residual data on PReP machines. @@ -1215,32 +1175,34 @@ and is between 256 and 4096 characters. It is defined in the file nosbagart [IA-64] - nosep [BUGS=IA-32] Disables x86 SYSENTER/SYSEXIT support. + nosep [BUGS=X86-32] Disables x86 SYSENTER/SYSEXIT support. - nosmp [SMP] Tells an SMP kernel to act as a UP kernel. + nosmp [SMP] Tells an SMP kernel to act as a UP kernel, + and disable the IO APIC. legacy for "maxcpus=0". + + nosoftlockup [KNL] Disable the soft-lockup detector. nosync [HW,M68K] Disables sync negotiation for all devices. - notsc [BUGS=IA-32] Disable Time Stamp Counter + notsc [BUGS=X86-32] Disable Time Stamp Counter nousb [USB] Disable the USB subsystem nowb [ARM] + numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA. + one of ['zone', 'node', 'default'] can be specified + This can be set from sysctl after boot. + See Documentation/sysctl/vm.txt for details. + nr_uarts= [SERIAL] maximum number of UARTs to be registered. opl3= [HW,OSS] Format: - opl3sa2= [HW,OSS] Format: - ,,,,,,,[,, - osst= [HW,SCSI] SCSI Tape Driver Format: , See also Documentation/scsi/st.txt. @@ -1295,28 +1257,28 @@ and is between 256 and 4096 characters. It is defined in the file See also Documentation/paride.txt. pci=option[,option...] [PCI] various PCI subsystem options: - off [IA-32] don't probe for the PCI bus - bios [IA-32] force use of PCI BIOS, don't access + off [X86-32] don't probe for the PCI bus + bios [X86-32] force use of PCI BIOS, don't access the hardware directly. Use this if your machine has a non-standard PCI host bridge. - nobios [IA-32] disallow use of PCI BIOS, only direct + nobios [X86-32] disallow use of PCI BIOS, only direct hardware access methods are allowed. Use this if you experience crashes upon bootup and you suspect they are caused by the BIOS. - conf1 [IA-32] Force use of PCI Configuration + conf1 [X86-32] Force use of PCI Configuration Mechanism 1. - conf2 [IA-32] Force use of PCI Configuration + conf2 [X86-32] Force use of PCI Configuration Mechanism 2. - nommconf [IA-32,X86_64] Disable use of MMCONFIG for PCI + nommconf [X86-32,X86_64] Disable use of MMCONFIG for PCI Configuration nomsi [MSI] If the PCI_MSI kernel config parameter is enabled, this kernel boot option can be used to disable the use of MSI interrupts system-wide. - nosort [IA-32] Don't sort PCI devices according to + nosort [X86-32] Don't sort PCI devices according to order given by the PCI BIOS. This sorting is done to get a device order compatible with older kernels. - biosirq [IA-32] Use PCI BIOS calls to get the interrupt + biosirq [X86-32] Use PCI BIOS calls to get the interrupt routing table. These calls are known to be buggy on several machines and they hang the machine when used, but on other computers it's the only @@ -1324,32 +1286,32 @@ and is between 256 and 4096 characters. It is defined in the file this option if the kernel is unable to allocate IRQs or discover secondary PCI buses on your motherboard. - rom [IA-32] Assign address space to expansion ROMs. + rom [X86-32] Assign address space to expansion ROMs. Use with caution as certain devices share address decoders between ROMs and other resources. - irqmask=0xMMMM [IA-32] Set a bit mask of IRQs allowed to be + irqmask=0xMMMM [X86-32] Set a bit mask of IRQs allowed to be assigned automatically to PCI devices. You can make the kernel exclude IRQs of your ISA cards this way. - pirqaddr=0xAAAAA [IA-32] Specify the physical address + pirqaddr=0xAAAAA [X86-32] Specify the physical address of the PIRQ table (normally generated by the BIOS) if it is outside the F0000h-100000h range. - lastbus=N [IA-32] Scan all buses thru bus #N. Can be + lastbus=N [X86-32] Scan all buses thru bus #N. Can be useful if the kernel is unable to find your secondary buses and you want to tell it explicitly which ones they are. - assign-busses [IA-32] Always assign all PCI bus + assign-busses [X86-32] Always assign all PCI bus numbers ourselves, overriding whatever the firmware may have done. - usepirqmask [IA-32] Honor the possible IRQ mask stored + usepirqmask [X86-32] Honor the possible IRQ mask stored in the BIOS $PIR table. This is needed on some systems with broken BIOSes, notably some HP Pavilion N5400 and Omnibook XE3 notebooks. This will have no effect if ACPI IRQ routing is enabled. - noacpi [IA-32] Do not use ACPI for IRQ routing + noacpi [X86-32] Do not use ACPI for IRQ routing or for PCI scanning. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), @@ -1419,6 +1381,15 @@ and is between 256 and 4096 characters. It is defined in the file autoconfiguration. Ranges are in pairs (memory base and size). + print-fatal-signals= + [KNL] debug: print fatal signals + print-fatal-signals=1: print segfault info to + the kernel console. + default: off. + + printk.time= Show timing data prefixed to each printk message line + Format: (1/Y/y=enable, 0/N/n=disable) + profile= [KNL] Enable kernel profiling via /proc/profile Format: [schedule,] Param: "schedule" - profile schedule points. @@ -1489,13 +1460,13 @@ and is between 256 and 4096 characters. It is defined in the file Run specified binary instead of /init from the ramdisk, used for early userspace startup. See initrd. - reboot= [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode + reboot= [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode Format: [,[,...]] See arch/*/kernel/reboot.c or arch/*/kernel/process.c reserve= [KNL,BUGS] Force the kernel to ignore some iomem area - reservetop= [IA-32] + reservetop= [X86-32] Format: nn[KMG] Reserves a hole at the top of the kernel virtual address space. @@ -1547,11 +1518,6 @@ and is between 256 and 4096 characters. It is defined in the file sbni= [NET] Granch SBNI12 leased line adapter - sbpcd= [HW,CD] Soundblaster CD adapter - Format: , - See a comment before function sbpcd_setup() in - drivers/cdrom/sbpcd.c. - sc1200wdt= [HW,WDT] SC1200 WDT (watchdog) driver Format: [,[,]] @@ -1591,7 +1557,7 @@ and is between 256 and 4096 characters. It is defined in the file Value can be changed at runtime via /selinux/compat_net. - serialnumber [BUGS=IA-32] + serialnumber [BUGS=X86-32] sg_def_reserved_size= [SCSI] @@ -1604,47 +1570,47 @@ and is between 256 and 4096 characters. It is defined in the file simeth= [IA-64] simscsi= - sjcd= [HW,CD] - Format: ,, - See header of drivers/cdrom/sjcd.c. - slram= [HW,MTD] - slub_debug [MM, SLUB] - Enabling slub_debug allows one to determine the culprit - if slab objects become corrupted. Enabling slub_debug - creates guard zones around objects and poisons objects - when not in use. Also tracks the last alloc / free. - For more information see Documentation/vm/slub.txt. + slub_debug[=options[,slabs]] [MM, SLUB] + Enabling slub_debug allows one to determine the + culprit if slab objects become corrupted. Enabling + slub_debug can create guard zones around objects and + may poison objects when not in use. Also tracks the + last alloc / free. For more information see + Documentation/vm/slub.txt. slub_max_order= [MM, SLUB] - Determines the maximum allowed order for slabs. Setting - this too high may cause fragmentation. - For more information see Documentation/vm/slub.txt. + Determines the maximum allowed order for slabs. + A high setting may cause OOMs due to memory + fragmentation. For more information see + Documentation/vm/slub.txt. slub_min_objects= [MM, SLUB] - The minimum objects per slab. SLUB will increase the - slab order up to slub_max_order to generate a - sufficiently big slab to satisfy the number of objects. - The higher the number of objects the smaller the overhead - of tracking slabs. + The minimum number of objects per slab. SLUB will + increase the slab order up to slub_max_order to + generate a sufficiently large slab able to contain + the number of objects indicated. The higher the number + of objects the smaller the overhead of tracking slabs + and the less frequently locks need to be acquired. For more information see Documentation/vm/slub.txt. slub_min_order= [MM, SLUB] Determines the mininum page order for slabs. Must be - lower than slub_max_order + lower than slub_max_order. For more information see Documentation/vm/slub.txt. slub_nomerge [MM, SLUB] - Disable merging of slabs of similar size. May be + Disable merging of slabs with similar size. May be necessary if there is some reason to distinguish - allocs to different slabs. + allocs to different slabs. Debug options disable + merging on their own. For more information see Documentation/vm/slub.txt. smart2= [HW] Format: [,[,...,]] - smp-alt-once [IA-32,SMP] On a hotplug CPU system, only + smp-alt-once [X86-32,SMP] On a hotplug CPU system, only attempt to substitute SMP alternatives once at boot. smsc-ircc2.nopnp [HW] Don't use PNP to discover SMC devices @@ -1780,9 +1746,6 @@ and is between 256 and 4096 characters. It is defined in the file snd-ymfpci= [HW,ALSA] - sonycd535= [HW,CD] - Format: [,] - sonypi.*= [HW] Sony Programmable I/O Control Device driver See Documentation/sonypi.txt @@ -1853,7 +1816,32 @@ and is between 256 and 4096 characters. It is defined in the file thash_entries= [KNL,NET] Set number of hash buckets for TCP connection + thermal.act= [HW,ACPI] + -1: disable all active trip points in all thermal zones + : override all lowest active trip points + + thermal.crt= [HW,ACPI] + -1: disable all critical trip points in all thermal zones + : lower all critical trip points + + thermal.nocrt= [HW,ACPI] + Set to disable actions on ACPI thermal zone + critical and hot trip points. + + thermal.off= [HW,ACPI] + 1: disable ACPI thermal control + + thermal.psv= [HW,ACPI] + -1: disable all passive trip points + : override all passive trip points to this value + + thermal.tzp= [HW,ACPI] + Specify global default ACPI thermal zone polling rate + : poll all this frequency + 0: no polling (default) + time Show timing data prefixed to each printk message line + [deprecated, see 'printk.time'] tipar.timeout= [HW,PPT] Set communications timeout in tenths of a second @@ -1911,15 +1899,18 @@ and is between 256 and 4096 characters. It is defined in the file usbhid.mousepoll= [USBHID] The interval which mice are to be polled at. - vdso= [IA-32,SH] + vdso= [X86-32,SH,x86-64] vdso=2: enable compat VDSO (default with COMPAT_VDSO) vdso=1: enable VDSO (default) vdso=0: disable VDSO mapping + vector= [IA-64,SMP] + vector=percpu: enable percpu vector domain + video= [FB] Frame buffer configuration See Documentation/fb/modedb.txt. - vga= [BOOT,IA-32] Select a particular video mode + vga= [BOOT,X86-32] Select a particular video mode See Documentation/i386/boot.txt and Documentation/svga.txt. Use vga=ask for menu. @@ -1951,7 +1942,7 @@ and is between 256 and 4096 characters. It is defined in the file See header of drivers/scsi/wd7000.c. wdt= [WDT] Watchdog - See Documentation/watchdog/watchdog.txt. + See Documentation/watchdog/wdt.txt. xd= [HW,XT] Original XT pre-IDE (RLL encoded) disks. xd_geo= See header of drivers/block/xd.c. diff --git a/Documentation/keys.txt b/Documentation/keys.txt index 81d9aa097298..947d57d53453 100644 --- a/Documentation/keys.txt +++ b/Documentation/keys.txt @@ -859,9 +859,8 @@ payload contents" for more information. void unregister_key_type(struct key_type *type); -Under some circumstances, it may be desirable to desirable to deal with a -bundle of keys. The facility provides access to the keyring type for managing -such a bundle: +Under some circumstances, it may be desirable to deal with a bundle of keys. +The facility provides access to the keyring type for managing such a bundle: struct key_type key_type_keyring; diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt index e44855513b3d..8ee49ee7c963 100644 --- a/Documentation/kobject.txt +++ b/Documentation/kobject.txt @@ -27,7 +27,6 @@ in detail, and briefly here: - kobjects a simple object. - kset a set of objects of a certain type. - ktype a set of helpers for objects of a common type. -- subsystem a controlling object for a number of ksets. The kobject infrastructure maintains a close relationship with the @@ -54,13 +53,15 @@ embedded in larger data structures and replace fields they duplicate. 1.2 Definition struct kobject { + const char * k_name; char name[KOBJ_NAME_LEN]; - atomic_t refcount; + struct kref kref; struct list_head entry; struct kobject * parent; struct kset * kset; struct kobj_type * ktype; - struct dentry * dentry; + struct sysfs_dirent * sd; + wait_queue_head_t poll; }; void kobject_init(struct kobject *); @@ -137,8 +138,7 @@ If a kobject does not have a parent when it is registered, its parent becomes its dominant kset. If a kobject does not have a parent nor a dominant kset, its directory -is created at the top-level of the sysfs partition. This should only -happen for kobjects that are embedded in a struct subsystem. +is created at the top-level of the sysfs partition. @@ -150,10 +150,10 @@ A kset is a set of kobjects that are embedded in the same type. struct kset { - struct subsystem * subsys; struct kobj_type * ktype; struct list_head list; struct kobject kobj; + struct kset_uevent_ops * uevent_ops; }; @@ -169,8 +169,7 @@ struct kobject * kset_find_obj(struct kset *, char *); The type that the kobjects are embedded in is described by the ktype -pointer. The subsystem that the kobject belongs to is pointed to by the -subsys pointer. +pointer. A kset contains a kobject itself, meaning that it may be registered in the kobject hierarchy and exported via sysfs. More importantly, the @@ -209,6 +208,58 @@ the hierarchy. kset_find_obj() may be used to locate a kobject with a particular name. The kobject, if found, is returned. +There are also some helper functions which names point to the formerly +existing "struct subsystem", whose functions have been taken over by +ksets. + + +decl_subsys(name,type,uevent_ops) + +Declares a kset named '_subsys' of type with +uevent_ops . For example, + +decl_subsys(devices, &ktype_device, &device_uevent_ops); + +is equivalent to doing: + +struct kset devices_subsys = { + .kobj = { + .name = "devices", + }, + .ktype = &ktype_devices, + .uevent_ops = &device_uevent_ops, +}; + + +The objects that are registered with a subsystem that use the +subsystem's default list must have their kset ptr set properly. These +objects may have embedded kobjects or ksets. The +following helpers make setting the kset easier: + + +kobj_set_kset_s(obj,subsys) + +- Assumes that obj->kobj exists, and is a struct kobject. +- Sets the kset of that kobject to the kset . + + +kset_set_kset_s(obj,subsys) + +- Assumes that obj->kset exists, and is a struct kset. +- Sets the kset of the embedded kobject to the kset . + +subsys_set_kset(obj,subsys) + +- Assumes obj->subsys exists, and is a struct subsystem. +- Sets obj->subsys.kset.kobj.kset to the subsystem's embedded kset. + +void subsystem_init(struct kset *s); +int subsystem_register(struct kset *s); +void subsystem_unregister(struct kset *s); +struct kset *subsys_get(struct kset *s); +void kset_put(struct kset *s); + +These are just wrappers around the respective kset_* functions. 2.3 sysfs @@ -254,114 +305,3 @@ Instances of struct kobj_type are not registered; only referenced by the kset. A kobj_type may be referenced by an arbitrary number of ksets, as there may be disparate sets of identical objects. - - -4. subsystems - -4.1 Description - -A subsystem represents a significant entity of code that maintains an -arbitrary number of sets of objects of various types. Since the number -of ksets and the type of objects they contain are variable, a -generic representation of a subsystem is minimal. - - -struct subsystem { - struct kset kset; - struct rw_semaphore rwsem; -}; - -int subsystem_register(struct subsystem *); -void subsystem_unregister(struct subsystem *); - -struct subsystem * subsys_get(struct subsystem * s); -void subsys_put(struct subsystem * s); - - -A subsystem contains an embedded kset so: - -- It can be represented in the object hierarchy via the kset's - embedded kobject. - -- It can maintain a default list of objects of one type. - -Additional ksets may attach to the subsystem simply by referencing the -subsystem before they are registered. (This one-way reference means -that there is no way to determine the ksets that are attached to the -subsystem.) - -All ksets that are attached to a subsystem share the subsystem's R/W -semaphore. - - -4.2 subsystem Programming Interface. - -The subsystem programming interface is simple and does not offer the -flexibility that the kset and kobject programming interfaces do. They -may be registered and unregistered, as well as reference counted. Each -call forwards the calls to their embedded ksets (which forward the -calls to their embedded kobjects). - - -4.3 Helpers - -A number of macros are available to make dealing with subsystems and -their embedded objects easier. - - -decl_subsys(name,type) - -Declares a subsystem named '_subsys', with an embedded kset of -type . For example, - -decl_subsys(devices,&ktype_devices); - -is equivalent to doing: - -struct subsystem device_subsys = { - .kset = { - .kobj = { - .name = "devices", - }, - .ktype = &ktype_devices, - } -}; - - -The objects that are registered with a subsystem that use the -subsystem's default list must have their kset ptr set properly. These -objects may have embedded kobjects, ksets, or other subsystems. The -following helpers make setting the kset easier: - - -kobj_set_kset_s(obj,subsys) - -- Assumes that obj->kobj exists, and is a struct kobject. -- Sets the kset of that kobject to the subsystem's embedded kset. - - -kset_set_kset_s(obj,subsys) - -- Assumes that obj->kset exists, and is a struct kset. -- Sets the kset of the embedded kobject to the subsystem's - embedded kset. - -subsys_set_kset(obj,subsys) - -- Assumes obj->subsys exists, and is a struct subsystem. -- Sets obj->subsys.kset.kobj.kset to the subsystem's embedded kset. - - -4.4 sysfs - -subsystems are represented in sysfs via their embedded kobjects. They -follow the same rules as previously mentioned with no exceptions. They -typically receive a top-level directory in sysfs, except when their -embedded kobject is part of another kset, or the parent of the -embedded kobject is explicitly set. - -Note that the subsystem's embedded kset must be 'attached' to the -subsystem itself in order to use its rwsem. This is done after -kset_add() has been called. (Not before, because kset_add() uses its -subsystem for a default parent if it doesn't already have one). - diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt index da5404ab7569..cb12ae175aa2 100644 --- a/Documentation/kprobes.txt +++ b/Documentation/kprobes.txt @@ -247,12 +247,6 @@ control to Kprobes.) If the probed function is declared asmlinkage, fastcall, or anything else that affects how args are passed, the handler's declaration must match. -NOTE: A macro JPROBE_ENTRY is provided to handle architecture-specific -aliasing of jp->entry. In the interest of portability, it is advised -to use: - - jp->entry = JPROBE_ENTRY(handler); - register_jprobe() returns 0 on success, or a negative errno otherwise. 4.3 register_kretprobe @@ -518,7 +512,7 @@ long jdo_fork(unsigned long clone_flags, unsigned long stack_start, } static struct jprobe my_jprobe = { - .entry = JPROBE_ENTRY(jdo_fork) + .entry = jdo_fork }; static int __init jprobe_init(void) diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt index 1c41db21d3c1..59108cebe163 100644 --- a/Documentation/m68k/kernel-options.txt +++ b/Documentation/m68k/kernel-options.txt @@ -82,13 +82,6 @@ Valid names are: /dev/fd : -> 0x0200 (floppy disk) /dev/xda: -> 0x0c00 (first XT disk, unused in Linux/m68k) /dev/xdb: -> 0x0c40 (second XT disk, unused in Linux/m68k) - /dev/ada: -> 0x1c00 (first ACSI device) - /dev/adb: -> 0x1c10 (second ACSI device) - /dev/adc: -> 0x1c20 (third ACSI device) - /dev/add: -> 0x1c30 (forth ACSI device) - -The last four names are available only if the kernel has been compiled -with Atari and ACSI support. The name must be followed by a decimal number, that stands for the partition number. Internally, the value of the number is just diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index af6a63ab9026..32c2e9da5f3a 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -433,6 +433,12 @@ tcp_workaround_signed_windows - BOOLEAN not receive a window scaling option from them. Default: 0 +tcp_dma_copybreak - INTEGER + Lower limit, in bytes, of the size of socket reads that will be + offloaded to a DMA copy engine, if one is present in the system + and CONFIG_NET_DMA is enabled. + Default: 4096 + CIPSOv4 Variables: cipso_cache_enable - BOOLEAN @@ -874,8 +880,7 @@ accept_redirects - BOOLEAN accept_source_route - INTEGER Accept source routing (routing extension header). - > 0: Accept routing header. - = 0: Accept only routing header type 2. + >= 0: Accept only routing header type 2. < 0: Do not accept routing header. Default: 0 diff --git a/Documentation/networking/net-modules.txt b/Documentation/networking/net-modules.txt index 0b27863f155c..98c4392dd0fd 100644 --- a/Documentation/networking/net-modules.txt +++ b/Documentation/networking/net-modules.txt @@ -146,12 +146,6 @@ at1700.c: irq = 0 (Probes ports: 0x260, 0x280, 0x2A0, 0x240, 0x340, 0x320, 0x380, 0x300) -atari_bionet.c: - Supports full autoprobing. (m68k/Atari) - -atari_pamsnet.c: - Supports full autoprobing. (m68k/Atari) - atarilance.c: Supports full autoprobing. (m68k/Atari) diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt index ce1361f95243..37869295fc70 100644 --- a/Documentation/networking/netdevices.txt +++ b/Documentation/networking/netdevices.txt @@ -20,6 +20,30 @@ private data which gets freed when the network device is freed. If separately allocated data is attached to the network device (dev->priv) then it is up to the module exit handler to free that. +MTU +=== +Each network device has a Maximum Transfer Unit. The MTU does not +include any link layer protocol overhead. Upper layer protocols must +not pass a socket buffer (skb) to a device to transmit with more data +than the mtu. The MTU does not include link layer header overhead, so +for example on Ethernet if the standard MTU is 1500 bytes used, the +actual skb will contain up to 1514 bytes because of the Ethernet +header. Devices should allow for the 4 byte VLAN header as well. + +Segmentation Offload (GSO, TSO) is an exception to this rule. The +upper layer protocol may pass a large socket buffer to the device +transmit routine, and the device will break that up into separate +packets based on the current MTU. + +MTU is symmetrical and applies both to receive and transmit. A device +must be able to receive at least the maximum size packet allowed by +the MTU. A network device may use the MTU as mechanism to size receive +buffers, but the device should allow packets with VLAN header. With +standard Ethernet mtu of 1500 bytes, the device should allow up to +1518 byte packets (1500 + 14 header + 4 tag). The device may either: +drop, truncate, or pass up oversize packets, but dropping oversize +packets is preferred. + struct net_device synchronization rules ======================================= @@ -43,16 +67,17 @@ dev->get_stats: dev->hard_start_xmit: Synchronization: netif_tx_lock spinlock. + When the driver sets NETIF_F_LLTX in dev->features this will be called without holding netif_tx_lock. In this case the driver has to lock by itself when needed. It is recommended to use a try lock - for this and return -1 when the spin lock fails. + for this and return NETDEV_TX_LOCKED when the spin lock fails. The locking there should also properly protect against - set_multicast_list - Context: Process with BHs disabled or BH (timer). - Notes: netif_queue_stopped() is guaranteed false - Interrupts must be enabled when calling hard_start_xmit. - (Interrupts must also be enabled when enabling the BH handler.) + set_multicast_list. + + Context: Process with BHs disabled or BH (timer), + will be called with interrupts disabled by netconsole. + Return codes: o NETDEV_TX_OK everything ok. o NETDEV_TX_BUSY Cannot transmit packet, try later @@ -74,4 +99,5 @@ dev->poll: Synchronization: __LINK_STATE_RX_SCHED bit in dev->state. See dev_close code and comments in net/core/dev.c for more info. Context: softirq + will be called with interrupts disabled by netconsole. diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt index 7d5b60dea551..7f60dfe642ca 100644 --- a/Documentation/oops-tracing.txt +++ b/Documentation/oops-tracing.txt @@ -86,6 +86,20 @@ stuff are the values reported by the Oops - you can just cut-and-paste and do a replace of spaces to "\x" - that's what I do, as I'm too lazy to write a program to automate this all). +Alternatively, you can use the shell script in scripts/decodecode. +Its usage is: decodecode < oops.txt + +The hex bytes that follow "Code:" may (in some architectures) have a series +of bytes that precede the current instruction pointer as well as bytes at and +following the current instruction pointer. In some cases, one instruction +byte or word is surrounded by <> or (), as in "<86>" or "(f00d)". These +<> or () markings indicate the current instruction pointer. Example from +i386, split into multiple lines for readability: + +Code: f9 0f 8d f9 00 00 00 8d 42 0c e8 dd 26 11 c7 a1 60 ea 2b f9 8b 50 08 a1 +64 ea 2b f9 8d 34 82 8b 1e 85 db 74 6d 8b 15 60 ea 2b f9 <8b> 43 04 39 42 54 +7e 04 40 89 42 54 8b 43 04 3b 05 00 f6 52 c0 + Finally, if you want to see where the code comes from, you can do cd /usr/src/linux @@ -237,6 +251,8 @@ characters, each representing a particular tainted value. 7: 'U' if a user or user application specifically requested that the Tainted flag be set, ' ' otherwise. + 8: 'D' if the kernel has died recently, i.e. there was an OOPS or BUG. + The primary reason for the 'Tainted: ' string is to tell kernel debuggers if this is a clean kernel or if anything unusual has occurred. Tainting is permanent: even if an offending module is diff --git a/Documentation/pci.txt b/Documentation/pci.txt index d38261b67905..7754f5aea4e9 100644 --- a/Documentation/pci.txt +++ b/Documentation/pci.txt @@ -113,9 +113,6 @@ initialization with a pointer to a structure describing the driver (Please see Documentation/power/pci.txt for descriptions of PCI Power Management and the related functions.) - enable_wake Enable device to generate wake events from a low power - state. - shutdown Hook into reboot_notifier_list (kernel/sys.c). Intended to stop any idling DMA operations. Useful for enabling wake-on-lan (NIC) or changing @@ -299,7 +296,10 @@ If the PCI device can use the PCI Memory-Write-Invalidate transaction, call pci_set_mwi(). This enables the PCI_COMMAND bit for Mem-Wr-Inval and also ensures that the cache line size register is set correctly. Check the return value of pci_set_mwi() as not all architectures -or chip-sets may support Memory-Write-Invalidate. +or chip-sets may support Memory-Write-Invalidate. Alternatively, +if Mem-Wr-Inval would be nice to have but is not required, call +pci_try_set_mwi() to have the system do its best effort at enabling +Mem-Wr-Inval. 3.2 Request MMIO/IOP resources diff --git a/Documentation/power/kernel_threads.txt b/Documentation/power/kernel_threads.txt deleted file mode 100644 index fb57784986b1..000000000000 --- a/Documentation/power/kernel_threads.txt +++ /dev/null @@ -1,40 +0,0 @@ -KERNEL THREADS - - -Freezer - -Upon entering a suspended state the system will freeze all -tasks. This is done by delivering pseudosignals. This affects -kernel threads, too. To successfully freeze a kernel thread -the thread has to check for the pseudosignal and enter the -refrigerator. Code to do this looks like this: - - do { - hub_events(); - wait_event_interruptible(khubd_wait, !list_empty(&hub_event_list)); - try_to_freeze(); - } while (!signal_pending(current)); - -from drivers/usb/core/hub.c::hub_thread() - - -The Unfreezable - -Some kernel threads however, must not be frozen. The kernel must -be able to finish pending IO operations and later on be able to -write the memory image to disk. Kernel threads needed to do IO -must stay awake. Such threads must mark themselves unfreezable -like this: - - /* - * This thread doesn't need any user-level access, - * so get rid of all our resources. - */ - daemonize("usb-storage"); - - current->flags |= PF_NOFREEZE; - -from drivers/usb/storage/usb.c::usb_stor_control_thread() - -Such drivers are themselves responsible for staying quiet during -the actual snapshotting. diff --git a/Documentation/power/pci.txt b/Documentation/power/pci.txt index e00b099a4b86..dd8fe43888d3 100644 --- a/Documentation/power/pci.txt +++ b/Documentation/power/pci.txt @@ -164,7 +164,6 @@ struct pci_driver: int (*suspend) (struct pci_dev *dev, pm_message_t state); int (*resume) (struct pci_dev *dev); - int (*enable_wake) (struct pci_dev *dev, pci_power_t state, int enable); suspend @@ -251,42 +250,6 @@ The driver should update the current_state field in its pci_dev structure in this function, except for PM-capable devices when pci_set_power_state is used. -enable_wake ------------ - -Usage: - -if (dev->driver && dev->driver->enable_wake) - dev->driver->enable_wake(dev,state,enable); - -This callback is generally only relevant for devices that support the PCI PM -spec and have the ability to generate a PME# (Power Management Event Signal) -to wake the system up. (However, it is possible that a device may support -some non-standard way of generating a wake event on sleep.) - -Bits 15:11 of the PMC (Power Mgmt Capabilities) Register in a device's -PM Capabilities describe what power states the device supports generating a -wake event from: - -+------------------+ -| Bit | State | -+------------------+ -| 11 | D0 | -| 12 | D1 | -| 13 | D2 | -| 14 | D3hot | -| 15 | D3cold | -+------------------+ - -A device can use this to enable wake events: - - pci_enable_wake(dev,state,enable); - -Note that to enable PME# from D3cold, a value of 4 should be passed to -pci_enable_wake (since it uses an index into a bitmask). If a driver gets -a request to enable wake events from D3, two calls should be made to -pci_enable_wake (one for both D3hot and D3cold). - A reference implementation ------------------------- diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt index 5b8d6953f05e..aea7e9209667 100644 --- a/Documentation/power/swsusp.txt +++ b/Documentation/power/swsusp.txt @@ -140,21 +140,11 @@ should be sent to the mailing list available through the suspend2 website, and not to the Linux Kernel Mailing List. We are working toward merging suspend2 into the mainline kernel. -Q: A kernel thread must voluntarily freeze itself (call 'refrigerator'). -I found some kernel threads that don't do it, and they don't freeze -so the system can't sleep. Is this a known behavior? - -A: All such kernel threads need to be fixed, one by one. Select the -place where the thread is safe to be frozen (no kernel semaphores -should be held at that point and it must be safe to sleep there), and -add: - - try_to_freeze(); - -If the thread is needed for writing the image to storage, you should -instead set the PF_NOFREEZE process flag when creating the thread (and -be very careful). +Q: What is the freezing of tasks and why are we using it? +A: The freezing of tasks is a mechanism by which user space processes and some +kernel threads are controlled during hibernation or system-wide suspend (on some +architectures). See freezing-of-tasks.txt for details. Q: What is the difference between "platform" and "shutdown"? @@ -393,6 +383,9 @@ safest thing is to unmount all filesystems on removable media (such USB, Firewire, CompactFlash, MMC, external SATA, or even IDE hotplug bays) before suspending; then remount them after resuming. +There is a work-around for this problem. For more information, see +Documentation/usb/persist.txt. + Q: I upgraded the kernel from 2.6.15 to 2.6.16. Both kernels were compiled with the similar configuration files. Anyway I found that suspend to disk (and resume) is much slower on 2.6.16 compared to diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index d42d98107d49..76733a3962f0 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt @@ -42,15 +42,16 @@ Table of Contents 1) Defining child nodes of an SOC 2) Representing devices without a current OF specification a) MDIO IO device - c) PHY nodes b) Gianfar-compatible ethernet nodes + c) PHY nodes d) Interrupt controllers e) I2C f) Freescale SOC USB controllers g) Freescale SOC SEC Security Engines h) Board Control and Status (BCSR) i) Freescale QUICC Engine module (QE) - g) Flash chip nodes + j) Flash chip nodes + k) Global Utilities Block VII - Specifying interrupt information for devices 1) interrupts property @@ -626,6 +627,14 @@ So the node content can be summarized as a start token, a full path, a list of properties, a list of child nodes, and an end token. Every child node is a full node structure itself as defined above. +NOTE: The above definition requires that all property definitions for +a particular node MUST precede any subnode definitions for that node. +Although the structure would not be ambiguous if properties and +subnodes were intermingled, the kernel parser requires that the +properties come first (up until at least 2.6.22). Any tools +manipulating a flattened tree must take care to preserve this +constraint. + 4) Device tree "strings" block In order to save space, property names, which are generally redundant, @@ -1241,6 +1250,12 @@ platforms are moved over to use the flattened-device-tree model. network device. This is used by the bootwrapper to interpret MAC addresses passed by the firmware when no information other than indices is available to associate an address with a device. + - phy-connection-type : a string naming the controller/PHY interface type, + i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii", + "tbi", or "rtbi". This property is only really needed if the connection + is of type "rgmii-id", as all other connection types are detected by + hardware. + Example: @@ -1782,6 +1797,33 @@ platforms are moved over to use the flattened-device-tree model. partition-names = "fs\0firmware"; }; + k) Global Utilities Block + + The global utilities block controls power management, I/O device + enabling, power-on-reset configuration monitoring, general-purpose + I/O signal configuration, alternate function selection for multiplexed + signals, and clock control. + + Required properties: + + - compatible : Should define the compatible device type for + global-utilities. + - reg : Offset and length of the register set for the device. + + Recommended properties: + + - fsl,has-rstcr : Indicates that the global utilities register set + contains a functioning "reset control register" (i.e. the board + is wired to reset upon setting the HRESET_REQ bit in this register). + + Example: + + global-utilities@e0000 { /* global utilities block */ + compatible = "fsl,mpc8548-guts"; + reg = ; + fsl,has-rstcr; + }; + More devices will be defined as this spec matures. VII - Specifying interrupt information for devices diff --git a/Documentation/rtc.txt b/Documentation/rtc.txt index 7c701b88d6d5..c931d613f641 100644 --- a/Documentation/rtc.txt +++ b/Documentation/rtc.txt @@ -385,7 +385,7 @@ test_PIE: /* not all RTCs support periodic IRQs */ if (errno == ENOTTY) { fprintf(stderr, "\nNo periodic IRQ support\n"); - return 0; + goto done; } perror("RTC_IRQP_READ ioctl"); exit(errno); diff --git a/Documentation/sched-stats.txt b/Documentation/sched-stats.txt index 6f72021aae51..442e14d35dea 100644 --- a/Documentation/sched-stats.txt +++ b/Documentation/sched-stats.txt @@ -1,10 +1,11 @@ -Version 10 of schedstats includes support for sched_domains, which -hit the mainline kernel in 2.6.7. Some counters make more sense to be -per-runqueue; other to be per-domain. Note that domains (and their associated -information) will only be pertinent and available on machines utilizing -CONFIG_SMP. - -In version 10 of schedstat, there is at least one level of domain +Version 14 of schedstats includes support for sched_domains, which hit the +mainline kernel in 2.6.20 although it is identical to the stats from version +12 which was in the kernel from 2.6.13-2.6.19 (version 13 never saw a kernel +release). Some counters make more sense to be per-runqueue; other to be +per-domain. Note that domains (and their associated information) will only +be pertinent and available on machines utilizing CONFIG_SMP. + +In version 14 of schedstat, there is at least one level of domain statistics for each cpu listed, and there may well be more than one domain. Domains have no particular names in this implementation, but the highest numbered one typically arbitrates balancing across all the @@ -27,7 +28,7 @@ to write their own scripts, the fields are described here. CPU statistics -------------- -cpu 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 +cpu 1 2 3 4 5 6 7 8 9 10 11 12 NOTE: In the sched_yield() statistics, the active queue is considered empty if it has only one process in it, since obviously the process calling @@ -39,48 +40,20 @@ First four fields are sched_yield() statistics: 3) # of times just the expired queue was empty 4) # of times sched_yield() was called -Next four are schedule() statistics: - 5) # of times the active queue had at least one other process on it - 6) # of times we switched to the expired queue and reused it - 7) # of times schedule() was called - 8) # of times schedule() left the processor idle - -Next four are active_load_balance() statistics: - 9) # of times active_load_balance() was called - 10) # of times active_load_balance() caused this cpu to gain a task - 11) # of times active_load_balance() caused this cpu to lose a task - 12) # of times active_load_balance() tried to move a task and failed - -Next three are try_to_wake_up() statistics: - 13) # of times try_to_wake_up() was called - 14) # of times try_to_wake_up() successfully moved the awakening task - 15) # of times try_to_wake_up() attempted to move the awakening task - -Next two are wake_up_new_task() statistics: - 16) # of times wake_up_new_task() was called - 17) # of times wake_up_new_task() successfully moved the new task - -Next one is a sched_migrate_task() statistic: - 18) # of times sched_migrate_task() was called +Next three are schedule() statistics: + 5) # of times we switched to the expired queue and reused it + 6) # of times schedule() was called + 7) # of times schedule() left the processor idle -Next one is a sched_balance_exec() statistic: - 19) # of times sched_balance_exec() was called +Next two are try_to_wake_up() statistics: + 8) # of times try_to_wake_up() was called + 9) # of times try_to_wake_up() was called to wake up the local cpu Next three are statistics describing scheduling latency: - 20) sum of all time spent running by tasks on this processor (in ms) - 21) sum of all time spent waiting to run by tasks on this processor (in ms) - 22) # of tasks (not necessarily unique) given to the processor - -The last six are statistics dealing with pull_task(): - 23) # of times pull_task() moved a task to this cpu when newly idle - 24) # of times pull_task() stole a task from this cpu when another cpu - was newly idle - 25) # of times pull_task() moved a task to this cpu when idle - 26) # of times pull_task() stole a task from this cpu when another cpu - was idle - 27) # of times pull_task() moved a task to this cpu when busy - 28) # of times pull_task() stole a task from this cpu when another cpu - was busy + 10) sum of all time spent running by tasks on this processor (in jiffies) + 11) sum of all time spent waiting to run by tasks on this processor (in + jiffies) + 12) # of timeslices run on this cpu Domain statistics @@ -89,65 +62,95 @@ One of these is produced per domain for each cpu described. (Note that if CONFIG_SMP is not defined, *no* domains are utilized and these lines will not appear in the output.) -domain 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 +domain 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 The first field is a bit mask indicating what cpus this domain operates over. -The next fifteen are a variety of load_balance() statistics: - - 1) # of times in this domain load_balance() was called when the cpu - was idle - 2) # of times in this domain load_balance() was called when the cpu - was busy - 3) # of times in this domain load_balance() was called when the cpu - was just becoming idle - 4) # of times in this domain load_balance() tried to move one or more - tasks and failed, when the cpu was idle - 5) # of times in this domain load_balance() tried to move one or more - tasks and failed, when the cpu was busy - 6) # of times in this domain load_balance() tried to move one or more - tasks and failed, when the cpu was just becoming idle - 7) sum of imbalances discovered (if any) with each call to - load_balance() in this domain when the cpu was idle - 8) sum of imbalances discovered (if any) with each call to - load_balance() in this domain when the cpu was busy - 9) sum of imbalances discovered (if any) with each call to - load_balance() in this domain when the cpu was just becoming idle - 10) # of times in this domain load_balance() was called but did not find - a busier queue while the cpu was idle - 11) # of times in this domain load_balance() was called but did not find - a busier queue while the cpu was busy - 12) # of times in this domain load_balance() was called but did not find - a busier queue while the cpu was just becoming idle - 13) # of times in this domain a busier queue was found while the cpu was - idle but no busier group was found - 14) # of times in this domain a busier queue was found while the cpu was - busy but no busier group was found - 15) # of times in this domain a busier queue was found while the cpu was - just becoming idle but no busier group was found - -Next two are sched_balance_exec() statistics: - 17) # of times in this domain sched_balance_exec() successfully pushed - a task to a new cpu - 18) # of times in this domain sched_balance_exec() tried but failed to - push a task to a new cpu - -Next two are try_to_wake_up() statistics: - 19) # of times in this domain try_to_wake_up() tried to move a task based - on affinity and cache warmth - 20) # of times in this domain try_to_wake_up() tried to move a task based - on load balancing - +The next 24 are a variety of load_balance() statistics in grouped into types +of idleness (idle, busy, and newly idle): + + 1) # of times in this domain load_balance() was called when the + cpu was idle + 2) # of times in this domain load_balance() checked but found + the load did not require balancing when the cpu was idle + 3) # of times in this domain load_balance() tried to move one or + more tasks and failed, when the cpu was idle + 4) sum of imbalances discovered (if any) with each call to + load_balance() in this domain when the cpu was idle + 5) # of times in this domain pull_task() was called when the cpu + was idle + 6) # of times in this domain pull_task() was called even though + the target task was cache-hot when idle + 7) # of times in this domain load_balance() was called but did + not find a busier queue while the cpu was idle + 8) # of times in this domain a busier queue was found while the + cpu was idle but no busier group was found + + 9) # of times in this domain load_balance() was called when the + cpu was busy + 10) # of times in this domain load_balance() checked but found the + load did not require balancing when busy + 11) # of times in this domain load_balance() tried to move one or + more tasks and failed, when the cpu was busy + 12) sum of imbalances discovered (if any) with each call to + load_balance() in this domain when the cpu was busy + 13) # of times in this domain pull_task() was called when busy + 14) # of times in this domain pull_task() was called even though the + target task was cache-hot when busy + 15) # of times in this domain load_balance() was called but did not + find a busier queue while the cpu was busy + 16) # of times in this domain a busier queue was found while the cpu + was busy but no busier group was found + + 17) # of times in this domain load_balance() was called when the + cpu was just becoming idle + 18) # of times in this domain load_balance() checked but found the + load did not require balancing when the cpu was just becoming idle + 19) # of times in this domain load_balance() tried to move one or more + tasks and failed, when the cpu was just becoming idle + 20) sum of imbalances discovered (if any) with each call to + load_balance() in this domain when the cpu was just becoming idle + 21) # of times in this domain pull_task() was called when newly idle + 22) # of times in this domain pull_task() was called even though the + target task was cache-hot when just becoming idle + 23) # of times in this domain load_balance() was called but did not + find a busier queue while the cpu was just becoming idle + 24) # of times in this domain a busier queue was found while the cpu + was just becoming idle but no busier group was found + + Next three are active_load_balance() statistics: + 25) # of times active_load_balance() was called + 26) # of times active_load_balance() tried to move a task and failed + 27) # of times active_load_balance() successfully moved a task + + Next three are sched_balance_exec() statistics: + 28) sbe_cnt is not used + 29) sbe_balanced is not used + 30) sbe_pushed is not used + + Next three are sched_balance_fork() statistics: + 31) sbf_cnt is not used + 32) sbf_balanced is not used + 33) sbf_pushed is not used + + Next three are try_to_wake_up() statistics: + 34) # of times in this domain try_to_wake_up() awoke a task that + last ran on a different cpu in this domain + 35) # of times in this domain try_to_wake_up() moved a task to the + waking cpu because it was cache-cold on its own cpu anyway + 36) # of times in this domain try_to_wake_up() started passive balancing /proc//schedstat ---------------- schedstats also adds a new /proc/ @@ -6,8 +6,19 @@ This document is a guide to using the M-Audio Audiophile USB (tm) device with ALSA and JACK. +History +======= +* v1.4 - Thibault Le Meur (2007-07-11) + - Added Low Endianness nature of 16bits-modes + found by Hakan Lennestal + - Modifying document structure +* v1.5 - Thibault Le Meur (2007-07-12) + - Added AC3/DTS passthru info + + 1 - Audiophile USB Specs and correct usage ========================================== + This part is a reminder of important facts about the functions and limitations of the device. @@ -25,18 +36,18 @@ The device has 4 audio interfaces, and 2 MIDI ports: The internal DAC/ADC has the following characteristics: * sample depth of 16 or 24 bits * sample rate from 8kHz to 96kHz -* Two ports can't use different sample depths at the same time. Moreover, the -Audiophile USB documentation gives the following Warning: "Please exit any -audio application running before switching between bit depths" +* Two interfaces can't use different sample depths at the same time. +Moreover, the Audiophile USB documentation gives the following Warning: +"Please exit any audio application running before switching between bit depths" Due to the USB 1.1 bandwidth limitation, a limited number of interfaces can be activated at the same time depending on the audio mode selected: - * 16-bit/48kHz ==> 4 channels in/4 channels out + * 16-bit/48kHz ==> 4 channels in + 4 channels out - Ai+Ao+Di+Do - * 24-bit/48kHz ==> 4 channels in/2 channels out, - or 2 channels in/4 channels out + * 24-bit/48kHz ==> 4 channels in + 2 channels out, + or 2 channels in + 4 channels out - Ai+Ao+Do or Ai+Di+Ao or Ai+Di+Do or Di+Ao+Do - * 24-bit/96kHz ==> 2 channels in, or 2 channels out (half duplex only) + * 24-bit/96kHz ==> 2 channels in _or_ 2 channels out (half duplex only) - Ai or Ao or Di or Do Important facts about the Digital interface: @@ -52,44 +63,56 @@ source is connected synchronization error (for instance sound played at an odd sample rate) -2 - Audiophile USB support in ALSA -================================== +2 - Audiophile USB MIDI support in ALSA +======================================= -2.1 - MIDI ports ----------------- -The Audiophile USB MIDI ports will be automatically supported once the +The Audiophile USB MIDI ports will be automatically supported once the following modules have been loaded: * snd-usb-audio * snd-seq-midi No additional setting is required. -2.2 - Audio ports ------------------ + +3 - Audiophile USB Audio support in ALSA +======================================== Audio functions of the Audiophile USB device are handled by the snd-usb-audio module. This module can work in a default mode (without any device-specific parameter), or in an "advanced" mode with the device-specific parameter called "device_setup". -2.2.1 - Default Alsa driver mode - -The default behavior of the snd-usb-audio driver is to parse the device -capabilities at startup and enable all functions inside the device (including -all ports at any supported sample rates and sample depths). This approach -has the advantage to let the driver easily switch from sample rates/depths -automatically according to the need of the application claiming the device. - -In this case the Audiophile ports are mapped to alsa pcm devices in the -following way (I suppose the device's index is 1): +3.1 - Default Alsa driver mode +------------------------------ + +The default behavior of the snd-usb-audio driver is to list the device +capabilities at startup and activate the required mode when required +by the applications: for instance if the user is recording in a +24bit-depth-mode and immediately after wants to switch to a 16bit-depth mode, +the snd-usb-audio module will reconfigure the device on the fly. + +This approach has the advantage to let the driver automatically switch from sample +rates/depths automatically according to the user's needs. However, those who +are using the device under windows know that this is not how the device is meant to +work: under windows applications must be closed before using the m-audio control +panel to switch the device working mode. Thus as we'll see in next section, this +Default Alsa driver mode can lead to device misconfigurations. + +Let's get back to the Default Alsa driver mode for now. In this case the +Audiophile interfaces are mapped to alsa pcm devices in the following +way (I suppose the device's index is 1): * hw:1,0 is Ao in playback and Di in capture * hw:1,1 is Do in playback and Ai in capture * hw:1,2 is Do in AC3/DTS passthrough mode -You must note as well that the device uses Big Endian byte encoding so that -supported audio format are S16_BE for 16-bit depth modes and S24_3BE for -24-bits depth mode. One exception is the hw:1,2 port which is Little Endian -compliant and thus uses S16_LE. +In this mode, the device uses Big Endian byte-encoding so that +supported audio format are S16_BE for 16-bit depth modes and S24_3BE for +24-bits depth mode. + +One exception is the hw:1,2 port which was reported to be Little Endian +compliant (supposedly supporting S16_LE) but processes in fact only S16_BE streams. +This has been fixed in kernel 2.6.23 and above and now the hw:1,2 interface +is reported to be big endian in this default driver mode. Examples: * playing a S24_3BE encoded raw file to the Ao port @@ -98,22 +121,26 @@ Examples: % arecord -D hw:1,1 -c2 -t raw -r48000 -fS24_3BE test.raw * playing a S16_BE encoded raw file to the Do port % aplay -D hw:1,1 -c2 -t raw -r48000 -fS16_BE test.raw + * playing an ac3 sample file to the Do port + % aplay -D hw:1,2 --channels=6 ac3_S16_BE_encoded_file.raw -If you're happy with the default Alsa driver setup and don't experience any +If you're happy with the default Alsa driver mode and don't experience any issue with this mode, then you can skip the following chapter. -2.2.2 - Advanced module setup +3.2 - Advanced module setup +--------------------------- Due to the hardware constraints described above, the device initialization made by the Alsa driver in default mode may result in a corrupted state of the device. For instance, a particularly annoying issue is that the sound captured -from the Ai port sounds distorted (as if boosted with an excessive high volume -gain). +from the Ai interface sounds distorted (as if boosted with an excessive high +volume gain). For people having this problem, the snd-usb-audio module has a new module -parameter called "device_setup". +parameter called "device_setup" (this parameter was introduced in kernel +release 2.6.17) -2.2.2.1 - Initializing the working mode of the Audiophile USB +3.2.1 - Initializing the working mode of the Audiophile USB As far as the Audiophile USB device is concerned, this value let the user specify: @@ -121,33 +148,57 @@ specify: * the sample rate * whether the Di port is used or not -Here is a list of supported device_setup values for this device: - * device_setup=0x00 (or omitted) - - Alsa driver default mode - - maintains backward compatibility with setups that do not use this - parameter by not introducing any change - - results sometimes in corrupted sound as described earlier +When initialized with "device_setup=0x00", the snd-usb-audio module has +the same behaviour as when the parameter is omitted (see paragraph "Default +Alsa driver mode" above) + +Others modes are described in the following subsections. + +3.2.1.1 - 16-bit modes + +The two supported modes are: + * device_setup=0x01 - 16bits 48kHz mode with Di disabled - Ai,Ao,Do can be used at the same time - hw:1,0 is not available in capture mode - hw:1,2 is not available + * device_setup=0x11 - 16bits 48kHz mode with Di enabled - Ai,Ao,Di,Do can be used at the same time - hw:1,0 is available in capture mode - hw:1,2 is not available + +In this modes the device operates only at 16bits-modes. Before kernel 2.6.23, +the devices where reported to be Big-Endian when in fact they were Little-Endian +so that playing a file was a matter of using: + % aplay -D hw:1,1 -c2 -t raw -r48000 -fS16_BE test_S16_LE.raw +where "test_S16_LE.raw" was in fact a little-endian sample file. + +Thanks to Hakan Lennestal (who discovered the Little-Endiannes of the device in +these modes) a fix has been committed (expected in kernel 2.6.23) and +Alsa now reports Little-Endian interfaces. Thus playing a file now is as simple as +using: + % aplay -D hw:1,1 -c2 -t raw -r48000 -fS16_LE test_S16_LE.raw + +3.2.1.2 - 24-bit modes + +The three supported modes are: + * device_setup=0x09 - 24bits 48kHz mode with Di disabled - Ai,Ao,Do can be used at the same time - hw:1,0 is not available in capture mode - hw:1,2 is not available + * device_setup=0x19 - 24bits 48kHz mode with Di enabled - 3 ports from {Ai,Ao,Di,Do} can be used at the same time - hw:1,0 is available in capture mode and an active digital source must be connected to Di - hw:1,2 is not available + * device_setup=0x0D or 0x10 - 24bits 96kHz mode - Di is enabled by default for this mode but does not need to be connected @@ -155,34 +206,64 @@ Here is a list of supported device_setup values for this device: - Only 1 port from {Ai,Ao,Di,Do} can be used at the same time - hw:1,0 is available in captured mode - hw:1,2 is not available + +In these modes the device is only Big-Endian compliant (see "Default Alsa driver +mode" above for an aplay command example) + +3.2.1.3 - AC3 w/ DTS passthru mode + +Thanks to Hakan Lennestal, I now have a report saying that this mode works. + * device_setup=0x03 - 16bits 48kHz mode with only the Do port enabled - - AC3 with DTS passthru (not tested) + - AC3 with DTS passthru - Caution with this setup the Do port is mapped to the pcm device hw:1,0 -2.2.2.2 - Setting and switching configurations with the device_setup parameter +The command line used to playback the AC3/DTS encoded .wav-files in this mode: + % aplay -D hw:1,0 --channels=6 ac3_S16_LE_encoded_file.raw + +3.2.2 - How to use the device_setup parameter +---------------------------------------------- The parameter can be given: + * By manually probing the device (as root): # modprobe -r snd-usb-audio # modprobe snd-usb-audio index=1 device_setup=0x09 + * Or while configuring the modules options in your modules configuration file - For Fedora distributions, edit the /etc/modprobe.conf file: alias snd-card-1 snd-usb-audio options snd-usb-audio index=1 device_setup=0x09 -IMPORTANT NOTE WHEN SWITCHING CONFIGURATION: -------------------------------------------- - * You may need to _first_ initialize the module with the correct device_setup - parameter and _only_after_ turn on the Audiophile USB device - * This is especially true when switching the sample depth: +CAUTION when initializaing the device +------------------------------------- + + * Correct initialization on the device requires that device_setup is given to + the module BEFORE the device is turned on. So, if you use the "manual probing" + method described above, take care to power-on the device AFTER this initialization. + + * Failing to respect this will lead in a misconfiguration of the device. In this case + turn off the device, unproble the snd-usb-audio module, then probe it again with + correct device_setup parameter and then (and only then) turn on the device again. + + * If you've correctly initialized the device in a valid mode and then want to switch + to another mode (possibly with another sample-depth), please use also the following + procedure: - first turn off the device - de-register the snd-usb-audio module (modprobe -r) - change the device_setup parameter by changing the device_setup option in /etc/modprobe.conf - turn on the device + * A workaround for this last issue has been applied to kernel 2.6.23, but it may not + be enough to ensure the 'stability' of the device initialization. -2.2.2.3 - Audiophile USB's device_setup structure +3.2.3 - Technical details for hackers +------------------------------------- +This section is for hackers, wanting to understand details about the device +internals and how Alsa supports it. + +3.2.3.1 - Audiophile USB's device_setup structure If you want to understand the device_setup magic numbers for the Audiophile USB, you need some very basic understanding of binary computation. However, @@ -228,12 +309,12 @@ Caution: - choosing b2 will prepare all interfaces for 24bits/96kHz but you'll only be able to use one at the same time -2.2.3 - USB implementation details for this device +3.2.3.2 - USB implementation details for this device You may safely skip this section if you're not interested in driver -development. +hacking. -This section describes some internal aspects of the device and summarize the +This section describes some internal aspects of the device and summarizes the data I got by usb-snooping the windows and Linux drivers. The M-Audio Audiophile USB has 7 USB Interfaces: @@ -293,43 +374,45 @@ parse_audio_endpoints function uses a quirk called "audiophile_skip_setting_quirk" in order to prevent AltSettings not corresponding to device_setup from being registered in the driver. -3 - Audiophile USB and Jack support +4 - Audiophile USB and Jack support =================================== This section deals with support of the Audiophile USB device in Jack. -The main issue regarding this support is that the device is Big Endian -compliant. -3.1 - Using the plug alsa plugin --------------------------------- +There are 2 main potential issues when using Jackd with the device: +* support for Big-Endian devices in 24-bit modes +* support for 4-in / 4-out channels + +4.1 - Direct support in Jackd +----------------------------- -Jack doesn't directly support big endian devices. Thus, one way to have support -for this device with Alsa is to use the Alsa "plug" converter. +Jack supports big endian devices only in recent versions (thanks to +Andreas Steinmetz for his first big-endian patch). I can't remember +extacly when this support was released into jackd, let's just say that +with jackd version 0.103.0 it's almost ok (just a small bug is affecting +16bits Big-Endian devices, but since you've read carefully the above +paragraphs, you're now using kernel >= 2.6.23 and your 16bits devices +are now Little Endians ;-) ). + +You can run jackd with the following command for playback with Ao and +record with Ai: + % jackd -R -dalsa -Phw:1,0 -r48000 -p128 -n2 -D -Chw:1,1 + +4.2 - Using Alsa plughw +----------------------- +If you don't have a recent Jackd installed, you can downgrade to using +the Alsa "plug" converter. For instance here is one way to run Jack with 2 playback channels on Ao and 2 capture channels from Ai: % jackd -R -dalsa -dplughw:1 -r48000 -p256 -n2 -D -Cplughw:1,1 - However you may see the following warning message: "You appear to be using the ALSA software "plug" layer, probably a result of using the "default" ALSA device. This is less efficient than it could be. Consider using a hardware device instead rather than using the plug layer." -3.2 - Patching alsa to use direct pcm device --------------------------------------------- -A patch for Jack by Andreas Steinmetz adds support for Big Endian devices. -However it has not been included in the CVS tree. - -You can find it at the following URL: -http://sourceforge.net/tracker/index.php?func=detail&aid=1289682&group_id=39687& -atid=425939 - -After having applied the patch you can run jackd with the following command -line: - % jackd -R -dalsa -Phw:1,0 -r48000 -p128 -n2 -D -Chw:1,1 - -3.2 - Getting 2 input and/or output interfaces in Jack +4.3 - Getting 2 input and/or output interfaces in Jack ------------------------------------------------------ As you can see, starting the Jack server this way will only enable 1 stereo @@ -339,6 +422,7 @@ This is due to the following restrictions: * Jack can only open one capture device and one playback device at a time * The Audiophile USB is seen as 2 (or three) Alsa devices: hw:1,0, hw:1,1 (and optionally hw:1,2) + If you want to get Ai+Di and/or Ao+Do support with Jack, you would need to combine the Alsa devices into one logical "complex" device. @@ -348,13 +432,11 @@ It is related to another device (ice1712) but can be adapted to suit the Audiophile USB. Enabling multiple Audiophile USB interfaces for Jackd will certainly require: -* patching Jack with the previously mentioned "Big Endian" patch -* patching Jackd with the MMAP_COMPLEX patch (see the ice1712 page) -* patching the alsa-lib/src/pcm/pcm_multi.c file (see the ice1712 page) +* Making sure your Jackd version has the MMAP_COMPLEX patch (see the ice1712 page) +* (maybe) patching the alsa-lib/src/pcm/pcm_multi.c file (see the ice1712 page) * define a multi device (combination of hw:1,0 and hw:1,1) in your .asoundrc file * start jackd with this device -I had no success in testing this for now, but this may be due to my OS -configuration. If you have any success with this kind of setup, please -drop me an email. +I had no success in testing this for now, if you have any success with this kind +of setup, please drop me an email. diff --git a/Documentation/sound/alsa/OSS-Emulation.txt b/Documentation/sound/alsa/OSS-Emulation.txt index ec2a02541d5b..bfa0c9aacb4b 100644 --- a/Documentation/sound/alsa/OSS-Emulation.txt +++ b/Documentation/sound/alsa/OSS-Emulation.txt @@ -278,6 +278,21 @@ current mixer configuration by reading and writing the whole file image. +Duplex Streams +============== + +Note that when attempting to use a single device file for playback and +capture, the OSS API provides no way to set the format, sample rate or +number of channels different in each direction. Thus + io_handle = open("device", O_RDWR) +will only function correctly if the values are the same in each direction. + +To use different values in the two directions, use both + input_handle = open("device", O_RDONLY) + output_handle = open("device", O_WRONLY) +and set the values for the corresponding handle. + + Unsupported Features ==================== diff --git a/Documentation/sound/oss/AD1816 b/Documentation/sound/oss/AD1816 deleted file mode 100644 index 14bd8f25d523..000000000000 --- a/Documentation/sound/oss/AD1816 +++ /dev/null @@ -1,84 +0,0 @@ -Documentation for the AD1816(A) sound driver -============================================ - -Installation: -------------- - -To get your AD1816(A) based sound card work, you'll have to enable support for -experimental code ("Prompt for development and/or incomplete code/drivers") -and isapnp ("Plug and Play support", "ISA Plug and Play support"). Enable -"Sound card support", "OSS modules support" and "Support for AD1816(A) based -cards (EXPERIMENTAL)" in the sound configuration menu, too. Now build, install -and reboot the new kernel as usual. - -Features: ---------- - -List of features supported by this driver: -- full-duplex support -- supported audio formats: unsigned 8bit, signed 16bit little endian, - signed 16bit big endian, µ-law, A-law -- supported channels: mono and stereo -- supported recording sources: Master, CD, Line, Line1, Line2, Mic -- supports phat 3d stereo circuit (Line 3) - - -Supported cards: ----------------- - -The following cards are known to work with this driver: -- Terratec Base 1 -- Terratec Base 64 -- HP Kayak -- Acer FX-3D -- SY-1816 -- Highscreen Sound-Boostar 32 Wave 3D -- Highscreen Sound-Boostar 16 -- AVM Apex Pro card -- (Aztech SC-16 3D) -- (Newcom SC-16 3D) -- (Terratec EWS64S) - -Cards listed in brackets are not supported reliable. If you have such a card -you should add the extra parameter: - options=1 -when loading the ad1816 module via modprobe. - - -Troubleshooting: ----------------- - -First of all you should check, if the driver has been loaded -properly. - -If loading of the driver succeeds, but playback/capture fails, check -if you used the correct values for irq, dma and dma2 when loading the module. -If one of them is wrong you usually get the following error message: - -Nov 6 17:06:13 tek01 kernel: Sound: DMA (output) timed out - IRQ/DRQ config error? - -If playback/capture is too fast or to slow, you should have a look at -the clock chip of your sound card. The AD1816 was designed for a 33MHz -oscillator, however most sound card manufacturer use slightly -different oscillators as they are cheaper than 33MHz oscillators. If -you have such a card you have to adjust the ad1816_clockfreq parameter -above. For example: For a card using a 32.875MHz oscillator use -ad1816_clockfreq=32875 instead of ad1816_clockfreq=33000. - - -Updates, bugfixes and bugreports: --------------------------------- - -As the driver is still experimental and under development, you should -watch out for updates. Updates of the driver are available on the -Internet from one of my home pages: - http://www.student.informatik.tu-darmstadt.de/~tek/projects/linux.html -or: - http://www.tu-darmstadt.de/~tek01/projects/linux.html - -Bugreports, bugfixes and related questions should be sent via E-Mail to: - tek@rbg.informatik.tu-darmstadt.de - -Thorsten Knabe -Christoph Hellwig - Last modified: 2000/09/20 diff --git a/Documentation/sound/oss/NM256 b/Documentation/sound/oss/NM256 deleted file mode 100644 index b503217488b3..000000000000 --- a/Documentation/sound/oss/NM256 +++ /dev/null @@ -1,280 +0,0 @@ -======================================================= -Documentation for the NeoMagic 256AV/256ZX sound driver -======================================================= - -You're looking at version 1.1 of the driver. (Woohoo!) It has been -successfully tested against the following laptop models: - - Sony Z505S/Z505SX/Z505DX/Z505RX - Sony F150, F160, F180, F250, F270, F280, PCG-F26 - Dell Latitude CPi, CPt (various submodels) - -There are a few caveats, which is why you should read the entirety of -this document first. - -This driver was developed without any support or assistance from -NeoMagic. There is no warranty, expressed, implied, or otherwise. It -is free software in the public domain; feel free to use it, sell it, -give it to your best friends, even claim that you wrote it (but why?!) -but don't go whining to me, NeoMagic, Sony, Dell, or anyone else -when it blows up your computer. - -Version 1.1 contains a change to try and detect non-AC97 versions of -the hardware, and not install itself appropriately. It should also -reinitialize the hardware on an APM resume event, assuming that APM -was configured into your kernel. - -============ -Installation -============ - -Enable the sound drivers, the OSS sound drivers, and then the NM256 -driver. The NM256 driver *must* be configured as a module (it won't -give you any other choice). - -Next, do the usual "make modules" and "make modules_install". -Finally, insmod the soundcore, sound and nm256 modules. - -When the nm256 driver module is loaded, you should see a couple of -confirmation messages in the kernel logfile indicating that it found -the device (the device does *not* use any I/O ports or DMA channels). -Now try playing a wav file, futz with the CD-ROM if you have one, etc. - -The NM256 is entirely a PCI-based device, and all the necessary -information is automatically obtained from the card. It can only be -configured as a module in a vain attempt to prevent people from -hurting themselves. It works correctly if it shares an IRQ with -another device (it normally shares IRQ 9 with the builtin eepro100 -ethernet on the Sony Z505 laptops). - -It does not run the card in any sort of compatibility mode. It will -not work on laptops that have the SB16-compatible, AD1848-compatible -or CS4232-compatible codec/mixer; you will want to use the appropriate -compatible OSS driver with these chipsets. I cannot provide any -assistance with machines using the SB16, AD1848 or CS4232 compatible -versions. (The driver now attempts to detect the mixer version, and -will refuse to load if it believes the hardware is not -AC97-compatible.) - -The sound support is very basic, but it does include simultaneous -playback and record capability. The mixer support is also quite -simple, although this is in keeping with the rather limited -functionality of the chipset. - -There is no hardware synthesizer available, as the Losedows OPL-3 and -MIDI support is done via hardware emulation. - -Only three recording devices are available on the Sony: the -microphone, the CD-ROM input, and the volume device (which corresponds -to the stereo output). (Other devices may be available on other -models of laptops.) The Z505 series does not have a builtin CD-ROM, -so of course the CD-ROM input doesn't work. It does work on laptops -with a builtin CD-ROM drive. - -The mixer device does not appear to have any tone controls, at least -on the Z505 series. The mixer module checks for tone controls in the -AC97 mixer, and will enable them if they are available. - -============== -Known problems -============== - - * There are known problems with PCMCIA cards and the eepro100 ethernet - driver on the Z505S/Z505SX/Z505DX. Keep reading. - - * There are also potential problems with using a virtual X display, and - also problems loading the module after the X server has been started. - Keep reading. - - * The volume control isn't anywhere near linear. Sorry. This will be - fixed eventually, when I get sufficiently annoyed with it. (I doubt - it will ever be fixed now, since I've never gotten sufficiently - annoyed with it and nobody else seems to care.) - - * There are reports that the CD-ROM volume is very low. Since I do not - have a CD-ROM equipped laptop, I cannot test this (it's kinda hard to - do remotely). - - * Only 8 fixed-rate speeds are supported. This is mainly a chipset - limitation. It may be possible to support other speeds in the future. - - * There is no support for the telephone mixer/codec. There is support - for a phonein/phoneout device in the mixer driver; whether or not - it does anything is anyone's guess. (Reports on this would be - appreciated. You'll have to figure out how to get the phone to - go off-hook before it'll work, tho.) - - * This driver was not written with any cooperation or support from - NeoMagic. If you have any questions about this, see their website - for their official stance on supporting open source drivers. - -============ -Video memory -============ - -The NeoMagic sound engine uses a portion of the display memory to hold -the sound buffer. (Crazy, eh?) The NeoMagic video BIOS sets up a -special pointer at the top of video RAM to indicate where the top of -the audio buffer should be placed. - -At the present time XFree86 is apparently not aware of this. It will -thus write over either the pointer or the sound buffer with abandon. -(Accelerated-X seems to do a better job here.) - -This implies a few things: - - * Sometimes the NM256 driver has to guess at where the buffer - should be placed, especially if the module is loaded after the - X server is started. It's usually correct, but it will consistently - fail on the Sony F250. - - * Virtual screens greater than 1024x768x16 under XFree86 are - problematic on laptops with only 2.5MB of screen RAM. This - includes all of the 256AV-equipped laptops. (Virtual displays - may or may not work on the 256ZX, which has at least 4MB of - video RAM.) - -If you start having problems with random noise being output either -constantly (this is the usual symptom on the F250), or when windows -are moved around (this is the usual symptom when using a virtual -screen), the best fix is to - - * Don't use a virtual frame buffer. - * Make sure you load the NM256 module before the X server is - started. - -On the F250, it is possible to force the driver to load properly even -after the XFree86 server is started by doing: - - insmod nm256 buffertop=0x25a800 - -This forces the audio buffers to the correct offset in screen RAM. - -One user has reported a similar problem on the Sony F270, although -others apparently aren't seeing any problems. His suggested command -is - - insmod nm256 buffertop=0x272800 - -================= -Official WWW site -================= - -The official site for the NM256 driver is: - - http://www.uglx.org/sony.html - -You should always be able to get the latest version of the driver there, -and the driver will be supported for the foreseeable future. - -============== -Z505RX and IDE -============== - -There appears to be a problem with the IDE chipset on the Z505RX; one -of the symptoms is that sound playback periodically hangs (when the -disk is accessed). The user reporting the problem also reported that -enabling all of the IDE chipset workarounds in the kernel solved the -problem, tho obviously only one of them should be needed--if someone -can give me more details I would appreciate it. - -============================== -Z505S/Z505SX on-board Ethernet -============================== - -If you're using the on-board Ethernet Pro/100 ethernet support on the Z505 -series, I strongly encourage you to download the latest eepro100 driver from -Donald Becker's site: - - ftp://cesdis.gsfc.nasa.gov/pub/linux/drivers/test/eepro100.c - -There was a reported problem on the Z505SX that if the ethernet -interface is disabled and reenabled while the sound driver is loaded, -the machine would lock up. I have included a workaround that is -working satisfactorily. However, you may occasionally see a message -about "Releasing interrupts, over 1000 bad interrupts" which indicates -that the workaround is doing its job. - -================================== -PCMCIA and the Z505S/Z505SX/Z505DX -================================== - -There is also a known problem with the Sony Z505S and Z505SX hanging -if a PCMCIA card is inserted while the ethernet driver is loaded, or -in some cases if the laptop is suspended. This is caused by tons of -spurious IRQ 9s, probably generated from the PCMCIA or ACPI bridges. - -There is currently no fix for the problem that works in every case. -The only known workarounds are to disable the ethernet interface -before inserting or removing a PCMCIA card, or with some cards -disabling the PCMCIA card before ejecting it will also help the -problem with the laptop hanging when the card is ejected. - -One user has reported that setting the tcic's cs_irq to some value -other than 9 (like 11) fixed the problem. This doesn't work on my -Z505S, however--changing the value causes the cardmgr to stop seeing -card insertions and removals, cards don't seem to work correctly, and -I still get hangs if a card is inserted when the kernel is booted. - -Using the latest ethernet driver and pcmcia package allows me to -insert an Adaptec 1480A SlimScsi card without the laptop hanging, -although I still have to shut down the card before ejecting or -powering down the laptop. However, similar experiments with a DE-660 -ethernet card still result in hangs when the card is inserted. I am -beginning to think that the interrupts are CardBus-related, since the -Adaptec card is a CardBus card, and the DE-660 is not; however, I -don't have any other CardBus cards to test with. - -====== -Thanks -====== - -First, I want to thank everyone (except NeoMagic of course) for their -generous support and encouragement. I'd like to list everyone's name -here that replied during the development phase, but the list is -amazingly long. - -I will be rather unfair and single out a few people, however: - - Justin Maurer, for being the first random net.person to try it, - and for letting me login to his Z505SX to get it working there - - Edi Weitz for trying out several different versions, and giving - me a lot of useful feedback - - Greg Rumple for letting me login remotely to get the driver - functional on the 256ZX, for his assistance on tracking - down all sorts of random stuff, and for trying out Accel-X - - Zach Brown, for the initial AC97 mixer interface design - - Jeff Garzik, for various helpful suggestions on the AC97 - interface - - "Mr. Bumpy" for feedback on the Z505RX - - Bill Nottingham, for generous assistance in getting the mixer ID - code working - -================= -Previous versions -================= - -Versions prior to 0.3 (aka `noname') had problems with weird artifacts -in the output and failed to set the recording rate properly. These -problems have long since been fixed. - -Versions prior to 0.5 had problems with clicks in the output when -anything other than 16-bit stereo sound was being played, and also had -periodic clicks when recording. - -Version 0.7 first incorporated support for the NM256ZX chipset, which -is found on some Dell Latitude laptops (the CPt, and apparently -some CPi models as well). It also included the generic AC97 -mixer module. - -Version 0.75 renamed all the functions and files with slightly more -generic names. - -Note that previous versions of this document claimed that recording was -8-bit only; it actually has been working for 16-bits all along. diff --git a/Documentation/sound/oss/OPL3-SA2 b/Documentation/sound/oss/OPL3-SA2 deleted file mode 100644 index d8b6d2bbada6..000000000000 --- a/Documentation/sound/oss/OPL3-SA2 +++ /dev/null @@ -1,210 +0,0 @@ -Documentation for the OPL3-SA2, SA3, and SAx driver (opl3sa2.o) ---------------------------------------------------------------- - -Scott Murray, scott@spiteful.org -January 7, 2001 - -NOTE: All trade-marked terms mentioned below are properties of their - respective owners. - - -Supported Devices ------------------ - -This driver is for PnP soundcards based on the following Yamaha audio -controller chipsets: - -YMF711 aka OPL3-SA2 -YMF715 and YMF719 aka OPL3-SA3 - -Up until recently (December 2000), I'd thought the 719 to be a -different chipset, the OPL3-SAx. After an email exhange with -Yamaha, however, it turns out that the 719 is just a re-badged -715, and the chipsets are identical. The chipset detection code -has been updated to reflect this. - -Anyways, all of these chipsets implement the following devices: - -OPL3 FM synthesizer -Soundblaster Pro -Microsoft/Windows Sound System -MPU401 MIDI interface - -Note that this driver uses the MSS device, and to my knowledge these -chipsets enforce an either/or situation with the Soundblaster Pro -device and the MSS device. Since the MSS device has better -capabilities, I have implemented the driver to use it. - - -Mixer Channels --------------- - -Older versions of this driver (pre-December 2000) had two mixers, -an OPL3-SA2 or SA3 mixer and a MSS mixer. The OPL3-SA[23] mixer -device contained a superset of mixer channels consisting of its own -channels and all of the MSS mixer channels. To simplify the driver -considerably, and to partition functionality better, the OPL3-SA[23] -mixer device now contains has its own specific mixer channels. They -are: - -Volume - Hardware master volume control -Bass - SA3 only, now supports left and right channels -Treble - SA3 only, now supports left and right channels -Microphone - Hardware microphone input volume control -Digital1 - Yamaha 3D enhancement "Wide" mixer - -All other mixer channels (e.g. "PCM", "CD", etc.) now have to be -controlled via the "MS Sound System (CS4231)" mixer. To facilitate -this, the mixer device creation order has been switched so that -the MSS mixer is created first. This allows accessing the majority -of the useful mixer channels even via single mixer-aware tools -such as "aumix". - - -Plug 'n Play ------------- - -In previous kernels (2.2.x), some configuration was required to -get the driver to talk to the card. Being the new millennium and -all, the 2.4.x kernels now support auto-configuration if ISA PnP -support is configured in. Theoretically, the driver even supports -having more than one card in this case. - -With the addition of PnP support to the driver, two new parameters -have been added to control it: - -isapnp - set to 0 to disable ISA PnP card detection - -multiple - set to 0 to disable multiple PnP card detection - - -Optional Parameters -------------------- - -Recent (December 2000) additions to the driver (based on a patch -provided by Peter Englmaier) are two new parameters: - -ymode - Set Yamaha 3D enhancement mode: - 0 = Desktop/Normal 5-12 cm speakers - 1 = Notebook PC (1) 3 cm speakers - 2 = Notebook PC (2) 1.5 cm speakers - 3 = Hi-Fi 16-38 cm speakers - -loopback - Set A/D input source. Useful for echo cancellation: - 0 = Mic Right channel (default) - 1 = Mono output loopback - -The ymode parameter has been tested and does work. The loopback -parameter, however, is untested. Any feedback on its usefulness -would be appreciated. - - -Manual Configuration --------------------- - -If for some reason you decide not to compile ISA PnP support into -your kernel, or disabled the driver's usage of it by setting the -isapnp parameter as discussed above, then you will need to do some -manual configuration. There are two ways of doing this. The most -common is to use the isapnptools package to initialize the card, and -use the kernel module form of the sound subsystem and sound drivers. -Alternatively, some BIOS's allow manual configuration of installed -PnP devices in a BIOS menu, which should allow using the non-modular -sound drivers, i.e. built into the kernel. - -I personally use isapnp and modules, and do not have access to a PnP -BIOS machine to test. If you have such a beast, configuring the -driver to be built into the kernel should just work (thanks to work -done by David Luyer ). You will still need -to specify settings, which can be done by adding: - -opl3sa2=,,,,, - -to the kernel command line. For example: - -opl3sa2=0x370,5,0,1,0x530,0x330 - -If you are instead using the isapnp tools (as most people have been -before Linux 2.4.x), follow the directions in their documentation to -produce a configuration file. Here is the relevant excerpt I used to -use for my SA3 card from my isapnp.conf: - -(CONFIGURE YMH0800/-1 (LD 0 - -# NOTE: IO 0 is for the unused SoundBlaster part of the chipset. -(IO 0 (BASE 0x0220)) -(IO 1 (BASE 0x0530)) -(IO 2 (BASE 0x0388)) -(IO 3 (BASE 0x0330)) -(IO 4 (BASE 0x0370)) -(INT 0 (IRQ 5 (MODE +E))) -(DMA 0 (CHANNEL 0)) -(DMA 1 (CHANNEL 1)) - -Here, note that: - -Port Acceptable Range Purpose ----- ---------------- ------- -IO 0 0x0220 - 0x0280 SB base address, unused. -IO 1 0x0530 - 0x0F48 MSS base address -IO 2 0x0388 - 0x03F8 OPL3 base address -IO 3 0x0300 - 0x0334 MPU base address -IO 4 0x0100 - 0x0FFE card's own base address for its control I/O ports - -The IRQ and DMA values can be any that are considered acceptable for a -MSS. Assuming you've got isapnp all happy, then you should be able to -do something like the following (which matches up with the isapnp -configuration above): - -modprobe mpu401 -modprobe ad1848 -modprobe opl3sa2 io=0x370 mss_io=0x530 mpu_io=0x330 irq=5 dma=0 dma2=1 -modprobe opl3 io=0x388 - -See the section "Automatic Module Loading" below for how to set up -/etc/modprobe.conf to automate this. - -An important thing to remember that the opl3sa2 module's io argument is -for it's own control port, which handles the card's master mixer for -volume (on all cards), and bass and treble (on SA3 cards). - - -Troubleshooting ---------------- - -If all goes well and you see no error messages, you should be able to -start using the sound capabilities of your system. If you get an -error message while trying to insert the opl3sa2 module, then make -sure that the values of the various arguments match what you specified -in your isapnp configuration file, and that there is no conflict with -another device for an I/O port or interrupt. Checking the contents of -/proc/ioports and /proc/interrupts can be useful to see if you're -butting heads with another device. - -If you still cannot get the module to load, look at the contents of -your system log file, usually /var/log/messages. If you see the -message "opl3sa2: Unknown Yamaha audio controller version", then you -have a different chipset version than I've encountered so far. Look -for all messages in the log file that start with "opl3sa2: " and see -if they provide any clues. If you do not see the chipset version -message, and none of the other messages present in the system log are -helpful, email me some details and I'll try my best to help. - - -Automatic Module Loading ------------------------- - -Lastly, if you're using modules and want to set up automatic module -loading with kmod, the kernel module loader, here is the section I -currently use in my modprobe.conf file: - -# Sound -alias sound-slot-0 opl3sa2 -options opl3sa2 io=0x370 mss_io=0x530 mpu_io=0x330 irq=7 dma=0 dma2=3 -options opl3 io=0x388 - -That's all it currently takes to get an OPL3-SA3 card working on my -system. Once again, if you have any other problems, email me at the -address listed above. - -Scott diff --git a/Documentation/sound/oss/VIA-chipset b/Documentation/sound/oss/VIA-chipset deleted file mode 100644 index 37865234e54d..000000000000 --- a/Documentation/sound/oss/VIA-chipset +++ /dev/null @@ -1,43 +0,0 @@ -Running sound cards on VIA chipsets - -o There are problems with VIA chipsets and sound cards that appear to - lock the hardware solidly. Test programs under DOS have verified the - problem exists on at least some (but apparently not all) VIA boards - -o VIA have so far failed to bother to answer support mail on the subject - so if you are a VIA engineer feeling aggrieved as you read this - document go chase your own people. If there is a workaround please - let us know so we can implement it. - - -Certain patterns of ISA DMA access used for most PC sound cards cause the -VIA chipsets to lock up. From the collected reports this appears to cover a -wide range of boards. Some also lock up with sound cards under Win* as well. - -Linux implements a workaround providing your chipset is PCI and you compiled -with PCI Quirks enabled. If so you will see a message - "Activating ISA DMA bug workarounds" - -during booting. If you have a VIA PCI chipset that hangs when you use the -sound and is not generating this message even with PCI quirks enabled -please report the information to the linux-kernel list (see REPORTING-BUGS). - -If you are one of the tiny number of unfortunates with a 486 ISA/VLB VIA -chipset board you need to do the following to build a special kernel for -your board - - edit linux/include/asm-i386/dma.h - -change - -#define isa_dma_bridge_buggy (0) - -to - -#define isa_dma_bridge_buggy (1) - -and rebuild a kernel without PCI quirk support. - - -Other than this particular glitch the VIA [M]VP* chipsets appear to work -perfectly with Linux. diff --git a/Documentation/sound/oss/cs46xx b/Documentation/sound/oss/cs46xx deleted file mode 100644 index b54432709863..000000000000 --- a/Documentation/sound/oss/cs46xx +++ /dev/null @@ -1,138 +0,0 @@ - -Documentation for the Cirrus Logic/Crystal SoundFusion cs46xx/cs4280 audio -controller chips (2001/05/11) - -The cs46xx audio driver supports the DSP line of Cirrus controllers. -Specifically, the cs4610, cs4612, cs4614, cs4622, cs4624, cs4630 and the cs4280 -products. This driver uses the generic ac97_codec driver for AC97 codec -support. - - -Features: - -Full Duplex Playback/Capture supported from 8k-48k. -16Bit Signed LE & 8Bit Unsigned, with Mono or Stereo supported. - -APM/PM - 2.2.x PM is enabled and functional. APM can also -be enabled for 2.4.x by modifying the CS46XX_ACPI_SUPPORT macro -definition. - -DMA playback buffer size is configurable from 16k (defaultorder=2) up to 2Meg -(defaultorder=11). DMA capture buffer size is fixed at a single 4k page as -two 2k fragments. - -MMAP seems to work well with QuakeIII, and test XMMS plugin. - -Myth2 works, but the polling logic is not fully correct, but is functional. - -The 2.4.4-ac6 gameport code in the cs461x joystick driver has been tested -with a Microsoft Sidewinder joystick (cs461x.o and sidewinder.o). This -audio driver must be loaded prior to the joystick driver to enable the -DSP task image supporting the joystick device. - - -Limitations: - -SPDIF is currently not supported. - -Primary codec support only. No secondary codec support is implemented. - - - -NOTES: - -Hercules Game Theatre XP - the EGPIO2 pin controls the external Amp, -and has been tested. -Module parameter hercules_egpio_disable set to 1, will force a 0 to EGPIODR -to disable the external amplifier. - -VTB Santa Cruz - the GPIO7/GPIO8 on the Secondary Codec control -the external amplifier for the "back" speakers, since we do not -support the secondary codec then this external amp is not -turned on. The primary codec external amplifier is supported but -note that the AC97 EAPD bit is inverted logic (amp_voyetra()). - -DMA buffer size - there are issues with many of the Linux applications -concerning the optimal buffer size. Several applications request a -certain fragment size and number and then do not verify that the driver -has the ability to support the requested configuration. -SNDCTL_DSP_SETFRAGMENT ioctl is used to request a fragment size and -number of fragments. Some applications exit if an error is returned -on this particular ioctl. Therefore, in alignment with the other OSS audio -drivers, no error is returned when a SETFRAGs IOCTL is received, but the -values passed from the app are not used in any buffer calculation -(ossfragshift/ossmaxfrags are not used). -Use the "defaultorder=N" module parameter to change the buffer size if -you have an application that requires a specific number of fragments -or a specific buffer size (see below). - -Debug Interface ---------------- -There is an ioctl debug interface to allow runtime modification of the -debug print levels. This debug interface code can be disabled from the -compilation process with commenting the following define: -#define CSDEBUG_INTERFACE 1 -There is also a debug print methodolgy to select printf statements from -different areas of the driver. A debug print level is also used to allow -additional printfs to be active. Comment out the following line in the -driver to disable compilation of the CS_DBGOUT print statements: -#define CSDEBUG 1 - -Please see the definitions for cs_debuglevel and cs_debugmask for additional -information on the debug levels and sections. - -There is also a csdbg executable to allow runtime manipulation of these -parameters. for a copy email: twoller@crystal.cirrus.com - - - -MODULE_PARMS definitions ------------------------- -module_param(defaultorder, ulong, 0); -defaultorder=N -where N is a value from 1 to 12 -The buffer order determines the size of the dma buffer for the driver. -under Linux, a smaller buffer allows more responsiveness from many of the -applications (e.g. games). A larger buffer allows some of the apps (esound) -to not underrun the dma buffer as easily. As default, use 32k (order=3) -rather than 64k as some of the games work more responsively. -(2^N) * PAGE_SIZE = allocated buffer size - -module_param(cs_debuglevel, ulong, 0644); -module_param(cs_debugmask, ulong, 0644); -cs_debuglevel=N -cs_debugmask=0xMMMMMMMM -where N is a value from 0 (no debug printfs), to 9 (maximum) -0xMMMMMMMM is a debug mask corresponding to the CS_xxx bits (see driver source). - -module_param(hercules_egpio_disable, ulong, 0); -hercules_egpio_disable=N -where N is a 0 (enable egpio), or a 1 (disable egpio support) - -module_param(initdelay, ulong, 0); -initdelay=N -This value is used to determine the millescond delay during the initialization -code prior to powering up the PLL. On laptops this value can be used to -assist with errors on resume, mostly with IBM laptops. Basically, if the -system is booted under battery power then the mdelay()/udelay() functions fail to -properly delay the required time. Also, if the system is booted under AC power -and then the power removed, the mdelay()/udelay() functions will not delay properly. - -module_param(powerdown, ulong, 0); -powerdown=N -where N is 0 (disable any powerdown of the internal blocks) or 1 (enable powerdown) - - -module_param(external_amp, bool, 0); -external_amp=1 -if N is set to 1, then force enabling the EAPD support in the primary AC97 codec. -override the detection logic and force the external amp bit in the AC97 0x26 register -to be reset (0). EAPD should be 0 for powerup, and 1 for powerdown. The VTB Santa Cruz -card has inverted logic, so there is a special function for these cards. - -module_param(thinkpad, bool, 0); -thinkpad=1 -if N is set to 1, then force enabling the clkrun functionality. -Currently, when the part is being used, then clkrun is disabled for the entire system, -but re-enabled when the driver is released or there is no outstanding open count. - diff --git a/Documentation/spinlocks.txt b/Documentation/spinlocks.txt index a661d684768e..471e75389778 100644 --- a/Documentation/spinlocks.txt +++ b/Documentation/spinlocks.txt @@ -1,7 +1,12 @@ -UPDATE March 21 2005 Amit Gud +SPIN_LOCK_UNLOCKED and RW_LOCK_UNLOCKED defeat lockdep state tracking and +are hence deprecated. -Macros SPIN_LOCK_UNLOCKED and RW_LOCK_UNLOCKED are deprecated and will be -removed soon. So for any new code dynamic initialization should be used: +Please use DEFINE_SPINLOCK()/DEFINE_RWLOCK() or +__SPIN_LOCK_UNLOCKED()/__RW_LOCK_UNLOCKED() as appropriate for static +initialization. + +Dynamic initialization, when necessary, may be performed as +demonstrated below. spinlock_t xxx_lock; rwlock_t xxx_rw_lock; @@ -15,12 +20,9 @@ removed soon. So for any new code dynamic initialization should be used: module_init(xxx_init); -Reasons for deprecation - - it hurts automatic lock validators - - it becomes intrusive for the realtime preemption patches - -Following discussion is still valid, however, with the dynamic initialization -of spinlocks instead of static. +The following discussion is still valid, however, with the dynamic +initialization of spinlocks or with DEFINE_SPINLOCK, etc., used +instead of SPIN_LOCK_UNLOCKED. ----------------------- diff --git a/Documentation/stable_api_nonsense.txt b/Documentation/stable_api_nonsense.txt index a2afca3b2bab..847b342b7b20 100644 --- a/Documentation/stable_api_nonsense.txt +++ b/Documentation/stable_api_nonsense.txt @@ -10,7 +10,7 @@ kernel to userspace interfaces. The kernel to userspace interface is the one that application programs use, the syscall interface. That interface is _very_ stable over time, and will not break. I have old programs that were built on a pre 0.9something kernel that still work -just fine on the latest 2.6 kernel release. This interface is the one +just fine on the latest 2.6 kernel release. That interface is the one that users and application programmers can count on being stable. diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt index 1d192565e182..a0ccc5b60260 100644 --- a/Documentation/sysctl/vm.txt +++ b/Documentation/sysctl/vm.txt @@ -31,12 +31,15 @@ Currently, these files are in /proc/sys/vm: - min_unmapped_ratio - min_slab_ratio - panic_on_oom +- mmap_min_address +- numa_zonelist_order ============================================================== dirty_ratio, dirty_background_ratio, dirty_expire_centisecs, dirty_writeback_centisecs, vfs_cache_pressure, laptop_mode, -block_dump, swap_token_timeout, drop-caches: +block_dump, swap_token_timeout, drop-caches, +hugepages_treat_as_movable: See Documentation/filesystems/proc.txt @@ -216,3 +219,61 @@ above-mentioned. The default value is 0. 1 and 2 are for failover of clustering. Please select either according to your policy of failover. + +============================================================== + +mmap_min_addr + +This file indicates the amount of address space which a user process will +be restricted from mmaping. Since kernel null dereference bugs could +accidentally operate based on the information in the first couple of pages +of memory userspace processes should not be allowed to write to them. By +default this value is set to 0 and no protections will be enforced by the +security module. Setting this value to something like 64k will allow the +vast majority of applications to work correctly and provide defense in depth +against future potential kernel bugs. + +============================================================== + +numa_zonelist_order + +This sysctl is only for NUMA. +'where the memory is allocated from' is controlled by zonelists. +(This documentation ignores ZONE_HIGHMEM/ZONE_DMA32 for simple explanation. + you may be able to read ZONE_DMA as ZONE_DMA32...) + +In non-NUMA case, a zonelist for GFP_KERNEL is ordered as following. +ZONE_NORMAL -> ZONE_DMA +This means that a memory allocation request for GFP_KERNEL will +get memory from ZONE_DMA only when ZONE_NORMAL is not available. + +In NUMA case, you can think of following 2 types of order. +Assume 2 node NUMA and below is zonelist of Node(0)'s GFP_KERNEL + +(A) Node(0) ZONE_NORMAL -> Node(0) ZONE_DMA -> Node(1) ZONE_NORMAL +(B) Node(0) ZONE_NORMAL -> Node(1) ZONE_NORMAL -> Node(0) ZONE_DMA. + +Type(A) offers the best locality for processes on Node(0), but ZONE_DMA +will be used before ZONE_NORMAL exhaustion. This increases possibility of +out-of-memory(OOM) of ZONE_DMA because ZONE_DMA is tend to be small. + +Type(B) cannot offer the best locality but is more robust against OOM of +the DMA zone. + +Type(A) is called as "Node" order. Type (B) is "Zone" order. + +"Node order" orders the zonelists by node, then by zone within each node. +Specify "[Nn]ode" for zone order + +"Zone Order" orders the zonelists by zone type, then by node within each +zone. Specify "[Zz]one"for zode order. + +Specify "[Dd]efault" to request automatic configuration. Autoconfiguration +will select "node" order in following case. +(1) if the DMA zone does not exist or +(2) if the DMA zone comprises greater than 50% of the available memory or +(3) if any node's DMA zone comprises greater than 60% of its local memory and + the amount of local memory is big enough. + +Otherwise, "zone" order will be selected. Default order is recommended unless +this is causing problems for your system/application. diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt index ba328f255417..10c8f6922ef4 100644 --- a/Documentation/sysrq.txt +++ b/Documentation/sysrq.txt @@ -1,6 +1,6 @@ Linux Magic System Request Key Hacks Documentation for sysrq.c -Last update: 2007-MAR-14 +Last update: 2007-AUG-04 * What is the magic SysRq key? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -43,7 +43,7 @@ On x86 - You press the key combo 'ALT-SysRq-'. Note - Some keyboards may not have a key labeled 'SysRq'. The 'SysRq' key is also known as the 'Print Screen' key. Also some keyboards cannot handle so many keys being pressed at the same time, so you might - have better luck with "press Alt", "press SysRq", "release Alt", + have better luck with "press Alt", "press SysRq", "release SysRq", "press ", release everything. On SPARC - You press 'ALT-STOP-', I believe. @@ -78,7 +78,7 @@ On all - write a character to /proc/sysrq-trigger. e.g.: 'g' - Used by kgdb on ppc and sh platforms. 'h' - Will display help (actually any other key than those listed - above will display help. but 'h' is easy to remember :-) + here will display help. but 'h' is easy to remember :-) 'i' - Send a SIGKILL to all processes, except for init. diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt index 9e6b94face4b..60953d6c919d 100644 --- a/Documentation/thinkpad-acpi.txt +++ b/Documentation/thinkpad-acpi.txt @@ -1,11 +1,11 @@ ThinkPad ACPI Extras Driver - Version 0.14 - April 21st, 2007 + Version 0.16 + August 2nd, 2007 Borislav Deianov - Henrique de Moraes Holschuh - http://ibm-acpi.sf.net/ + Henrique de Moraes Holschuh + http://ibm-acpi.sf.net/ This is a Linux driver for the IBM and Lenovo ThinkPad laptops. It @@ -105,10 +105,10 @@ The version of thinkpad-acpi's sysfs interface is exported by the driver as a driver attribute (see below). Sysfs driver attributes are on the driver's sysfs attribute space, -for 2.6.20 this is /sys/bus/platform/drivers/thinkpad-acpi/. +for 2.6.20 this is /sys/bus/platform/drivers/thinkpad_acpi/. Sysfs device attributes are on the driver's sysfs attribute space, -for 2.6.20 this is /sys/devices/platform/thinkpad-acpi/. +for 2.6.20 this is /sys/devices/platform/thinkpad_acpi/. Driver version -------------- @@ -134,54 +134,70 @@ end of this document. Changes to the sysfs interface done by the kernel subsystems are not documented here, nor are they tracked by this attribute. +Changes to the thinkpad-acpi sysfs interface are only considered +non-experimental when they are submitted to Linux mainline, at which +point the changes in this interface are documented and interface_version +may be updated. If you are using any thinkpad-acpi features not yet +sent to mainline for merging, you do so on your own risk: these features +may disappear, or be implemented in a different and incompatible way by +the time they are merged in Linux mainline. + +Changes that are backwards-compatible by nature (e.g. the addition of +attributes that do not change the way the other attributes work) do not +always warrant an update of interface_version. Therefore, one must +expect that an attribute might not be there, and deal with it properly +(an attribute not being there *is* a valid way to make it clear that a +feature is not available in sysfs). + Hot keys -------- procfs: /proc/acpi/ibm/hotkey sysfs device attribute: hotkey_* -Without this driver, only the Fn-F4 key (sleep button) generates an -ACPI event. With the driver loaded, the hotkey feature enabled and the -mask set (see below), the various hot keys generate ACPI events in the -following format: +In a ThinkPad, the ACPI HKEY handler is responsible for comunicating +some important events and also keyboard hot key presses to the operating +system. Enabling the hotkey functionality of thinkpad-acpi signals the +firmware that such a driver is present, and modifies how the ThinkPad +firmware will behave in many situations. + +The driver enables the hot key feature automatically when loaded. The +feature can later be disabled and enabled back at runtime. The driver +will also restore the hot key feature to its previous state and mask +when it is unloaded. + +When the hotkey feature is enabled and the hot key mask is set (see +below), the driver will report HKEY events in the following format: ibm/hotkey HKEY 00000080 0000xxxx -The last four digits vary depending on the key combination pressed. -All labeled Fn-Fx key combinations generate distinct events. In -addition, the lid microswitch and some docking station buttons may -also generate such events. - -The bit mask allows some control over which hot keys generate ACPI -events. Not all bits in the mask can be modified. Not all bits that -can be modified do anything. Not all hot keys can be individually -controlled by the mask. Most recent ThinkPad models honor the -following bits (assuming the hot keys feature has been enabled): - - key bit behavior when set behavior when unset - - Fn-F3 always generates ACPI event - Fn-F4 always generates ACPI event - Fn-F5 0010 generate ACPI event enable/disable Bluetooth - Fn-F7 0040 generate ACPI event switch LCD and external display - Fn-F8 0080 generate ACPI event expand screen or none - Fn-F9 0100 generate ACPI event none - Fn-F12 always generates ACPI event - -Some models do not support all of the above. For example, the T30 does -not support Fn-F5 and Fn-F9. Other models do not support the mask at -all. On those models, hot keys cannot be controlled individually. - -Note that enabling ACPI events for some keys prevents their default -behavior. For example, if events for Fn-F5 are enabled, that key will -no longer enable/disable Bluetooth by itself. This can still be done -from an acpid handler for the ibm/hotkey event. - -Note also that not all Fn key combinations are supported through -ACPI. For example, on the X40, the brightness, volume and "Access IBM" -buttons do not generate ACPI events even with this driver. They *can* -be used through the "ThinkPad Buttons" utility, see -http://www.nongnu.org/tpb/ +Some of these events refer to hot key presses, but not all. + +The driver will generate events over the input layer for hot keys and +radio switches, and over the ACPI netlink layer for other events. The +input layer support accepts the standard IOCTLs to remap the keycodes +assigned to each hot key. + +The hot key bit mask allows some control over which hot keys generate +events. If a key is "masked" (bit set to 0 in the mask), the firmware +will handle it. If it is "unmasked", it signals the firmware that +thinkpad-acpi would prefer to handle it, if the firmware would be so +kind to allow it (and it often doesn't!). + +Not all bits in the mask can be modified. Not all bits that can be +modified do anything. Not all hot keys can be individually controlled +by the mask. Some models do not support the mask at all, and in those +models, hot keys cannot be controlled individually. The behaviour of +the mask is, therefore, higly dependent on the ThinkPad model. + +Note that unmasking some keys prevents their default behavior. For +example, if Fn+F5 is unmasked, that key will no longer enable/disable +Bluetooth by itself. + +Note also that not all Fn key combinations are supported through ACPI. +For example, on the X40, the brightness, volume and "Access IBM" buttons +do not generate ACPI events even with this driver. They *can* be used +through the "ThinkPad Buttons" utility, see http://www.nongnu.org/tpb/ procfs notes: @@ -189,9 +205,9 @@ The following commands can be written to the /proc/acpi/ibm/hotkey file: echo enable > /proc/acpi/ibm/hotkey -- enable the hot keys feature echo disable > /proc/acpi/ibm/hotkey -- disable the hot keys feature - echo 0xffff > /proc/acpi/ibm/hotkey -- enable all possible hot keys - echo 0x0000 > /proc/acpi/ibm/hotkey -- disable all possible hot keys - ... any other 4-hex-digit mask ... + echo 0xffffffff > /proc/acpi/ibm/hotkey -- enable all hot keys + echo 0 > /proc/acpi/ibm/hotkey -- disable all possible hot keys + ... any other 8-hex-digit mask ... echo reset > /proc/acpi/ibm/hotkey -- restore the original mask sysfs notes: @@ -202,7 +218,7 @@ sysfs notes: key feature status will be restored to this value. 0: hot keys were disabled - 1: hot keys were enabled + 1: hot keys were enabled (unusual) hotkey_bios_mask: Returns the hot keys mask when thinkpad-acpi was loaded. @@ -217,9 +233,238 @@ sysfs notes: 1: enables the hot keys feature / feature enabled hotkey_mask: - bit mask to enable ACPI event generation for each hot - key (see above). Returns the current status of the hot - keys mask, and allows one to modify it. + bit mask to enable driver-handling and ACPI event + generation for each hot key (see above). Returns the + current status of the hot keys mask, and allows one to + modify it. + + hotkey_all_mask: + bit mask that should enable event reporting for all + supported hot keys, when echoed to hotkey_mask above. + Unless you know which events need to be handled + passively (because the firmware *will* handle them + anyway), do *not* use hotkey_all_mask. Use + hotkey_recommended_mask, instead. You have been warned. + + hotkey_recommended_mask: + bit mask that should enable event reporting for all + supported hot keys, except those which are always + handled by the firmware anyway. Echo it to + hotkey_mask above, to use. + + hotkey_radio_sw: + if the ThinkPad has a hardware radio switch, this + attribute will read 0 if the switch is in the "radios + disabled" postition, and 1 if the switch is in the + "radios enabled" position. + + hotkey_report_mode: + Returns the state of the procfs ACPI event report mode + filter for hot keys. If it is set to 1 (the default), + all hot key presses are reported both through the input + layer and also as ACPI events through procfs (but not + through netlink). If it is set to 2, hot key presses + are reported only through the input layer. + + This attribute is read-only in kernels 2.6.23 or later, + and read-write on earlier kernels. + + May return -EPERM (write access locked out by module + parameter) or -EACCES (read-only). + +input layer notes: + +A Hot key is mapped to a single input layer EV_KEY event, possibly +followed by an EV_MSC MSC_SCAN event that shall contain that key's scan +code. An EV_SYN event will always be generated to mark the end of the +event block. + +Do not use the EV_MSC MSC_SCAN events to process keys. They are to be +used as a helper to remap keys, only. They are particularly useful when +remapping KEY_UNKNOWN keys. + +The events are available in an input device, with the following id: + + Bus: BUS_HOST + vendor: 0x1014 (PCI_VENDOR_ID_IBM) or + 0x17aa (PCI_VENDOR_ID_LENOVO) + product: 0x5054 ("TP") + version: 0x4101 + +The version will have its LSB incremented if the keymap changes in a +backwards-compatible way. The MSB shall always be 0x41 for this input +device. If the MSB is not 0x41, do not use the device as described in +this section, as it is either something else (e.g. another input device +exported by a thinkpad driver, such as HDAPS) or its functionality has +been changed in a non-backwards compatible way. + +Adding other event types for other functionalities shall be considered a +backwards-compatible change for this input device. + +Thinkpad-acpi Hot Key event map (version 0x4101): + +ACPI Scan +event code Key Notes + +0x1001 0x00 FN+F1 - +0x1002 0x01 FN+F2 IBM: battery (rare) + Lenovo: Screen lock + +0x1003 0x02 FN+F3 Many IBM models always report + this hot key, even with hot keys + disabled or with Fn+F3 masked + off + IBM: screen lock + Lenovo: battery + +0x1004 0x03 FN+F4 Sleep button (ACPI sleep button + semanthics, i.e. sleep-to-RAM). + It is always generate some kind + of event, either the hot key + event or a ACPI sleep button + event. The firmware may + refuse to generate further FN+F4 + key presses until a S3 or S4 ACPI + sleep cycle is performed or some + time passes. + +0x1005 0x04 FN+F5 Radio. Enables/disables + the internal BlueTooth hardware + and W-WAN card if left in control + of the firmware. Does not affect + the WLAN card. + Should be used to turn on/off all + radios (bluetooth+W-WAN+WLAN), + really. + +0x1006 0x05 FN+F6 - + +0x1007 0x06 FN+F7 Video output cycle. + Do you feel lucky today? + +0x1008 0x07 FN+F8 IBM: toggle screen expand + Lenovo: configure ultranav + +0x1009 0x08 FN+F9 - + .. .. .. +0x100B 0x0A FN+F11 - + +0x100C 0x0B FN+F12 Sleep to disk. You are always + supposed to handle it yourself, + either through the ACPI event, + or through a hotkey event. + The firmware may refuse to + generate further FN+F4 key + press events until a S3 or S4 + ACPI sleep cycle is performed, + or some time passes. + +0x100D 0x0C FN+BACKSPACE - +0x100E 0x0D FN+INSERT - +0x100F 0x0E FN+DELETE - + +0x1010 0x0F FN+HOME Brightness up. This key is + always handled by the firmware + in IBM ThinkPads, even when + unmasked. Just leave it alone. + For Lenovo ThinkPads with a new + BIOS, it has to be handled either + by the ACPI OSI, or by userspace. +0x1011 0x10 FN+END Brightness down. See brightness + up for details. + +0x1012 0x11 FN+PGUP Thinklight toggle. This key is + always handled by the firmware, + even when unmasked. + +0x1013 0x12 FN+PGDOWN - + +0x1014 0x13 FN+SPACE Zoom key + +0x1015 0x14 VOLUME UP Internal mixer volume up. This + key is always handled by the + firmware, even when unmasked. + NOTE: Lenovo seems to be changing + this. +0x1016 0x15 VOLUME DOWN Internal mixer volume up. This + key is always handled by the + firmware, even when unmasked. + NOTE: Lenovo seems to be changing + this. +0x1017 0x16 MUTE Mute internal mixer. This + key is always handled by the + firmware, even when unmasked. + +0x1018 0x17 THINKPAD Thinkpad/Access IBM/Lenovo key + +0x1019 0x18 unknown +.. .. .. +0x1020 0x1F unknown + +The ThinkPad firmware does not allow one to differentiate when most hot +keys are pressed or released (either that, or we don't know how to, yet). +For these keys, the driver generates a set of events for a key press and +immediately issues the same set of events for a key release. It is +unknown by the driver if the ThinkPad firmware triggered these events on +hot key press or release, but the firmware will do it for either one, not +both. + +If a key is mapped to KEY_RESERVED, it generates no input events at all. +If a key is mapped to KEY_UNKNOWN, it generates an input event that +includes an scan code. If a key is mapped to anything else, it will +generate input device EV_KEY events. + +Non hot-key ACPI HKEY event map: +0x5001 Lid closed +0x5002 Lid opened +0x7000 Radio Switch may have changed state + +The above events are not propagated by the driver, except for legacy +compatibility purposes when hotkey_report_mode is set to 1. + +Compatibility notes: + +ibm-acpi and thinkpad-acpi 0.15 (mainline kernels before 2.6.23) never +supported the input layer, and sent events over the procfs ACPI event +interface. + +To avoid sending duplicate events over the input layer and the ACPI +event interface, thinkpad-acpi 0.16 implements a module parameter +(hotkey_report_mode), and also a sysfs device attribute with the same +name. + +Make no mistake here: userspace is expected to switch to using the input +layer interface of thinkpad-acpi, together with the ACPI netlink event +interface in kernels 2.6.23 and later, or with the ACPI procfs event +interface in kernels 2.6.22 and earlier. + +If no hotkey_report_mode module parameter is specified (or it is set to +zero), the driver defaults to mode 1 (see below), and on kernels 2.6.22 +and earlier, also allows one to change the hotkey_report_mode through +sysfs. In kernels 2.6.23 and later, where the netlink ACPI event +interface is available, hotkey_report_mode cannot be changed through +sysfs (it is read-only). + +If the hotkey_report_mode module parameter is set to 1 or 2, it cannot +be changed later through sysfs (any writes will return -EPERM to signal +that hotkey_report_mode was locked. On 2.6.23 and later, where +hotkey_report_mode cannot be changed at all, writes will return -EACES). + +hotkey_report_mode set to 1 makes the driver export through the procfs +ACPI event interface all hot key presses (which are *also* sent to the +input layer). This is a legacy compatibility behaviour, and it is also +the default mode of operation for the driver. + +hotkey_report_mode set to 2 makes the driver filter out the hot key +presses from the procfs ACPI event interface, so these events will only +be sent through the input layer. Userspace that has been updated to use +the thinkpad-acpi input layer interface should set hotkey_report_mode to +2. + +Hot key press events are never sent to the ACPI netlink event interface. +Really up-to-date userspace under kernel 2.6.23 and later is to use the +netlink interface and the input layer interface, and don't bother at all +with hotkey_report_mode. Bluetooth @@ -437,27 +682,34 @@ CMOS control procfs: /proc/acpi/ibm/cmos sysfs device attribute: cmos_command -This feature is used internally by the ACPI firmware to control the -ThinkLight on most newer ThinkPad models. It may also control LCD -brightness, sounds volume and more, but only on some models. +This feature is mostly used internally by the ACPI firmware to keep the legacy +CMOS NVRAM bits in sync with the current machine state, and to record this +state so that the ThinkPad will retain such settings across reboots. + +Some of these commands actually perform actions in some ThinkPad models, but +this is expected to disappear more and more in newer models. As an example, in +a T43 and in a X40, commands 12 and 13 still control the ThinkLight state for +real, but commands 0 to 2 don't control the mixer anymore (they have been +phased out) and just update the NVRAM. The range of valid cmos command numbers is 0 to 21, but not all have an effect and the behavior varies from model to model. Here is the behavior on the X40 (tpb is the ThinkPad Buttons utility): - 0 - no effect but tpb reports "Volume down" - 1 - no effect but tpb reports "Volume up" - 2 - no effect but tpb reports "Mute on" - 3 - simulate pressing the "Access IBM" button - 4 - LCD brightness up - 5 - LCD brightness down - 11 - toggle screen expansion - 12 - ThinkLight on - 13 - ThinkLight off - 14 - no effect but tpb reports ThinkLight status change + 0 - Related to "Volume down" key press + 1 - Related to "Volume up" key press + 2 - Related to "Mute on" key press + 3 - Related to "Access IBM" key press + 4 - Related to "LCD brightness up" key pess + 5 - Related to "LCD brightness down" key press + 11 - Related to "toggle screen expansion" key press/function + 12 - Related to "ThinkLight on" + 13 - Related to "ThinkLight off" + 14 - Related to "ThinkLight" key press (toggle thinklight) The cmos command interface is prone to firmware split-brain problems, as -in newer ThinkPads it is just a compatibility layer. +in newer ThinkPads it is just a compatibility layer. Do not use it, it is +exported just as a debug tool. LED control -- /proc/acpi/ibm/led --------------------------------- @@ -516,23 +768,15 @@ Temperature sensors procfs: /proc/acpi/ibm/thermal sysfs device attributes: (hwmon) temp*_input -Most ThinkPads include six or more separate temperature sensors but -only expose the CPU temperature through the standard ACPI methods. -This feature shows readings from up to eight different sensors on older -ThinkPads, and it has experimental support for up to sixteen different -sensors on newer ThinkPads. - -EXPERIMENTAL: The 16-sensors feature is marked EXPERIMENTAL because the -implementation directly accesses hardware registers and may not work as -expected. USE WITH CAUTION! To use this feature, you need to supply the -experimental=1 parameter when loading the module. When EXPERIMENTAL -mode is enabled, reading the first 8 sensors on newer ThinkPads will -also use an new experimental thermal sensor access mode. +Most ThinkPads include six or more separate temperature sensors but only +expose the CPU temperature through the standard ACPI methods. This +feature shows readings from up to eight different sensors on older +ThinkPads, and up to sixteen different sensors on newer ThinkPads. For example, on the X40, a typical output may be: temperatures: 42 42 45 41 36 -128 33 -128 -EXPERIMENTAL: On the T43/p, a typical output may be: +On the T43/p, a typical output may be: temperatures: 48 48 36 52 38 -128 31 -128 48 52 48 -128 -128 -128 -128 -128 The mapping of thermal sensors to physical locations varies depending on @@ -562,7 +806,8 @@ http://thinkwiki.org/wiki/Thermal_Sensors#ThinkPad_T43.2C_T43p 2: System board, left side (near PCMCIA slot), reported as HDAPS temp 3: PCMCIA slot 9: MCH (northbridge) to DRAM Bus -10: ICH (southbridge), under Mini-PCI card, under touchpad +10: Clock-generator, mini-pci card and ICH (southbridge), under Mini-PCI + card, under touchpad 11: Power regulator, underside of system board, below F2 key The A31 has a very atypical layout for the thermal sensors @@ -681,6 +926,12 @@ cannot be controlled. The backlight control has eight levels, ranging from 0 to 7. Some of the levels may not be distinct. +There are two interfaces to the firmware for brightness control, EC and CMOS. +To select which one should be used, use the brightness_mode module parameter: +brightness_mode=1 selects EC mode, brightness_mode=2 selects CMOS mode, +brightness_mode=3 selects both EC and CMOS. The driver tries to autodetect +which interface to use. + Procfs notes: The available commands are: @@ -976,3 +1227,9 @@ Sysfs interface changelog: 0x000100: Initial sysfs support, as a single platform driver and device. +0x000200: Hot key support for 32 hot keys, and radio slider switch + support. +0x010000: Hot keys are now handled by default over the input + layer, the radio switch generates input event EV_RADIO, + and the driver enables hot key handling by default in + the firmware. diff --git a/Documentation/time_interpolators.txt b/Documentation/time_interpolators.txt deleted file mode 100644 index e3b60854fbc2..000000000000 --- a/Documentation/time_interpolators.txt +++ /dev/null @@ -1,41 +0,0 @@ -Time Interpolators ------------------- - -Time interpolators are a base of time calculation between timer ticks and -allow an accurate determination of time down to the accuracy of the time -source in nanoseconds. - -The architecture specific code typically provides gettimeofday and -settimeofday under Linux. The time interpolator provides both if an arch -defines CONFIG_TIME_INTERPOLATION. The arch still must set up timer tick -operations and call the necessary functions to advance the clock. - -With the time interpolator a standardized interface exists for time -interpolation between ticks. The provided logic is highly scalable -and has been tested in SMP situations of up to 512 CPUs. - -If CONFIG_TIME_INTERPOLATION is defined then the architecture specific code -(or the device drivers - like HPET) may register time interpolators. -These are typically defined in the following way: - -static struct time_interpolator my_interpolator { - .frequency = MY_FREQUENCY, - .source = TIME_SOURCE_MMIO32, - .shift = 8, /* scaling for higher accuracy */ - .drift = -1, /* Unknown drift */ - .jitter = 0 /* time source is stable */ -}; - -void time_init(void) -{ - .... - /* Initialization of the timer *. - my_interpolator.address = &my_timer; - register_time_interpolator(&my_interpolator); - .... -} - -For more details see include/linux/timex.h and kernel/timer.c. - -Christoph Lameter , October 31, 2004 - diff --git a/Documentation/usb/dma.txt b/Documentation/usb/dma.txt index 62844aeba69c..e8b50b7de9d9 100644 --- a/Documentation/usb/dma.txt +++ b/Documentation/usb/dma.txt @@ -32,12 +32,15 @@ ELIMINATING COPIES It's good to avoid making CPUs copy data needlessly. The costs can add up, and effects like cache-trashing can impose subtle penalties. -- When you're allocating a buffer for DMA purposes anyway, use the buffer - primitives. Think of them as kmalloc and kfree that give you the right - kind of addresses to store in urb->transfer_buffer and urb->transfer_dma, - while guaranteeing that no hidden copies through DMA "bounce" buffers will - slow things down. You'd also set URB_NO_TRANSFER_DMA_MAP in - urb->transfer_flags: +- If you're doing lots of small data transfers from the same buffer all + the time, that can really burn up resources on systems which use an + IOMMU to manage the DMA mappings. It can cost MUCH more to set up and + tear down the IOMMU mappings with each request than perform the I/O! + + For those specific cases, USB has primitives to allocate less expensive + memory. They work like kmalloc and kfree versions that give you the right + kind of addresses to store in urb->transfer_buffer and urb->transfer_dma. + You'd also set URB_NO_TRANSFER_DMA_MAP in urb->transfer_flags: void *usb_buffer_alloc (struct usb_device *dev, size_t size, int mem_flags, dma_addr_t *dma); @@ -45,6 +48,10 @@ and effects like cache-trashing can impose subtle penalties. void usb_buffer_free (struct usb_device *dev, size_t size, void *addr, dma_addr_t dma); + Most drivers should *NOT* be using these primitives; they don't need + to use this type of memory ("dma-coherent"), and memory returned from + kmalloc() will work just fine. + For control transfers you can use the buffer primitives or not for each of the transfer buffer and setup buffer independently. Set the flag bits URB_NO_TRANSFER_DMA_MAP and URB_NO_SETUP_DMA_MAP to indicate which @@ -54,29 +61,39 @@ and effects like cache-trashing can impose subtle penalties. The memory buffer returned is "dma-coherent"; sometimes you might need to force a consistent memory access ordering by using memory barriers. It's not using a streaming DMA mapping, so it's good for small transfers on - systems where the I/O would otherwise tie up an IOMMU mapping. (See + systems where the I/O would otherwise thrash an IOMMU mapping. (See Documentation/DMA-mapping.txt for definitions of "coherent" and "streaming" DMA mappings.) Asking for 1/Nth of a page (as well as asking for N pages) is reasonably space-efficient. + On most systems the memory returned will be uncached, because the + semantics of dma-coherent memory require either bypassing CPU caches + or using cache hardware with bus-snooping support. While x86 hardware + has such bus-snooping, many other systems use software to flush cache + lines to prevent DMA conflicts. + - Devices on some EHCI controllers could handle DMA to/from high memory. - Driver probe() routines can notice this using a generic DMA call, then - tell higher level code (network, scsi, etc) about it like this: - if (dma_supported (&intf->dev, 0xffffffffffffffffULL)) - net->features |= NETIF_F_HIGHDMA; + Unfortunately, the current Linux DMA infrastructure doesn't have a sane + way to expose these capabilities ... and in any case, HIGHMEM is mostly a + design wart specific to x86_32. So your best bet is to ensure you never + pass a highmem buffer into a USB driver. That's easy; it's the default + behavior. Just don't override it; e.g. with NETIF_F_HIGHDMA. - That can eliminate dma bounce buffering of requests that originate (or - terminate) in high memory, in cases where the buffers aren't allocated - with usb_buffer_alloc() but instead are dma-mapped. + This may force your callers to do some bounce buffering, copying from + high memory to "normal" DMA memory. If you can come up with a good way + to fix this issue (for x86_32 machines with over 1 GByte of memory), + feel free to submit patches. WORKING WITH EXISTING BUFFERS Existing buffers aren't usable for DMA without first being mapped into the -DMA address space of the device. +DMA address space of the device. However, most buffers passed to your +driver can safely be used with such DMA mapping. (See the first section +of DMA-mapping.txt, titled "What memory is DMA-able?") - When you're using scatterlists, you can map everything at once. On some systems, this kicks in an IOMMU and turns the scatterlists into single @@ -114,3 +131,8 @@ DMA address space of the device. The calls manage urb->transfer_dma for you, and set URB_NO_TRANSFER_DMA_MAP so that usbcore won't map or unmap the buffer. The same goes for urb->setup_dma and URB_NO_SETUP_DMA_MAP for control requests. + +Note that several of those interfaces are currently commented out, since +they don't have current users. See the source code. Other than the dmasync +calls (where the underlying DMA primitives have changed), most of them can +easily be commented back in if you want to use them. diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv index b60639130a51..177159c5f4c4 100644 --- a/Documentation/video4linux/CARDLIST.bttv +++ b/Documentation/video4linux/CARDLIST.bttv @@ -66,7 +66,7 @@ 65 -> Lifeview FlyVideo 2000S LR90 66 -> Terratec TValueRadio [153b:1135,153b:ff3b] 67 -> IODATA GV-BCTV4/PCI [10fc:4050] - 68 -> 3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA) [121a:3000,10b4:2637] + 68 -> 3Dfx VoodooTV FM (Euro) [10b4:2637] 69 -> Active Imaging AIMMS 70 -> Prolink Pixelview PV-BT878P+ (Rev.4C,8E) 71 -> Lifeview FlyVideo 98EZ (capture only) LR51 [1851:1851] @@ -145,3 +145,5 @@ 144 -> MagicTV 145 -> SSAI Security Video Interface [4149:5353] 146 -> SSAI Ultrasound Video Interface [414a:5353] +147 -> VoodooTV 200 (USA) [121a:3000] +148 -> DViCO FusionHDTV 2 [dbc0:d200] diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88 index 60f838beb9c8..82ac8250e978 100644 --- a/Documentation/video4linux/CARDLIST.cx88 +++ b/Documentation/video4linux/CARDLIST.cx88 @@ -55,3 +55,4 @@ 54 -> Norwood Micro TV Tuner 55 -> Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM [c180:c980] 56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder [0070:9600,0070:9601,0070:9602] + 57 -> ADS Tech Instant Video PCI [1421:0390] diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index 712e8c8333cc..3f8aeab50a10 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 @@ -114,3 +114,4 @@ 113 -> Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM) [1019:4cb6] 114 -> KWorld DVB-T 210 [17de:7250] 115 -> Sabrent PCMCIA TV-PCB05 [0919:2003] +116 -> 10MOONS TM300 TV Card [1131:2304] diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner index 44134f04b82a..a88c02d23805 100644 --- a/Documentation/video4linux/CARDLIST.tuner +++ b/Documentation/video4linux/CARDLIST.tuner @@ -40,7 +40,7 @@ tuner=38 - Philips PAL/SECAM multi (FM1216ME MK3) tuner=39 - LG NTSC (newer TAPC series) tuner=40 - HITACHI V7-J180AT tuner=41 - Philips PAL_MK (FI1216 MK) -tuner=42 - Philips 1236D ATSC/NTSC dual in +tuner=42 - Philips FCV1236D ATSC/NTSC dual in tuner=43 - Philips NTSC MK3 (FM1236MK3 or FM1236/F) tuner=44 - Philips 4 in 1 (ATI TV Wonder Pro/Conexant) tuner=45 - Microtune 4049 FM5 @@ -72,3 +72,4 @@ tuner=70 - Samsung TCPN 2121P30A tuner=71 - Xceive xc3028 tuner=72 - Thomson FE6600 tuner=73 - Samsung TCPG 6121P30A +tuner=75 - Philips TEA5761 FM Radio diff --git a/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/Documentation/video4linux/cx2341x/fw-encoder-api.txt index 5dd3109a8b3f..5a27af2ee1c6 100644 --- a/Documentation/video4linux/cx2341x/fw-encoder-api.txt +++ b/Documentation/video4linux/cx2341x/fw-encoder-api.txt @@ -407,8 +407,10 @@ Description u32 length; // Length of this frame u32 offset_low; // Offset in the file of the u32 offset_high; // start of this frame - u32 mask1; // Bits 0-1 are the type mask: + u32 mask1; // Bits 0-2 are the type mask: // 1=I, 2=P, 4=B + // 0=End of Program Index, other fields + // are invalid. u32 pts; // The PTS of the frame u32 mask2; // Bit 0 is bit 32 of the pts. }; diff --git a/Documentation/video4linux/sn9c102.txt b/Documentation/video4linux/sn9c102.txt index 279717c96f63..1ffad19ce891 100644 --- a/Documentation/video4linux/sn9c102.txt +++ b/Documentation/video4linux/sn9c102.txt @@ -436,7 +436,7 @@ HV7131D Hynix Semiconductor | Yes No No No HV7131R Hynix Semiconductor | No Yes Yes Yes MI-0343 Micron Technology | Yes No No No MI-0360 Micron Technology | No Yes Yes Yes -OV7630 OmniVision Technologies | Yes Yes No No +OV7630 OmniVision Technologies | Yes Yes Yes Yes OV7660 OmniVision Technologies | No No Yes Yes PAS106B PixArt Imaging | Yes No No No PAS202B PixArt Imaging | Yes Yes No No @@ -583,6 +583,7 @@ order): - Bertrik Sikken, who reverse-engineered and documented the Huffman compression algorithm used in the SN9C101, SN9C102 and SN9C103 controllers and implemented the first decoder; +- Ronny Standke for the donation of a webcam; - Mizuno Takafumi for the donation of a webcam; - an "anonymous" donator (who didn't want his name to be revealed) for the donation of a webcam. diff --git a/Documentation/video4linux/zr364xx.txt b/Documentation/video4linux/zr364xx.txt index c76992d0ff4d..4d9a0c33f2fd 100644 --- a/Documentation/video4linux/zr364xx.txt +++ b/Documentation/video4linux/zr364xx.txt @@ -62,4 +62,4 @@ Vendor Product Distributor Model 0x0784 0x0040 Traveler Slimline X5 0x06d6 0x0034 Trust Powerc@m 750 0x0a17 0x0062 Pentax Optio 50L - +0x06d6 0x003b Trust Powerc@m 970Z diff --git a/Documentation/vm/hugetlbpage.txt b/Documentation/vm/hugetlbpage.txt index 687104bfd09a..51ccc48aa763 100644 --- a/Documentation/vm/hugetlbpage.txt +++ b/Documentation/vm/hugetlbpage.txt @@ -77,8 +77,9 @@ If the user applications are going to request hugepages using mmap system call, then it is required that system administrator mount a file system of type hugetlbfs: - mount none /mnt/huge -t hugetlbfs - + mount -t hugetlbfs \ + -o uid=,gid=,mode=,size=,nr_inodes= \ + none /mnt/huge This command mounts a (pseudo) filesystem of type hugetlbfs on the directory /mnt/huge. Any files created on /mnt/huge uses hugepages. The uid and gid @@ -88,11 +89,10 @@ mode of root of file system to value & 0777. This value is given in octal. By default the value 0755 is picked. The size option sets the maximum value of memory (huge pages) allowed for that filesystem (/mnt/huge). The size is rounded down to HPAGE_SIZE. The option nr_inodes sets the maximum number of -inodes that /mnt/huge can use. If the size or nr_inodes options are not +inodes that /mnt/huge can use. If the size or nr_inodes option is not provided on command line then no limits are set. For size and nr_inodes options, you can use [G|g]/[M|m]/[K|k] to represent giga/mega/kilo. For -example, size=2K has the same meaning as size=2048. An example is given at -the end of this document. +example, size=2K has the same meaning as size=2048. read and write system calls are not supported on files that reside on hugetlb file systems. diff --git a/Documentation/vm/slabinfo.c b/Documentation/vm/slabinfo.c index d4f21ffd1404..1af7bd5a2183 100644 --- a/Documentation/vm/slabinfo.c +++ b/Documentation/vm/slabinfo.c @@ -396,7 +396,7 @@ void report(struct slabinfo *s) if (strcmp(s->name, "*") == 0) return; - printf("\nSlabcache: %-20s Aliases: %2d Order : %2d Objects: %d\n", + printf("\nSlabcache: %-20s Aliases: %2d Order : %2d Objects: %lu\n", s->name, s->aliases, s->order, s->objects); if (s->hwcache_align) printf("** Hardware cacheline aligned\n"); diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt index 1523320abd87..d17f324db9f5 100644 --- a/Documentation/vm/slub.txt +++ b/Documentation/vm/slub.txt @@ -41,6 +41,8 @@ Possible debug options are P Poisoning (object and padding) U User tracking (free and alloc) T Trace (please only use on single slabs) + - Switch all debugging off (useful if the kernel is + configured with CONFIG_SLUB_DEBUG_ON) F.e. in order to boot just with sanity checks and red zoning one would specify: @@ -125,13 +127,20 @@ SLUB Debug output Here is a sample of slub debug output: -*** SLUB kmalloc-8: Redzone Active@0xc90f6d20 slab 0xc528c530 offset=3360 flags=0x400000c3 inuse=61 freelist=0xc90f6d58 - Bytes b4 0xc90f6d10: 00 00 00 00 00 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a ........ZZZZZZZZ - Object 0xc90f6d20: 31 30 31 39 2e 30 30 35 1019.005 - Redzone 0xc90f6d28: 00 cc cc cc . -FreePointer 0xc90f6d2c -> 0xc90f6d58 -Last alloc: get_modalias+0x61/0xf5 jiffies_ago=53 cpu=1 pid=554 -Filler 0xc90f6d50: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ +==================================================================== +BUG kmalloc-8: Redzone overwritten +-------------------------------------------------------------------- + +INFO: 0xc90f6d28-0xc90f6d2b. First byte 0x00 instead of 0xcc +INFO: Slab 0xc528c530 flags=0x400000c3 inuse=61 fp=0xc90f6d58 +INFO: Object 0xc90f6d20 @offset=3360 fp=0xc90f6d58 +INFO: Allocated in get_modalias+0x61/0xf5 age=53 cpu=1 pid=554 + +Bytes b4 0xc90f6d10: 00 00 00 00 00 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a ........ZZZZZZZZ + Object 0xc90f6d20: 31 30 31 39 2e 30 30 35 1019.005 + Redzone 0xc90f6d28: 00 cc cc cc . + Padding 0xc90f6d50: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ + [] dump_trace+0x63/0x1eb [] show_trace_log_lvl+0x1a/0x2f [] show_trace+0x12/0x14 @@ -153,74 +162,108 @@ Filler 0xc90f6d50: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ [] sysenter_past_esp+0x5f/0x99 [] 0xb7f7b410 ======================= -@@@ SLUB kmalloc-8: Restoring redzone (0xcc) from 0xc90f6d28-0xc90f6d2b +FIX kmalloc-8: Restoring Redzone 0xc90f6d28-0xc90f6d2b=0xcc +If SLUB encounters a corrupted object (full detection requires the kernel +to be booted with slub_debug) then the following output will be dumped +into the syslog: -If SLUB encounters a corrupted object then it will perform the following -actions: - -1. Isolation and report of the issue +1. Description of the problem encountered This will be a message in the system log starting with -*** SLUB : @ -offset= flags= -inuse= freelist= +=============================================== +BUG : +----------------------------------------------- -2. Report on how the problem was dealt with in order to ensure the continued -operation of the system. +INFO: - +INFO: Slab
+INFO: Object
+INFO: Allocated in age= cpu= pid= +INFO: Freed in age= cpu= + pid= -These are messages in the system log beginning with - -@@@ SLUB : +(Object allocation / free information is only available if SLAB_STORE_USER is +set for the slab. slub_debug sets that option) +2. The object contents if an object was involved. -In the above sample SLUB found that the Redzone of an active object has -been overwritten. Here a string of 8 characters was written into a slab that -has the length of 8 characters. However, a 8 character string needs a -terminating 0. That zero has overwritten the first byte of the Redzone field. -After reporting the details of the issue encountered the @@@ SLUB message -tell us that SLUB has restored the redzone to its proper value and then -system operations continue. - -Various types of lines can follow the @@@ SLUB line: +Various types of lines can follow the BUG SLUB line: Bytes b4
: - Show a few bytes before the object where the problem was detected. + Shows a few bytes before the object where the problem was detected. Can be useful if the corruption does not stop with the start of the object. Object
: The bytes of the object. If the object is inactive then the bytes - typically contain poisoning values. Any non-poison value shows a + typically contain poison values. Any non-poison value shows a corruption by a write after free. Redzone
: - The redzone following the object. The redzone is used to detect + The Redzone following the object. The Redzone is used to detect writes after the object. All bytes should always have the same value. If there is any deviation then it is due to a write after the object boundary. -Freepointer - The pointer to the next free object in the slab. May become - corrupted if overwriting continues after the red zone. - -Last alloc: -Last free: - Shows the address from which the object was allocated/freed last. - We note the pid, the time and the CPU that did so. This is usually - the most useful information to figure out where things went wrong. - Here get_modalias() did an kmalloc(8) instead of a kmalloc(9). + (Redzone information is only available if SLAB_RED_ZONE is set. + slub_debug sets that option) -Filler
: +Padding
: Unused data to fill up the space in order to get the next object properly aligned. In the debug case we make sure that there are - at least 4 bytes of filler. This allow for the detection of writes + at least 4 bytes of padding. This allows the detection of writes before the object. -Following the filler will be a stackdump. That stackdump describes the -location where the error was detected. The cause of the corruption is more -likely to be found by looking at the information about the last alloc / free. +3. A stackdump + +The stackdump describes the location where the error was detected. The cause +of the corruption is may be more likely found by looking at the function that +allocated or freed the object. + +4. Report on how the problem was dealt with in order to ensure the continued +operation of the system. + +These are messages in the system log beginning with + +FIX : + +In the above sample SLUB found that the Redzone of an active object has +been overwritten. Here a string of 8 characters was written into a slab that +has the length of 8 characters. However, a 8 character string needs a +terminating 0. That zero has overwritten the first byte of the Redzone field. +After reporting the details of the issue encountered the FIX SLUB message +tell us that SLUB has restored the Redzone to its proper value and then +system operations continue. + +Emergency operations: +--------------------- + +Minimal debugging (sanity checks alone) can be enabled by booting with + + slub_debug=F + +This will be generally be enough to enable the resiliency features of slub +which will keep the system running even if a bad kernel component will +keep corrupting objects. This may be important for production systems. +Performance will be impacted by the sanity checks and there will be a +continual stream of error messages to the syslog but no additional memory +will be used (unlike full debugging). + +No guarantees. The kernel component still needs to be fixed. Performance +may be optimized further by locating the slab that experiences corruption +and enabling debugging only for that cache + +I.e. + + slub_debug=F,dentry + +If the corruption occurs by writing after the end of the object then it +may be advisable to enable a Redzone to avoid corrupting the beginning +of other objects. + + slub_debug=FZ,dentry -Christoph Lameter, , May 23, 2007 +Christoph Lameter, , May 30, 2007 diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index 6177d881983f..945311840a10 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt @@ -14,9 +14,11 @@ Machine check mce=nobootlog Disable boot machine check logging. mce=tolerancelevel (number) - 0: always panic, 1: panic if deadlock possible, - 2: try to avoid panic, 3: never panic or exit (for testing) - default is 1 + 0: always panic on uncorrected errors, log corrected errors + 1: panic or SIGBUS on uncorrected errors, log corrected errors + 2: SIGBUS or log uncorrected errors, log corrected errors + 3: never panic or SIGBUS, log all errors (for testing only) + Default is 1 Can be also set using sysfs which is preferable. nomce (for compatibility with i386): same as mce=off @@ -134,12 +136,6 @@ Non Executable Mappings SMP - nosmp Only use a single CPU - - maxcpus=NUMBER only use upto NUMBER CPUs - - cpumask=MASK only use cpus with bits set in mask - additional_cpus=NUM Allow NUM more CPUs for hotplug (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec) diff --git a/Documentation/x86_64/machinecheck b/Documentation/x86_64/machinecheck index feaeaf6f6e4d..a05e58e7b159 100644 --- a/Documentation/x86_64/machinecheck +++ b/Documentation/x86_64/machinecheck @@ -49,12 +49,14 @@ tolerant Since machine check exceptions can happen any time it is sometimes risky for the kernel to kill a process because it defies normal kernel locking rules. The tolerance level configures - how hard the kernel tries to recover even at some risk of deadlock. - - 0: always panic, - 1: panic if deadlock possible, - 2: try to avoid panic, - 3: never panic or exit (for testing only) + how hard the kernel tries to recover even at some risk of + deadlock. Higher tolerant values trade potentially better uptime + with the risk of a crash or even corruption (for tolerant >= 3). + + 0: always panic on uncorrected errors, log corrected errors + 1: panic or SIGBUS on uncorrected errors, log corrected errors + 2: SIGBUS or log uncorrected errors, log corrected errors + 3: never panic or SIGBUS, log all errors (for testing only) Default: 1 diff --git a/Kbuild b/Kbuild index 163f8cb020a4..56b8edf6a3bc 100644 --- a/Kbuild +++ b/Kbuild @@ -13,6 +13,7 @@ offsets-file := include/asm-$(ARCH)/asm-offsets.h always := $(offsets-file) targets := $(offsets-file) targets += arch/$(ARCH)/kernel/asm-offsets.s +clean-files := $(addprefix $(objtree)/,$(targets)) # Default sed regexp - multiline due to syntax constraints define sed-y diff --git a/MAINTAINERS b/MAINTAINERS index 8927e5dc2fa2..c22d34b11f64 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -44,9 +44,10 @@ trivial patch so apply some common sense. or does something very odd once a month document it. PLEASE remember that submissions must be made under the terms - of the OSDL certificate of contribution - (http://www.osdl.org/newsroom/press_releases/2004/2004_05_24_dco.html) - and should include a Signed-off-by: line. + of the OSDL certificate of contribution and should include a + Signed-off-by: line. The current version of this "Developer's + Certificate of Origin" (DCO) is listed in the file + Documentation/SubmittingPatches. 6. Make sure you have the right to send any changes you make. If you do changes at work you may find your employer owns the patch @@ -97,6 +98,12 @@ M: philb@gnu.org L: netdev@vger.kernel.org S: Maintained +3C59X NETWORK DRIVER +P: Steffen Klassert +M: klassert@mathematik.tu-chemnitz.de +L: netdev@vger.kernel.org +S: Maintained + 3CR990 NETWORK DRIVER P: David Dillow M: dave@thedillows.org @@ -161,11 +168,11 @@ S: Maintained P: Eric Van Hensbergen M: ericvh@gmail.com P: Ron Minnich -M: rminnich@lanl.gov +M: rminnich@sandia.gov P: Latchesar Ionkov M: lucho@ionkov.net L: v9fs-developer@lists.sourceforge.net -W: http://v9fs.sf.net +W: http://swik.net/v9fs T: git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git S: Maintained @@ -194,13 +201,6 @@ M: jes@trained-monkey.org L: linux-acenic@sunsite.dk S: Maintained -ACI MIXER DRIVER -P: Robert Siemer -M: Robert.Siemer@gmx.de -L: linux-sound@vger.kernel.org -W: http://www.stud.uni-karlsruhe.de/~uh1b/ -S: Maintained - IPS SCSI RAID DRIVER P: Adaptec OEM Raid Solutions M: aacraid@adaptec.com @@ -232,15 +232,15 @@ T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git S: Supported ACPI BATTERY DRIVERS -P: Vladimir P. Lebedev -M: vladimir.p.lebedev@intel.com +P: Alexey Starikovskiy +M: astarikovskiy@suse.de L: linux-acpi@vger.kernel.org W: http://acpi.sourceforge.net/ S: Supported ACPI EC DRIVER P: Alexey Starikovskiy -M: alexey.y.starikovskiy@linux.intel.com +M: astarikovskiy@suse.de L: linux-acpi@vger.kernel.org W: http://acpi.sourceforge.net/ S: Supported @@ -272,21 +272,6 @@ L: linux-acpi@vger.kernel.org W: http://acpi.sourceforge.net/ S: Supported -AD1816 SOUND DRIVER -P: Thorsten Knabe -M: Thorsten Knabe -W: http://linux.thorsten-knabe.de -S: Maintained - -AD1889 SOUND DRIVER -P: Kyle McMartin -M: kyle@parisc-linux.org -P: Thibaut Varene -M: T-Bone@parisc-linux.org -W: http://wiki.parisc-linux.org/AD1889 -L: parisc-linux@lists.parisc-linux.org -S: Maintained - ADM1025 HARDWARE MONITOR DRIVER P: Jean Delvare M: khali@linux-fr.org @@ -315,10 +300,9 @@ M: zippel@linux-m68k.org S: Maintained AGPGART DRIVER -P: Dave Jones -M: davej@codemonkey.org.uk -W: http://www.codemonkey.org.uk/projects/agp/ -T: git kernel.org:/pub/scm/linux/kernel/git/davej/agpgart.git +P: David Airlie +M: airlied@linux.ie +T: git kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git S: Maintained AHA152X SCSI DRIVER @@ -352,6 +336,12 @@ P: Ivan Kokshaysky M: ink@jurassic.park.msu.ru S: Maintained for 2.4; PCI support for 2.6. +AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER +P: Thomas Dahlmann +M: thomas.dahlmann@amd.com +L: info-linux@geode.amd.com +S: Supported + AMD GEODE PROCESSOR/CHIPSET SUPPORT P: Jordan Crouse M: info-linux@geode.amd.com @@ -371,7 +361,7 @@ P: Tom Tucker M: tom@opengridcomputing.com P: Steve Wise M: swise@opengridcomputing.com -L: openib-general@openib.org +L: general@lists.openfabrics.org S: Maintained AOA (Apple Onboard Audio) ALSA DRIVER @@ -404,21 +394,6 @@ P: Jaya Kumar M: jayalk@intworks.biz S: Maintained -ARM26 ARCHITECTURE -P: Ian Molton -M: spyro@f2s.com -S: Maintained - -ARM26/ARCHIMEDES -P: Ian Molton -M: spyro@f2s.com -S: Maintained - -ARM26/A5000 -P: John Appleby -M: john@dnsworld.co.uk -S: Maintained - ARM MFM AND FLOPPY DRIVERS P: Ian Molton M: spyro@f2s.com @@ -480,7 +455,7 @@ S: Maintained ARM/HP JORNADA 7XX MACHINE SUPPORT P: Kristoffer Ericson -M: kristoffer_e1@hotmail.com +M: kristoffer.ericson@gmail.com W: www.jlime.com S: Maintained @@ -630,6 +605,12 @@ W: http://sourceforge.net/projects/acpi4asus W: http://xf.iksaif.net/acpi4asus S: Maintained +ASUS ASB100 HARDWARE MONITOR DRIVER +P: Mark M. Hoffman +M: mhoffman@lightlink.com +L: lm-sensors@lm-sensors.org +S: Maintained + ASUS LAPTOP EXTRAS DRIVER P: Corentin Chary M: corentincj@iksaif.net @@ -638,6 +619,15 @@ W: http://sourceforge.net/projects/acpi4asus W: http://xf.iksaif.net/acpi4asus S: Maintained +ASYNCHRONOUS TRANSFERS/TRANSFORMS API +P: Dan Williams +M: dan.j.williams@intel.com +P: Shannon Nelson +M: shannon.nelson@intel.com +L: linux-kernel@vger.kernel.org +W: http://sourceforge.net/projects/xscaleiop +S: Supported + ATA OVER ETHERNET DRIVER P: Ed L. Cashin M: ecashin@coraid.com @@ -690,7 +680,7 @@ S: Maintained AUDIT SUBSYSTEM P: David Woodhouse M: dwmw2@infradead.org -L: linux-audit@redhat.com +L: linux-audit@redhat.com (subscribers-only) W: http://people.redhat.com/sgrubb/audit/ T: git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git S: Maintained @@ -760,6 +750,13 @@ L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) W: http://blackfin.uclinux.org S: Supported +BLACKFIN EMAC DRIVER +P: Bryan Wu +M: bryan.wu@analog.com +L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) +W: http://blackfin.uclinux.org +S: Supported + BLACKFIN RTC DRIVER P: Mike Frysinger M: michael.frysinger@analog.com @@ -775,6 +772,14 @@ L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) W: http://blackfin.uclinux.org S: Supported +BLACKFIN WATCHDOG DRIVER +P: Mike Frysinger +M: michael.frysinger@analog.com +M: vapier.adi@gmail.com +L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) +W: http://blackfin.uclinux.org +S: Supported + BAYCOM/HDLCDRV DRIVERS FOR AX.25 P: Thomas Sailer M: t.sailer@alumni.ethz.ch @@ -941,6 +946,12 @@ M: mchan@broadcom.com L: netdev@vger.kernel.org S: Supported +BSG (block layer generic sg v4 driver) +P: FUJITA Tomonori +M: fujita.tomonori@lab.ntt.co.jp +L: linux-scsi@vger.kernel.org +S: Supported + BTTV VIDEO4LINUX DRIVER P: Mauro Carvalho Chehab M: mchehab@infradead.org @@ -999,7 +1010,7 @@ P: Steve French M: sfrench@samba.org L: linux-cifs-client@lists.samba.org L: samba-technical@lists.samba.org -W: http://us1.samba.org/samba/Linux_CIFS_client.html +W: http://linux-cifs.samba.org/ T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git S: Supported @@ -1282,6 +1293,20 @@ M: tori@unhappy.mine.nu L: netdev@vger.kernel.org S: Maintained +DMA GENERIC OFFLOAD ENGINE SUBSYSTEM +P: Shannon Nelson +M: shannon.nelson@intel.com +P: Dan Williams +M: dan.j.williams@intel.com +L: linux-kernel@vger.kernel.org +S: Supported + +DME1737 HARDWARE MONITOR DRIVER +P: Juerg Haefliger +M: juergh@gmail.com +L: lm-sensors@lm-sensors.org +S: Maintained + DOCBOOK FOR DOCUMENTATION P: Randy Dunlap M: rdunlap@xenotime.net @@ -1361,21 +1386,60 @@ S: Supported EDAC-CORE P: Doug Thompson -M: norsk5@xmission.com +M: dougthompson@xmission.com L: bluesmoke-devel@lists.sourceforge.net W: bluesmoke.sourceforge.net S: Supported EDAC-E752X P: Mark Gross +P: Doug Thompson M: mark.gross@intel.com +M: dougthompson@xmission.com L: bluesmoke-devel@lists.sourceforge.net W: bluesmoke.sourceforge.net S: Maintained EDAC-E7XXX P: Doug Thompson -M: norsk5@xmission.com +M: dougthompson@xmission.com +L: bluesmoke-devel@lists.sourceforge.net +W: bluesmoke.sourceforge.net +S: Maintained + +EDAC-I82443BXGX +P: Tim Small +M: tim@buttersideup.com +L: bluesmoke-devel@lists.sourceforge.net +W: bluesmoke.sourceforge.net +S: Maintained + +EDAC-I3000 +P: Jason Uhlenkott +M: juhlenko@akamai.com +L: bluesmoke-devel@lists.sourceforge.net +W: bluesmoke.sourceforge.net +S: Maintained + +EDAC-I5000 +P: Doug Thompson +M: dougthompson@xmission.com +L: bluesmoke-devel@lists.sourceforge.net +W: bluesmoke.sourceforge.net +S: Maintained + +EDAC-I82975X +P: Ranganathan Desikan +P: Arvind R. +M: rdesikan@jetzbroadband.com +M: arvind@acarlab.com +L: bluesmoke-devel@lists.sourceforge.net +W: bluesmoke.sourceforge.net +S: Maintained + +EDAC-PASEMI +P: Egor Martovetsky +M: egor@pasemi.com L: bluesmoke-devel@lists.sourceforge.net W: bluesmoke.sourceforge.net S: Maintained @@ -1401,16 +1465,9 @@ P: Hoang-Nam Nguyen M: hnguyen@de.ibm.com P: Christoph Raisch M: raisch@de.ibm.com -L: openib-general@openib.org +L: general@lists.openfabrics.org S: Supported -EMU10K1 SOUND DRIVER -P: James Courtier-Dutton -M: James@superbug.demon.co.uk -L: emu10k1-devel@lists.sourceforge.net -W: http://sourceforge.net/projects/emu10k1/ -S: Maintained - EMULEX LPFC FC SCSI DRIVER P: James Smart M: james.smart@emulex.com @@ -1600,11 +1657,11 @@ W: http://gigaset307x.sourceforge.net/ S: Maintained HARDWARE MONITORING -P: Jean Delvare -M: khali@linux-fr.org +P: Mark M. Hoffman +M: mhoffman@lightlink.com L: lm-sensors@lm-sensors.org W: http://www.lm-sensors.org/ -T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/ +T: git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git S: Maintained HARDWARE RANDOM NUMBER GENERATOR CORE @@ -1740,6 +1797,12 @@ P: William Irwin M: wli@holomorphy.com S: Maintained +I2C/SMBUS STUB DRIVER +P: Mark M. Hoffman +M: mhoffman@lightlink.com +L: lm-sensors@lm-sensors.org +S: Maintained + I2C SUBSYSTEM P: Jean Delvare M: khali@linux-fr.org @@ -1755,14 +1818,15 @@ T: http://www.harbaum.org/till/i2c_tiny_usb S: Maintained i386 BOOT CODE -P: Riley H. Williams -M: Riley@Williams.Name +P: H. Peter Anvin +M: hpa@zytor.com L: Linux-Kernel@vger.kernel.org S: Maintained i386 SETUP CODE / CPU ERRATA WORKAROUNDS P: H. Peter Anvin M: hpa@zytor.com +T: git.kernel.org:/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git S: Maintained IA64 (Itanium) PLATFORM @@ -1855,13 +1919,13 @@ M: rolandd@cisco.com P: Sean Hefty M: mshefty@ichips.intel.com P: Hal Rosenstock -M: halr@voltaire.com -L: openib-general@openib.org +M: hal.rosenstock@gmail.com +L: general@lists.openfabrics.org W: http://www.openib.org/ T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git S: Supported -INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS +INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS P: Dmitry Torokhov M: dmitry.torokhov@gmail.com M: dtor@mail.ru @@ -1906,6 +1970,18 @@ P: Tigran Aivazian M: tigran@aivazian.fsnet.co.uk S: Maintained +INTEL I/OAT DMA DRIVER +P: Shannon Nelson +M: shannon.nelson@intel.com +L: linux-kernel@vger.kernel.org +S: Supported + +INTEL IOP-ADMA DMA DRIVER +P: Dan Williams +M: dan.j.williams@intel.com +L: linux-kernel@vger.kernel.org +S: Supported + INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT P: Deepak Saxena M: dsaxena@plexity.net @@ -1982,21 +2058,28 @@ L: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel W: http://ipw2200.sourceforge.net S: Supported -IOC3 DRIVER +IOC3 ETHERNET DRIVER P: Ralf Baechle M: ralf@linux-mips.org L: linux-mips@linux-mips.org S: Maintained +IOC3 SERIAL DRIVER +P: Pat Gefre +M: pfg@sgi.com +L: linux-kernel@linux-mips.org +S: Maintained + IP MASQUERADING: P: Juanjo Ciarlante M: jjciarla@raiz.uncu.edu.ar S: Maintained IPATH DRIVER: -P: Bryan O'Sullivan -M: support@pathscale.com -L: openib-general@openib.org +P: Arthur Jones +M: infinipath@qlogic.com +L: general@lists.openfabrics.org +T: git git://git.qlogic.com/ipath-linux-2.6 S: Supported IPMI SUBSYSTEM @@ -2111,6 +2194,8 @@ W: http://www.kerneljanitors.org/ S: Maintained KERNEL NFSD +P: J. Bruce Fields +M: bfields@fieldses.org P: Neil Brown M: neilb@suse.de L: nfs@lists.sourceforge.net @@ -2302,6 +2387,14 @@ M: matthew@wil.cx L: linux-scsi@vger.kernel.org S: Maintained +M32R ARCHITECTURE +P: Hirokazu Takata +M: takata@linux-m32r.org +L: linux-m32r@ml.linux-m32r.org +L: linux-m32r-ja@ml.linux-m32r.org (in Japanese) +W: http://www.linux-m32r.org/ +S: Maintained + M68K ARCHITECTURE P: Geert Uytterhoeven M: geert@linux-m68k.org @@ -2335,6 +2428,12 @@ W: http://linuxwireless.org/ T: git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git S: Maintained +MACVLAN DRIVER +P: Patrick McHardy +M: kaber@trash.net +L: netdev@vger.kernel.org +S: Maintained + MARVELL YUKON / SYSKONNECT DRIVER P: Mirko Lindner M: mlindner@syskonnect.de @@ -2395,7 +2494,7 @@ P: Artem Bityutskiy M: dedekind@infradead.org W: http://www.linux-mtd.infradead.org/ L: linux-mtd@lists.infradead.org -T: git git://git.infradead.org/ubi-2.6.git +T: git git://git.infradead.org/~dedekind/ubi-2.6.git S: Maintained MICROTEK X6 SCANNER @@ -2502,6 +2601,19 @@ M: shemminger@linux-foundation.org L: netem@lists.linux-foundation.org S: Maintained +NETERION (S2IO) Xframe 10GbE DRIVER +P: Ramkrishna Vepa +M: ram.vepa@neterion.com +P: Rastapur Santosh +M: santosh.rastapur@neterion.com +P: Sivakumar Subramani +M: sivakumar.subramani@neterion.com +P: Sreenivasa Honnur +M: sreenivasa.honnur@neterion.com +L: netdev@vger.kernel.org +W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous +S: Supported + NETFILTER/IPTABLES/IPCHAINS P: Rusty Russell P: Marc Boucher @@ -2510,8 +2622,8 @@ P: Harald Welte P: Jozsef Kadlecsik P: Patrick McHardy M: kaber@trash.net -L: netfilter-devel@lists.netfilter.org -L: netfilter@lists.netfilter.org (subscribers-only) +L: netfilter-devel@vger.kernel.org +L: netfilter@vger.kernel.org L: coreteam@netfilter.org W: http://www.netfilter.org/ W: http://www.iptables.org/ @@ -2564,11 +2676,17 @@ M: jmorris@namei.org P: Hideaki YOSHIFUJI M: yoshfuji@linux-ipv6.org P: Patrick McHardy -M: kaber@coreworks.de +M: kaber@trash.net L: netdev@vger.kernel.org T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git S: Maintained +NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK) +P: Paul Moore +M: paul.moore@hp.com +L: netdev@vger.kernel.org +S: Maintained + NETWORKING [WIRELESS] P: John W. Linville M: linville@tuxdriver.com @@ -2621,12 +2739,6 @@ M: yokota@netlab.is.tsukuba.ac.jp W: http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/ S: Maintained -NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility) -P: Eberhard Moenkeberg -M: emoenke@gwdg.de -L: linux-kernel@vger.kernel.org -S: Maintained - NTFS FILESYSTEM P: Anton Altaparmakov M: aia21@cantab.net @@ -2642,19 +2754,6 @@ M: adaplas@gmail.com L: linux-fbdev-devel@lists.sourceforge.net (subscribers-only) S: Maintained -NETERION (S2IO) Xframe 10GbE DRIVER -P: Ramkrishna Vepa -M: ram.vepa@neterion.com -P: Rastapur Santosh -M: santosh.rastapur@neterion.com -P: Sivakumar Subramani -M: sivakumar.subramani@neterion.com -P: Sreenivasa Honnur -M: sreenivasa.honnur@neterion.com -L: netdev@vger.kernel.org -W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous -S: Supported - OPENCORES I2C BUS DRIVER P: Peter Korsgaard M: jacmet@sunsite.dk @@ -2709,12 +2808,6 @@ L: osst-users@lists.sourceforge.net L: linux-scsi@vger.kernel.org S: Maintained -OPL3-SA2, SA3, and SAx DRIVER -P: Zwane Mwaikambo -M: zwane@arm.linux.org.uk -L: linux-sound@vger.kernel.org -S: Maintained - OPROFILE P: Philippe Elie M: phil.el@wanadoo.fr @@ -2819,11 +2912,6 @@ P: Kristen Carlson Accardi M: kristen.c.accardi@intel.com S: Supported -PCI HOTPLUG COMPAQ DRIVER -P: Greg Kroah-Hartman -M: greg@kroah.com -S: Maintained - PCIE HOTPLUG DRIVER P: Kristen Carlson Accardi M: kristen.c.accardi@intel.com @@ -2868,11 +2956,21 @@ L: linux-kernel@vger.kernel.org S: Maintained POSIX CLOCKS and TIMERS -P: George Anzinger -M: george@mvista.com +P: Thomas Gleixner +M: tglx@linutronix.de L: linux-kernel@vger.kernel.org S: Supported +POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS +P: Anton Vorontsov +M: cbou@mail.ru +P: David Woodhouse +M: dwmw2@infradead.org +L: linux-kernel@vger.kernel.org +L: kernel-discuss@handhelds.org +T: git git.infradead.org/battery-2.6.git +S: Maintained + POWERPC 4xx EMAC DRIVER P: Eugene Surovegin M: ebs@ebshome.net @@ -2908,6 +3006,11 @@ P: Michal Ostrowski M: mostrows@speakeasy.net S: Maintained +PPP OVER L2TP +P: James Chapman +M: jchapman@katalix.com +S: Maintained + PREEMPTIBLE KERNEL P: Robert Love M: rml@tech9.net @@ -2935,6 +3038,13 @@ M: mikpe@it.uu.se L: linux-ide@vger.kernel.org S: Maintained +PS3 NETWORK SUPPORT +P: Masakazu Mokuno +M: mokuno@sm.sony.co.jp +L: netdev@vger.kernel.org +L: cbe-oss-dev@ozlabs.org +S: Supported + PS3 PLATFORM SUPPORT P: Geoff Levand M: geoffrey.levand@am.sony.com @@ -3054,6 +3164,16 @@ S: Maintained RISCOM8 DRIVER S: Orphan +RTL818X WIRELESS DRIVER +P: Michael Wu +M: flamingice@sourmilk.net +P: Andrea Merello +M: andreamrl@tiscali.it +L: linux-wireless@vger.kernel.org +W: http://linuxwireless.org/ +T: git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git +S: Maintained + S3 SAVAGE FRAMEBUFFER DRIVER P: Antonino Daplas M: adaplas@gmail.com @@ -3092,12 +3212,6 @@ M: michael@mihu.de W: http://www.mihu.de/linux/saa7146 S: Maintained -SBPCD CDROM DRIVER -P: Eberhard Moenkeberg -M: emoenke@gwdg.de -L: linux-kernel@vger.kernel.org -S: Maintained - SC1200 WDT DRIVER P: Zwane Mwaikambo M: zwane@arm.linux.org.uk @@ -3238,6 +3352,12 @@ W: http://www.brownhat.org/sis900.html L: netdev@vger.kernel.org S: Maintained +SIS 96X I2C/SMBUS DRIVER +P: Mark M. Hoffman +M: mhoffman@lightlink.com +L: lm-sensors@lm-sensors.org +S: Maintained + SIS FRAMEBUFFER DRIVER P: Thomas Winischhofer M: thomas@winischhofer.net @@ -3250,11 +3370,25 @@ M: thomas@winischhofer.net W: http://www.winischhofer.at/linuxsisusbvga.shtml S: Maintained +SLAB ALLOCATOR +P: Christoph Lameter +M: clameter@sgi.com +P: Pekka Enberg +M: penberg@cs.helsinki.fi +L: linux-mm@kvack.org +S: Maintained + SMC91x ETHERNET DRIVER P: Nicolas Pitre M: nico@cam.org S: Maintained +SMSC47B397 HARDWARE MONITOR DRIVER +P: Mark M. Hoffman +M: mhoffman@lightlink.com +L: lm-sensors@lm-sensors.org +S: Maintained + SOFTMAC LAYER (IEEE 802.11) P: Johannes Berg M: johannes@sipsolutions.net @@ -3274,9 +3408,19 @@ M: neilb@suse.de L: linux-raid@vger.kernel.org S: Supported -SOFTWARE SUSPEND: +HIBERNATION (aka Software Suspend, aka swsusp): +P: Pavel Machek +M: pavel@suse.cz +P: Rafael J. Wysocki +M: rjw@sisk.pl +L: linux-pm@lists.linux-foundation.org +S: Supported + +SUSPEND TO RAM: P: Pavel Machek M: pavel@suse.cz +P: Rafael J. Wysocki +M: rjw@sisk.pl L: linux-pm@lists.linux-foundation.org S: Maintained @@ -3321,7 +3465,7 @@ S: Maintained TPM DEVICE DRIVER P: Kylene Hall -M: kjhall@us.ibm.com +M: tpmdd-devel@lists.sourceforge.net W: http://tpmdd.sourceforge.net P: Marcel Selhorst M: tpm@selhorst.net @@ -3561,11 +3705,9 @@ W: http://www.auk.cx/tms380tr/ S: Maintained TULIP NETWORK DRIVER -P: Valerie Henson -M: val@nmt.edu L: tulip-users@lists.sourceforge.net W: http://sourceforge.net/projects/tulip/ -S: Maintained +S: Orphan TUN/TAP driver P: Maxim Krasnyansky @@ -3648,7 +3790,7 @@ L: linux-usb-devel@lists.sourceforge.net W: http://www.linux-usb.org/gadget S: Maintained -USB HID/HIDBP DRIVERS +USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...) P: Jiri Kosina M: jkosina@suse.cz L: linux-usb-devel@lists.sourceforge.net @@ -3712,12 +3854,12 @@ L: netdev@vger.kernel.org W: http://pegasus2.sourceforge.net/ S: Maintained -USB PRINTER DRIVER -P: Vojtech Pavlik -M: vojtech@suse.cz +USB PRINTER DRIVER (usblp) +P: Pete Zaitcev +M: zaitcev@redhat.com L: linux-usb-users@lists.sourceforge.net L: linux-usb-devel@lists.sourceforge.net -S: Maintained +S: Supported USB RTL8150 DRIVER P: Petko Manolov @@ -4103,6 +4245,11 @@ W: http://www.polyware.nl/~middelin/En/hobbies.html W: http://www.polyware.nl/~middelin/hobbies.html S: Maintained +ZS DECSTATION Z85C30 SERIAL DRIVER +P: Maciej W. Rozycki +M: macro@linux-mips.org +S: Maintained + THE REST P: Linus Torvalds S: Buried alive in reporters diff --git a/Makefile b/Makefile index 3067f6a1906f..4635a64da36c 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 22 -EXTRAVERSION = .6 -NAME = Holy Dancing Manatees, Batman! +SUBLEVEL = 23 +EXTRAVERSION = +NAME = Arr Matey! A Hairy Bilge Rat! # *DOCUMENTATION* # To see a list of typical targets execute "make help" @@ -299,7 +299,7 @@ CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(C MODFLAGS = -DMODULE CFLAGS_MODULE = $(MODFLAGS) AFLAGS_MODULE = $(MODFLAGS) -LDFLAGS_MODULE = -r +LDFLAGS_MODULE = CFLAGS_KERNEL = AFLAGS_KERNEL = @@ -313,7 +313,8 @@ LINUXINCLUDE := -Iinclude \ CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE) CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common + -fno-strict-aliasing -fno-common \ + -Werror-implicit-function-declaration AFLAGS := -D__ASSEMBLY__ # Read KERNELRELEASE from include/config/kernel.release (if it exists) @@ -491,7 +492,7 @@ endif include $(srctree)/arch/$(ARCH)/Makefile ifdef CONFIG_FRAME_POINTER -CFLAGS += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,) +CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls else CFLAGS += -fomit-frame-pointer endif @@ -513,6 +514,12 @@ CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) # disable pointer signed / unsigned warnings in gcc 4.0 CFLAGS += $(call cc-option,-Wno-pointer-sign,) +# Use --build-id when available. +LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\ + $(call ld-option, -Wl$(comma)--build-id,)) +LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID) +LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID) + # Default kernel image to build when no specific target is given. # KBUILD_IMAGE may be overruled on the command line or # set in the environment @@ -611,7 +618,7 @@ quiet_cmd_vmlinux__ ?= LD $@ cmd_vmlinux__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) -o $@ \ -T $(vmlinux-lds) $(vmlinux-init) \ --start-group $(vmlinux-main) --end-group \ - $(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE ,$^) + $(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o FORCE ,$^) # Generate new vmlinux version quiet_cmd_vmlinux_version = GEN .version @@ -735,15 +742,31 @@ debug_kallsyms: .tmp_map$(last_kallsyms) endif # ifdef CONFIG_KALLSYMS +# Do modpost on a prelinked vmlinux. The finally linked vmlinux has +# relevant sections renamed as per the linker script. +quiet_cmd_vmlinux-modpost = LD $@ + cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@ \ + $(vmlinux-init) --start-group $(vmlinux-main) --end-group \ + $(filter-out $(vmlinux-init) $(vmlinux-main) $(vmlinux-lds) FORCE ,$^) +define rule_vmlinux-modpost + : + +$(call cmd,vmlinux-modpost) + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@ + $(Q)echo 'cmd_$@ := $(cmd_vmlinux-modpost)' > $(dot-target).cmd +endef + # vmlinux image - including updated kernel symbols -vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE +vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) vmlinux.o FORCE ifdef CONFIG_HEADERS_CHECK $(Q)$(MAKE) -f $(srctree)/Makefile headers_check endif + $(call vmlinux-modpost) $(call if_changed_rule,vmlinux__) - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@ $(Q)rm -f .old_version +vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE + $(call if_changed_rule,vmlinux-modpost) + # The actual objects are generated when descending, # make sure no implicit rule kicks in $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ; @@ -1316,7 +1339,7 @@ define xtags -I __initdata,__exitdata,__acquires,__releases \ -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \ --extra=+f --c-kinds=+px \ - --regex-asm='/ENTRY\(([^)]*)\).*/\1/'; \ + --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'; \ $(all-kconfigs) | xargs $1 -a \ --langdef=kconfig \ --language-force=kconfig \ diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 79c6e5a24456..2a85dc33907c 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -327,6 +327,9 @@ config PCI_DOMAINS bool default y +config PCI_SYSCALL + def_bool PCI + config ALPHA_CORE_AGP bool depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL diff --git a/arch/alpha/boot/Makefile b/arch/alpha/boot/Makefile index e1ae14cd2b4e..cd143887380a 100644 --- a/arch/alpha/boot/Makefile +++ b/arch/alpha/boot/Makefile @@ -104,7 +104,7 @@ OBJ_bootlx := $(obj)/head.o $(obj)/main.o OBJ_bootph := $(obj)/head.o $(obj)/bootp.o OBJ_bootpzh := $(obj)/head.o $(obj)/bootpz.o $(obj)/misc.o -$(obj)/bootloader: $(obj)/bootloader.lds $(OBJ_bootlx) FORCE +$(obj)/bootloader: $(obj)/bootloader.lds $(OBJ_bootlx) $(LIBS_Y) FORCE $(call if_changed,ld) $(obj)/bootpheader: $(obj)/bootloader.lds $(OBJ_bootph) $(LIBS_Y) FORCE diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c index 90ed55b662a8..89f3be071ae5 100644 --- a/arch/alpha/boot/main.c +++ b/arch/alpha/boot/main.c @@ -132,7 +132,7 @@ static inline long load(long dev, unsigned long addr, unsigned long count) if (result) srm_printk("Boot file specification (%s) not implemented\n", bootfile); - return callback_read(dev, count, addr, boot_size/512 + 1); + return callback_read(dev, count, (void *)addr, boot_size/512 + 1); } /* diff --git a/arch/alpha/boot/tools/mkbb.c b/arch/alpha/boot/tools/mkbb.c index 632a7fd6d7dc..1185778e6a1e 100644 --- a/arch/alpha/boot/tools/mkbb.c +++ b/arch/alpha/boot/tools/mkbb.c @@ -11,6 +11,7 @@ #include #include +#include #include /* Minimal definition of disklabel, so we don't have to include @@ -114,7 +115,7 @@ int main(int argc, char ** argv) nread = read(fd, &bootloader_image, sizeof(bootblock)); if(nread != sizeof(bootblock)) { perror("lxboot read"); - fprintf(stderr, "expected %d, got %d\n", sizeof(bootblock), nread); + fprintf(stderr, "expected %zd, got %d\n", sizeof(bootblock), nread); exit(0); } @@ -122,7 +123,7 @@ int main(int argc, char ** argv) nread = read(dev, &bootblock_from_disk, sizeof(bootblock)); if(nread != sizeof(bootblock)) { perror("bootblock read"); - fprintf(stderr, "expected %d, got %d\n", sizeof(bootblock), nread); + fprintf(stderr, "expected %zd, got %d\n", sizeof(bootblock), nread); exit(0); } diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c index 96154e768a20..ef1838230291 100644 --- a/arch/alpha/boot/tools/objstrip.c +++ b/arch/alpha/boot/tools/objstrip.c @@ -144,7 +144,7 @@ main (int argc, char *argv[]) #ifdef __ELF__ elf = (struct elfhdr *) buf; - if (elf->e_ident[0] == 0x7f && strncmp(elf->e_ident + 1, "ELF", 3) == 0) { + if (elf->e_ident[0] == 0x7f && strncmp((char *)elf->e_ident + 1, "ELF", 3) == 0) { if (elf->e_type != ET_EXEC) { fprintf(stderr, "%s: %s is not an ELF executable\n", prog_name, inname); diff --git a/arch/alpha/kernel/head.S b/arch/alpha/kernel/head.S index e27d23c74ba8..7ac1f1372c36 100644 --- a/arch/alpha/kernel/head.S +++ b/arch/alpha/kernel/head.S @@ -10,6 +10,7 @@ #include #include +.section .text.head, "ax" .globl swapper_pg_dir .globl _stext swapper_pg_dir=SWAPPER_PGD diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c index bd03dc94c72b..026ba9af6d6a 100644 --- a/arch/alpha/kernel/module.c +++ b/arch/alpha/kernel/module.c @@ -119,8 +119,7 @@ module_frob_arch_sections(Elf64_Ehdr *hdr, Elf64_Shdr *sechdrs, } nsyms = symtab->sh_size / sizeof(Elf64_Sym); - chains = kmalloc(nsyms * sizeof(struct got_entry), GFP_KERNEL); - memset(chains, 0, nsyms * sizeof(struct got_entry)); + chains = kcalloc(nsyms, sizeof(struct got_entry), GFP_KERNEL); got->sh_size = 0; got->sh_addralign = 8; diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index ab642a4f08de..9dc1cee43265 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -195,7 +195,7 @@ pcibios_init(void) subsys_initcall(pcibios_init); -char * __init +char * __devinit pcibios_setup(char *str) { return str; @@ -204,7 +204,7 @@ pcibios_setup(char *str) #ifdef ALPHA_RESTORE_SRM_SETUP static struct pdev_srm_saved_conf *srm_saved_configs; -void __init +void __devinit pdev_save_srm_config(struct pci_dev *dev) { struct pdev_srm_saved_conf *tmp; @@ -247,14 +247,14 @@ pci_restore_srm_config(void) } #endif -void __init +void __devinit pcibios_fixup_resource(struct resource *res, struct resource *root) { res->start += root->start; res->end += root->start; } -void __init +void __devinit pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus) { /* Update device resources. */ @@ -273,7 +273,7 @@ pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus) } } -void __init +void __devinit pcibios_fixup_bus(struct pci_bus *bus) { /* Propagate hose info into the subordinate devices. */ diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 28c84e55feb9..e1c470752ebc 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -58,7 +58,7 @@ size_for_memory(unsigned long max) return max; } -struct pci_iommu_arena * +struct pci_iommu_arena * __init iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, unsigned long window_size, unsigned long align) { @@ -117,7 +117,7 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, return arena; } -struct pci_iommu_arena * +struct pci_iommu_arena * __init iommu_arena_new(struct pci_controller *hose, dma_addr_t base, unsigned long window_size, unsigned long align) { @@ -207,6 +207,10 @@ iommu_arena_free(struct pci_iommu_arena *arena, long ofs, long n) p[i] = 0; } +/* True if the machine supports DAC addressing, and DEV can + make use of it given MASK. */ +static int pci_dac_dma_supported(struct pci_dev *hwdev, u64 mask); + /* Map a single buffer of the indicated size for PCI DMA in streaming mode. The 32-bit PCI bus mastering address to use is returned. Once the device is given the dma address, the device owns this memory @@ -897,7 +901,7 @@ iommu_unbind(struct pci_iommu_arena *arena, long pg_start, long pg_count) /* True if the machine supports DAC addressing, and DEV can make use of it given MASK. */ -int +static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask) { dma64_addr_t dac_offset = alpha_mv.pci_dac_offset; @@ -917,32 +921,6 @@ pci_dac_dma_supported(struct pci_dev *dev, u64 mask) return ok; } -EXPORT_SYMBOL(pci_dac_dma_supported); - -dma64_addr_t -pci_dac_page_to_dma(struct pci_dev *pdev, struct page *page, - unsigned long offset, int direction) -{ - return (alpha_mv.pci_dac_offset - + __pa(page_address(page)) - + (dma64_addr_t) offset); -} -EXPORT_SYMBOL(pci_dac_page_to_dma); - -struct page * -pci_dac_dma_to_page(struct pci_dev *pdev, dma64_addr_t dma_addr) -{ - unsigned long paddr = (dma_addr & PAGE_MASK) - alpha_mv.pci_dac_offset; - return virt_to_page(__va(paddr)); -} -EXPORT_SYMBOL(pci_dac_dma_to_page); - -unsigned long -pci_dac_dma_to_offset(struct pci_dev *pdev, dma64_addr_t dma_addr) -{ - return (dma_addr & ~PAGE_MASK); -} -EXPORT_SYMBOL(pci_dac_dma_to_offset); /* Helper for generic DMA-mapping functions. */ diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c index 0cd060598f9a..83a781842266 100644 --- a/arch/alpha/kernel/ptrace.c +++ b/arch/alpha/kernel/ptrace.c @@ -315,9 +315,7 @@ do_sys_ptrace(long request, long pid, long addr, long data, /* When I and D space are separate, this will have to be fixed. */ case PTRACE_POKETEXT: /* write the word at location addr. */ case PTRACE_POKEDATA: - tmp = data; - copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 1); - ret = (copied == sizeof(tmp)) ? 0 : -EIO; + ret = generic_ptrace_pokedata(child, addr, data); break; case PTRACE_POKEUSR: /* write the specified register */ diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index 80cfb758ee2b..ad176441be55 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -65,7 +66,7 @@ enum ipi_message_type { }; /* Set to a secondary's cpuid when it comes online. */ -static int smp_secondary_alive __initdata = 0; +static int smp_secondary_alive __devinitdata = 0; /* Which cpus ids came online. */ cpumask_t cpu_online_map; @@ -173,7 +174,7 @@ smp_callin(void) } /* Wait until hwrpb->txrdy is clear for cpu. Return -1 on timeout. */ -static int __init +static int __devinit wait_for_txrdy (unsigned long cpumask) { unsigned long timeout; @@ -358,7 +359,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle) /* * Bring one cpu online. */ -static int __init +static int __cpuinit smp_boot_one_cpu(int cpuid) { struct task_struct *idle; @@ -487,7 +488,7 @@ smp_prepare_boot_cpu(void) { } -int __devinit +int __cpuinit __cpu_up(unsigned int cpu) { smp_boot_one_cpu(cpu); @@ -541,7 +542,7 @@ smp_percpu_timer_interrupt(struct pt_regs *regs) set_irq_regs(old_regs); } -int __init +int setup_profiling_timer(unsigned int multiplier) { return -EINVAL; diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c index 930cedc8be24..783f4e50c111 100644 --- a/arch/alpha/kernel/srmcons.c +++ b/arch/alpha/kernel/srmcons.c @@ -289,7 +289,7 @@ srm_console_device(struct console *co, int *index) return srmcons_driver; } -static int __init +static int srm_console_setup(struct console *co, char *options) { return 0; diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c index 0bcb968cb60a..922143ea1cdb 100644 --- a/arch/alpha/kernel/sys_marvel.c +++ b/arch/alpha/kernel/sys_marvel.c @@ -420,7 +420,7 @@ marvel_init_pci(void) io7_clear_errors(io7); } -static void +static void __init marvel_init_rtc(void) { init_rtc_irq(); diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index 1d3c1398c428..52c91ccc1648 100644 --- a/arch/alpha/kernel/sys_titan.c +++ b/arch/alpha/kernel/sys_titan.c @@ -270,6 +270,19 @@ titan_dispatch_irqs(u64 mask) /* * Titan Family */ +static void __init +titan_request_irq(unsigned int irq, irq_handler_t handler, + unsigned long irqflags, const char *devname, + void *dev_id) +{ + int err; + err = request_irq(irq, handler, irqflags, devname, dev_id); + if (err) { + printk("titan_request_irq for IRQ %d returned %d; ignoring\n", + irq, err); + } +} + static void __init titan_late_init(void) { @@ -278,15 +291,15 @@ titan_late_init(void) * all reported to the kernel as machine checks, so the handler * is a nop so it can be called to count the individual events. */ - request_irq(63+16, titan_intr_nop, IRQF_DISABLED, + titan_request_irq(63+16, titan_intr_nop, IRQF_DISABLED, "CChip Error", NULL); - request_irq(62+16, titan_intr_nop, IRQF_DISABLED, + titan_request_irq(62+16, titan_intr_nop, IRQF_DISABLED, "PChip 0 H_Error", NULL); - request_irq(61+16, titan_intr_nop, IRQF_DISABLED, + titan_request_irq(61+16, titan_intr_nop, IRQF_DISABLED, "PChip 1 H_Error", NULL); - request_irq(60+16, titan_intr_nop, IRQF_DISABLED, + titan_request_irq(60+16, titan_intr_nop, IRQF_DISABLED, "PChip 0 C_Error", NULL); - request_irq(59+16, titan_intr_nop, IRQF_DISABLED, + titan_request_irq(59+16, titan_intr_nop, IRQF_DISABLED, "PChip 1 C_Error", NULL); /* @@ -345,9 +358,9 @@ privateer_init_pci(void) * Hook a couple of extra err interrupts that the * common titan code won't. */ - request_irq(53+16, titan_intr_nop, IRQF_DISABLED, + titan_request_irq(53+16, titan_intr_nop, IRQF_DISABLED, "NMI", NULL); - request_irq(50+16, titan_intr_nop, IRQF_DISABLED, + titan_request_irq(50+16, titan_intr_nop, IRQF_DISABLED, "Temperature Warning", NULL); /* diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c index 4748e14a28bc..1dd50d07693c 100644 --- a/arch/alpha/kernel/time.c +++ b/arch/alpha/kernel/time.c @@ -144,7 +144,7 @@ irqreturn_t timer_interrupt(int irq, void *dev) return IRQ_HANDLED; } -void +void __init common_init_rtc(void) { unsigned char x; diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index d6e665d567bd..ec0f05e0d8ff 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c @@ -184,6 +184,7 @@ die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15) #endif printk("%s(%d): %s %ld\n", current->comm, current->pid, str, err); dik_show_regs(regs, r9_15); + add_taint(TAINT_DIE); dik_show_trace((unsigned long *)(regs+1)); dik_show_code((unsigned int *)regs->pc); diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index 449e76f118d3..7af07d3ad5f0 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S @@ -3,7 +3,7 @@ OUTPUT_FORMAT("elf64-alpha") OUTPUT_ARCH(alpha) ENTRY(__start) -PHDRS { kernel PT_LOAD ; } +PHDRS { kernel PT_LOAD; note PT_NOTE; } jiffies = jiffies_64; SECTIONS { @@ -15,6 +15,7 @@ SECTIONS _text = .; /* Text and read-only data */ .text : { + *(.text.head) TEXT_TEXT SCHED_TEXT LOCK_TEXT @@ -28,6 +29,9 @@ SECTIONS __ex_table : { *(__ex_table) } __stop___ex_table = .; + NOTES :kernel :note + .dummy : { *(.dummy) } :kernel + RODATA /* Will be freed after init */ @@ -69,10 +73,7 @@ SECTIONS . = ALIGN(8); SECURITY_INIT - . = ALIGN(8192); - __per_cpu_start = .; - .data.percpu : { *(.data.percpu) } - __per_cpu_end = .; + PERCPU(8192) . = ALIGN(2*8192); __init_end = .; diff --git a/arch/alpha/lib/checksum.c b/arch/alpha/lib/checksum.c index ab3761c437a8..8698e0746f9f 100644 --- a/arch/alpha/lib/checksum.c +++ b/arch/alpha/lib/checksum.c @@ -69,6 +69,7 @@ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, result = (result & 0xffffffff) + (result >> 32); return (__force __wsum)result; } +EXPORT_SYMBOL(csum_tcpudp_nofold); /* * Do a 64-bit checksum on an arbitrary memory area.. diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index f5862792a167..a0e18da594d9 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -148,21 +148,17 @@ do_page_fault(unsigned long address, unsigned long mmcsr, the fault. */ fault = handle_mm_fault(mm, vma, address, cause > 0); up_read(&mm->mmap_sem); - - switch (fault) { - case VM_FAULT_MINOR: - current->min_flt++; - break; - case VM_FAULT_MAJOR: - current->maj_flt++; - break; - case VM_FAULT_SIGBUS: - goto do_sigbus; - case VM_FAULT_OOM: - goto out_of_memory; - default: + if (unlikely(fault & VM_FAULT_ERROR)) { + if (fault & VM_FAULT_OOM) + goto out_of_memory; + else if (fault & VM_FAULT_SIGBUS) + goto do_sigbus; BUG(); } + if (fault & VM_FAULT_MAJOR) + current->maj_flt++; + else + current->min_flt++; return; /* Something tried to access memory that isn't in our memory map. diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index 550f4907d613..5e6da47779a4 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c @@ -267,8 +267,7 @@ callback_init(void * kernel_end) /* * paging_init() sets up the memory map. */ -void -paging_init(void) +void __init paging_init(void) { unsigned long zones_size[MAX_NR_ZONES] = {0, }; unsigned long dma_pfn, high_pfn; diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5c8e7c8d6da5..b97bcef32b24 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -241,6 +241,9 @@ config ARCH_H720X config ARCH_IMX bool "IMX" + select GENERIC_GPIO + select GENERIC_TIME + select GENERIC_CLOCKEVENTS help Support for Motorola's i.MX family of processors (MX1, MXL). @@ -306,17 +309,9 @@ config ARCH_L7200 If you have any questions or comments about the Linux kernel port to this board, send e-mail to . -config ARCH_MXC - bool "Freescale MXC/iMX-based" - select ISA - select ARCH_MTD_XIP - select GENERIC_TIME - select GENERIC_CLOCKEVENTS - help - Support for Freescale MXC/iMX-based family of processors - config ARCH_KS8695 bool "Micrel/Kendin KS8695" + select GENERIC_GPIO help Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based System-on-Chip devices. @@ -329,6 +324,15 @@ config ARCH_NS9XXX +config ARCH_MXC + bool "Freescale MXC/iMX-based" + select ISA + select ARCH_MTD_XIP + select GENERIC_TIME + select GENERIC_CLOCKEVENTS + help + Support for Freescale MXC/iMX-based family of processors + config ARCH_PNX4008 bool "Philips Nexperia PNX4008 Mobile" help @@ -340,6 +344,7 @@ config ARCH_PXA select ARCH_MTD_XIP select GENERIC_GPIO select GENERIC_TIME + select GENERIC_CLOCKEVENTS help Support for Intel's PXA2XX processor line. @@ -393,6 +398,7 @@ config ARCH_DAVINCI bool "TI DaVinci" select GENERIC_TIME select GENERIC_CLOCKEVENTS + select GENERIC_GPIO help Support for TI's DaVinci platform. @@ -436,6 +442,7 @@ source "arch/arm/mach-omap1/Kconfig" source "arch/arm/mach-omap2/Kconfig" source "arch/arm/plat-s3c24xx/Kconfig" +source "arch/arm/plat-s3c/Kconfig" if ARCH_S3C2410 source "arch/arm/mach-s3c2400/Kconfig" @@ -542,6 +549,9 @@ config PCI information about which PCI hardware does work under Linux and which doesn't. +config PCI_SYSCALL + def_bool PCI + # Select the host bridge type config PCI_HOST_VIA82C505 bool @@ -714,7 +724,8 @@ config LEDS config LEDS_TIMER bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \ - MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 || ARCH_MXC + OMAP_OSK_MISTRAL || MACH_OMAP_H2 \ + || MACH_OMAP_PERSEUS2 || ARCH_MXC depends on LEDS depends on !GENERIC_CLOCKEVENTS default y if ARCH_EBSA110 @@ -731,7 +742,9 @@ config LEDS_TIMER config LEDS_CPU bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \ - !ARCH_OMAP) || MACH_OMAP_H2 || MACH_OMAP_PERSEUS2 || ARCH_MXC + !ARCH_OMAP) \ + || OMAP_OSK_MISTRAL || MACH_OMAP_H2 \ + || MACH_OMAP_PERSEUS2 || ARCH_MXC depends on LEDS help If you say Y here, the red LED will be used to give a good real @@ -984,8 +997,6 @@ source "drivers/pnp/Kconfig" source "drivers/block/Kconfig" -source "drivers/acorn/block/Kconfig" - if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \ || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \ || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \ @@ -1045,6 +1056,8 @@ source "drivers/mmc/Kconfig" source "drivers/rtc/Kconfig" +source "drivers/dma/Kconfig" + if ARCH_MXC source "drivers/mxc/Kconfig" endif diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 40c5eb1f55c7..18101f5f5f24 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -82,24 +82,24 @@ config DEBUG_CLPS711X_UART2 output to the second serial port on these devices. Saying N will cause the debug messages to appear on the first serial port. -config DEBUG_S3C2410_PORT - depends on DEBUG_LL && ARCH_S3C2410 - bool "Kernel low-level debugging messages via S3C2410 UART" +config DEBUG_S3C_PORT + depends on DEBUG_LL && PLAT_S3C + bool "Kernel low-level debugging messages via S3C UART" help Say Y here if you want debug print routines to go to one of the - S3C2410 internal UARTs. The chosen UART must have been configured + S3C internal UARTs. The chosen UART must have been configured before it is used. -config DEBUG_S3C2410_UART - depends on ARCH_S3C2410 - int "S3C2410 UART to use for low-level debug" +config DEBUG_S3C_UART + depends on PLAT_S3C + int "S3C UART to use for low-level debug" default "0" help - Choice for UART for kernel low-level using S3C2410 UARTS, + Choice for UART for kernel low-level using S3C UARTS, should be between zero and two. The port must have been initialised by the boot-loader before use. The uncompressor code port configuration is now handled - by CONFIG_S3C2410_LOWLEVEL_UART_PORT. + by CONFIG_S3C_LOWLEVEL_UART_PORT. endmenu diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f6403a320a36..32662186590b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -137,7 +137,7 @@ endif textofs-$(CONFIG_ARCH_NS9XXX) := 0x00108000 machine-$(CONFIG_ARCH_DAVINCI) := davinci machine-$(CONFIG_ARCH_KS8695) := ks8695 - incdir-$(CONFIG_ARCH_MXC) := mxc + incdir-$(CONFIG_ARCH_MXC) := mxc machine-$(CONFIG_ARCH_MX3) := mx3 machine-$(CONFIG_ARCH_MX27) := mx27 diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index ec9c400c7f82..25f12303b106 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -91,4 +91,12 @@ zinstall: $(obj)/zImage $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ $(obj)/zImage System.map "$(INSTALL_PATH)" +zi: + $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ + $(obj)/zImage System.map "$(INSTALL_PATH)" + +i: + $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ + $(obj)/Image System.map "$(INSTALL_PATH)" + subdir- := bootp compressed diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore index aefee20cbf98..b15f927a5926 100644 --- a/arch/arm/boot/compressed/.gitignore +++ b/arch/arm/boot/compressed/.gitignore @@ -1 +1,2 @@ piggy.gz +font.c diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index adddc7131685..6b8cbd69f249 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -6,15 +6,13 @@ HEAD = head.o OBJS = misc.o -FONTC = drivers/video/console/font_acorn_8x8.c - -FONT = $(addprefix ../../../../drivers/video/console/, font_acorn_8x8.o) +FONTC = $(srctree)/drivers/video/console/font_acorn_8x8.c # # Architecture dependencies # ifeq ($(CONFIG_ARCH_ACORN),y) -OBJS += ll_char_wr.o $(FONT) +OBJS += ll_char_wr.o font.o endif ifeq ($(CONFIG_ARCH_SHARK),y) @@ -73,9 +71,9 @@ endif SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ -targets := vmlinux vmlinux.lds piggy.gz piggy.o $(FONT) \ +targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \ head.o misc.o $(OBJS) -EXTRA_CFLAGS := -fpic +EXTRA_CFLAGS := -fpic -fno-builtin EXTRA_AFLAGS := # Supply ZRELADDR, INITRD_PHYS and PARAMS_PHYS to the decompressor via @@ -105,7 +103,10 @@ $(obj)/piggy.gz: $(obj)/../Image FORCE $(obj)/piggy.o: $(obj)/piggy.gz FORCE -CFLAGS_font_acorn_8x8.o := -Dstatic= +CFLAGS_font.o := -Dstatic= + +$(obj)/font.c: $(FONTC) + $(call cmd,shipped) $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config @sed "$(SEDFLAGS)" < $< > $@ diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S index 73c5d9e0201c..236bbe578312 100644 --- a/arch/arm/boot/compressed/head-xscale.S +++ b/arch/arm/boot/compressed/head-xscale.S @@ -41,11 +41,6 @@ __XScale_start: mov r7, #MACH_TYPE_COTULLA_IDP #endif -#ifdef CONFIG_MACH_GTWX5715 - mov r7, #(MACH_TYPE_GTWX5715 & 0xff) - orr r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00) -#endif - #ifdef CONFIG_ARCH_IXP2000 mov r1, #-1 mov r0, #0xd6000000 diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 680ea6ed77b8..b9b03eda70e5 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -55,7 +55,7 @@ #elif defined(CONFIG_ARCH_S3C2410) .macro loadsp, rb mov \rb, #0x50000000 - add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT + add \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT .endm #else .macro loadsp, rb @@ -436,6 +436,28 @@ __armv4_mmu_cache_on: mcr p15, 0, r0, c8, c7, 0 @ flush I,D TLBs mov pc, r12 +__armv7_mmu_cache_on: + mov r12, lr + mrc p15, 0, r11, c0, c1, 4 @ read ID_MMFR0 + tst r11, #0xf @ VMSA + blne __setup_mmu + mov r0, #0 + mcr p15, 0, r0, c7, c10, 4 @ drain write buffer + tst r11, #0xf @ VMSA + mcrne p15, 0, r0, c8, c7, 0 @ flush I,D TLBs + mrc p15, 0, r0, c1, c0, 0 @ read control reg + orr r0, r0, #0x5000 @ I-cache enable, RR cache replacement + orr r0, r0, #0x003c @ write buffer + orrne r0, r0, #1 @ MMU enabled + movne r1, #-1 + mcrne p15, 0, r3, c2, c0, 0 @ load page table pointer + mcrne p15, 0, r1, c3, c0, 0 @ load domain access control + mcr p15, 0, r0, c1, c0, 0 @ load control register + mrc p15, 0, r0, c1, c0, 0 @ and read it back + mov r0, #0 + mcr p15, 0, r0, c7, c5, 4 @ ISB + mov pc, r12 + __arm6_mmu_cache_on: mov r12, lr bl __setup_mmu @@ -622,11 +644,17 @@ proc_types: b __armv4_mmu_cache_flush .word 0x0007b000 @ ARMv6 - .word 0x0007f000 + .word 0x000ff000 b __armv4_mmu_cache_on b __armv4_mmu_cache_off b __armv6_mmu_cache_flush + .word 0x000f0000 @ new CPU Id + .word 0x000f0000 + b __armv7_mmu_cache_on + b __armv7_mmu_cache_off + b __armv7_mmu_cache_flush + .word 0 @ unrecognised type .word 0 mov pc, lr @@ -674,6 +702,16 @@ __armv4_mmu_cache_off: mcr p15, 0, r0, c8, c7 @ invalidate whole TLB v4 mov pc, lr +__armv7_mmu_cache_off: + mrc p15, 0, r0, c1, c0 + bic r0, r0, #0x000d + mcr p15, 0, r0, c1, c0 @ turn MMU and cache off + mov r12, lr + bl __armv7_mmu_cache_flush + mov r0, #0 + mcr p15, 0, r0, c8, c7, 0 @ invalidate whole TLB + mov pc, r12 + __arm6_mmu_cache_off: mov r0, #0x00000030 @ ARM6 control reg. b __armv3_mmu_cache_off @@ -730,6 +768,59 @@ __armv6_mmu_cache_flush: mcr p15, 0, r1, c7, c10, 4 @ drain WB mov pc, lr +__armv7_mmu_cache_flush: + mrc p15, 0, r10, c0, c1, 5 @ read ID_MMFR1 + tst r10, #0xf << 16 @ hierarchical cache (ARMv7) + beq hierarchical + mov r10, #0 + mcr p15, 0, r10, c7, c14, 0 @ clean+invalidate D + b iflush +hierarchical: + stmfd sp!, {r0-r5, r7, r9-r11} + mrc p15, 1, r0, c0, c0, 1 @ read clidr + ands r3, r0, #0x7000000 @ extract loc from clidr + mov r3, r3, lsr #23 @ left align loc bit field + beq finished @ if loc is 0, then no need to clean + mov r10, #0 @ start clean at cache level 0 +loop1: + add r2, r10, r10, lsr #1 @ work out 3x current cache level + mov r1, r0, lsr r2 @ extract cache type bits from clidr + and r1, r1, #7 @ mask of the bits for current cache only + cmp r1, #2 @ see what cache we have at this level + blt skip @ skip if no cache, or just i-cache + mcr p15, 2, r10, c0, c0, 0 @ select current cache level in cssr + mcr p15, 0, r10, c7, c5, 4 @ isb to sych the new cssr&csidr + mrc p15, 1, r1, c0, c0, 0 @ read the new csidr + and r2, r1, #7 @ extract the length of the cache lines + add r2, r2, #4 @ add 4 (line length offset) + ldr r4, =0x3ff + ands r4, r4, r1, lsr #3 @ find maximum number on the way size + .word 0xe16f5f14 @ clz r5, r4 - find bit position of way size increment + ldr r7, =0x7fff + ands r7, r7, r1, lsr #13 @ extract max number of the index size +loop2: + mov r9, r4 @ create working copy of max way size +loop3: + orr r11, r10, r9, lsl r5 @ factor way and cache number into r11 + orr r11, r11, r7, lsl r2 @ factor index number into r11 + mcr p15, 0, r11, c7, c14, 2 @ clean & invalidate by set/way + subs r9, r9, #1 @ decrement the way + bge loop3 + subs r7, r7, #1 @ decrement the index + bge loop2 +skip: + add r10, r10, #2 @ increment cache number + cmp r3, r10 + bgt loop1 +finished: + mov r10, #0 @ swith back to cache level 0 + mcr p15, 2, r10, c0, c0, 0 @ select current cache level in cssr + ldmfd sp!, {r0-r5, r7, r9-r11} +iflush: + mcr p15, 0, r10, c7, c5, 0 @ invalidate I+BTB + mcr p15, 0, r10, c7, c10, 4 @ drain WB + mov pc, lr + __armv4_mmu_cache_flush: mov r2, #64*1024 @ default: 32K dcache size (*2) mov r11, #32 @ default: 32 byte line size diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index cfe6f4650bc9..ae21755872ed 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c @@ -60,6 +60,9 @@ struct locomo { unsigned int irq; spinlock_t lock; void __iomem *base; +#ifdef CONFIG_PM + void *saved_state; +#endif }; struct locomo_dev_info { @@ -565,7 +568,7 @@ static int locomo_suspend(struct platform_device *dev, pm_message_t state) if (!save) return -ENOMEM; - dev->dev.power.saved_state = (void *) save; + lchip->saved_state = save; spin_lock_irqsave(&lchip->lock, flags); @@ -605,8 +608,8 @@ static int locomo_resume(struct platform_device *dev) struct locomo_save_data *save; unsigned long r; unsigned long flags; - - save = (struct locomo_save_data *) dev->dev.power.saved_state; + + save = lchip->saved_state; if (!save) return 0; @@ -628,6 +631,8 @@ static int locomo_resume(struct platform_device *dev) locomo_writel(0x1, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KCMD); spin_unlock_irqrestore(&lchip->lock, flags); + + lchip->saved_state = NULL; kfree(save); return 0; diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 798bbfccafb7..eb06d0b2cb74 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -51,6 +51,9 @@ struct sa1111 { int irq; spinlock_t lock; void __iomem *base; +#ifdef CONFIG_PM + void *saved_state; +#endif }; /* @@ -822,7 +825,7 @@ static int sa1111_suspend(struct platform_device *dev, pm_message_t state) save = kmalloc(sizeof(struct sa1111_save_data), GFP_KERNEL); if (!save) return -ENOMEM; - dev->dev.power.saved_state = save; + sachip->saved_state = save; spin_lock_irqsave(&sachip->lock, flags); @@ -878,7 +881,7 @@ static int sa1111_resume(struct platform_device *dev) unsigned long flags, id; void __iomem *base; - save = (struct sa1111_save_data *)dev->dev.power.saved_state; + save = sachip->saved_state; if (!save) return 0; @@ -923,7 +926,7 @@ static int sa1111_resume(struct platform_device *dev) spin_unlock_irqrestore(&sachip->lock, flags); - dev->dev.power.saved_state = NULL; + sachip->saved_state = NULL; kfree(save); return 0; @@ -958,8 +961,8 @@ static int sa1111_remove(struct platform_device *pdev) platform_set_drvdata(pdev, NULL); #ifdef CONFIG_PM - kfree(pdev->dev.power.saved_state); - pdev->dev.power.saved_state = NULL; + kfree(sachip->saved_state); + sachip->saved_state = NULL; #endif } diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index 3bf3a927ae22..111a7fa5debe 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c @@ -766,9 +766,7 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info) } static struct pm_ops sharpsl_pm_ops = { - .prepare = pxa_pm_prepare, .enter = corgi_pxa_pm_enter, - .finish = pxa_pm_finish, .valid = pm_valid_only_mem, }; diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig index 821865f75605..b2bbf217c707 100644 --- a/arch/arm/configs/badge4_defconfig +++ b/arch/arm/configs/badge4_defconfig @@ -708,7 +708,6 @@ CONFIG_I2C_ALGOPCF=m # I2C Hardware Bus support # CONFIG_I2C_ELEKTOR=m -# CONFIG_I2C_ISA is not set # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set diff --git a/arch/arm/configs/clps7500_defconfig b/arch/arm/configs/clps7500_defconfig index af9ae5389131..49e9f9d8b3d1 100644 --- a/arch/arm/configs/clps7500_defconfig +++ b/arch/arm/configs/clps7500_defconfig @@ -536,7 +536,6 @@ CONFIG_I2C_ALGOBIT=y # I2C Hardware Bus support # # CONFIG_I2C_ELEKTOR is not set -# CONFIG_I2C_ISA is not set # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PCA_ISA is not set diff --git a/arch/arm/configs/footbridge_defconfig b/arch/arm/configs/footbridge_defconfig index 2a612d23120b..299dc22294a0 100644 --- a/arch/arm/configs/footbridge_defconfig +++ b/arch/arm/configs/footbridge_defconfig @@ -748,7 +748,6 @@ CONFIG_I2C=m # CONFIG_I2C_ELEKTOR is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set -# CONFIG_I2C_ISA is not set # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set diff --git a/arch/arm/configs/iop13xx_defconfig b/arch/arm/configs/iop13xx_defconfig index 43c4a37e9247..add03c9e5553 100644 --- a/arch/arm/configs/iop13xx_defconfig +++ b/arch/arm/configs/iop13xx_defconfig @@ -1,12 +1,18 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-rc1-git5 -# Tue Dec 19 21:38:01 2006 +# Linux kernel version: 2.6.22 +# Thu Jul 19 15:57:52 2007 # CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +# CONFIG_GENERIC_GPIO is not set # CONFIG_GENERIC_TIME is not set +# CONFIG_GENERIC_CLOCKEVENTS is not set CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y @@ -15,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -32,17 +39,19 @@ CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set -# CONFIG_UTS_NS is not set +# CONFIG_USER_NS is not set # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y @@ -57,32 +66,30 @@ CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y +CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y -CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y - -# -# Block layer -# CONFIG_BLOCK=y # CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set # # IO Schedulers @@ -114,13 +121,15 @@ CONFIG_DEFAULT_IOSCHED="deadline" # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_IMX is not set +CONFIG_ARCH_IOP13XX=y # CONFIG_ARCH_IOP32X is not set # CONFIG_ARCH_IOP33X is not set -CONFIG_ARCH_IOP13XX=y -# CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -128,6 +137,7 @@ CONFIG_ARCH_IOP13XX=y # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set # @@ -140,6 +150,12 @@ CONFIG_ARCH_IOP13XX=y CONFIG_MACH_IQ81340SC=y CONFIG_MACH_IQ81340MC=y +# +# IOP13XX IMU Support +# +# CONFIG_IOP_IMU is not set +CONFIG_PLAT_IOP=y + # # Processor Type # @@ -159,13 +175,16 @@ CONFIG_IO_36=y CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set +# CONFIG_OUTER_CACHE is not set # CONFIG_IWMMXT is not set # # Bus support # CONFIG_PCI=y -# CONFIG_PCI_MULTITHREAD_PROBE is not set +CONFIG_PCI_SYSCALL=y +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCI_MSI is not set # # PCCARD (PCMCIA/CardBus) support @@ -175,6 +194,7 @@ CONFIG_PCI=y # # Kernel Features # +# CONFIG_TICK_ONESHOT is not set # CONFIG_PREEMPT is not set # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 @@ -189,6 +209,9 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y CONFIG_ALIGNMENT_TRAP=y # @@ -198,6 +221,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="ip=bootp root=nfs console=ttyS0,115200 nfsroot=,tcp,v3,wsize=8192,rsize=8192" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set # # Floating point emulation @@ -222,7 +246,6 @@ CONFIG_BINFMT_AOUT=y # Power management options # # CONFIG_PM is not set -# CONFIG_APM is not set # # Networking @@ -232,14 +255,15 @@ CONFIG_NET=y # # Networking options # -# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set @@ -270,6 +294,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_IPV6=y # CONFIG_IPV6_PRIVACY is not set # CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set # CONFIG_INET6_AH is not set # CONFIG_INET6_ESP is not set # CONFIG_INET6_IPCOMP is not set @@ -285,20 +310,8 @@ CONFIG_IPV6=y # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# # CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# # CONFIG_IP_SCTP is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -324,7 +337,17 @@ CONFIG_IPV6=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set # # Device Drivers @@ -337,15 +360,7 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set # CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# # CONFIG_CONNECTOR is not set - -# -# Memory Technology Devices (MTD) -# CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set # CONFIG_MTD_CONCAT is not set @@ -361,6 +376,7 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y # User Modules And Translation Layers # # CONFIG_MTD_CHAR is not set +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set @@ -397,7 +413,6 @@ CONFIG_MTD_CFI_UTIL=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access @@ -425,42 +440,27 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set - -# -# NAND Flash Device Drivers -# # CONFIG_MTD_NAND is not set - -# -# OneNAND Flash Device Drivers -# # CONFIG_MTD_ONENAND is not set # -# Parallel port support +# UBI - Unsorted block images # +# CONFIG_MTD_UBI is not set # CONFIG_PARPORT is not set - -# -# Plug and Play support -# - -# -# Block devices -# +CONFIG_BLK_DEV=y # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set -CONFIG_BLK_DEV_NBD=y +# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=2 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -469,6 +469,7 @@ CONFIG_BLK_DEV_INITRD=y # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y +CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_PROC_FS=y @@ -490,6 +491,7 @@ CONFIG_CHR_DEV_SG=y CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -534,15 +536,7 @@ CONFIG_SCSI_SAS_ATTRS=y # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_SRP is not set - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# # CONFIG_ATA is not set - -# -# Multi-device support (RAID and LVM) -# CONFIG_MD=y CONFIG_BLK_DEV_MD=y # CONFIG_MD_LINEAR is not set @@ -560,6 +554,7 @@ CONFIG_BLK_DEV_DM=y # CONFIG_DM_MIRROR is not set # CONFIG_DM_ZERO is not set # CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set # # Fusion MPT device support @@ -572,39 +567,19 @@ CONFIG_BLK_DEV_DM=y # # IEEE 1394 (FireWire) support # +# CONFIG_FIREWIRE is not set # CONFIG_IEEE1394 is not set - -# -# I2O device support -# # CONFIG_I2O is not set - -# -# Network device support -# CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set - -# -# ARCnet devices -# # CONFIG_ARCNET is not set - -# -# PHY device support -# - -# -# Ethernet (10 or 100Mbit) -# # CONFIG_NET_ETHERNET is not set - -# -# Ethernet (1000 Mbit) -# +CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set CONFIG_E1000=y @@ -617,33 +592,26 @@ CONFIG_E1000_NAPI=y # CONFIG_SIS190 is not set # CONFIG_SKGE is not set # CONFIG_SKY2 is not set -# CONFIG_SK98LIN is not set +# CONFIG_VIA_VELOCITY is not set # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set # CONFIG_QLA3XXX is not set - -# -# Ethernet (10000 Mbit) -# +# CONFIG_ATL1 is not set +CONFIG_NETDEV_10000=y # CONFIG_CHELSIO_T1 is not set +# CONFIG_CHELSIO_T3 is not set # CONFIG_IXGB is not set # CONFIG_S2IO is not set # CONFIG_MYRI10GE is not set # CONFIG_NETXEN_NIC is not set - -# -# Token Ring devices -# +# CONFIG_MLX4_CORE is not set # CONFIG_TR is not set # -# Wireless LAN (non-hamradio) -# -# CONFIG_NET_RADIO is not set - -# -# Wan interfaces +# Wireless LAN # +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set @@ -654,10 +622,6 @@ CONFIG_E1000_NAPI=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set - -# -# ISDN subsystem -# # CONFIG_ISDN is not set # @@ -665,6 +629,7 @@ CONFIG_E1000_NAPI=y # CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set # # Userland interfaces @@ -684,6 +649,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set @@ -721,33 +687,18 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 - -# -# IPMI -# # CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# # CONFIG_WATCHDOG is not set CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set -# CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# # CONFIG_TCG_TPM is not set - -# -# I2C support -# +CONFIG_DEVPORT=y CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_CHARDEV is not set # @@ -774,25 +725,28 @@ CONFIG_I2C_IOP3XX=y # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PROSAVAGE is not set # CONFIG_I2C_SAVAGE4 is not set +# CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_SIS5595 is not set # CONFIG_I2C_SIS630 is not set # CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set # CONFIG_I2C_VOODOO3 is not set -# CONFIG_I2C_PCA_ISA is not set # # Miscellaneous I2C Chip support # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set +# CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -803,21 +757,15 @@ CONFIG_I2C_IOP3XX=y # # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set - -# -# Dallas's 1-wire bus -# # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_AD7418 is not set # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set # CONFIG_SENSORS_ADM1031 is not set # CONFIG_SENSORS_ADM9240 is not set # CONFIG_SENSORS_ASB100 is not set @@ -840,6 +788,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_LM90 is not set # CONFIG_SENSORS_LM92 is not set # CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_SIS5595 is not set @@ -857,12 +806,16 @@ CONFIG_HWMON=y # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_MISC_DEVICES=y +# CONFIG_PHANTOM is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set # -# Misc devices +# Multifunction device drivers # -# CONFIG_SGI_IOC4 is not set -# CONFIG_TIFM_CORE is not set +# CONFIG_MFD_SM501 is not set # # LED devices @@ -881,16 +834,19 @@ CONFIG_HWMON=y # Multimedia devices # # CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +CONFIG_DAB=y # -# Digital Video Broadcasting Devices +# Graphics support # -# CONFIG_DVB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # -# Graphics support +# Display device support # -CONFIG_FIRMWARE_EDID=y +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set # CONFIG_FB is not set # @@ -898,21 +854,15 @@ CONFIG_FIRMWARE_EDID=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound # # CONFIG_SOUND is not set - -# -# HID Devices -# +CONFIG_HID_SUPPORT=y CONFIG_HID=y - -# -# USB support -# +# CONFIG_HID_DEBUG is not set +CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y @@ -926,10 +876,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y # USB Gadget Support # # CONFIG_USB_GADGET is not set - -# -# MMC/SD Card support -# # CONFIG_MMC is not set # @@ -938,6 +884,22 @@ CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set +# +# DMA Engine support +# +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +# CONFIG_NET_DMA is not set + +# +# DMA Devices +# +# CONFIG_INTEL_IOATDMA is not set +CONFIG_INTEL_IOP_ADMA=y + # # File systems # @@ -1004,7 +966,6 @@ CONFIG_ECRYPT_FS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y @@ -1014,7 +975,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=y # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -1040,6 +1001,7 @@ CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y +# CONFIG_SUNRPC_BIND34 is not set # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m @@ -1053,7 +1015,6 @@ CONFIG_CIFS=m # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set # # Partition Types @@ -1075,6 +1036,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set # # Native Language Support @@ -1140,7 +1102,6 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=14 CONFIG_DEBUG_BUGVERBOSE=y CONFIG_FRAME_POINTER=y CONFIG_DEBUG_USER=y @@ -1151,10 +1112,10 @@ CONFIG_DEBUG_USER=y CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_SECURITY is not set - -# -# Cryptographic options -# +CONFIG_XOR_BLOCKS=y +CONFIG_ASYNC_CORE=y +CONFIG_ASYNC_MEMCPY=y +CONFIG_ASYNC_XOR=y CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_BLKCIPHER=y @@ -1173,8 +1134,11 @@ CONFIG_CRYPTO_TGR192=y CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_LRW=y +# CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set CONFIG_CRYPTO_BLOWFISH=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_TWOFISH_COMMON=y @@ -1189,11 +1153,9 @@ CONFIG_CRYPTO_ANUBIS=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_MICHAEL_MIC=y CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_TEST is not set - -# -# Hardware crypto devices -# +CONFIG_CRYPTO_HW=y # # Library routines @@ -1201,9 +1163,13 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set +# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y +# CONFIG_CRC7 is not set CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig index 7909a555706d..027aef22b4d1 100644 --- a/arch/arm/configs/iop32x_defconfig +++ b/arch/arm/configs/iop32x_defconfig @@ -1,12 +1,18 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-rc1-git5 -# Tue Dec 19 21:37:52 2006 +# Linux kernel version: 2.6.22 +# Thu Jul 19 16:00:36 2007 # CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +# CONFIG_GENERIC_GPIO is not set # CONFIG_GENERIC_TIME is not set +# CONFIG_GENERIC_CLOCKEVENTS is not set CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y @@ -15,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -32,16 +39,18 @@ CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set -# CONFIG_UTS_NS is not set +# CONFIG_USER_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y @@ -57,32 +66,30 @@ CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y +CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y -CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y - -# -# Block layer -# CONFIG_BLOCK=y # CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set # # IO Schedulers @@ -114,13 +121,15 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set CONFIG_ARCH_IOP32X=y # CONFIG_ARCH_IOP33X is not set -# CONFIG_ARCH_IOP13XX is not set -# CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -128,6 +137,7 @@ CONFIG_ARCH_IOP32X=y # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set # @@ -137,10 +147,12 @@ CONFIG_ARCH_IOP32X=y # # IOP32x Platform Types # +CONFIG_MACH_EP80219=y CONFIG_MACH_GLANTANK=y CONFIG_ARCH_IQ80321=y CONFIG_ARCH_IQ31244=y CONFIG_MACH_N2100=y +CONFIG_IOP3XX_ATU=y CONFIG_PLAT_IOP=y # @@ -160,6 +172,7 @@ CONFIG_CPU_CP15_MMU=y # # CONFIG_ARM_THUMB is not set # CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set # CONFIG_IWMMXT is not set CONFIG_XSCALE_PMU=y @@ -167,7 +180,8 @@ CONFIG_XSCALE_PMU=y # Bus support # CONFIG_PCI=y -# CONFIG_PCI_MULTITHREAD_PROBE is not set +CONFIG_PCI_SYSCALL=y +# CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_PCI_DEBUG is not set # @@ -178,6 +192,7 @@ CONFIG_PCI=y # # Kernel Features # +# CONFIG_TICK_ONESHOT is not set # CONFIG_PREEMPT is not set # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 @@ -192,6 +207,9 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y CONFIG_ALIGNMENT_TRAP=y # @@ -199,8 +217,9 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp" +CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp cachepolicy=writealloc" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set # # Floating point emulation @@ -225,7 +244,6 @@ CONFIG_BINFMT_AOUT=y # Power management options # # CONFIG_PM is not set -# CONFIG_APM is not set # # Networking @@ -235,13 +253,13 @@ CONFIG_NET=y # # Networking options # -# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -273,6 +291,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_IPV6=y # CONFIG_IPV6_PRIVACY is not set # CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set # CONFIG_INET6_AH is not set # CONFIG_INET6_ESP is not set # CONFIG_INET6_IPCOMP is not set @@ -288,20 +307,8 @@ CONFIG_IPV6=y # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# # CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# # CONFIG_IP_SCTP is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -327,7 +334,17 @@ CONFIG_IPV6=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set # # Device Drivers @@ -340,16 +357,9 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# # CONFIG_CONNECTOR is not set - -# -# Memory Technology Devices (MTD) -# CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set # CONFIG_MTD_CONCAT is not set @@ -365,6 +375,7 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y # User Modules And Translation Layers # CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set @@ -396,7 +407,6 @@ CONFIG_MTD_CFI_UTIL=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access @@ -424,29 +434,15 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set - -# -# NAND Flash Device Drivers -# # CONFIG_MTD_NAND is not set - -# -# OneNAND Flash Device Drivers -# # CONFIG_MTD_ONENAND is not set # -# Parallel port support +# UBI - Unsorted block images # +# CONFIG_MTD_UBI is not set # CONFIG_PARPORT is not set - -# -# Plug and Play support -# - -# -# Block devices -# +CONFIG_BLK_DEV=y # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set @@ -461,13 +457,8 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set - -# -# ATA/ATAPI/MFM/RLL support -# # CONFIG_IDE is not set # @@ -475,6 +466,7 @@ CONFIG_BLK_DEV_INITRD=y # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y +CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_PROC_FS=y @@ -496,6 +488,7 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -541,11 +534,8 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_SRP is not set - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SVW is not set # CONFIG_ATA_PIIX is not set @@ -560,11 +550,13 @@ CONFIG_SATA_SIL=y # CONFIG_SATA_SIS is not set # CONFIG_SATA_ULI is not set # CONFIG_SATA_VIA is not set -# CONFIG_SATA_VITESSE is not set +CONFIG_SATA_VITESSE=y +# CONFIG_SATA_INIC162X is not set # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set # CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_CMD64X is not set # CONFIG_PATA_CS5520 is not set # CONFIG_PATA_CS5530 is not set @@ -576,6 +568,7 @@ CONFIG_SATA_SIL=y # CONFIG_PATA_HPT3X2N is not set # CONFIG_PATA_HPT3X3 is not set # CONFIG_PATA_IT821X is not set +# CONFIG_PATA_IT8213 is not set # CONFIG_PATA_JMICRON is not set # CONFIG_PATA_TRIFLEX is not set # CONFIG_PATA_MARVELL is not set @@ -595,17 +588,14 @@ CONFIG_SATA_SIL=y # CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set - -# -# Multi-device support (RAID and LVM) -# CONFIG_MD=y CONFIG_BLK_DEV_MD=y # CONFIG_MD_LINEAR is not set CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y -# CONFIG_MD_RAID10 is not set -# CONFIG_MD_RAID456 is not set +CONFIG_MD_RAID10=y +CONFIG_MD_RAID456=y +# CONFIG_MD_RAID5_RESHAPE is not set # CONFIG_MD_MULTIPATH is not set # CONFIG_MD_FAULTY is not set CONFIG_BLK_DEV_DM=y @@ -615,6 +605,7 @@ CONFIG_BLK_DEV_DM=y # CONFIG_DM_MIRROR is not set # CONFIG_DM_ZERO is not set # CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set # # Fusion MPT device support @@ -627,47 +618,27 @@ CONFIG_BLK_DEV_DM=y # # IEEE 1394 (FireWire) support # +# CONFIG_FIREWIRE is not set # CONFIG_IEEE1394 is not set - -# -# I2O device support -# # CONFIG_I2O is not set - -# -# Network device support -# CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set - -# -# ARCnet devices -# # CONFIG_ARCNET is not set - -# -# PHY device support -# # CONFIG_PHYLIB is not set - -# -# Ethernet (10 or 100Mbit) -# CONFIG_NET_ETHERNET=y CONFIG_MII=y +# CONFIG_AX88796 is not set # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set # CONFIG_CASSINI is not set # CONFIG_NET_VENDOR_3COM is not set # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set - -# -# Tulip family network device support -# # CONFIG_NET_TULIP is not set # CONFIG_HP100 is not set CONFIG_NET_PCI=y @@ -689,10 +660,8 @@ CONFIG_E100=y # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set # CONFIG_VIA_RHINE is not set - -# -# Ethernet (1000 Mbit) -# +# CONFIG_SC92031 is not set +CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set CONFIG_E1000=y @@ -706,34 +675,36 @@ CONFIG_R8169=y # CONFIG_SIS190 is not set # CONFIG_SKGE is not set # CONFIG_SKY2 is not set -# CONFIG_SK98LIN is not set # CONFIG_VIA_VELOCITY is not set # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set # CONFIG_QLA3XXX is not set - -# -# Ethernet (10000 Mbit) -# +# CONFIG_ATL1 is not set +CONFIG_NETDEV_10000=y # CONFIG_CHELSIO_T1 is not set +# CONFIG_CHELSIO_T3 is not set # CONFIG_IXGB is not set # CONFIG_S2IO is not set # CONFIG_MYRI10GE is not set # CONFIG_NETXEN_NIC is not set - -# -# Token Ring devices -# +# CONFIG_MLX4_CORE is not set # CONFIG_TR is not set # -# Wireless LAN (non-hamradio) +# Wireless LAN # -# CONFIG_NET_RADIO is not set +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set # -# Wan interfaces +# USB Network Adapters # +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET_MII is not set +# CONFIG_USB_USBNET is not set # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set @@ -744,10 +715,6 @@ CONFIG_R8169=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set - -# -# ISDN subsystem -# # CONFIG_ISDN is not set # @@ -755,6 +722,7 @@ CONFIG_R8169=y # CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set # # Userland interfaces @@ -774,6 +742,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set @@ -811,33 +780,18 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 - -# -# IPMI -# # CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# # CONFIG_WATCHDOG is not set CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set -# CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# # CONFIG_TCG_TPM is not set - -# -# I2C support -# +CONFIG_DEVPORT=y CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y # @@ -864,25 +818,29 @@ CONFIG_I2C_IOP3XX=y # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PROSAVAGE is not set # CONFIG_I2C_SAVAGE4 is not set +# CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_SIS5595 is not set # CONFIG_I2C_SIS630 is not set # CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set +# CONFIG_I2C_TINY_USB is not set # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set # CONFIG_I2C_VOODOO3 is not set -# CONFIG_I2C_PCA_ISA is not set # # Miscellaneous I2C Chip support # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set +# CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -893,21 +851,15 @@ CONFIG_I2C_IOP3XX=y # # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set - -# -# Dallas's 1-wire bus -# # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_AD7418 is not set # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set # CONFIG_SENSORS_ADM1031 is not set # CONFIG_SENSORS_ADM9240 is not set # CONFIG_SENSORS_ASB100 is not set @@ -930,6 +882,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_LM90 is not set # CONFIG_SENSORS_LM92 is not set # CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_SIS5595 is not set @@ -947,12 +900,16 @@ CONFIG_HWMON=y # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_MISC_DEVICES=y +# CONFIG_PHANTOM is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set # -# Misc devices +# Multifunction device drivers # -# CONFIG_SGI_IOC4 is not set -# CONFIG_TIFM_CORE is not set +# CONFIG_MFD_SM501 is not set # # LED devices @@ -971,17 +928,20 @@ CONFIG_HWMON=y # Multimedia devices # # CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +CONFIG_DAB=y +# CONFIG_USB_DABUSB is not set # -# Digital Video Broadcasting Devices +# Graphics support # -# CONFIG_DVB is not set -# CONFIG_USB_DABUSB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # -# Graphics support +# Display device support # -CONFIG_FIRMWARE_EDID=y +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set # CONFIG_FB is not set # @@ -989,21 +949,26 @@ CONFIG_FIRMWARE_EDID=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound # # CONFIG_SOUND is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set # -# HID Devices +# USB Input Devices # -CONFIG_HID=y +# CONFIG_USB_HID is not set # -# USB support +# USB HID Boot Protocol drivers # +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y @@ -1014,9 +979,8 @@ CONFIG_USB=y # Miscellaneous USB options # # CONFIG_USB_DEVICEFS is not set -# CONFIG_USB_BANDWIDTH is not set +CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_MULTITHREAD_PROBE is not set # CONFIG_USB_OTG is not set # @@ -1030,6 +994,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y # CONFIG_USB_OHCI_HCD is not set CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set # # USB Device Class drivers @@ -1057,44 +1022,11 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_LIBUSUAL is not set -# -# USB Input Devices -# -# CONFIG_USB_HID is not set - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_ACECAD is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set -# CONFIG_USB_TOUCHSCREEN is not set -# CONFIG_USB_YEALINK is not set -# CONFIG_USB_XPAD is not set -# CONFIG_USB_ATI_REMOTE is not set -# CONFIG_USB_ATI_REMOTE2 is not set -# CONFIG_USB_KEYSPAN_REMOTE is not set -# CONFIG_USB_APPLETOUCH is not set - # # USB Imaging devices # # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set - -# -# USB Network Adapters -# -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET_MII is not set -# CONFIG_USB_USBNET is not set CONFIG_USB_MON=y # @@ -1116,6 +1048,7 @@ CONFIG_USB_MON=y # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set # CONFIG_USB_LED is not set # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set @@ -1126,6 +1059,7 @@ CONFIG_USB_MON=y # CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set # # USB DSL modem support @@ -1135,10 +1069,6 @@ CONFIG_USB_MON=y # USB Gadget Support # # CONFIG_USB_GADGET is not set - -# -# MMC/SD Card support -# # CONFIG_MMC is not set # @@ -1147,6 +1077,22 @@ CONFIG_USB_MON=y CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set +# +# DMA Engine support +# +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y + +# +# DMA Devices +# +# CONFIG_INTEL_IOATDMA is not set +CONFIG_INTEL_IOP_ADMA=y + # # File systems # @@ -1164,11 +1110,7 @@ CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set -CONFIG_XFS_FS=y -# CONFIG_XFS_QUOTA is not set -CONFIG_XFS_SECURITY=y -CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set +# CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set @@ -1217,7 +1159,6 @@ CONFIG_ECRYPT_FS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y @@ -1227,7 +1168,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=y # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -1253,6 +1194,7 @@ CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y +# CONFIG_SUNRPC_BIND34 is not set # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set @@ -1260,7 +1202,6 @@ CONFIG_SUNRPC=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set # # Partition Types @@ -1282,6 +1223,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set # # Native Language Support @@ -1308,15 +1250,19 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y -CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_SHIRQ is not set CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set @@ -1327,6 +1273,7 @@ CONFIG_DEBUG_BUGVERBOSE=y CONFIG_FRAME_POINTER=y # CONFIG_FORCED_INLINING is not set # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set CONFIG_DEBUG_USER=y # CONFIG_DEBUG_ERRORS is not set CONFIG_DEBUG_LL=y @@ -1338,10 +1285,10 @@ CONFIG_DEBUG_LL=y CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y # CONFIG_SECURITY is not set - -# -# Cryptographic options -# +CONFIG_XOR_BLOCKS=y +CONFIG_ASYNC_CORE=y +CONFIG_ASYNC_MEMCPY=y +CONFIG_ASYNC_XOR=y CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_BLKCIPHER=y @@ -1360,8 +1307,11 @@ CONFIG_CRYPTO_TGR192=y CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_LRW=y +# CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set CONFIG_CRYPTO_BLOWFISH=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_TWOFISH_COMMON=y @@ -1376,11 +1326,9 @@ CONFIG_CRYPTO_ANUBIS=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_MICHAEL_MIC=y CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_TEST is not set - -# -# Hardware crypto devices -# +CONFIG_CRYPTO_HW=y # # Library routines @@ -1388,9 +1336,13 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_BITREVERSE=y # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set +# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y +# CONFIG_CRC7 is not set CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/arch/arm/configs/iop33x_defconfig b/arch/arm/configs/iop33x_defconfig index fa271bce8ff7..721ee64a13f7 100644 --- a/arch/arm/configs/iop33x_defconfig +++ b/arch/arm/configs/iop33x_defconfig @@ -1,12 +1,18 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-rc1 -# Sat Dec 16 06:05:34 2006 +# Linux kernel version: 2.6.22 +# Thu Jul 19 16:05:59 2007 # CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +# CONFIG_GENERIC_GPIO is not set # CONFIG_GENERIC_TIME is not set +# CONFIG_GENERIC_CLOCKEVENTS is not set CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y @@ -15,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -32,16 +39,18 @@ CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set -# CONFIG_UTS_NS is not set +# CONFIG_USER_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y @@ -57,32 +66,30 @@ CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y +CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y -CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y - -# -# Block layer -# CONFIG_BLOCK=y # CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set # # IO Schedulers @@ -114,13 +121,15 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IOP32X is not set CONFIG_ARCH_IOP33X=y -# CONFIG_ARCH_IOP13XX is not set -# CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -128,7 +137,9 @@ CONFIG_ARCH_IOP33X=y # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set +CONFIG_IOP3XX_ATU=y # # IOP33x Implementation Options @@ -158,6 +169,7 @@ CONFIG_CPU_CP15_MMU=y # # CONFIG_ARM_THUMB is not set # CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set # CONFIG_IWMMXT is not set CONFIG_XSCALE_PMU=y @@ -165,7 +177,8 @@ CONFIG_XSCALE_PMU=y # Bus support # CONFIG_PCI=y -# CONFIG_PCI_MULTITHREAD_PROBE is not set +CONFIG_PCI_SYSCALL=y +# CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_PCI_DEBUG is not set # @@ -176,6 +189,7 @@ CONFIG_PCI=y # # Kernel Features # +# CONFIG_TICK_ONESHOT is not set # CONFIG_PREEMPT is not set # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 @@ -190,6 +204,9 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y CONFIG_ALIGNMENT_TRAP=y # @@ -197,8 +214,9 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp" +CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp cachepolicy=writealloc" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set # # Floating point emulation @@ -223,7 +241,6 @@ CONFIG_BINFMT_AOUT=y # Power management options # # CONFIG_PM is not set -# CONFIG_APM is not set # # Networking @@ -233,13 +250,13 @@ CONFIG_NET=y # # Networking options # -# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -271,6 +288,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_IPV6=y # CONFIG_IPV6_PRIVACY is not set # CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set # CONFIG_INET6_AH is not set # CONFIG_INET6_ESP is not set # CONFIG_INET6_IPCOMP is not set @@ -286,20 +304,8 @@ CONFIG_IPV6=y # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# # CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# # CONFIG_IP_SCTP is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -325,7 +331,17 @@ CONFIG_IPV6=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set # # Device Drivers @@ -338,16 +354,9 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# # CONFIG_CONNECTOR is not set - -# -# Memory Technology Devices (MTD) -# CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set # CONFIG_MTD_CONCAT is not set @@ -363,6 +372,7 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y # User Modules And Translation Layers # CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set @@ -399,7 +409,6 @@ CONFIG_MTD_CFI_UTIL=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access @@ -427,29 +436,15 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set - -# -# NAND Flash Device Drivers -# # CONFIG_MTD_NAND is not set - -# -# OneNAND Flash Device Drivers -# # CONFIG_MTD_ONENAND is not set # -# Parallel port support +# UBI - Unsorted block images # +# CONFIG_MTD_UBI is not set # CONFIG_PARPORT is not set - -# -# Plug and Play support -# - -# -# Block devices -# +CONFIG_BLK_DEV=y # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set @@ -462,13 +457,8 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set - -# -# ATA/ATAPI/MFM/RLL support -# # CONFIG_IDE is not set # @@ -476,6 +466,7 @@ CONFIG_BLK_DEV_INITRD=y # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y +CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_PROC_FS=y @@ -497,6 +488,7 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m # # SCSI Transports @@ -541,22 +533,15 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_SRP is not set - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# # CONFIG_ATA is not set - -# -# Multi-device support (RAID and LVM) -# CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_LINEAR=y CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y # CONFIG_MD_RAID10 is not set -# CONFIG_MD_RAID456 is not set +CONFIG_MD_RAID456=y +# CONFIG_MD_RAID5_RESHAPE is not set # CONFIG_MD_MULTIPATH is not set # CONFIG_MD_FAULTY is not set CONFIG_BLK_DEV_DM=y @@ -566,6 +551,7 @@ CONFIG_BLK_DEV_DM=y # CONFIG_DM_MIRROR is not set # CONFIG_DM_ZERO is not set # CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set # # Fusion MPT device support @@ -578,39 +564,19 @@ CONFIG_BLK_DEV_DM=y # # IEEE 1394 (FireWire) support # +# CONFIG_FIREWIRE is not set # CONFIG_IEEE1394 is not set - -# -# I2O device support -# # CONFIG_I2O is not set - -# -# Network device support -# CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set - -# -# ARCnet devices -# # CONFIG_ARCNET is not set - -# -# PHY device support -# - -# -# Ethernet (10 or 100Mbit) -# # CONFIG_NET_ETHERNET is not set - -# -# Ethernet (1000 Mbit) -# +CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set CONFIG_E1000=y @@ -623,33 +589,26 @@ CONFIG_E1000_NAPI=y # CONFIG_SIS190 is not set # CONFIG_SKGE is not set # CONFIG_SKY2 is not set -# CONFIG_SK98LIN is not set +# CONFIG_VIA_VELOCITY is not set # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set # CONFIG_QLA3XXX is not set - -# -# Ethernet (10000 Mbit) -# +# CONFIG_ATL1 is not set +CONFIG_NETDEV_10000=y # CONFIG_CHELSIO_T1 is not set +# CONFIG_CHELSIO_T3 is not set # CONFIG_IXGB is not set # CONFIG_S2IO is not set # CONFIG_MYRI10GE is not set # CONFIG_NETXEN_NIC is not set - -# -# Token Ring devices -# +# CONFIG_MLX4_CORE is not set # CONFIG_TR is not set # -# Wireless LAN (non-hamradio) -# -# CONFIG_NET_RADIO is not set - -# -# Wan interfaces +# Wireless LAN # +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set @@ -660,10 +619,6 @@ CONFIG_E1000_NAPI=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set - -# -# ISDN subsystem -# # CONFIG_ISDN is not set # @@ -671,6 +626,7 @@ CONFIG_E1000_NAPI=y # CONFIG_INPUT=y # CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set # # Userland interfaces @@ -690,6 +646,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set @@ -727,33 +684,18 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 - -# -# IPMI -# # CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# # CONFIG_WATCHDOG is not set CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set -# CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# # CONFIG_TCG_TPM is not set - -# -# I2C support -# +CONFIG_DEVPORT=y CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y # @@ -780,25 +722,28 @@ CONFIG_I2C_IOP3XX=y # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PROSAVAGE is not set # CONFIG_I2C_SAVAGE4 is not set +# CONFIG_I2C_SIMTEC is not set # CONFIG_I2C_SIS5595 is not set # CONFIG_I2C_SIS630 is not set # CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set # CONFIG_I2C_VOODOO3 is not set -# CONFIG_I2C_PCA_ISA is not set # # Miscellaneous I2C Chip support # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set +# CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -809,21 +754,15 @@ CONFIG_I2C_IOP3XX=y # # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set - -# -# Dallas's 1-wire bus -# # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_AD7418 is not set # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set # CONFIG_SENSORS_ADM1031 is not set # CONFIG_SENSORS_ADM9240 is not set # CONFIG_SENSORS_ASB100 is not set @@ -846,6 +785,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_LM90 is not set # CONFIG_SENSORS_LM92 is not set # CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_SIS5595 is not set @@ -863,12 +803,16 @@ CONFIG_HWMON=y # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_MISC_DEVICES=y +# CONFIG_PHANTOM is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set # -# Misc devices +# Multifunction device drivers # -# CONFIG_SGI_IOC4 is not set -# CONFIG_TIFM_CORE is not set +# CONFIG_MFD_SM501 is not set # # LED devices @@ -887,16 +831,19 @@ CONFIG_HWMON=y # Multimedia devices # # CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +CONFIG_DAB=y # -# Digital Video Broadcasting Devices +# Graphics support # -# CONFIG_DVB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # -# Graphics support +# Display device support # -CONFIG_FIRMWARE_EDID=y +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set # CONFIG_FB is not set # @@ -904,21 +851,15 @@ CONFIG_FIRMWARE_EDID=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound # # CONFIG_SOUND is not set - -# -# HID Devices -# +CONFIG_HID_SUPPORT=y CONFIG_HID=y - -# -# USB support -# +# CONFIG_HID_DEBUG is not set +CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y @@ -932,10 +873,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y # USB Gadget Support # # CONFIG_USB_GADGET is not set - -# -# MMC/SD Card support -# # CONFIG_MMC is not set # @@ -944,6 +881,22 @@ CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set +# +# DMA Engine support +# +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y + +# +# DMA Devices +# +# CONFIG_INTEL_IOATDMA is not set +CONFIG_INTEL_IOP_ADMA=y + # # File systems # @@ -961,11 +914,7 @@ CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set -CONFIG_XFS_FS=y -# CONFIG_XFS_QUOTA is not set -CONFIG_XFS_SECURITY=y -CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set +# CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set @@ -1013,9 +962,8 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set # CONFIG_JFFS2_FS is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=y # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -1041,6 +989,7 @@ CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y +# CONFIG_SUNRPC_BIND34 is not set # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set @@ -1048,7 +997,6 @@ CONFIG_SUNRPC=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set # # Partition Types @@ -1070,6 +1018,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set # # Native Language Support @@ -1096,15 +1045,19 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y -CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_DEBUG_SHIRQ is not set CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set @@ -1115,6 +1068,7 @@ CONFIG_DEBUG_BUGVERBOSE=y CONFIG_FRAME_POINTER=y # CONFIG_FORCED_INLINING is not set # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set CONFIG_DEBUG_USER=y # CONFIG_DEBUG_ERRORS is not set CONFIG_DEBUG_LL=y @@ -1125,10 +1079,10 @@ CONFIG_DEBUG_LL=y # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set - -# -# Cryptographic options -# +CONFIG_XOR_BLOCKS=y +CONFIG_ASYNC_CORE=y +CONFIG_ASYNC_MEMCPY=y +CONFIG_ASYNC_XOR=y # CONFIG_CRYPTO is not set # @@ -1136,7 +1090,12 @@ CONFIG_DEBUG_LL=y # # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set +# CONFIG_CRC_ITU_T is not set # CONFIG_CRC32 is not set +# CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig index e86794a10fc0..92ccdc6492f7 100644 --- a/arch/arm/configs/neponset_defconfig +++ b/arch/arm/configs/neponset_defconfig @@ -698,7 +698,6 @@ CONFIG_I2C_ALGOBIT=y # I2C Hardware Bus support # # CONFIG_I2C_ELEKTOR is not set -# CONFIG_I2C_ISA is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_PCA_ISA is not set diff --git a/arch/arm/configs/picotux200_defconfig b/arch/arm/configs/picotux200_defconfig index 339c48953a62..3c0c4f192dc1 100644 --- a/arch/arm/configs/picotux200_defconfig +++ b/arch/arm/configs/picotux200_defconfig @@ -735,7 +735,6 @@ CONFIG_I2C_CHARDEV=m # I2C Hardware Bus support # CONFIG_I2C_AT91=m -CONFIG_I2C_ISA=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set diff --git a/arch/arm/configs/rpc_defconfig b/arch/arm/configs/rpc_defconfig index bc091264d354..5ddecb9ddf01 100644 --- a/arch/arm/configs/rpc_defconfig +++ b/arch/arm/configs/rpc_defconfig @@ -1,87 +1,150 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11 -# Wed Mar 9 14:41:48 2005 +# Linux kernel version: 2.6.23-rc2 +# Mon Aug 6 16:47:24 2007 # CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +# CONFIG_GENERIC_GPIO is not set +# CONFIG_GENERIC_TIME is not set +# CONFIG_GENERIC_CLOCKEVENTS is not set CONFIG_MMU=y -CONFIG_UID16=y +CONFIG_NO_IOPORT=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_ZONE_DMA=y CONFIG_FIQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # -# Code maturity level options +# General setup # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y - -# -# General setup -# +CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y +# CONFIG_TASKSTATS is not set +# CONFIG_USER_NS is not set # CONFIG_AUDIT is not set -CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_HOTPLUG is not set -CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y # CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y +CONFIG_ANON_INODES=y CONFIG_EPOLL=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 - -# -# Loadable module support -# CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set -# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set CONFIG_ARCH_RPC=y # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_H720X is not set + +# +# Boot options +# + +# +# Power management +# CONFIG_ARCH_ACORN=y # @@ -100,29 +163,49 @@ CONFIG_CPU_COPY_V3=y CONFIG_CPU_COPY_V4WB=y CONFIG_CPU_TLB_V3=y CONFIG_CPU_TLB_V4WB=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set CONFIG_TIMER_ACORN=y # # Bus support # +CONFIG_ISA_DMA_API=y +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set # # PCCARD (PCMCIA/CardBus) support # # CONFIG_PCCARD is not set -# -# PC-card bridges -# - # # Kernel Features # +# CONFIG_TICK_ONESHOT is not set # CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y CONFIG_ALIGNMENT_TRAP=y # @@ -132,6 +215,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set # # Floating point emulation @@ -157,41 +241,122 @@ CONFIG_BINFMT_AOUT=y # CONFIG_PM is not set # -# Device Drivers +# Networking # +CONFIG_NET=y # -# Generic Driver Options +# Networking options # -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set -# CONFIG_DEBUG_DRIVER is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=m +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET6_XFRM_MODE_TUNNEL is not set +# CONFIG_INET6_XFRM_MODE_BEET is not set +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set # -# Memory Technology Devices (MTD) +# QoS and/or fair queueing # -# CONFIG_MTD is not set +# CONFIG_NET_SCHED is not set # -# Parallel port support +# Network testing # -CONFIG_PARPORT=y -CONFIG_PARPORT_PC=y -CONFIG_PARPORT_PC_CML1=y -CONFIG_PARPORT_PC_FIFO=y -# CONFIG_PARPORT_PC_SUPERIO is not set -# CONFIG_PARPORT_ARC is not set -# CONFIG_PARPORT_OTHER is not set -# CONFIG_PARPORT_1284 is not set +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set +# CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set # -# Plug and Play support +# Device Drivers # # -# Block devices +# Generic Driver Options # +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set +CONFIG_PARPORT=y +CONFIG_PARPORT_PC=y +CONFIG_PARPORT_PC_FIFO=y +# CONFIG_PARPORT_PC_SUPERIO is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +# CONFIG_PARPORT_1284 is not set +CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=y # CONFIG_PARIDE is not set # CONFIG_BLK_DEV_COW_COMMON is not set @@ -201,59 +366,19 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_CDROM_PKTCDVD is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y # CONFIG_ATA_OVER_ETH is not set - -# -# Acorn-specific block devices -# - -# -# ATA/ATAPI/MFM/RLL support -# -CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y -CONFIG_IDEDISK_MULTI_MODE=y -CONFIG_BLK_DEV_IDECD=y -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -CONFIG_IDE_ARM=y -CONFIG_BLK_DEV_IDE_ICSIDE=y -CONFIG_BLK_DEV_IDEDMA_ICS=y -CONFIG_IDEDMA_ICS_AUTO=y -CONFIG_BLK_DEV_IDE_RAPIDE=y -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -CONFIG_IDEDMA_AUTO=y -# CONFIG_BLK_DEV_HD is not set +# CONFIG_IDE is not set # # SCSI device support # +# CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_PROC_FS=y # @@ -265,6 +390,7 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -272,26 +398,23 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_MULTI_LUN is not set CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m # -# SCSI Transport Attributes +# SCSI Transports # -# CONFIG_SCSI_SPI_ATTRS is not set +CONFIG_SCSI_SPI_ATTRS=m # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set - -# -# SCSI low-level drivers -# -# CONFIG_SCSI_SATA is not set -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m +# CONFIG_SCSI_SAS_LIBSAS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set # CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set # CONFIG_SCSI_DEBUG is not set -CONFIG_SCSI_ACORNSCSI_3=m -CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE=y -CONFIG_SCSI_ACORNSCSI_SYNC=y CONFIG_SCSI_ARXESCSI=m CONFIG_SCSI_CUMANA_2=m CONFIG_SCSI_EESOXSCSI=m @@ -302,129 +425,36 @@ CONFIG_SCSI_POWERTECSCSI=y # CONFIG_SCSI_CUMANA_1=m CONFIG_SCSI_OAK1=m - -# -# Multi-device support (RAID and LVM) -# +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_PATA_PLATFORM=y +CONFIG_PATA_ICSIDE=y # CONFIG_MD is not set - -# -# Fusion MPT device support -# - -# -# IEEE 1394 (FireWire) support -# - -# -# I2O device support -# - -# -# Networking support -# -CONFIG_NET=y - -# -# Networking options -# -# CONFIG_PACKET is not set -CONFIG_NETLINK_DEV=y -CONFIG_UNIX=y -# CONFIG_NET_KEY is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_IP_ADVANCED_ROUTER is not set -# CONFIG_IP_PNP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_IP_MROUTE is not set -# CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_TUNNEL is not set -# CONFIG_IP_TCPDIAG is not set -# CONFIG_IP_TCPDIAG_IPV6 is not set -CONFIG_IPV6=m -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_NETFILTER is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_SCTP is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set - -# -# QoS and/or fair queueing -# -# CONFIG_NET_SCHED is not set -# CONFIG_NET_CLS_ROUTE is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set -# CONFIG_HAMRADIO is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set -# CONFIG_ETHERTAP is not set - -# -# Ethernet (10 or 100Mbit) -# +# CONFIG_PHYLIB is not set CONFIG_NET_ETHERNET=y # CONFIG_MII is not set CONFIG_ARM_ETHER1=y CONFIG_ARM_ETHER3=y CONFIG_ARM_ETHERH=y +# CONFIG_AX88796 is not set # CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_NET_POCKET is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set # -# Ethernet (1000 Mbit) -# - -# -# Ethernet (10000 Mbit) -# - -# -# Token Ring devices -# - -# -# Wireless LAN (non-hamradio) -# -# CONFIG_NET_RADIO is not set - -# -# Wan interfaces +# Wireless LAN # +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set # CONFIG_WAN is not set # CONFIG_PLIP is not set CONFIG_PPP=m @@ -434,20 +464,23 @@ CONFIG_PPP=m # CONFIG_PPP_SYNC_TTY is not set # CONFIG_PPP_DEFLATE is not set # CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_MPPE is not set CONFIG_PPPOE=m +# CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set +CONFIG_SLHC=m # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set - -# -# ISDN subsystem -# +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_ISDN is not set # # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set # # Userland interfaces @@ -461,19 +494,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set -# -# Input I/O drivers -# -# CONFIG_GAMEPORT is not set -CONFIG_SOUND_GAMEPORT=y -CONFIG_SERIO=y -# CONFIG_SERIO_SERPORT is not set -# CONFIG_SERIO_CT82C710 is not set -# CONFIG_SERIO_PARKBD is not set -CONFIG_SERIO_RPCKBD=y -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set - # # Input Device Drivers # @@ -483,21 +503,35 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_SERIAL is not set CONFIG_MOUSE_RISCPC=y # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set +# +# Hardware I/O ports +# +CONFIG_SERIO=y +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_PARKBD is not set +CONFIG_SERIO_RPCKBD=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + # # Character devices # CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -506,12 +540,13 @@ CONFIG_HW_CONSOLE=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=16 +CONFIG_SERIAL_8250_RUNTIME_UARTS=8 # CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_SERIAL_8250_ACORN=y # # Non-8250 serial port support # -CONFIG_SERIAL_8250_ACORN=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y @@ -521,31 +556,15 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set # CONFIG_PPDEV is not set # CONFIG_TIPAR is not set - -# -# IPMI -# # CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# # CONFIG_WATCHDOG is not set +# CONFIG_HW_RANDOM is not set # CONFIG_NVRAM is not set -# CONFIG_RTC is not set -# CONFIG_DTLK is not set # CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# -# CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set - -# -# I2C support -# +# CONFIG_TCG_TPM is not set CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y # @@ -558,77 +577,87 @@ CONFIG_I2C_ALGOBIT=y # # I2C Hardware Bus support # -# CONFIG_I2C_ISA is not set +# CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set -# CONFIG_I2C_PCA_ISA is not set - -# -# Hardware Sensors Chip support -# -# CONFIG_I2C_SENSOR is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set - -# -# Other I2C Chip support +CONFIG_I2C_ACORN=y + +# +# Miscellaneous I2C Chip support # +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set # -# Misc devices +# SPI support # +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set +# CONFIG_W1 is not set +# CONFIG_HWMON is not set +CONFIG_MISC_DEVICES=y +# CONFIG_EEPROM_93CX6 is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set +# CONFIG_NEW_LEDS is not set # # Multimedia devices # # CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +# CONFIG_DAB is not set # -# Digital Video Broadcasting Devices +# Graphics support # -# CONFIG_DVB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # -# Graphics support +# Display device support # +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# CONFIG_FB_ACORN=y +# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set # @@ -636,24 +665,23 @@ CONFIG_FB_ACORN=y # CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set CONFIG_FONT_8x16=y # CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set # CONFIG_FONT_PEARL_8x8 is not set CONFIG_FONT_ACORN_8x8=y # CONFIG_FONT_MINI_4x6 is not set # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set - -# -# Logo configuration -# +# CONFIG_FONT_10x18 is not set CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound @@ -669,91 +697,115 @@ CONFIG_SOUND=m # Open Sound System # CONFIG_SOUND_PRIME=m -# CONFIG_SOUND_BT878 is not set -# CONFIG_SOUND_FUSION is not set -# CONFIG_SOUND_CS4281 is not set -# CONFIG_SOUND_SONICVIBES is not set -# CONFIG_SOUND_TRIDENT is not set # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set CONFIG_SOUND_OSS=m # CONFIG_SOUND_TRACEINIT is not set # CONFIG_SOUND_DMAP is not set -# CONFIG_SOUND_AD1816 is not set -# CONFIG_SOUND_AD1889 is not set -# CONFIG_SOUND_SGALAXY is not set -# CONFIG_SOUND_ADLIB is not set -# CONFIG_SOUND_ACI_MIXER is not set -# CONFIG_SOUND_CS4232 is not set # CONFIG_SOUND_SSCAPE is not set -# CONFIG_SOUND_GUS is not set # CONFIG_SOUND_VMIDI is not set # CONFIG_SOUND_TRIX is not set # CONFIG_SOUND_MSS is not set # CONFIG_SOUND_MPU401 is not set -# CONFIG_SOUND_NM256 is not set -# CONFIG_SOUND_MAD16 is not set # CONFIG_SOUND_PAS is not set # CONFIG_SOUND_PSS is not set # CONFIG_SOUND_SB is not set -# CONFIG_SOUND_AWE32_SYNTH is not set -# CONFIG_SOUND_WAVEFRONT is not set -# CONFIG_SOUND_MAUI is not set # CONFIG_SOUND_YM3812 is not set -# CONFIG_SOUND_OPL3SA1 is not set -# CONFIG_SOUND_OPL3SA2 is not set # CONFIG_SOUND_UART6850 is not set # CONFIG_SOUND_AEDSP16 is not set CONFIG_SOUND_VIDC=m -# CONFIG_SOUND_TVMIXER is not set -# CONFIG_SOUND_AD1980 is not set +# CONFIG_HID_SUPPORT is not set +# CONFIG_USB_SUPPORT is not set +# CONFIG_MMC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set # -# USB support +# RTC interfaces # -# CONFIG_USB is not set -CONFIG_USB_ARCH_HAS_HCD=y -# CONFIG_USB_ARCH_HAS_OHCI is not set +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set # -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information +# I2C RTC drivers # +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +CONFIG_RTC_DRV_PCF8583=y +# CONFIG_RTC_DRV_M41T80 is not set # -# USB Gadget Support +# SPI RTC drivers # -# CONFIG_USB_GADGET is not set # -# MMC/SD Card support +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# + +# +# DMA Engine support +# +# CONFIG_DMA_ENGINE is not set + +# +# DMA Clients +# + +# +# DMA Devices # -# CONFIG_MMC is not set # # File systems # CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set - -# -# XFS support -# +# CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set CONFIG_AUTOFS4_FS=m +# CONFIG_FUSE_FS is not set # # CD-ROM/DVD Filesystems @@ -777,12 +829,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y -# CONFIG_DEVFS_FS is not set -# CONFIG_DEVPTS_FS_XATTR is not set # CONFIG_TMPFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set # # Miscellaneous filesystems @@ -811,7 +863,9 @@ CONFIG_NFS_FS=y # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set CONFIG_LOCKD=y +CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y +# CONFIG_SUNRPC_BIND34 is not set # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set @@ -831,20 +885,22 @@ CONFIG_ACORN_PARTITION_ICS=y CONFIG_ACORN_PARTITION_ADFS=y CONFIG_ACORN_PARTITION_POWERTEC=y CONFIG_ACORN_PARTITION_RISCIX=y -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set # CONFIG_ATARI_PARTITION is not set -CONFIG_MAC_PARTITION=y +# CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y CONFIG_BSD_DISKLABEL=y # CONFIG_MINIX_SUBPARTITION is not set -CONFIG_SOLARIS_X86_PARTITION=y +# CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_LDM_PARTITION is not set -CONFIG_SGI_PARTITION=y +# CONFIG_SGI_PARTITION is not set # CONFIG_ULTRIX_PARTITION is not set -CONFIG_SUN_PARTITION=y +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set # # Native Language Support @@ -890,6 +946,11 @@ CONFIG_NLS_KOI8_R=m # CONFIG_NLS_KOI8_U is not set # CONFIG_NLS_UTF8 is not set +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + # # Profiling support # @@ -898,17 +959,37 @@ CONFIG_NLS_KOI8_R=m # # Kernel hacking # -CONFIG_DEBUG_KERNEL=y -CONFIG_MAGIC_SYSRQ=y # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set CONFIG_DEBUG_USER=y CONFIG_DEBUG_ERRORS=y CONFIG_DEBUG_LL=y @@ -919,19 +1000,18 @@ CONFIG_DEBUG_LL=y # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set - -# -# Cryptographic options -# # CONFIG_CRYPTO is not set -# -# Hardware crypto devices -# - # # Library routines # +CONFIG_BITREVERSE=y # CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y +# CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_DMA=y diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index a850da377a29..f8a1645b3d4a 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig @@ -138,11 +138,11 @@ CONFIG_ARCH_S3C2410=y CONFIG_PLAT_S3C24XX=y CONFIG_CPU_S3C244X=y CONFIG_PM_SIMTEC=y -# CONFIG_S3C2410_BOOT_WATCHDOG is not set -# CONFIG_S3C2410_BOOT_ERROR_RESET is not set +# CONFIG_S3C_BOOT_WATCHDOG is not set +# CONFIG_S3C_BOOT_ERROR_RESET is not set # CONFIG_S3C2410_PM_DEBUG is not set # CONFIG_S3C2410_PM_CHECK is not set -CONFIG_S3C2410_LOWLEVEL_UART_PORT=0 +CONFIG_S3C_LOWLEVEL_UART_PORT=0 CONFIG_S3C2410_DMA=y # CONFIG_S3C2410_DMA_DEBUG is not set CONFIG_MACH_SMDK=y @@ -826,7 +826,6 @@ CONFIG_I2C_ALGOBIT=m # I2C Hardware Bus support # # CONFIG_I2C_ELEKTOR is not set -CONFIG_I2C_ISA=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set @@ -1393,8 +1392,8 @@ CONFIG_DEBUG_USER=y # CONFIG_DEBUG_ERRORS is not set CONFIG_DEBUG_LL=y # CONFIG_DEBUG_ICEDCC is not set -CONFIG_DEBUG_S3C2410_PORT=y -CONFIG_DEBUG_S3C2410_UART=0 +CONFIG_DEBUG_S3C_PORT=y +CONFIG_DEBUG_S3C_UART=0 # # Security options diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 240c448ec31c..a2dd930d11ef 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -338,7 +338,7 @@ pbus_assign_bus_resources(struct pci_bus *bus, struct pci_sys_data *root) * pcibios_fixup_bus - Called after each bus is probed, * but before its children are examined. */ -void __devinit pcibios_fixup_bus(struct pci_bus *bus) +void pcibios_fixup_bus(struct pci_bus *bus) { struct pci_sys_data *root = bus->sysdata; struct pci_dev *dev; @@ -419,7 +419,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) /* * Convert from Linux-centric to bus-centric addresses for bridge devices. */ -void __devinit +void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, struct resource *res) { diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index c589dc3ecd1a..33e6cc2ffd3b 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -46,7 +46,7 @@ fast_work_pending: work_pending: tst r1, #_TIF_NEED_RESCHED bne work_resched - tst r1, #_TIF_NOTIFY_RESUME | _TIF_SIGPENDING + tst r1, #_TIF_SIGPENDING beq no_work_pending mov r0, sp @ 'regs' mov r2, why @ 'syscall' diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S index a52da0ddb43d..024a9cf469b4 100644 --- a/arch/arm/kernel/head-common.S +++ b/arch/arm/kernel/head-common.S @@ -20,7 +20,8 @@ __switch_data: .long _end @ r7 .long processor_id @ r4 .long __machine_arch_type @ r5 - .long cr_alignment @ r6 + .long __atags_pointer @ r6 + .long cr_alignment @ r7 .long init_thread_union + THREAD_START_SP @ sp /* @@ -29,6 +30,7 @@ __switch_data: * * r0 = cp#15 control register * r1 = machine ID + * r2 = atags pointer * r9 = processor ID */ .type __mmap_switched, %function @@ -47,11 +49,12 @@ __mmap_switched: strcc fp, [r6],#4 bcc 1b - ldmia r3, {r4, r5, r6, sp} + ldmia r3, {r4, r5, r6, r7, sp} str r9, [r4] @ Save processor ID str r1, [r5] @ Save machine type + str r2, [r6] @ Save atags pointer bic r4, r0, #CR_A @ Clear 'A' bit - stmia r6, {r0, r4} @ Save control register values + stmia r7, {r0, r4} @ Save control register values b start_kernel /* @@ -215,3 +218,34 @@ ENTRY(lookup_machine_type) bl __lookup_machine_type mov r0, r5 ldmfd sp!, {r4 - r6, pc} + +/* Determine validity of the r2 atags pointer. The heuristic requires + * that the pointer be aligned, in the first 16k of physical RAM and + * that the ATAG_CORE marker is first and present. Future revisions + * of this function may be more lenient with the physical address and + * may also be able to move the ATAGS block if necessary. + * + * r8 = machinfo + * + * Returns: + * r2 either valid atags pointer, or zero + * r5, r6 corrupted + */ + + .type __vet_atags, %function +__vet_atags: + tst r2, #0x3 @ aligned? + bne 1f + + ldr r5, [r2, #0] @ is first tag ATAG_CORE? + subs r5, r5, #ATAG_CORE_SIZE + bne 1f + ldr r5, [r2, #4] + ldr r6, =ATAG_CORE + cmp r5, r6 + bne 1f + + mov pc, lr @ atag pointer is ok + +1: mov r2, #0 + mov pc, lr diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 41f98b4ba2ee..7898cbc9861a 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -29,6 +29,10 @@ #define KERNEL_RAM_VADDR (PAGE_OFFSET + TEXT_OFFSET) #define KERNEL_RAM_PADDR (PHYS_OFFSET + TEXT_OFFSET) +#define ATAG_CORE 0x54410001 +#define ATAG_CORE_SIZE ((2*4 + 3*4) >> 2) + + /* * swapper_pg_dir is the virtual address of the initial page table. * We place the page tables 16K below KERNEL_RAM_VADDR. Therefore, we must @@ -61,7 +65,7 @@ * * This is normally called from the decompressor code. The requirements * are: MMU = off, D-cache = off, I-cache = dont care, r0 = 0, - * r1 = machine nr. + * r1 = machine nr, r2 = atags pointer. * * This code is mostly position independent, so if you link the kernel at * 0xc0008000, you call this at __pa(0xc0008000). @@ -85,6 +89,7 @@ ENTRY(stext) bl __lookup_machine_type @ r5=machinfo movs r8, r5 @ invalid machine (r5=0)? beq __error_a @ yes, error 'a' + bl __vet_atags bl __create_page_tables /* diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 842361777d4e..93b7f8e22dcc 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -44,6 +44,10 @@ static const char *processor_modes[] = { "UK8_32" , "UK9_32" , "UK10_32", "UND_32" , "UK12_32", "UK13_32", "UK14_32", "SYS_32" }; +static const char *isa_modes[] = { + "ARM" , "Thumb" , "Jazelle", "ThumbEE" +}; + extern void setup_mm_for_reboot(char mode); static volatile int hlt_counter; @@ -230,11 +234,11 @@ void __show_regs(struct pt_regs *regs) buf[3] = flags & PSR_V_BIT ? 'V' : 'v'; buf[4] = '\0'; - printk("Flags: %s IRQs o%s FIQs o%s Mode %s%s Segment %s\n", + printk("Flags: %s IRQs o%s FIQs o%s Mode %s ISA %s Segment %s\n", buf, interrupts_enabled(regs) ? "n" : "ff", fast_interrupts_enabled(regs) ? "n" : "ff", processor_modes[processor_mode(regs)], - thumb_mode(regs) ? " (T)" : "", + isa_modes[isa_mode(regs)], get_fs() == get_ds() ? "kernel" : "user"); #ifdef CONFIG_CPU_CP15 { diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 6f2f46c2e406..78c9f1a3d41f 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -657,7 +657,6 @@ static int ptrace_setcrunchregs(struct task_struct *tsk, void __user *ufp) long arch_ptrace(struct task_struct *child, long request, long addr, long data) { - unsigned long tmp; int ret; switch (request) { @@ -666,12 +665,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) */ case PTRACE_PEEKTEXT: case PTRACE_PEEKDATA: - ret = access_process_vm(child, addr, &tmp, - sizeof(unsigned long), 0); - if (ret == sizeof(unsigned long)) - ret = put_user(tmp, (unsigned long __user *) data); - else - ret = -EIO; + ret = generic_ptrace_peekdata(child, addr, data); break; case PTRACE_PEEKUSR: @@ -683,12 +677,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) */ case PTRACE_POKETEXT: case PTRACE_POKEDATA: - ret = access_process_vm(child, addr, &data, - sizeof(unsigned long), 1); - if (ret == sizeof(unsigned long)) - ret = 0; - else - ret = -EIO; + ret = generic_ptrace_pokedata(child, addr, data); break; case PTRACE_POKEUSR: diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 650eac1bc0a6..4de432ec903a 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -63,6 +64,8 @@ unsigned int processor_id; unsigned int __machine_arch_type; EXPORT_SYMBOL(__machine_arch_type); +unsigned int __atags_pointer __initdata; + unsigned int system_rev; EXPORT_SYMBOL(system_rev); @@ -780,7 +783,9 @@ void __init setup_arch(char **cmdline_p) if (mdesc->soft_reboot) reboot_setup("s"); - if (mdesc->boot_params) + if (__atags_pointer) + tags = phys_to_virt(__atags_pointer); + else if (mdesc->boot_params) tags = phys_to_virt(mdesc->boot_params); /* diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 1b76d87fa335..eafbb2b05eb8 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -630,7 +631,7 @@ void smp_send_stop(void) /* * not supported here */ -int __init setup_profiling_timer(unsigned int multiplier) +int setup_profiling_timer(unsigned int multiplier) { return -EINVAL; } diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 237f4999b9a1..8ad47619c079 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -249,6 +249,7 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err) bust_spinlocks(1); __die(str, err, thread, regs); bust_spinlocks(0); + add_taint(TAINT_DIE); spin_unlock_irq(&die_lock); if (in_interrupt()) @@ -351,10 +352,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) asmlinkage void do_unexp_fiq (struct pt_regs *regs) { -#ifndef CONFIG_IGNORE_FIQ printk("Hmm. Unexpected FIQ received, but trying to continue\n"); printk("You may have a hardware problem...\n"); -#endif } /* diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 2b7a8f5d8cf2..5ff5406666b4 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -66,6 +66,7 @@ SECTIONS . = ALIGN(4096); __per_cpu_start = .; *(.data.percpu) + *(.data.percpu.shared_aligned) __per_cpu_end = .; #ifndef CONFIG_XIP_KERNEL __init_begin = _stext; diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index 70599bcf451c..0417c165d50d 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -477,7 +477,7 @@ void __init at91_add_device_i2c(void) {} * SPI * -------------------------------------------------------------------- */ -#if defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE) || defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE) +#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE) static u64 spi_dmamask = 0xffffffffUL; static struct resource spi_resources[] = { @@ -494,7 +494,7 @@ static struct resource spi_resources[] = { }; static struct platform_device at91rm9200_spi_device = { - .name = "at91_spi", + .name = "atmel_spi", .id = 0, .dev = { .dma_mask = &spi_dmamask, @@ -522,18 +522,14 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) else cs_pin = spi_standard_cs[devices[i].chip_select]; -#ifdef CONFIG_SPI_AT91_MANUAL_CS + /* enable chip-select pin */ at91_set_gpio_output(cs_pin, 1); -#else - at91_set_A_periph(cs_pin, 0); -#endif /* pass chip-select pin to driver */ devices[i].controller_data = (void *) cs_pin; } spi_register_board_info(devices, nr_devices); - at91_clock_associate("spi_clk", &at91rm9200_spi_device.dev, "spi"); platform_device_register(&at91rm9200_spi_device); } #else diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 9db58da04754..3576595b4941 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -15,6 +15,8 @@ #include +#include