From dccc6006b20ce22d0989aca44b27ce044f5373b6 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Wed, 21 Jul 2010 19:03:57 +0200 Subject: [PATCH] --- yaml --- r: 212033 b: refs/heads/master c: 1f999ab5a1360afc388868cc0ef9afe8edeef3be h: refs/heads/master i: 212031: ec08ebc390eb06b9702d876c5caaa04396feed1d v: v3 --- [refs] | 2 +- trunk/CREDITS | 8 +- trunk/Documentation/DMA-API-HOWTO.txt | 6 +- .../Documentation/DocBook/device-drivers.tmpl | 1 + trunk/Documentation/DocBook/kernel-api.tmpl | 1 + .../Documentation/DocBook/kernel-locking.tmpl | 27 +- trunk/Documentation/DocBook/tracepoint.tmpl | 5 - trunk/Documentation/RCU/checklist.txt | 46 +- trunk/Documentation/RCU/stallwarn.txt | 18 - trunk/Documentation/RCU/trace.txt | 13 +- .../Documentation/acpi/method-customizing.txt | 2 - trunk/Documentation/block/cfq-iosched.txt | 45 - .../cgroups/blkio-controller.txt | 28 - trunk/Documentation/cputopology.txt | 23 +- trunk/Documentation/filesystems/Locking | 8 +- trunk/Documentation/filesystems/vfs.txt | 6 +- trunk/Documentation/gpio.txt | 22 +- trunk/Documentation/hwmon/emc2103 | 33 - trunk/Documentation/hwmon/f71882fg | 4 + trunk/Documentation/hwmon/ltc4245 | 24 +- trunk/Documentation/hwmon/pc87427 | 27 +- trunk/Documentation/hwmon/sysfs-interface | 36 +- trunk/Documentation/hwmon/w83627ehf | 15 +- trunk/Documentation/kbuild/makefiles.txt | 6 + trunk/Documentation/kernel-doc-nano-HOWTO.txt | 5 - trunk/Documentation/kernel-parameters.txt | 167 +- trunk/Documentation/kprobes.txt | 8 +- trunk/Documentation/laptops/thinkpad-acpi.txt | 4 - trunk/Documentation/lguest/Makefile | 3 +- trunk/Documentation/lguest/lguest.c | 23 +- trunk/Documentation/mutex-design.txt | 3 +- trunk/Documentation/networking/e1000.txt | 373 ++- trunk/Documentation/networking/e1000e.txt | 302 -- trunk/Documentation/networking/ixgbevf.txt | 40 +- .../power/regulator/overview.txt | 2 +- .../powerpc/booting-without-of.txt | 31 +- trunk/Documentation/powerpc/hvcs.txt | 2 +- trunk/Documentation/scsi/scsi-parameters.txt | 139 - .../sound/alsa/HD-Audio-Models.txt | 1 - trunk/Documentation/vm/page-types.c | 2 +- trunk/Documentation/workqueue.txt | 380 --- trunk/MAINTAINERS | 235 +- trunk/Makefile | 20 +- trunk/arch/Kconfig | 7 +- trunk/arch/alpha/Kconfig | 1 - trunk/arch/alpha/defconfig | 884 +++++- trunk/arch/alpha/include/asm/Kbuild | 11 +- trunk/arch/alpha/include/asm/cache.h | 1 + trunk/arch/alpha/include/asm/cacheflush.h | 2 - trunk/arch/alpha/include/asm/perf_event.h | 5 + trunk/arch/alpha/include/asm/unistd.h | 6 +- trunk/arch/alpha/kernel/entry.S | 81 +- trunk/arch/alpha/kernel/err_ev6.c | 12 +- trunk/arch/alpha/kernel/err_marvel.c | 39 +- trunk/arch/alpha/kernel/err_titan.c | 35 +- trunk/arch/alpha/kernel/osf_sys.c | 17 +- trunk/arch/alpha/kernel/pci-sysfs.c | 2 +- trunk/arch/alpha/kernel/perf_event.c | 146 +- trunk/arch/alpha/kernel/process.c | 7 +- trunk/arch/alpha/kernel/proto.h | 3 + trunk/arch/alpha/kernel/signal.c | 97 +- trunk/arch/alpha/kernel/srm_env.c | 2 +- trunk/arch/alpha/kernel/sys_cabriolet.c | 19 +- trunk/arch/alpha/kernel/sys_takara.c | 11 +- trunk/arch/alpha/kernel/systbls.S | 5 +- trunk/arch/alpha/kernel/time.c | 34 +- trunk/arch/alpha/kernel/traps.c | 3 + trunk/arch/arm/Kconfig | 131 +- trunk/arch/arm/Makefile | 3 - trunk/arch/arm/boot/Makefile | 8 +- trunk/arch/arm/boot/compressed/Makefile | 6 +- trunk/arch/arm/boot/compressed/head.S | 2 +- trunk/arch/arm/common/it8152.c | 16 - trunk/arch/arm/configs/omap_4430sdp_defconfig | 3 - trunk/arch/arm/include/asm/Kbuild | 2 +- trunk/arch/arm/include/asm/dma-mapping.h | 8 + trunk/arch/arm/include/asm/hardware/pl080.h | 4 +- trunk/arch/arm/include/asm/perf_event.h | 12 + trunk/arch/arm/include/asm/pgtable.h | 4 - trunk/arch/arm/include/asm/ptrace.h | 17 +- trunk/arch/arm/include/asm/unistd.h | 4 - trunk/arch/arm/kernel/calls.S | 4 - trunk/arch/arm/kernel/entry-common.S | 4 - trunk/arch/arm/kernel/etm.c | 2 +- trunk/arch/arm/kernel/kgdb.c | 2 +- trunk/arch/arm/kernel/kprobes-decode.c | 7 +- trunk/arch/arm/kernel/perf_event.c | 224 +- trunk/arch/arm/kernel/sys_arm.c | 14 +- trunk/arch/arm/kernel/sys_oabi-compat.c | 6 +- trunk/arch/arm/mach-at91/at91sam9g45.c | 15 +- .../arch/arm/mach-at91/at91sam9g45_devices.c | 10 +- trunk/arch/arm/mach-at91/board-sam9261ek.c | 31 +- trunk/arch/arm/mach-at91/clock.c | 3 +- .../arch/arm/mach-at91/include/mach/system.h | 7 +- trunk/arch/arm/mach-bcmring/dma.c | 4 +- trunk/arch/arm/mach-davinci/dm355.c | 3 +- trunk/arch/arm/mach-davinci/dm365.c | 3 +- trunk/arch/arm/mach-davinci/dm644x.c | 3 +- trunk/arch/arm/mach-davinci/dm646x.c | 3 +- trunk/arch/arm/mach-dove/include/mach/io.h | 6 +- trunk/arch/arm/mach-ep93xx/clock.c | 2 +- trunk/arch/arm/mach-ep93xx/dma-m2p.c | 2 +- trunk/arch/arm/mach-imx/Kconfig | 1 - trunk/arch/arm/mach-imx/mach-cpuimx27.c | 6 +- trunk/arch/arm/mach-imx/mach-pca100.c | 4 +- trunk/arch/arm/mach-ixp4xx/common-pci.c | 8 - .../arm/mach-ixp4xx/include/mach/hardware.h | 2 - trunk/arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 - .../arm/mach-kirkwood/include/mach/kirkwood.h | 2 +- trunk/arch/arm/mach-kirkwood/pcie.c | 4 +- trunk/arch/arm/mach-mmp/include/mach/system.h | 7 +- .../arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +- trunk/arch/arm/mach-mx25/mach-cpuimx25.c | 6 +- trunk/arch/arm/mach-mx3/clock-imx35.c | 77 +- .../arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +- trunk/arch/arm/mach-mx3/mach-cpuimx35.c | 6 +- trunk/arch/arm/mach-mx3/mach-qong.c | 1 - trunk/arch/arm/mach-mx5/clock-mx51.c | 2 +- trunk/arch/arm/mach-omap2/Makefile | 1 - trunk/arch/arm/mach-omap2/clock3xxx_data.c | 14 +- trunk/arch/arm/mach-omap2/id.c | 2 +- .../arm/mach-omap2/include/mach/entry-macro.S | 6 +- trunk/arch/arm/mach-omap2/omap-smp.c | 3 +- trunk/arch/arm/mach-omap2/pm34xx.c | 4 +- trunk/arch/arm/mach-orion5x/ts78xx-setup.c | 1 - trunk/arch/arm/mach-pxa/cpufreq-pxa2xx.c | 5 +- trunk/arch/arm/mach-pxa/cpufreq-pxa3xx.c | 2 +- .../arch/arm/mach-pxa/include/mach/hardware.h | 14 +- trunk/arch/arm/mach-pxa/include/mach/io.h | 2 - .../arm/mach-pxa/include/mach/mfp-pxa300.h | 4 +- trunk/arch/arm/mach-pxa/palm27x.c | 6 +- trunk/arch/arm/mach-pxa/vpac270.c | 1 - .../arm/mach-s3c2410/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-s3c64xx/Kconfig | 9 - trunk/arch/arm/mach-s3c64xx/Makefile | 1 - trunk/arch/arm/mach-s3c64xx/dev-spi.c | 3 +- trunk/arch/arm/mach-s3c64xx/dma.c | 2 +- .../arm/mach-s3c64xx/include/mach/memory.h | 2 - .../arm/mach-s3c64xx/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-s3c64xx/mach-real6410.c | 152 - trunk/arch/arm/mach-s3c64xx/mach-smartq.c | 40 +- trunk/arch/arm/mach-s3c64xx/mach-smartq5.c | 36 +- trunk/arch/arm/mach-s3c64xx/mach-smartq7.c | 28 + trunk/arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 - trunk/arch/arm/mach-s5p6440/cpu.c | 1 - .../arm/mach-s5p6440/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-s5p6442/cpu.c | 1 - .../arm/mach-s5p6442/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-s5pc100/cpu.c | 1 - trunk/arch/arm/mach-s5pv210/clock.c | 25 +- trunk/arch/arm/mach-s5pv210/cpu.c | 3 +- .../arm/mach-s5pv210/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-s5pv310/clock.c | 82 +- trunk/arch/arm/mach-s5pv310/cpu.c | 10 - .../arch/arm/mach-s5pv310/include/mach/irqs.h | 11 +- .../arch/arm/mach-s5pv310/include/mach/map.h | 16 +- .../mach-s5pv310/include/mach/regs-clock.h | 59 +- .../arm/mach-s5pv310/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-s5pv310/platsmp.c | 2 +- trunk/arch/arm/mach-shmobile/Makefile | 2 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 56 +- trunk/arch/arm/mach-shmobile/clock-sh7372.c | 9 +- trunk/arch/arm/mach-shmobile/clock.c | 4 +- trunk/arch/arm/mach-shmobile/pm_runtime.c | 169 - trunk/arch/arm/mach-tegra/board-harmony.c | 2 + .../arm/mach-tegra/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-u300/include/mach/gpio.h | 3 - trunk/arch/arm/mach-vexpress/ct-ca9x4.c | 12 +- trunk/arch/arm/mach-vexpress/v2m.c | 2 +- .../arch/arm/mach-w90x900/include/mach/i2c.h | 9 - trunk/arch/arm/mm/Kconfig | 2 +- trunk/arch/arm/mm/alignment.c | 19 +- trunk/arch/arm/mm/dma-mapping.c | 2 - trunk/arch/arm/mm/ioremap.c | 8 +- trunk/arch/arm/mm/mmu.c | 31 +- trunk/arch/arm/mm/proc-v7.S | 70 +- trunk/arch/arm/oprofile/Makefile | 4 - trunk/arch/arm/oprofile/common.c | 308 +- trunk/arch/arm/plat-mxc/Kconfig | 1 - .../plat-mxc/include/mach/eukrea-baseboards.h | 4 +- trunk/arch/arm/plat-mxc/tzic.c | 5 +- trunk/arch/arm/plat-nomadik/timer.c | 33 +- trunk/arch/arm/plat-omap/Kconfig | 2 +- trunk/arch/arm/plat-omap/include/plat/smp.h | 7 + trunk/arch/arm/plat-omap/iommu.c | 1 - trunk/arch/arm/plat-omap/mcbsp.c | 2 +- trunk/arch/arm/plat-omap/sram.c | 25 +- trunk/arch/arm/plat-pxa/pwm.c | 2 +- trunk/arch/arm/plat-s5p/dev-fimc0.c | 9 +- trunk/arch/arm/plat-s5p/dev-fimc1.c | 9 +- trunk/arch/arm/plat-s5p/dev-fimc2.c | 9 +- .../arch/arm/plat-s5p/include/plat/map-s5p.h | 2 - trunk/arch/arm/plat-samsung/Kconfig | 2 +- trunk/arch/arm/plat-samsung/adc.c | 1 + trunk/arch/arm/plat-samsung/clock.c | 27 +- trunk/arch/arm/plat-samsung/dev-hsmmc.c | 2 - trunk/arch/arm/plat-samsung/dev-hsmmc1.c | 2 - trunk/arch/arm/plat-samsung/dev-hsmmc2.c | 2 - trunk/arch/arm/plat-samsung/gpio-config.c | 7 +- .../arm/plat-samsung/include/plat/gpio-cfg.h | 10 +- trunk/arch/arm/tools/mach-types | 98 +- trunk/arch/avr32/configs/atngw100_defconfig | 1249 ++++++++ .../configs/atngw100_evklcd100_defconfig | 1374 +++++++++ .../configs/atngw100_evklcd101_defconfig | 1369 ++++++++ .../avr32/configs/atngw100_mrmt_defconfig | 1213 ++++++++ .../arch/avr32/configs/atngw100mkii_defconfig | 1254 ++++++++ .../configs/atngw100mkii_evklcd100_defconfig | 1377 +++++++++ .../configs/atngw100mkii_evklcd101_defconfig | 1378 +++++++++ trunk/arch/avr32/configs/atstk1002_defconfig | 1319 ++++++++ trunk/arch/avr32/configs/atstk1003_defconfig | 946 +++++- trunk/arch/avr32/configs/atstk1004_defconfig | 601 +++- trunk/arch/avr32/configs/atstk1006_defconfig | 1321 ++++++++ trunk/arch/avr32/configs/favr-32_defconfig | 1079 ++++++- trunk/arch/avr32/configs/hammerhead_defconfig | 1311 +++++++- trunk/arch/avr32/configs/merisc_defconfig | 1105 +++++++ trunk/arch/avr32/configs/mimc200_defconfig | 991 +++++- trunk/arch/avr32/include/asm/syscalls.h | 2 +- trunk/arch/avr32/kernel/module.c | 3 +- trunk/arch/avr32/kernel/process.c | 6 +- trunk/arch/avr32/kernel/sys_avr32.c | 4 +- .../blackfin/configs/BF518F-EZBRD_defconfig | 1307 ++++++++ .../blackfin/configs/BF526-EZBRD_defconfig | 1594 ++++++++++ .../blackfin/configs/BF527-EZKIT-V2_defconfig | 1698 ++++++++++ .../blackfin/configs/BF527-EZKIT_defconfig | 1651 ++++++++++ .../blackfin/configs/BF533-EZKIT_defconfig | 1222 ++++++++ .../blackfin/configs/BF533-STAMP_defconfig | 1384 +++++++++ .../blackfin/configs/BF537-STAMP_defconfig | 1435 +++++++++ .../blackfin/configs/BF538-EZKIT_defconfig | 1365 ++++++++ .../blackfin/configs/BF548-EZKIT_defconfig | 1757 +++++++++++ .../blackfin/configs/BF561-ACVILON_defconfig | 1482 +++++++++ .../blackfin/configs/BF561-EZKIT_defconfig | 1206 ++++++++ .../blackfin/configs/BlackStamp_defconfig | 1098 ++++++- .../arch/blackfin/configs/CM-BF527_defconfig | 1404 +++++++++ .../arch/blackfin/configs/CM-BF533_defconfig | 841 +++++ .../arch/blackfin/configs/CM-BF537E_defconfig | 1112 +++++++ .../arch/blackfin/configs/CM-BF537U_defconfig | 986 ++++++ .../arch/blackfin/configs/CM-BF548_defconfig | 1367 ++++++++ .../arch/blackfin/configs/CM-BF561_defconfig | 1049 +++++++ trunk/arch/blackfin/configs/H8606_defconfig | 1085 ++++++- trunk/arch/blackfin/configs/IP0X_defconfig | 1164 ++++++- trunk/arch/blackfin/configs/PNAV-10_defconfig | 1371 +++++++++ trunk/arch/blackfin/configs/SRV1_defconfig | 1217 +++++++- .../arch/blackfin/configs/TCM-BF518_defconfig | 1240 ++++++++ .../arch/blackfin/configs/TCM-BF537_defconfig | 1085 +++++++ trunk/arch/blackfin/include/asm/Kbuild | 4 +- trunk/arch/blackfin/include/asm/bfin_sport.h | 6 + trunk/arch/blackfin/include/asm/bitops.h | 17 +- trunk/arch/blackfin/include/asm/unistd.h | 5 +- trunk/arch/blackfin/kernel/process.c | 4 +- .../mach-bf518/include/mach/defBF51x_base.h | 82 + .../blackfin/mach-bf527/boards/cm_bf527.c | 1 + trunk/arch/blackfin/mach-bf527/boards/ezbrd.c | 1 + trunk/arch/blackfin/mach-bf527/boards/ezkit.c | 1 + .../mach-bf527/include/mach/defBF52x_base.h | 82 + .../mach-bf533/include/mach/defBF532.h | 92 + trunk/arch/blackfin/mach-bf537/boards/stamp.c | 1 - .../mach-bf537/include/mach/defBF534.h | 80 + .../mach-bf538/include/mach/defBF539.h | 107 + .../blackfin/mach-bf548/boards/cm_bf548.c | 1 + trunk/arch/blackfin/mach-bf548/boards/ezkit.c | 1 + .../mach-bf548/include/mach/defBF54x_base.h | 67 + .../arch/blackfin/mach-bf561/boards/acvilon.c | 1 - .../mach-bf561/include/mach/defBF561.h | 60 + trunk/arch/blackfin/mach-common/entry.S | 3 - trunk/arch/cris/arch-v10/kernel/process.c | 4 +- trunk/arch/cris/arch-v32/kernel/process.c | 6 +- trunk/arch/cris/configs/artpec_3_defconfig | 538 ++++ trunk/arch/cris/configs/etrax-100lx_defconfig | 489 ++- .../cris/configs/etrax-100lx_v2_defconfig | 537 ++++ trunk/arch/cris/configs/etraxfs_defconfig | 545 ++++ trunk/arch/cris/include/asm/Kbuild | 5 +- trunk/arch/frv/Kconfig | 1 - trunk/arch/frv/defconfig | 600 +++- trunk/arch/frv/include/asm/Kbuild | 3 +- trunk/arch/frv/kernel/process.c | 4 +- trunk/arch/frv/kernel/signal.c | 51 +- trunk/arch/frv/lib/Makefile | 2 +- .../cache-disabled.c => frv/lib/perf_event.c} | 14 +- trunk/arch/h8300/defconfig | 333 +- trunk/arch/h8300/include/asm/atomic.h | 15 +- trunk/arch/h8300/include/asm/system.h | 4 +- trunk/arch/h8300/kernel/module.c | 3 +- trunk/arch/h8300/kernel/process.c | 5 +- trunk/arch/h8300/kernel/sys_h8300.c | 8 +- trunk/arch/h8300/kernel/traps.c | 2 +- trunk/arch/ia64/configs/bigsur_defconfig | 183 +- trunk/arch/ia64/configs/generic_defconfig | 351 +-- trunk/arch/ia64/configs/gensparse_defconfig | 313 +- trunk/arch/ia64/configs/sim_defconfig | 87 +- trunk/arch/ia64/configs/tiger_defconfig | 265 +- trunk/arch/ia64/configs/xen_domu_defconfig | 279 +- trunk/arch/ia64/configs/zx1_defconfig | 231 +- trunk/arch/ia64/hp/sim/simserial.c | 2 +- trunk/arch/ia64/include/asm/Kbuild | 9 +- trunk/arch/ia64/include/asm/atomic.h | 8 +- trunk/arch/ia64/include/asm/compat.h | 2 +- trunk/arch/ia64/include/asm/hardirq.h | 11 +- trunk/arch/ia64/include/asm/system.h | 4 + trunk/arch/ia64/include/asm/unistd.h | 7 +- trunk/arch/ia64/kernel/entry.S | 3 - trunk/arch/ia64/kernel/fsys.S | 30 +- trunk/arch/ia64/kernel/process.c | 4 +- trunk/arch/m32r/configs/m32104ut_defconfig | 897 +++++- .../arch/m32r/configs/m32700ut.smp_defconfig | 779 ++++- trunk/arch/m32r/configs/m32700ut.up_defconfig | 777 ++++- trunk/arch/m32r/configs/mappi.nommu_defconfig | 609 ++++ trunk/arch/m32r/configs/mappi.smp_defconfig | 710 ++++- trunk/arch/m32r/configs/mappi.up_defconfig | 709 ++++- trunk/arch/m32r/configs/mappi2.opsp_defconfig | 681 ++++ .../arch/m32r/configs/mappi2.vdec2_defconfig | 680 ++++ trunk/arch/m32r/configs/mappi3.smp_defconfig | 714 ++++- trunk/arch/m32r/configs/oaks32r_defconfig | 583 ++++ trunk/arch/m32r/configs/opsput_defconfig | 664 ++++ trunk/arch/m32r/configs/usrv_defconfig | 693 ++++- trunk/arch/m32r/include/asm/elf.h | 4 +- trunk/arch/m32r/include/asm/signal.h | 1 + trunk/arch/m32r/include/asm/unistd.h | 1 - trunk/arch/m32r/kernel/.gitignore | 1 - trunk/arch/m32r/kernel/entry.S | 5 +- trunk/arch/m32r/kernel/process.c | 5 +- trunk/arch/m32r/kernel/ptrace.c | 7 +- trunk/arch/m32r/kernel/signal.c | 103 +- trunk/arch/m32r/kernel/sys_m32r.c | 4 +- trunk/arch/m68k/configs/amiga_defconfig | 867 +++++- trunk/arch/m68k/configs/apollo_defconfig | 784 +++++ trunk/arch/m68k/configs/atari_defconfig | 824 ++++- trunk/arch/m68k/configs/bvme6000_defconfig | 758 +++++ trunk/arch/m68k/configs/hp300_defconfig | 793 +++++ trunk/arch/m68k/configs/mac_defconfig | 815 +++++ trunk/arch/m68k/configs/multi_defconfig | 895 +++++- trunk/arch/m68k/configs/mvme147_defconfig | 759 +++++ trunk/arch/m68k/configs/mvme16x_defconfig | 758 +++++ trunk/arch/m68k/configs/q40_defconfig | 839 +++++ trunk/arch/m68k/configs/sun3_defconfig | 779 +++++ trunk/arch/m68k/configs/sun3x_defconfig | 790 +++++ trunk/arch/m68k/include/asm/ide.h | 13 +- trunk/arch/m68k/include/asm/unistd.h | 5 +- trunk/arch/m68k/kernel/entry.S | 3 - trunk/arch/m68k/kernel/process.c | 4 +- trunk/arch/m68k/kernel/sys_m68k.c | 4 +- trunk/arch/m68k/mac/macboing.c | 6 +- .../arch/m68knommu/configs/m5208evb_defconfig | 559 ++++ .../arch/m68knommu/configs/m5249evb_defconfig | 580 ++++ .../arch/m68knommu/configs/m5272c3_defconfig | 580 ++++ .../arch/m68knommu/configs/m5275evb_defconfig | 580 ++++ .../arch/m68knommu/configs/m5307c3_defconfig | 600 ++++ .../arch/m68knommu/configs/m5407c3_defconfig | 589 ++++ trunk/arch/m68knommu/defconfig | 588 +++- trunk/arch/m68knommu/kernel/process.c | 14 +- trunk/arch/m68knommu/kernel/sys_m68k.c | 4 +- trunk/arch/m68knommu/kernel/syscalltable.S | 3 - trunk/arch/m68knommu/kernel/vmlinux.lds.S | 2 - trunk/arch/microblaze/configs/mmu_defconfig | 842 ++++- trunk/arch/microblaze/configs/nommu_defconfig | 849 ++++- trunk/arch/microblaze/kernel/prom_parse.c | 2 +- trunk/arch/microblaze/kernel/sys_microblaze.c | 10 +- trunk/arch/microblaze/pci/pci-common.c | 5 +- trunk/arch/microblaze/pci/xilinx_pci.c | 1 - trunk/arch/mips/Kbuild | 4 - trunk/arch/mips/Kconfig | 25 +- trunk/arch/mips/alchemy/common/prom.c | 5 +- trunk/arch/mips/boot/compressed/Makefile | 4 +- trunk/arch/mips/cavium-octeon/Kconfig | 4 - trunk/arch/mips/cavium-octeon/cpu.c | 2 +- .../mips/cavium-octeon/executive/Makefile | 2 +- trunk/arch/mips/configs/ar7_defconfig | 1119 +++++++ trunk/arch/mips/configs/bcm47xx_defconfig | 1593 ++++++++++ trunk/arch/mips/configs/bcm63xx_defconfig | 1135 +++++++ trunk/arch/mips/configs/bigsur_defconfig | 1357 ++++++++ trunk/arch/mips/configs/capcella_defconfig | 779 ++++- .../arch/mips/configs/cavium-octeon_defconfig | 850 ++++- trunk/arch/mips/configs/cobalt_defconfig | 1143 ++++++- trunk/arch/mips/configs/db1000_defconfig | 1064 +++++++ trunk/arch/mips/configs/db1100_defconfig | 1085 +++++++ trunk/arch/mips/configs/db1200_defconfig | 1396 +++++++++ trunk/arch/mips/configs/db1500_defconfig | 1152 +++++++ trunk/arch/mips/configs/db1550_defconfig | 1292 ++++++++ trunk/arch/mips/configs/decstation_defconfig | 860 +++++- trunk/arch/mips/configs/e55_defconfig | 543 ++++ trunk/arch/mips/configs/fuloong2e_defconfig | 1563 ++++++++++ trunk/arch/mips/configs/gpr_defconfig | 1711 ++++++++++ trunk/arch/mips/configs/ip22_defconfig | 918 +++++- trunk/arch/mips/configs/ip27_defconfig | 1167 ++++++- trunk/arch/mips/configs/ip28_defconfig | 807 ++++- trunk/arch/mips/configs/ip32_defconfig | 1031 +++++++ trunk/arch/mips/configs/jazz_defconfig | 1116 ++++++- trunk/arch/mips/configs/jmr3927_defconfig | 800 +++++ trunk/arch/mips/configs/lasat_defconfig | 753 +++++ trunk/arch/mips/configs/lemote2f_defconfig | 1750 +++++++++++ trunk/arch/mips/configs/malta_defconfig | 1250 +++++++- trunk/arch/mips/configs/markeins_defconfig | 1269 +++++++- trunk/arch/mips/configs/mipssim_defconfig | 601 +++- trunk/arch/mips/configs/mpc30x_defconfig | 780 +++++ trunk/arch/mips/configs/msp71xx_defconfig | 1400 ++++++++- trunk/arch/mips/configs/mtx1_defconfig | 1797 +++++++++++ trunk/arch/mips/configs/pb1100_defconfig | 1096 +++++++ trunk/arch/mips/configs/pb1200_defconfig | 1397 +++++++++ trunk/arch/mips/configs/pb1500_defconfig | 1233 ++++++++ trunk/arch/mips/configs/pb1550_defconfig | 1288 ++++++++ .../mips/configs/pnx8335-stb225_defconfig | 1051 ++++++- trunk/arch/mips/configs/pnx8550-jbs_defconfig | 1204 +++++++- .../mips/configs/pnx8550-stb810_defconfig | 1200 +++++++- trunk/arch/mips/configs/powertv_defconfig | 1535 +++++++++ trunk/arch/mips/configs/rb532_defconfig | 1328 ++++++++ trunk/arch/mips/configs/rbtx49xx_defconfig | 981 ++++++ trunk/arch/mips/configs/rm200_defconfig | 1379 ++++++++- .../arch/mips/configs/sb1250-swarm_defconfig | 960 +++++- trunk/arch/mips/configs/tb0219_defconfig | 830 ++++- trunk/arch/mips/configs/tb0226_defconfig | 833 ++++- trunk/arch/mips/configs/tb0287_defconfig | 1003 +++++- trunk/arch/mips/configs/workpad_defconfig | 708 +++++ trunk/arch/mips/configs/wrppmc_defconfig | 896 +++++- trunk/arch/mips/configs/yosemite_defconfig | 824 ++++- trunk/arch/mips/dec/Platform | 2 +- trunk/arch/mips/include/asm/atomic.h | 4 - trunk/arch/mips/include/asm/compat.h | 2 +- trunk/arch/mips/include/asm/cop2.h | 2 +- trunk/arch/mips/include/asm/fcntl.h | 1 - trunk/arch/mips/include/asm/gic.h | 1 - .../mips/include/asm/mach-tx49xx/kmalloc.h | 2 +- .../mips/include/asm/mips-boards/maltaint.h | 3 + trunk/arch/mips/include/asm/page.h | 14 - trunk/arch/mips/include/asm/siginfo.h | 1 - trunk/arch/mips/include/asm/thread_info.h | 3 +- trunk/arch/mips/include/asm/unistd.h | 21 +- trunk/arch/mips/jz4740/Platform | 2 +- trunk/arch/mips/kernel/branch.c | 1 + trunk/arch/mips/kernel/irq-gic.c | 5 +- trunk/arch/mips/kernel/kgdb.c | 2 +- trunk/arch/mips/kernel/kspd.c | 2 +- trunk/arch/mips/kernel/linux32.c | 7 - trunk/arch/mips/kernel/mips-mt-fpaff.c | 2 +- trunk/arch/mips/kernel/ptrace.c | 4 +- trunk/arch/mips/kernel/scall32-o32.S | 16 +- trunk/arch/mips/kernel/scall64-64.S | 14 +- trunk/arch/mips/kernel/scall64-n32.S | 17 +- trunk/arch/mips/kernel/scall64-o32.S | 20 +- trunk/arch/mips/kernel/signal.c | 45 +- trunk/arch/mips/kernel/signal_n32.c | 5 - trunk/arch/mips/kernel/syscall.c | 12 +- trunk/arch/mips/kernel/unaligned.c | 2 + trunk/arch/mips/mm/dma-default.c | 28 +- trunk/arch/mips/mm/sc-rm7k.c | 2 +- trunk/arch/mips/mti-malta/malta-int.c | 3 - trunk/arch/mips/pci/pci-rc32434.c | 2 +- trunk/arch/mips/pnx833x/common/platform.c | 1 - trunk/arch/mips/pnx8550/common/reset.c | 20 +- trunk/arch/mips/pnx8550/common/setup.c | 3 +- trunk/arch/mn10300/Kconfig | 1 + trunk/arch/mn10300/Kconfig.debug | 2 +- trunk/arch/mn10300/configs/asb2303_defconfig | 563 ++++ trunk/arch/mn10300/include/asm/bitops.h | 4 +- trunk/arch/mn10300/include/asm/signal.h | 2 +- trunk/arch/mn10300/kernel/mn10300-serial.c | 22 +- trunk/arch/mn10300/kernel/module.c | 3 +- trunk/arch/mn10300/kernel/process.c | 6 +- trunk/arch/mn10300/kernel/signal.c | 35 +- trunk/arch/mn10300/mm/Makefile | 14 +- trunk/arch/mn10300/mm/cache.c | 20 +- trunk/arch/mn10300/mm/dma-alloc.c | 3 +- trunk/arch/parisc/Kconfig | 1 - trunk/arch/parisc/configs/712_defconfig | 909 ++++++ trunk/arch/parisc/configs/a500_defconfig | 1110 +++++++ trunk/arch/parisc/configs/b180_defconfig | 1144 +++++++ trunk/arch/parisc/configs/c3000_defconfig | 1353 +++++++- trunk/arch/parisc/configs/default_defconfig | 1380 +++++++++ trunk/arch/parisc/hpux/fs.c | 13 +- trunk/arch/parisc/include/asm/Kbuild | 2 +- trunk/arch/parisc/include/asm/compat.h | 2 +- trunk/arch/parisc/include/asm/perf_event.h | 3 +- trunk/arch/parisc/kernel/module.c | 3 +- trunk/arch/parisc/kernel/process.c | 15 +- trunk/arch/powerpc/Kconfig | 1 - trunk/arch/powerpc/Makefile | 2 +- trunk/arch/powerpc/boot/dts/canyonlands.dts | 8 - trunk/arch/powerpc/include/asm/Kbuild | 53 +- trunk/arch/powerpc/include/asm/compat.h | 2 +- trunk/arch/powerpc/include/asm/fsldma.h | 1 - trunk/arch/powerpc/include/asm/mmu-hash64.h | 2 +- trunk/arch/powerpc/include/asm/paca.h | 2 +- trunk/arch/powerpc/include/asm/reg.h | 9 +- trunk/arch/powerpc/include/asm/rwsem.h | 64 +- trunk/arch/powerpc/include/asm/systbl.h | 3 - trunk/arch/powerpc/include/asm/system.h | 4 + trunk/arch/powerpc/include/asm/unistd.h | 5 +- trunk/arch/powerpc/kernel/cputable.c | 1 + trunk/arch/powerpc/kernel/crash.c | 24 +- trunk/arch/powerpc/kernel/head_44x.S | 4 - trunk/arch/powerpc/kernel/head_64.S | 18 +- trunk/arch/powerpc/kernel/idle.c | 2 +- trunk/arch/powerpc/kernel/irq.c | 16 +- trunk/arch/powerpc/kernel/misc_32.S | 3 - trunk/arch/powerpc/kernel/module.c | 6 + trunk/arch/powerpc/kernel/pci_of_scan.c | 2 +- trunk/arch/powerpc/kernel/perf_callchain.c | 86 +- trunk/arch/powerpc/kernel/perf_event.c | 166 +- .../arch/powerpc/kernel/perf_event_fsl_emb.c | 148 +- trunk/arch/powerpc/kernel/process.c | 27 +- trunk/arch/powerpc/kernel/setup_32.c | 9 +- trunk/arch/powerpc/kernel/setup_64.c | 63 +- trunk/arch/powerpc/kernel/signal.c | 2 - trunk/arch/powerpc/kernel/signal_32.c | 3 +- trunk/arch/powerpc/kernel/signal_64.c | 2 +- trunk/arch/powerpc/kernel/smp.c | 4 +- trunk/arch/powerpc/kernel/sys_ppc32.c | 10 +- trunk/arch/powerpc/kernel/time.c | 65 +- trunk/arch/powerpc/kernel/vio.c | 3 +- trunk/arch/powerpc/mm/init_64.c | 2 - trunk/arch/powerpc/mm/tlb_nohash_low.S | 1 - trunk/arch/powerpc/platforms/512x/clock.c | 2 +- trunk/arch/powerpc/platforms/52xx/efika.c | 9 +- .../powerpc/platforms/52xx/mpc52xx_common.c | 8 +- .../arch/powerpc/platforms/83xx/mpc837x_mds.c | 9 +- .../arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 - trunk/arch/powerpc/platforms/85xx/p1022_ds.c | 4 +- trunk/arch/powerpc/platforms/Kconfig | 3 +- trunk/arch/powerpc/platforms/cell/iommu.c | 2 +- trunk/arch/powerpc/platforms/iseries/iommu.c | 2 +- .../arch/powerpc/platforms/powermac/feature.c | 3 +- trunk/arch/powerpc/platforms/powermac/pci.c | 2 + trunk/arch/powerpc/platforms/pseries/dlpar.c | 42 +- trunk/arch/powerpc/platforms/pseries/iommu.c | 8 +- trunk/arch/powerpc/platforms/pseries/smp.c | 11 +- trunk/arch/powerpc/platforms/pseries/xics.c | 6 +- trunk/arch/powerpc/sysdev/fsl_pci.c | 2 - trunk/arch/powerpc/sysdev/fsl_rio.c | 6 +- trunk/arch/powerpc/sysdev/qe_lib/qe.c | 1 - trunk/arch/powerpc/xmon/xmon.c | 5 +- trunk/arch/s390/Kconfig | 8 - trunk/arch/s390/appldata/appldata_net_sum.c | 3 +- trunk/arch/s390/defconfig | 970 ++++++ trunk/arch/s390/include/asm/Kbuild | 11 +- trunk/arch/s390/include/asm/compat.h | 2 +- trunk/arch/s390/include/asm/hardirq.h | 4 + trunk/arch/s390/include/asm/hugetlb.h | 4 +- trunk/arch/s390/include/asm/mmu.h | 2 - trunk/arch/s390/include/asm/mmu_context.h | 9 - trunk/arch/s390/include/asm/perf_event.h | 3 +- trunk/arch/s390/include/asm/pgtable.h | 6 +- trunk/arch/s390/include/asm/system.h | 1 + trunk/arch/s390/include/asm/tlb.h | 3 +- trunk/arch/s390/include/asm/tlbflush.h | 6 +- trunk/arch/s390/include/asm/topology.h | 27 +- trunk/arch/s390/include/asm/unistd.h | 5 +- trunk/arch/s390/kernel/compat_linux.c | 10 +- trunk/arch/s390/kernel/compat_linux.h | 10 +- trunk/arch/s390/kernel/compat_wrapper.S | 26 +- trunk/arch/s390/kernel/entry.h | 6 +- trunk/arch/s390/kernel/module.c | 3 +- trunk/arch/s390/kernel/process.c | 5 +- trunk/arch/s390/kernel/smp.c | 2 - trunk/arch/s390/kernel/sys_s390.c | 4 +- trunk/arch/s390/kernel/syscalls.S | 3 - trunk/arch/s390/kernel/topology.c | 150 +- trunk/arch/s390/mm/init.c | 2 - trunk/arch/score/configs/spct6600_defconfig | 632 ++++ trunk/arch/score/kernel/sys_score.c | 10 +- trunk/arch/sh/Kconfig | 14 - trunk/arch/sh/configs/ap325rxa_defconfig | 1331 ++++++++ trunk/arch/sh/configs/cayman_defconfig | 1319 ++++++++ trunk/arch/sh/configs/dreamcast_defconfig | 1087 +++++++ .../sh/configs/ecovec24-romimage_defconfig | 1016 ++++++ trunk/arch/sh/configs/ecovec24_defconfig | 1631 ++++++++++ trunk/arch/sh/configs/edosk7705_defconfig | 481 +++ trunk/arch/sh/configs/edosk7760_defconfig | 1118 +++++++ trunk/arch/sh/configs/espt_defconfig | 1159 +++++++ trunk/arch/sh/configs/hp6xx_defconfig | 936 ++++++ .../sh/configs/kfr2r09-romimage_defconfig | 763 +++++ trunk/arch/sh/configs/kfr2r09_defconfig | 1033 +++++++ trunk/arch/sh/configs/landisk_defconfig | 1446 +++++++++ trunk/arch/sh/configs/lboxre2_defconfig | 1324 ++++++++ trunk/arch/sh/configs/magicpanelr2_defconfig | 1060 +++++++ trunk/arch/sh/configs/microdev_defconfig | 974 ++++++ trunk/arch/sh/configs/migor_defconfig | 1304 ++++++++ trunk/arch/sh/configs/polaris_defconfig | 972 ++++++ trunk/arch/sh/configs/r7780mp_defconfig | 1569 ++++++++++ trunk/arch/sh/configs/r7785rp_defconfig | 1582 ++++++++++ trunk/arch/sh/configs/rsk7201_defconfig | 745 +++++ trunk/arch/sh/configs/rsk7203_defconfig | 1159 +++++++ trunk/arch/sh/configs/rts7751r2d1_defconfig | 1582 ++++++++++ .../arch/sh/configs/rts7751r2dplus_defconfig | 1661 ++++++++++ trunk/arch/sh/configs/sdk7780_defconfig | 1568 ++++++++++ trunk/arch/sh/configs/sdk7786_defconfig | 1773 ++++++++++- trunk/arch/sh/configs/se7206_defconfig | 1000 ++++++ trunk/arch/sh/configs/se7343_defconfig | 1244 ++++++++ trunk/arch/sh/configs/se7619_defconfig | 706 +++++ trunk/arch/sh/configs/se7705_defconfig | 996 ++++++ trunk/arch/sh/configs/se7712_defconfig | 1088 +++++++ trunk/arch/sh/configs/se7721_defconfig | 1229 ++++++++ trunk/arch/sh/configs/se7722_defconfig | 1031 +++++++ trunk/arch/sh/configs/se7724_defconfig | 1682 ++++++++++ trunk/arch/sh/configs/se7750_defconfig | 1030 +++++++ trunk/arch/sh/configs/se7751_defconfig | 990 ++++++ trunk/arch/sh/configs/se7780_defconfig | 1366 ++++++++ trunk/arch/sh/configs/sh03_defconfig | 1218 ++++++++ trunk/arch/sh/configs/sh7710voipgw_defconfig | 1012 ++++++ .../arch/sh/configs/sh7724_generic_defconfig | 707 +++++ trunk/arch/sh/configs/sh7763rdp_defconfig | 1172 +++++++ .../arch/sh/configs/sh7770_generic_defconfig | 697 +++++ .../arch/sh/configs/sh7785lcr_32bit_defconfig | 1734 +++++++++++ trunk/arch/sh/configs/sh7785lcr_defconfig | 1537 +++++++++ trunk/arch/sh/configs/shmin_defconfig | 908 ++++++ trunk/arch/sh/configs/shx3_defconfig | 1312 ++++++++ trunk/arch/sh/configs/snapgear_defconfig | 954 ++++++ trunk/arch/sh/configs/systemh_defconfig | 677 ++++ trunk/arch/sh/configs/titan_defconfig | 1612 ++++++++++ trunk/arch/sh/configs/ul2_defconfig | 1233 ++++++++ trunk/arch/sh/configs/urquell_defconfig | 1732 +++++++++++ trunk/arch/sh/include/asm/Kbuild | 9 +- trunk/arch/sh/include/asm/perf_event.h | 7 + trunk/arch/sh/include/asm/syscalls_32.h | 2 +- trunk/arch/sh/include/asm/syscalls_64.h | 2 +- trunk/arch/sh/kernel/module.c | 2 + trunk/arch/sh/kernel/perf_callchain.c | 50 +- trunk/arch/sh/kernel/perf_event.c | 159 +- trunk/arch/sh/kernel/process_32.c | 7 +- trunk/arch/sh/kernel/process_64.c | 6 +- trunk/arch/sh/kernel/sys_sh32.c | 4 +- trunk/arch/sh/kernel/sys_sh64.c | 4 +- trunk/arch/sh/oprofile/Makefile | 4 - trunk/arch/sh/oprofile/common.c | 115 +- trunk/arch/sh/oprofile/op_impl.h | 33 + trunk/arch/sparc/Kconfig | 3 - trunk/arch/sparc/configs/sparc32_defconfig | 1120 +++++++ trunk/arch/sparc/configs/sparc64_defconfig | 1714 +++++++++++ trunk/arch/sparc/include/asm/atomic_64.h | 10 +- trunk/arch/sparc/include/asm/backoff.h | 11 +- trunk/arch/sparc/include/asm/compat.h | 2 +- trunk/arch/sparc/include/asm/fb.h | 4 - trunk/arch/sparc/include/asm/jump_label.h | 32 - trunk/arch/sparc/include/asm/oplib_64.h | 27 +- trunk/arch/sparc/include/asm/perf_event.h | 4 + trunk/arch/sparc/include/asm/rwsem-const.h | 12 + trunk/arch/sparc/include/asm/rwsem.h | 120 +- trunk/arch/sparc/include/asm/system_64.h | 1 - trunk/arch/sparc/include/asm/unistd.h | 5 +- trunk/arch/sparc/kernel/Makefile | 2 - trunk/arch/sparc/kernel/jump_label.c | 47 - trunk/arch/sparc/kernel/module.c | 6 - trunk/arch/sparc/kernel/pcr.c | 8 +- trunk/arch/sparc/kernel/perf_event.c | 248 +- trunk/arch/sparc/kernel/process_32.c | 6 +- trunk/arch/sparc/kernel/process_64.c | 6 +- trunk/arch/sparc/kernel/signal32.c | 161 +- trunk/arch/sparc/kernel/signal_32.c | 55 +- trunk/arch/sparc/kernel/signal_64.c | 45 +- trunk/arch/sparc/kernel/sys32.S | 9 - trunk/arch/sparc/kernel/sys_sparc32.c | 7 +- trunk/arch/sparc/kernel/sys_sparc_32.c | 6 +- trunk/arch/sparc/kernel/sys_sparc_64.c | 4 +- trunk/arch/sparc/kernel/systbls_32.S | 3 +- trunk/arch/sparc/kernel/systbls_64.S | 6 +- trunk/arch/sparc/kernel/unaligned_32.c | 3 +- trunk/arch/sparc/kernel/windows.c | 2 + trunk/arch/sparc/lib/Makefile | 2 +- trunk/arch/sparc/lib/atomic_64.S | 36 +- trunk/arch/sparc/lib/bitops.S | 12 +- trunk/arch/sparc/lib/rwsem_64.S | 163 + trunk/arch/sparc/prom/cif.S | 16 +- trunk/arch/sparc/prom/console_64.c | 48 +- trunk/arch/sparc/prom/devops_64.c | 36 +- trunk/arch/sparc/prom/misc_64.c | 314 +- trunk/arch/sparc/prom/p1275.c | 102 +- trunk/arch/sparc/prom/tree_64.c | 210 +- trunk/arch/tile/Makefile | 20 +- trunk/arch/tile/configs/tile_defconfig | 1219 ++++++++ trunk/arch/tile/include/arch/abi.h | 4 +- trunk/arch/tile/include/arch/chip_tile64.h | 3 - trunk/arch/tile/include/arch/chip_tilepro.h | 3 - trunk/arch/tile/include/asm/atomic_32.h | 37 + trunk/arch/tile/include/asm/backtrace.h | 4 +- trunk/arch/tile/include/asm/bitops.h | 9 +- trunk/arch/tile/include/asm/cache.h | 5 +- trunk/arch/tile/include/asm/compat.h | 7 +- trunk/arch/tile/include/asm/highmem.h | 2 +- trunk/arch/tile/include/asm/io.h | 8 +- trunk/arch/tile/include/asm/page.h | 6 +- trunk/arch/tile/include/asm/processor.h | 12 - trunk/arch/tile/include/asm/ptrace.h | 15 +- trunk/arch/tile/include/asm/scatterlist.h | 21 + trunk/arch/tile/include/asm/setup.h | 8 +- trunk/arch/tile/include/asm/sigcontext.h | 18 +- trunk/arch/tile/include/asm/siginfo.h | 4 - trunk/arch/tile/include/asm/signal.h | 1 - trunk/arch/tile/include/asm/syscalls.h | 21 +- trunk/arch/tile/include/asm/uaccess.h | 4 +- trunk/arch/tile/include/hv/hypervisor.h | 8 +- trunk/arch/tile/kernel/backtrace.c | 137 +- trunk/arch/tile/kernel/compat_signal.c | 4 +- trunk/arch/tile/kernel/intvec_32.S | 21 +- trunk/arch/tile/kernel/proc.c | 1 + trunk/arch/tile/kernel/process.c | 35 +- trunk/arch/tile/kernel/setup.c | 4 +- trunk/arch/tile/kernel/signal.c | 27 +- trunk/arch/tile/kernel/stack.c | 10 +- trunk/arch/tile/kernel/time.c | 33 +- trunk/arch/tile/kernel/traps.c | 4 +- trunk/arch/tile/lib/Makefile | 4 +- trunk/arch/tile/lib/exports.c | 16 +- trunk/arch/tile/lib/memcpy_32.S | 20 +- trunk/arch/tile/lib/memset_32.c | 25 + trunk/arch/tile/mm/fault.c | 8 - trunk/arch/tile/mm/highmem.c | 4 +- trunk/arch/tile/mm/homecache.c | 3 - trunk/arch/tile/mm/pgtable.c | 1 + trunk/arch/um/drivers/hostaudio_kern.c | 14 +- trunk/arch/um/drivers/mconsole_kern.c | 2 +- trunk/arch/um/drivers/net_kern.c | 17 +- trunk/arch/um/drivers/ubd_kern.c | 9 +- trunk/arch/um/include/asm/dma-mapping.h | 7 + trunk/arch/um/kernel/exec.c | 11 +- trunk/arch/um/kernel/internal.h | 2 +- trunk/arch/um/kernel/syscall.c | 8 +- trunk/arch/x86/Kconfig | 71 +- trunk/arch/x86/Makefile | 10 +- trunk/arch/x86/boot/early_serial_console.c | 14 +- trunk/arch/x86/configs/i386_defconfig | 2242 +++++++++++++- trunk/arch/x86/configs/x86_64_defconfig | 2209 ++++++++++++- trunk/arch/x86/ia32/ia32_aout.c | 22 +- trunk/arch/x86/ia32/ia32entry.S | 22 +- trunk/arch/x86/ia32/sys_ia32.c | 14 +- trunk/arch/x86/include/asm/Kbuild | 29 +- trunk/arch/x86/include/asm/alternative.h | 11 - trunk/arch/x86/include/asm/amd_iommu.h | 2 +- trunk/arch/x86/include/asm/amd_iommu_proto.h | 8 +- trunk/arch/x86/include/asm/amd_iommu_types.h | 23 +- trunk/arch/x86/include/asm/apb_timer.h | 1 + trunk/arch/x86/include/asm/bitops.h | 2 +- trunk/arch/x86/include/asm/compat.h | 2 +- trunk/arch/x86/include/asm/cpu.h | 1 + trunk/arch/x86/include/asm/cpufeature.h | 18 +- trunk/arch/x86/include/asm/dwarf2.h | 20 - trunk/arch/x86/include/asm/entry_arch.h | 4 +- trunk/arch/x86/include/asm/gart.h | 15 +- trunk/arch/x86/include/asm/hardirq.h | 2 +- trunk/arch/x86/include/asm/hpet.h | 1 + trunk/arch/x86/include/asm/hw_breakpoint.h | 2 +- trunk/arch/x86/include/asm/hw_irq.h | 2 +- trunk/arch/x86/include/asm/i387.h | 2 +- trunk/arch/x86/include/asm/iomap.h | 4 +- trunk/arch/x86/include/asm/irq_vectors.h | 4 +- trunk/arch/x86/include/asm/jump_label.h | 37 - trunk/arch/x86/include/asm/{amd_nb.h => k8.h} | 21 +- trunk/arch/x86/include/asm/kdebug.h | 6 - trunk/arch/x86/include/asm/kvm_emulate.h | 7 +- trunk/arch/x86/include/asm/kvm_host.h | 24 + trunk/arch/x86/include/asm/page.h | 7 - trunk/arch/x86/include/asm/pci.h | 6 +- trunk/arch/x86/include/asm/perf_event_p4.h | 52 +- trunk/arch/x86/include/asm/pgtable_32.h | 1 - trunk/arch/x86/include/asm/processor.h | 2 - trunk/arch/x86/include/asm/sys_ia32.h | 12 +- trunk/arch/x86/include/asm/syscalls.h | 5 +- trunk/arch/x86/include/asm/trampoline.h | 5 +- trunk/arch/x86/include/asm/tsc.h | 2 - trunk/arch/x86/include/asm/uv/uv_bau.h | 151 +- trunk/arch/x86/kernel/Makefile | 8 +- trunk/arch/x86/kernel/acpi/cstate.c | 2 +- trunk/arch/x86/kernel/alternative.c | 71 +- trunk/arch/x86/kernel/amd_iommu.c | 6 +- trunk/arch/x86/kernel/amd_iommu_init.c | 163 +- trunk/arch/x86/kernel/apb_timer.c | 6 +- trunk/arch/x86/kernel/aperture_64.c | 20 +- trunk/arch/x86/kernel/apic/apic.c | 2 +- trunk/arch/x86/kernel/apic/io_apic.c | 25 +- trunk/arch/x86/kernel/apic/x2apic_uv_x.c | 10 +- trunk/arch/x86/kernel/cpu/amd.c | 79 +- trunk/arch/x86/kernel/cpu/common.c | 19 +- trunk/arch/x86/kernel/cpu/cpu.h | 2 - .../x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 +- .../arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 18 +- trunk/arch/x86/kernel/cpu/intel.c | 3 +- trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 14 +- trunk/arch/x86/kernel/cpu/mcheck/mce-apei.c | 4 +- trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c | 13 +- .../arch/x86/kernel/cpu/mcheck/therm_throt.c | 14 +- trunk/arch/x86/kernel/cpu/mtrr/cleanup.c | 2 +- trunk/arch/x86/kernel/cpu/perf_event.c | 351 +-- trunk/arch/x86/kernel/cpu/perf_event_amd.c | 4 +- trunk/arch/x86/kernel/cpu/perf_event_intel.c | 102 +- .../arch/x86/kernel/cpu/perf_event_intel_ds.c | 13 +- trunk/arch/x86/kernel/cpu/perf_event_p4.c | 303 +- trunk/arch/x86/kernel/cpu/perfctr-watchdog.c | 9 +- trunk/arch/x86/kernel/cpu/scattered.c | 7 - trunk/arch/x86/kernel/crash.c | 3 - trunk/arch/x86/kernel/early-quirks.c | 20 + trunk/arch/x86/kernel/entry_32.S | 310 +- trunk/arch/x86/kernel/entry_64.S | 118 +- trunk/arch/x86/kernel/ftrace.c | 63 +- trunk/arch/x86/kernel/head_32.S | 8 +- trunk/arch/x86/kernel/hpet.c | 33 +- trunk/arch/x86/kernel/hw_breakpoint.c | 40 +- trunk/arch/x86/kernel/i387.c | 7 +- trunk/arch/x86/kernel/irq.c | 8 +- trunk/arch/x86/kernel/irq_work.c | 30 - trunk/arch/x86/kernel/irqinit.c | 6 +- trunk/arch/x86/kernel/jump_label.c | 50 - trunk/arch/x86/kernel/{amd_nb.c => k8.c} | 56 +- trunk/arch/x86/kernel/kgdb.c | 2 +- trunk/arch/x86/kernel/kprobes.c | 39 +- trunk/arch/x86/kernel/machine_kexec_64.c | 4 +- trunk/arch/x86/kernel/module.c | 6 +- trunk/arch/x86/kernel/mpparse.c | 16 - trunk/arch/x86/kernel/pci-gart_64.c | 31 +- trunk/arch/x86/kernel/pmtimer_64.c | 69 + trunk/arch/x86/kernel/process.c | 5 +- trunk/arch/x86/kernel/reboot.c | 2 +- trunk/arch/x86/kernel/setup.c | 117 +- trunk/arch/x86/kernel/setup_percpu.c | 2 +- trunk/arch/x86/kernel/smpboot.c | 79 +- trunk/arch/x86/kernel/sys_i386_32.c | 8 +- trunk/arch/x86/kernel/tlb_uv.c | 760 ++--- trunk/arch/x86/kernel/trampoline.c | 17 - trunk/arch/x86/kernel/tsc.c | 104 +- trunk/arch/x86/kvm/emulate.c | 9 +- trunk/arch/x86/kvm/i8254.c | 3 +- trunk/arch/x86/kvm/i8259.c | 3 - trunk/arch/x86/kvm/irq.h | 2 +- trunk/arch/x86/kvm/lapic.c | 3 +- trunk/arch/x86/kvm/svm.c | 17 +- trunk/arch/x86/kvm/vmx.c | 24 +- trunk/arch/x86/kvm/x86.c | 11 +- trunk/arch/x86/lguest/boot.c | 13 +- trunk/arch/x86/lib/atomic64_386_32.S | 238 +- trunk/arch/x86/mm/fault.c | 8 +- trunk/arch/x86/mm/init_32.c | 4 +- trunk/arch/x86/mm/init_64.c | 2 +- trunk/arch/x86/mm/iomap_32.c | 6 +- trunk/arch/x86/mm/k8topology_64.c | 8 +- trunk/arch/x86/mm/kmemcheck/kmemcheck.c | 2 - trunk/arch/x86/mm/numa_64.c | 2 +- trunk/arch/x86/mm/srat_64.c | 8 +- trunk/arch/x86/oprofile/backtrace.c | 70 +- trunk/arch/x86/oprofile/nmi_int.c | 33 +- trunk/arch/x86/power/cpu.c | 2 - trunk/arch/x86/xen/platform-pci-unplug.c | 18 +- trunk/arch/x86/xen/time.c | 5 +- trunk/arch/xtensa/kernel/process.c | 5 +- trunk/block/blk-cgroup.c | 2 +- trunk/block/blk-core.c | 6 +- trunk/block/blk-map.c | 2 +- trunk/block/blk-merge.c | 12 - trunk/block/blk-sysfs.c | 1 - trunk/block/blk.h | 8 +- trunk/block/bsg.c | 2 +- trunk/block/cfq-iosched.c | 119 +- trunk/block/elevator.c | 52 +- trunk/crypto/Kconfig | 8 +- trunk/crypto/ahash.c | 7 +- trunk/crypto/algboss.c | 8 +- trunk/crypto/testmgr.c | 4 +- trunk/drivers/Makefile | 2 +- trunk/drivers/acpi/Kconfig | 13 +- trunk/drivers/acpi/Makefile | 5 +- trunk/drivers/acpi/acpi_pad.c | 34 +- trunk/drivers/acpi/acpica/acevents.h | 4 - trunk/drivers/acpi/acpica/acglobal.h | 2 +- trunk/drivers/acpi/acpica/aclocal.h | 2 - trunk/drivers/acpi/acpica/evgpe.c | 73 - trunk/drivers/acpi/acpica/evxface.c | 77 +- trunk/drivers/acpi/acpica/evxfevnt.c | 62 +- trunk/drivers/acpi/acpica/exutils.c | 2 +- trunk/drivers/acpi/acpica/rsutils.c | 2 +- trunk/drivers/acpi/acpica/utmutex.c | 5 +- trunk/drivers/acpi/apei/Kconfig | 9 - trunk/drivers/acpi/apei/Makefile | 1 - trunk/drivers/acpi/apei/apei-base.c | 25 +- trunk/drivers/acpi/apei/einj.c | 4 +- trunk/drivers/acpi/apei/erst-dbg.c | 211 -- trunk/drivers/acpi/apei/erst.c | 29 +- trunk/drivers/acpi/apei/ghes.c | 172 +- trunk/drivers/acpi/apei/hest.c | 79 +- trunk/drivers/acpi/atomicio.c | 2 +- trunk/drivers/acpi/battery.c | 1 + trunk/drivers/acpi/blacklist.c | 35 - trunk/drivers/acpi/bus.c | 22 +- trunk/drivers/acpi/debug.c | 422 +++ trunk/drivers/acpi/debugfs.c | 93 - trunk/drivers/acpi/fan.c | 2 - trunk/drivers/acpi/glue.c | 3 +- trunk/drivers/acpi/internal.h | 8 +- trunk/drivers/acpi/numa.c | 4 +- trunk/drivers/acpi/osl.c | 7 +- trunk/drivers/acpi/pci_root.c | 97 +- trunk/drivers/acpi/power.c | 129 +- trunk/drivers/acpi/proc.c | 70 + trunk/drivers/acpi/processor_core.c | 7 +- trunk/drivers/acpi/processor_driver.c | 87 +- trunk/drivers/acpi/processor_idle.c | 102 +- trunk/drivers/acpi/processor_perflib.c | 4 +- trunk/drivers/acpi/processor_thermal.c | 83 + trunk/drivers/acpi/processor_throttling.c | 2 + trunk/drivers/acpi/sleep.c | 82 +- trunk/drivers/acpi/sleep.h | 5 +- trunk/drivers/acpi/{sysfs.c => system.c} | 474 ++- trunk/drivers/acpi/thermal.c | 86 +- trunk/drivers/acpi/video.c | 141 +- trunk/drivers/acpi/video_detect.c | 4 +- trunk/drivers/acpi/wakeup.c | 48 +- trunk/drivers/ata/Kconfig | 1 - trunk/drivers/ata/Makefile | 1 + trunk/drivers/ata/ahci.c | 18 - trunk/drivers/ata/ahci.h | 13 +- trunk/drivers/ata/ahci_platform.c | 6 +- trunk/drivers/ata/ata_piix.c | 4 - trunk/drivers/ata/libahci.c | 34 +- trunk/drivers/ata/libata-acpi.c | 6 + trunk/drivers/ata/libata-core.c | 25 +- trunk/drivers/ata/libata-eh.c | 4 - trunk/drivers/ata/libata-sff.c | 45 +- trunk/drivers/ata/pata_artop.c | 3 +- trunk/drivers/ata/pata_cmd64x.c | 6 + trunk/drivers/ata/pata_legacy.c | 15 +- trunk/drivers/ata/pata_via.c | 2 - trunk/drivers/ata/pata_winbond.c | 282 ++ trunk/drivers/ata/sata_dwc_460ex.c | 6 +- trunk/drivers/ata/sata_mv.c | 46 +- trunk/drivers/atm/iphase.c | 6 + trunk/drivers/atm/iphase.h | 2 +- trunk/drivers/atm/solos-pci.c | 8 +- trunk/drivers/base/firmware_class.c | 2 +- trunk/drivers/base/power/main.c | 1 - trunk/drivers/base/topology.c | 16 +- trunk/drivers/block/Kconfig | 17 - trunk/drivers/block/Makefile | 1 - trunk/drivers/block/cciss.c | 13 +- trunk/drivers/block/loop.c | 2 +- trunk/drivers/block/mg_disk.c | 3 +- trunk/drivers/block/pktcdvd.c | 2 +- trunk/drivers/block/ps3disk.c | 2 +- trunk/drivers/block/rbd.c | 1841 ----------- trunk/drivers/block/rbd_types.h | 73 - trunk/drivers/block/virtio_blk.c | 23 +- trunk/drivers/block/xen-blkfront.c | 2 +- trunk/drivers/block/xsysace.c | 1 - trunk/drivers/char/agp/Kconfig | 2 +- trunk/drivers/char/agp/amd64-agp.c | 39 +- trunk/drivers/char/agp/generic.c | 4 +- trunk/drivers/char/agp/intel-agp.c | 42 +- trunk/drivers/char/agp/intel-agp.h | 23 +- trunk/drivers/char/agp/intel-gtt.c | 66 +- trunk/drivers/char/hangcheck-timer.c | 2 +- trunk/drivers/char/hvc_console.c | 2 +- trunk/drivers/char/hvsi.c | 2 +- trunk/drivers/char/hw_random/n2-drv.c | 2 +- trunk/drivers/char/ip2/ip2main.c | 4 +- trunk/drivers/char/ipmi/ipmi_si_intf.c | 17 +- trunk/drivers/char/mem.c | 3 +- trunk/drivers/char/pty.c | 4 +- trunk/drivers/char/rocket.c | 1 - trunk/drivers/char/synclink_gt.c | 4 +- trunk/drivers/char/sysrq.c | 53 +- trunk/drivers/char/tpm/tpm.c | 22 +- trunk/drivers/char/tty_io.c | 94 +- trunk/drivers/char/virtio_console.c | 263 +- trunk/drivers/char/vt.c | 26 +- trunk/drivers/char/vt_ioctl.c | 16 +- .../char/xilinx_hwicap/xilinx_hwicap.c | 1 - trunk/drivers/cpuidle/governors/menu.c | 2 +- trunk/drivers/crypto/Kconfig | 2 +- trunk/drivers/dca/dca-core.c | 85 +- trunk/drivers/dma/ioat/dma_v2.c | 2 +- trunk/drivers/dma/mv_xor.c | 2 +- trunk/drivers/dma/shdma.c | 3 +- trunk/drivers/edac/Kconfig | 2 +- trunk/drivers/edac/amd64_edac.c | 14 +- trunk/drivers/edac/edac_mc.c | 3 - trunk/drivers/edac/edac_mce_amd.c | 17 +- trunk/drivers/edac/i7core_edac.c | 1 - trunk/drivers/firewire/core-transaction.c | 13 +- trunk/drivers/firewire/net.c | 28 +- trunk/drivers/firewire/ohci.c | 30 +- trunk/drivers/firewire/ohci.h | 8 + trunk/drivers/firewire/sbp2.c | 23 +- trunk/drivers/firmware/Kconfig | 10 +- trunk/drivers/firmware/Makefile | 1 + .../{scsi => firmware}/iscsi_boot_sysfs.c | 0 trunk/drivers/firmware/iscsi_ibft.c | 6 +- trunk/drivers/gpio/sx150x.c | 26 +- trunk/drivers/gpu/drm/drm_buffer.c | 6 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 32 +- trunk/drivers/gpu/drm/drm_drv.c | 25 +- trunk/drivers/gpu/drm/drm_fb_helper.c | 5 +- trunk/drivers/gpu/drm/drm_fops.c | 1 - trunk/drivers/gpu/drm/drm_gem.c | 39 +- trunk/drivers/gpu/drm/drm_info.c | 2 +- trunk/drivers/gpu/drm/drm_lock.c | 2 - trunk/drivers/gpu/drm/drm_mm.c | 24 +- trunk/drivers/gpu/drm/drm_modes.c | 5 +- trunk/drivers/gpu/drm/drm_pci.c | 4 - trunk/drivers/gpu/drm/drm_platform.c | 5 - trunk/drivers/gpu/drm/drm_sysfs.c | 2 +- trunk/drivers/gpu/drm/drm_vm.c | 30 +- trunk/drivers/gpu/drm/i810/i810_dma.c | 32 +- trunk/drivers/gpu/drm/i830/i830_dma.c | 30 +- trunk/drivers/gpu/drm/i915/Makefile | 2 - trunk/drivers/gpu/drm/i915/dvo.h | 7 +- trunk/drivers/gpu/drm/i915/i915_debugfs.c | 53 - trunk/drivers/gpu/drm/i915/i915_dma.c | 132 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 67 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 72 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 444 ++- trunk/drivers/gpu/drm/i915/i915_gem_evict.c | 271 -- trunk/drivers/gpu/drm/i915/i915_irq.c | 143 +- trunk/drivers/gpu/drm/i915/i915_opregion.c | 11 +- trunk/drivers/gpu/drm/i915/i915_reg.h | 23 - trunk/drivers/gpu/drm/i915/i915_suspend.c | 133 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 59 +- trunk/drivers/gpu/drm/i915/intel_display.c | 762 +++-- trunk/drivers/gpu/drm/i915/intel_dp.c | 671 ++-- trunk/drivers/gpu/drm/i915/intel_drv.h | 38 +- trunk/drivers/gpu/drm/i915/intel_dvo.c | 139 +- trunk/drivers/gpu/drm/i915/intel_fb.c | 4 +- trunk/drivers/gpu/drm/i915/intel_hdmi.c | 79 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 115 +- trunk/drivers/gpu/drm/i915/intel_overlay.c | 101 +- trunk/drivers/gpu/drm/i915/intel_panel.c | 111 - trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 111 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.h | 13 +- trunk/drivers/gpu/drm/i915/intel_sdvo.c | 2150 +++++++------ trunk/drivers/gpu/drm/i915/intel_sdvo_regs.h | 50 +- trunk/drivers/gpu/drm/i915/intel_tv.c | 171 +- trunk/drivers/gpu/drm/mga/mga_state.c | 26 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 100 +- trunk/drivers/gpu/drm/nouveau/nouveau_bios.h | 1 - trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 15 - .../drivers/gpu/drm/nouveau/nouveau_channel.c | 24 +- .../gpu/drm/nouveau/nouveau_connector.c | 18 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.h | 10 - trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 6 +- trunk/drivers/gpu/drm/nouveau/nouveau_gem.c | 53 +- trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c | 12 +- trunk/drivers/gpu/drm/nouveau/nv04_dfp.c | 31 +- trunk/drivers/gpu/drm/nouveau/nv17_tv.c | 12 +- trunk/drivers/gpu/drm/nouveau/nv50_instmem.c | 4 +- trunk/drivers/gpu/drm/nouveau/nvc0_instmem.c | 13 +- trunk/drivers/gpu/drm/r128/r128_state.c | 35 +- trunk/drivers/gpu/drm/radeon/atombios.h | 2 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 100 +- trunk/drivers/gpu/drm/radeon/atombios_dp.c | 2 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 80 +- trunk/drivers/gpu/drm/radeon/r100.c | 27 +- trunk/drivers/gpu/drm/radeon/r600.c | 25 +- trunk/drivers/gpu/drm/radeon/r600_blit_kms.c | 27 - .../gpu/drm/radeon/r600_blit_shaders.h | 24 - trunk/drivers/gpu/drm/radeon/r600_cs.c | 5 +- trunk/drivers/gpu/drm/radeon/radeon.h | 9 +- trunk/drivers/gpu/drm/radeon/radeon_agp.c | 8 +- trunk/drivers/gpu/drm/radeon/radeon_asic.c | 19 +- .../drivers/gpu/drm/radeon/radeon_atombios.c | 93 +- trunk/drivers/gpu/drm/radeon/radeon_clocks.c | 58 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 177 +- .../gpu/drm/radeon/radeon_connectors.c | 120 +- trunk/drivers/gpu/drm/radeon/radeon_cursor.c | 28 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 30 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 29 +- .../drivers/gpu/drm/radeon/radeon_encoders.c | 223 +- trunk/drivers/gpu/drm/radeon/radeon_fb.c | 15 +- trunk/drivers/gpu/drm/radeon/radeon_gem.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_i2c.c | 9 +- trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c | 5 +- trunk/drivers/gpu/drm/radeon/radeon_kms.c | 83 +- .../gpu/drm/radeon/radeon_legacy_crtc.c | 2 +- .../gpu/drm/radeon/radeon_legacy_encoders.c | 7 +- trunk/drivers/gpu/drm/radeon/radeon_mode.h | 7 +- trunk/drivers/gpu/drm/radeon/radeon_object.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_object.h | 5 +- trunk/drivers/gpu/drm/radeon/radeon_pm.c | 7 +- trunk/drivers/gpu/drm/radeon/radeon_state.c | 56 +- trunk/drivers/gpu/drm/radeon/rs600.c | 1 - trunk/drivers/gpu/drm/radeon/rs690.c | 1 - trunk/drivers/gpu/drm/radeon/rv770.c | 63 +- trunk/drivers/gpu/drm/savage/savage_bci.c | 8 +- trunk/drivers/gpu/drm/sis/sis_mm.c | 12 +- trunk/drivers/gpu/drm/ttm/ttm_bo.c | 83 +- trunk/drivers/gpu/drm/ttm/ttm_bo_util.c | 1 - trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c | 8 +- trunk/drivers/gpu/drm/via/via_dma.c | 28 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 179 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 8 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 5 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 3 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 17 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 34 +- .../drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 - trunk/drivers/gpu/vga/vgaarb.c | 2 +- trunk/drivers/hid/hid-cando.c | 2 - trunk/drivers/hid/hid-core.c | 6 +- trunk/drivers/hid/hid-egalax.c | 9 - trunk/drivers/hid/hid-ids.h | 7 - trunk/drivers/hid/hid-mosart.c | 1 - trunk/drivers/hid/hid-picolcd.c | 4 +- trunk/drivers/hid/hid-topseed.c | 1 - trunk/drivers/hid/hidraw.c | 11 - trunk/drivers/hid/usbhid/hid-core.c | 8 +- trunk/drivers/hid/usbhid/hid-quirks.c | 5 - trunk/drivers/hid/usbhid/hiddev.c | 13 +- trunk/drivers/hid/usbhid/usbhid.h | 1 - trunk/drivers/hwmon/Kconfig | 22 +- trunk/drivers/hwmon/Makefile | 1 - trunk/drivers/hwmon/adm1031.c | 43 +- trunk/drivers/hwmon/ads7871.c | 38 +- trunk/drivers/hwmon/asc7621.c | 9 +- trunk/drivers/hwmon/coretemp.c | 58 +- trunk/drivers/hwmon/emc1403.c | 34 +- trunk/drivers/hwmon/emc2103.c | 740 ----- trunk/drivers/hwmon/f71882fg.c | 115 +- trunk/drivers/hwmon/f75375s.c | 6 +- trunk/drivers/hwmon/hp_accel.c | 2 - trunk/drivers/hwmon/it87.c | 46 +- trunk/drivers/hwmon/k8temp.c | 38 +- trunk/drivers/hwmon/lis3lv02d.c | 4 +- trunk/drivers/hwmon/lis3lv02d_i2c.c | 4 +- trunk/drivers/hwmon/lis3lv02d_spi.c | 4 +- trunk/drivers/hwmon/lm75.c | 39 - trunk/drivers/hwmon/lm75.h | 1 - trunk/drivers/hwmon/lm95241.c | 21 +- trunk/drivers/hwmon/ltc4245.c | 177 +- trunk/drivers/hwmon/pc87360.c | 31 +- trunk/drivers/hwmon/pc87427.c | 862 +----- trunk/drivers/hwmon/pkgtemp.c | 23 +- trunk/drivers/hwmon/via-cputemp.c | 2 +- trunk/drivers/hwmon/w83627ehf.c | 98 +- trunk/drivers/i2c/busses/Kconfig | 11 +- trunk/drivers/i2c/busses/Makefile | 1 - trunk/drivers/i2c/busses/i2c-cpm.c | 5 - trunk/drivers/i2c/busses/i2c-davinci.c | 332 +- trunk/drivers/i2c/busses/i2c-ibm_iic.c | 3 - trunk/drivers/i2c/busses/i2c-imx.c | 12 +- trunk/drivers/i2c/busses/i2c-mpc.c | 1 - trunk/drivers/i2c/busses/i2c-nuc900.c | 709 ----- trunk/drivers/i2c/busses/i2c-octeon.c | 2 +- trunk/drivers/i2c/busses/i2c-omap.c | 2 - trunk/drivers/i2c/busses/i2c-pca-isa.c | 12 +- trunk/drivers/i2c/busses/i2c-pca-platform.c | 11 +- trunk/drivers/i2c/busses/i2c-pxa.c | 2 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 4 +- trunk/drivers/i2c/i2c-core.c | 54 +- trunk/drivers/ide/ide-probe.c | 12 +- trunk/drivers/idle/Kconfig | 3 +- trunk/drivers/idle/intel_idle.c | 91 +- trunk/drivers/ieee1394/ohci1394.c | 2 +- trunk/drivers/infiniband/hw/cxgb3/cxio_hal.h | 2 +- trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 +- trunk/drivers/infiniband/hw/nes/nes_cm.c | 18 +- trunk/drivers/infiniband/hw/nes/nes_hw.c | 14 +- trunk/drivers/infiniband/hw/nes/nes_hw.h | 1 - trunk/drivers/infiniband/hw/nes/nes_nic.c | 4 +- trunk/drivers/input/evdev.c | 10 +- trunk/drivers/input/input.c | 11 +- trunk/drivers/input/joydev.c | 3 - trunk/drivers/input/joystick/amijoy.c | 2 +- trunk/drivers/input/keyboard/hil_kbd.c | 16 +- trunk/drivers/input/keyboard/pxa27x_keypad.c | 2 + trunk/drivers/input/misc/hp_sdc_rtc.c | 4 +- trunk/drivers/input/misc/uinput.c | 9 - trunk/drivers/input/mouse/bcm5974.c | 12 +- trunk/drivers/input/mousedev.c | 8 +- trunk/drivers/input/serio/hil_mlc.c | 6 +- trunk/drivers/input/serio/hp_sdc.c | 4 +- trunk/drivers/input/serio/i8042.c | 2 +- trunk/drivers/input/tablet/wacom_sys.c | 23 +- trunk/drivers/input/tablet/wacom_wac.c | 8 +- trunk/drivers/isdn/hardware/avm/Kconfig | 3 +- trunk/drivers/isdn/hardware/avm/c4.c | 1 - trunk/drivers/isdn/hardware/avm/t1pci.c | 1 - .../isdn/hardware/mISDN/mISDNinfineon.c | 5 +- trunk/drivers/isdn/sc/interrupt.c | 18 +- trunk/drivers/leds/leds-ns2.c | 9 +- trunk/drivers/macintosh/adb.c | 2 +- trunk/drivers/macintosh/via-pmu.c | 42 - trunk/drivers/md/.gitignore | 4 + trunk/drivers/md/bitmap.c | 12 +- trunk/drivers/md/md.c | 71 +- trunk/drivers/md/md.h | 2 +- trunk/drivers/md/raid1.c | 25 +- trunk/drivers/md/raid10.c | 17 +- trunk/drivers/md/raid5.c | 13 +- trunk/drivers/media/IR/Kconfig | 9 +- trunk/drivers/media/IR/ir-keytable.c | 9 +- trunk/drivers/media/IR/ir-lirc-codec.c | 2 +- trunk/drivers/media/IR/ir-raw-event.c | 4 +- trunk/drivers/media/IR/ir-sysfs.c | 17 +- trunk/drivers/media/IR/keymaps/rc-rc6-mce.c | 3 - trunk/drivers/media/IR/mceusb.c | 4 - trunk/drivers/media/dvb/dm1105/Kconfig | 2 +- trunk/drivers/media/dvb/dvb-usb/Kconfig | 2 +- .../drivers/media/dvb/dvb-usb/dib0700_core.c | 3 + .../media/dvb/dvb-usb/dib0700_devices.c | 56 +- trunk/drivers/media/dvb/dvb-usb/opera1.c | 4 +- trunk/drivers/media/dvb/frontends/dib7000p.c | 8 +- trunk/drivers/media/dvb/frontends/dib7000p.h | 5 - trunk/drivers/media/dvb/mantis/Kconfig | 2 +- trunk/drivers/media/dvb/siano/Kconfig | 2 +- trunk/drivers/media/dvb/siano/smscoreapi.c | 31 +- trunk/drivers/media/dvb/ttpci/Kconfig | 2 +- .../media/radio/si470x/radio-si470x-i2c.c | 2 +- trunk/drivers/media/video/bt8xx/Kconfig | 2 +- trunk/drivers/media/video/cx18/Kconfig | 2 +- trunk/drivers/media/video/cx231xx/Kconfig | 2 +- trunk/drivers/media/video/cx231xx/Makefile | 1 - .../media/video/cx231xx/cx231xx-cards.c | 17 +- trunk/drivers/media/video/cx23885/Kconfig | 2 +- .../media/video/cx25840/cx25840-core.c | 2 +- trunk/drivers/media/video/cx88/Kconfig | 4 +- trunk/drivers/media/video/em28xx/Kconfig | 2 +- trunk/drivers/media/video/gspca/gspca.c | 1 - trunk/drivers/media/video/gspca/sn9c20x.c | 3 +- trunk/drivers/media/video/ivtv/Kconfig | 2 +- trunk/drivers/media/video/ivtv/ivtvfb.c | 2 - trunk/drivers/media/video/mem2mem_testdev.c | 3 +- trunk/drivers/media/video/mt9m111.c | 8 +- trunk/drivers/media/video/mt9v022.c | 3 + trunk/drivers/media/video/mx2_camera.c | 4 - .../media/video/pvrusb2/pvrusb2-ctrl.c | 6 +- .../drivers/media/video/s5p-fimc/fimc-core.c | 94 +- trunk/drivers/media/video/saa7134/Kconfig | 2 +- .../media/video/saa7134/saa7134-cards.c | 10 +- .../media/video/saa7164/saa7164-buffer.c | 5 +- trunk/drivers/media/video/tlg2300/Kconfig | 2 +- trunk/drivers/media/video/uvc/uvc_driver.c | 24 - trunk/drivers/media/video/uvc/uvcvideo.h | 1 - .../drivers/media/video/v4l2-compat-ioctl32.c | 39 +- trunk/drivers/media/video/v4l2-ctrls.c | 1 - .../drivers/media/video/videobuf-dma-contig.c | 6 +- trunk/drivers/media/video/videobuf-dma-sg.c | 11 +- trunk/drivers/message/fusion/mptbase.c | 6 +- trunk/drivers/mfd/max8925-core.c | 13 +- trunk/drivers/mfd/wm831x-irq.c | 9 +- trunk/drivers/misc/Kconfig | 2 +- trunk/drivers/misc/Makefile | 2 +- trunk/drivers/misc/bh1780gli.c | 1 + .../misc/{vmw_balloon.c => vmware_balloon.c} | 0 trunk/drivers/mmc/core/core.c | 13 - trunk/drivers/mmc/core/host.c | 2 - trunk/drivers/mmc/core/sdio.c | 5 +- trunk/drivers/mmc/host/Kconfig | 11 +- trunk/drivers/mmc/host/Makefile | 2 +- trunk/drivers/mmc/host/at91_mci.c | 1 - trunk/drivers/mmc/host/imxmmc.c | 3 +- trunk/drivers/mmc/host/mmc_spi.c | 59 +- trunk/drivers/mmc/host/msm_sdcc.c | 35 +- trunk/drivers/mmc/host/omap_hsmmc.c | 3 +- trunk/drivers/mmc/host/s3cmci.c | 2 +- trunk/drivers/mmc/host/sdhci-s3c.c | 14 +- trunk/drivers/mmc/host/sdhci.c | 3 +- trunk/drivers/mmc/host/sdhci.h | 2 - trunk/drivers/mmc/host/tmio_mmc.c | 7 +- trunk/drivers/mmc/host/tmio_mmc.h | 13 +- trunk/drivers/mtd/devices/m25p80.c | 14 +- trunk/drivers/mtd/maps/physmap_of.c | 1 - trunk/drivers/mtd/nand/bf5xx_nand.c | 9 +- trunk/drivers/mtd/nand/denali.c | 497 +-- trunk/drivers/mtd/nand/denali.h | 18 + trunk/drivers/mtd/nand/mxc_nand.c | 137 +- trunk/drivers/mtd/nand/nand_base.c | 11 +- trunk/drivers/mtd/nand/nand_ids.c | 2 +- trunk/drivers/mtd/nand/omap2.c | 2 +- trunk/drivers/mtd/nand/plat_nand.c | 5 - trunk/drivers/mtd/nand/pxa3xx_nand.c | 8 +- trunk/drivers/mtd/onenand/samsung.c | 16 +- trunk/drivers/mtd/ubi/Kconfig.debug | 2 +- trunk/drivers/mtd/ubi/cdev.c | 12 +- trunk/drivers/mtd/ubi/scan.c | 2 +- trunk/drivers/mtd/ubi/wl.c | 3 +- trunk/drivers/net/3c527.c | 2 +- trunk/drivers/net/3c59x.c | 47 +- trunk/drivers/net/Kconfig | 14 +- trunk/drivers/net/Makefile | 1 - trunk/drivers/net/atlx/atl1.c | 11 +- trunk/drivers/net/b44.c | 13 +- trunk/drivers/net/benet/be.h | 1 - trunk/drivers/net/benet/be_cmds.c | 8 +- trunk/drivers/net/benet/be_cmds.h | 2 +- trunk/drivers/net/benet/be_ethtool.c | 1 - trunk/drivers/net/benet/be_hw.h | 7 +- trunk/drivers/net/benet/be_main.c | 47 +- trunk/drivers/net/bnx2x/bnx2x.h | 4 +- trunk/drivers/net/bnx2x/bnx2x_main.c | 9 +- trunk/drivers/net/bonding/bond_3ad.c | 3 - trunk/drivers/net/bonding/bond_alb.c | 3 - trunk/drivers/net/bonding/bond_main.c | 65 +- trunk/drivers/net/caif/Kconfig | 2 +- trunk/drivers/net/caif/caif_spi_slave.c | 4 +- trunk/drivers/net/cxgb3/cxgb3_main.c | 2 - trunk/drivers/net/e1000e/82571.c | 31 +- trunk/drivers/net/e1000e/defines.h | 4 - trunk/drivers/net/e1000e/hw.h | 1 - trunk/drivers/net/e1000e/ich8lan.c | 197 +- trunk/drivers/net/e1000e/lib.c | 10 - trunk/drivers/net/e1000e/netdev.c | 29 +- trunk/drivers/net/ehea/ehea.h | 3 +- trunk/drivers/net/ehea/ehea_main.c | 69 +- trunk/drivers/net/ehea/ehea_qmr.h | 1 - trunk/drivers/net/eql.c | 2 - trunk/drivers/net/fec.c | 44 +- trunk/drivers/net/hamradio/6pack.c | 2 +- trunk/drivers/net/hamradio/mkiss.c | 2 +- trunk/drivers/net/ibm_newemac/core.c | 4 +- trunk/drivers/net/ibm_newemac/debug.c | 2 +- trunk/drivers/net/ibmveth.c | 32 +- trunk/drivers/net/irda/sir_dev.c | 2 +- trunk/drivers/net/ks8851.c | 39 +- trunk/drivers/net/ll_temac_main.c | 5 +- trunk/drivers/net/ll_temac_mdio.c | 1 - trunk/drivers/net/netxen/netxen_nic.h | 4 +- trunk/drivers/net/netxen/netxen_nic_init.c | 7 + trunk/drivers/net/netxen/netxen_nic_main.c | 11 +- trunk/drivers/net/niu.c | 16 +- trunk/drivers/net/pcmcia/pcnet_cs.c | 140 +- trunk/drivers/net/pcmcia/xirc2ps_cs.c | 2 +- trunk/drivers/net/phy/Kconfig | 2 +- trunk/drivers/net/phy/mdio_bus.c | 4 +- trunk/drivers/net/phy/phy.c | 2 +- trunk/drivers/net/phy/phy_device.c | 2 - trunk/drivers/net/ppp_async.c | 2 +- trunk/drivers/net/ppp_generic.c | 9 +- trunk/drivers/net/pxa168_eth.c | 1666 ---------- trunk/drivers/net/qlcnic/qlcnic_init.c | 7 +- trunk/drivers/net/qlcnic/qlcnic_main.c | 83 +- trunk/drivers/net/qlge/qlge_main.c | 4 +- trunk/drivers/net/r8169.c | 70 +- trunk/drivers/net/rionet.c | 2 +- trunk/drivers/net/sgiseeq.c | 2 +- trunk/drivers/net/sh_eth.c | 2 +- trunk/drivers/net/skge.c | 18 +- trunk/drivers/net/smsc911x.c | 1 - trunk/drivers/net/stmmac/stmmac_main.c | 9 +- trunk/drivers/net/tg3.c | 6 +- trunk/drivers/net/tg3.h | 2 +- trunk/drivers/net/tulip/de2104x.c | 43 +- trunk/drivers/net/usb/hso.c | 2 - trunk/drivers/net/usb/ipheth.c | 12 +- trunk/drivers/net/usb/usbnet.c | 22 +- trunk/drivers/net/via-velocity.c | 2 +- trunk/drivers/net/wan/cosa.c | 2 +- trunk/drivers/net/wan/farsync.c | 15 +- trunk/drivers/net/wimax/i2400m/rx.c | 26 +- trunk/drivers/net/wireless/adm8211.c | 8 +- trunk/drivers/net/wireless/at76c50x-usb.c | 22 +- trunk/drivers/net/wireless/ath/ar9170/main.c | 4 +- trunk/drivers/net/wireless/ath/ath5k/base.c | 25 - trunk/drivers/net/wireless/ath/ath9k/ani.c | 2 +- .../net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- trunk/drivers/net/wireless/ath/ath9k/eeprom.h | 3 +- .../net/wireless/ath/ath9k/eeprom_9287.c | 7 +- .../drivers/net/wireless/ath/ath9k/hif_usb.c | 8 +- .../net/wireless/ath/ath9k/htc_drv_init.c | 1 - .../net/wireless/ath/ath9k/htc_drv_main.c | 3 +- .../net/wireless/ath/ath9k/htc_drv_txrx.c | 15 +- trunk/drivers/net/wireless/ath/ath9k/reg.h | 1 - trunk/drivers/net/wireless/ath/regd.h | 1 + trunk/drivers/net/wireless/ipw2x00/ipw2100.c | 13 +- trunk/drivers/net/wireless/iwlwifi/iwl-1000.c | 6 +- trunk/drivers/net/wireless/iwlwifi/iwl-3945.c | 22 +- trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 4 +- trunk/drivers/net/wireless/iwlwifi/iwl-5000.c | 24 +- trunk/drivers/net/wireless/iwlwifi/iwl-6000.c | 48 +- .../net/wireless/iwlwifi/iwl-agn-hcmd.c | 19 +- .../net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- .../drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 20 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 130 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 79 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 17 +- trunk/drivers/net/wireless/iwlwifi/iwl-dev.h | 3 +- .../net/wireless/iwlwifi/iwl3945-base.c | 58 +- trunk/drivers/net/wireless/libertas/cfg.c | 1 - trunk/drivers/net/wireless/libertas/if_sdio.c | 2 +- trunk/drivers/net/wireless/mac80211_hwsim.c | 2 +- trunk/drivers/net/wireless/mwl8k.c | 34 +- trunk/drivers/net/wireless/p54/eeprom.c | 6 +- trunk/drivers/net/wireless/p54/fwio.c | 2 +- trunk/drivers/net/wireless/p54/led.c | 4 +- trunk/drivers/net/wireless/p54/p54pci.c | 4 +- trunk/drivers/net/wireless/p54/txrx.c | 4 +- .../net/wireless/rtl818x/rtl8180_dev.c | 6 +- .../net/wireless/rtl818x/rtl8187_dev.c | 4 +- .../net/wireless/rtl818x/rtl8187_rtl8225.c | 4 +- .../drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 +- trunk/drivers/oprofile/buffer_sync.c | 27 +- trunk/drivers/oprofile/cpu_buffer.c | 2 + trunk/drivers/oprofile/oprof.c | 32 +- trunk/drivers/oprofile/oprof.h | 2 +- trunk/drivers/oprofile/oprofile_files.c | 7 +- trunk/drivers/oprofile/oprofile_perf.c | 328 -- trunk/drivers/oprofile/oprofilefs.c | 54 +- trunk/drivers/parport/share.c | 2 +- trunk/drivers/pci/hotplug/acpi_pcihp.c | 6 +- trunk/drivers/pci/hotplug/pciehp.h | 16 +- trunk/drivers/pci/hotplug/pciehp_acpi.c | 4 +- trunk/drivers/pci/hotplug/pciehp_core.c | 4 +- trunk/drivers/pci/intel-iommu.c | 119 +- trunk/drivers/pci/intr_remapping.c | 20 - trunk/drivers/pci/iov.c | 2 +- trunk/drivers/pci/pci.h | 7 +- trunk/drivers/pci/pcie/Makefile | 3 +- trunk/drivers/pci/pcie/aer/aerdrv.c | 9 +- trunk/drivers/pci/pcie/aer/aerdrv_acpi.c | 36 + trunk/drivers/pci/pcie/aer/aerdrv_core.c | 14 +- trunk/drivers/pci/pcie/pme/Makefile | 8 + .../pci/pcie/{pme.c => pme/pcie_pme.c} | 66 +- trunk/drivers/pci/pcie/pme/pcie_pme.h | 28 + trunk/drivers/pci/pcie/pme/pcie_pme_acpi.c | 54 + trunk/drivers/pci/pcie/portdrv.h | 22 - trunk/drivers/pci/pcie/portdrv_acpi.c | 77 - trunk/drivers/pci/pcie/portdrv_core.c | 53 +- trunk/drivers/pci/pcie/portdrv_pci.c | 38 +- trunk/drivers/pci/quirks.c | 20 - trunk/drivers/pci/slot.c | 2 +- trunk/drivers/pcmcia/pcmcia_resource.c | 57 +- trunk/drivers/pcmcia/pd6729.c | 2 +- trunk/drivers/platform/x86/Kconfig | 11 +- trunk/drivers/platform/x86/Makefile | 1 - trunk/drivers/platform/x86/asus_acpi.c | 6 +- trunk/drivers/platform/x86/compal-laptop.c | 9 - trunk/drivers/platform/x86/dell-laptop.c | 7 - trunk/drivers/platform/x86/hp-wmi.c | 64 +- trunk/drivers/platform/x86/ideapad_acpi.c | 306 -- trunk/drivers/platform/x86/intel_ips.c | 137 +- .../drivers/platform/x86/intel_rar_register.c | 2 +- trunk/drivers/platform/x86/intel_scu_ipc.c | 2 +- trunk/drivers/platform/x86/thinkpad_acpi.c | 172 +- trunk/drivers/power/apm_power.c | 1 - trunk/drivers/power/intel_mid_battery.c | 6 +- trunk/drivers/regulator/88pm8607.c | 4 +- trunk/drivers/regulator/ab3100.c | 5 +- trunk/drivers/regulator/ab8500.c | 9 +- trunk/drivers/regulator/ad5398.c | 13 +- trunk/drivers/regulator/core.c | 6 +- trunk/drivers/regulator/isl6271a-regulator.c | 4 +- trunk/drivers/regulator/max1586.c | 12 +- trunk/drivers/regulator/max8649.c | 2 +- trunk/drivers/regulator/max8998.c | 8 +- trunk/drivers/regulator/tps6507x-regulator.c | 6 + trunk/drivers/regulator/tps6586x-regulator.c | 4 +- trunk/drivers/regulator/wm831x-ldo.c | 7 +- trunk/drivers/regulator/wm8350-regulator.c | 2 +- trunk/drivers/rtc/rtc-ab3100.c | 2 - trunk/drivers/rtc/rtc-bfin.c | 15 +- trunk/drivers/rtc/rtc-ds3232.c | 2 + trunk/drivers/rtc/rtc-m41t80.c | 2 +- trunk/drivers/rtc/rtc-pl031.c | 2 +- trunk/drivers/rtc/rtc-s3c.c | 13 +- trunk/drivers/s390/block/dasd.c | 4 +- trunk/drivers/s390/char/ctrlchar.c | 4 +- trunk/drivers/s390/char/keyboard.c | 2 +- trunk/drivers/s390/char/tape_block.c | 3 +- trunk/drivers/s390/net/claw.c | 118 +- trunk/drivers/s390/net/claw.h | 4 +- trunk/drivers/s390/net/ctcm_fsms.c | 60 +- trunk/drivers/s390/net/ctcm_main.c | 84 +- trunk/drivers/s390/net/ctcm_main.h | 4 +- trunk/drivers/s390/net/ctcm_mpc.c | 64 +- trunk/drivers/s390/net/ctcm_sysfs.c | 20 +- trunk/drivers/scsi/Kconfig | 8 - trunk/drivers/scsi/Makefile | 1 - trunk/drivers/scsi/arcmsr/arcmsr_hba.c | 1 - trunk/drivers/scsi/be2iscsi/Kconfig | 1 - trunk/drivers/scsi/be2iscsi/be_cmds.h | 147 +- trunk/drivers/scsi/be2iscsi/be_iscsi.c | 79 +- trunk/drivers/scsi/be2iscsi/be_iscsi.h | 2 - trunk/drivers/scsi/be2iscsi/be_main.c | 311 -- trunk/drivers/scsi/be2iscsi/be_main.h | 7 +- trunk/drivers/scsi/be2iscsi/be_mgmt.c | 73 +- trunk/drivers/scsi/constants.c | 6 +- trunk/drivers/scsi/hpsa.c | 6 - trunk/drivers/scsi/ibmvscsi/ibmvfc.c | 380 +-- trunk/drivers/scsi/ibmvscsi/ibmvfc.h | 6 +- trunk/drivers/scsi/libfc/fc_fcp.c | 4 +- trunk/drivers/scsi/lpfc/lpfc.h | 3 - trunk/drivers/scsi/lpfc/lpfc_attr.c | 46 +- trunk/drivers/scsi/lpfc/lpfc_bsg.c | 9 + trunk/drivers/scsi/lpfc/lpfc_compat.h | 3 +- trunk/drivers/scsi/lpfc/lpfc_els.c | 76 +- trunk/drivers/scsi/lpfc/lpfc_hbadisc.c | 17 +- trunk/drivers/scsi/lpfc/lpfc_hw.h | 32 +- trunk/drivers/scsi/lpfc/lpfc_init.c | 132 +- trunk/drivers/scsi/lpfc/lpfc_mbox.c | 8 +- trunk/drivers/scsi/lpfc/lpfc_scsi.c | 8 +- trunk/drivers/scsi/lpfc/lpfc_sli.c | 36 +- trunk/drivers/scsi/lpfc/lpfc_version.h | 2 +- trunk/drivers/scsi/osd/osd_initiator.c | 2 +- trunk/drivers/scsi/pm8001/pm8001_hwi.c | 13 +- trunk/drivers/scsi/qla2xxx/qla_attr.c | 23 +- trunk/drivers/scsi/qla2xxx/qla_dbg.h | 2 + trunk/drivers/scsi/qla2xxx/qla_def.h | 20 - trunk/drivers/scsi/qla2xxx/qla_init.c | 94 +- trunk/drivers/scsi/qla2xxx/qla_isr.c | 7 +- trunk/drivers/scsi/qla2xxx/qla_mbx.c | 7 +- trunk/drivers/scsi/qla2xxx/qla_mid.c | 68 +- trunk/drivers/scsi/qla2xxx/qla_nx.c | 36 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 30 +- trunk/drivers/scsi/qla2xxx/qla_version.h | 4 +- trunk/drivers/scsi/qla4xxx/ql4_def.h | 36 +- trunk/drivers/scsi/qla4xxx/ql4_fw.h | 20 +- trunk/drivers/scsi/qla4xxx/ql4_glbl.h | 2 - trunk/drivers/scsi/qla4xxx/ql4_init.c | 14 +- trunk/drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- trunk/drivers/scsi/qla4xxx/ql4_isr.c | 3 - trunk/drivers/scsi/qla4xxx/ql4_mbx.c | 48 +- trunk/drivers/scsi/qla4xxx/ql4_nx.c | 17 +- trunk/drivers/scsi/qla4xxx/ql4_os.c | 315 +- trunk/drivers/scsi/qla4xxx/ql4_version.h | 2 +- trunk/drivers/scsi/scsi.c | 4 +- trunk/drivers/scsi/scsi_error.c | 11 +- trunk/drivers/scsi/scsi_lib.c | 2 +- trunk/drivers/scsi/scsi_tgt_lib.c | 1 - trunk/drivers/scsi/sd.c | 8 +- trunk/drivers/scsi/sym53c8xx_2/sym_hipd.c | 10 +- trunk/drivers/serial/68328serial.c | 29 +- trunk/drivers/serial/8250_early.c | 4 +- trunk/drivers/serial/amba-pl010.c | 9 +- trunk/drivers/serial/bfin_sport_uart.c | 2 +- trunk/drivers/serial/ioc3_serial.c | 1 - trunk/drivers/serial/mfd.c | 18 +- trunk/drivers/serial/mpc52xx_uart.c | 1 - trunk/drivers/serial/mrst_max3110.c | 1 - trunk/drivers/serial/of_serial.c | 3 +- trunk/drivers/serial/serial_cs.c | 62 +- trunk/drivers/serial/sn_console.c | 2 +- trunk/drivers/serial/suncore.c | 15 +- trunk/drivers/spi/amba-pl022.c | 22 +- trunk/drivers/spi/coldfire_qspi.c | 1 - trunk/drivers/spi/dw_spi.c | 24 +- trunk/drivers/spi/mpc512x_psc_spi.c | 16 +- trunk/drivers/spi/omap_spi_100k.c | 23 +- trunk/drivers/spi/spi.c | 239 +- trunk/drivers/spi/spi_bitbang.c | 9 +- trunk/drivers/spi/spi_bitbang_txrx.h | 16 +- trunk/drivers/spi/spi_butterfly.c | 2 +- trunk/drivers/spi/spi_gpio.c | 109 +- trunk/drivers/spi/spi_lm70llp.c | 2 +- trunk/drivers/spi/spi_mpc8xxx.c | 10 +- trunk/drivers/spi/spi_s3c24xx_gpio.c | 8 +- trunk/drivers/spi/spi_s3c64xx.c | 37 +- trunk/drivers/spi/spi_sh_sci.c | 8 +- trunk/drivers/staging/Kconfig | 2 + trunk/drivers/staging/Makefile | 1 + trunk/drivers/staging/batman-adv/bat_sysfs.c | 4 - .../staging/batman-adv/hard-interface.c | 42 +- .../drivers/staging/batman-adv/icmp_socket.c | 12 +- trunk/drivers/staging/batman-adv/main.c | 7 +- trunk/drivers/staging/batman-adv/originator.c | 14 +- trunk/drivers/staging/batman-adv/routing.c | 16 +- trunk/drivers/staging/batman-adv/send.c | 8 +- trunk/drivers/staging/batman-adv/types.h | 1 - .../drivers/staging/comedi/drivers/das08_cs.c | 1 + trunk/drivers/staging/hv/netvsc_drv.c | 3 - trunk/drivers/staging/hv/ring_buffer.c | 3 +- trunk/drivers/staging/hv/storvsc_api.h | 4 +- trunk/drivers/staging/hv/storvsc_drv.c | 11 +- trunk/drivers/staging/octeon/Kconfig | 2 +- trunk/drivers/staging/pohmelfs/path_entry.c | 8 +- trunk/drivers/staging/rt2860/usb_main_dev.c | 41 +- trunk/drivers/staging/sep/Kconfig | 10 + trunk/drivers/staging/sep/Makefile | 2 + trunk/drivers/staging/sep/TODO | 8 + trunk/drivers/staging/sep/sep_dev.h | 110 + trunk/drivers/staging/sep/sep_driver.c | 2742 +++++++++++++++++ trunk/drivers/staging/sep/sep_driver_api.h | 425 +++ trunk/drivers/staging/sep/sep_driver_config.h | 225 ++ .../drivers/staging/sep/sep_driver_hw_defs.h | 232 ++ trunk/drivers/staging/spectra/Kconfig | 1 - trunk/drivers/staging/spectra/ffsport.c | 30 +- trunk/drivers/staging/spectra/flash.c | 420 ++- trunk/drivers/staging/ti-st/st.h | 1 + trunk/drivers/staging/ti-st/st_core.c | 9 +- trunk/drivers/staging/ti-st/st_core.h | 2 +- trunk/drivers/staging/ti-st/st_kim.c | 22 +- trunk/drivers/staging/tm6000/Kconfig | 2 +- trunk/drivers/staging/tm6000/tm6000-input.c | 61 +- trunk/drivers/staging/vt6655/wpactl.c | 11 +- trunk/drivers/staging/wlan-ng/cfg80211.c | 3 - trunk/drivers/staging/zram/zram_drv.c | 1 - trunk/drivers/usb/atm/cxacru.c | 24 +- trunk/drivers/usb/class/cdc-acm.c | 23 +- trunk/drivers/usb/core/Kconfig | 6 +- trunk/drivers/usb/core/file.c | 35 +- trunk/drivers/usb/core/message.c | 23 +- trunk/drivers/usb/gadget/composite.c | 4 +- trunk/drivers/usb/gadget/m66592-udc.c | 1 - trunk/drivers/usb/gadget/r8a66597-udc.c | 1 - trunk/drivers/usb/gadget/rndis.c | 12 +- trunk/drivers/usb/gadget/rndis.h | 2 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 2 + trunk/drivers/usb/gadget/uvc_v4l2.c | 2 +- trunk/drivers/usb/host/ehci-pci.c | 5 - trunk/drivers/usb/host/ehci-ppc-of.c | 12 +- trunk/drivers/usb/host/isp1760-hcd.c | 2 - trunk/drivers/usb/host/xhci-ring.c | 6 +- trunk/drivers/usb/misc/adutux.c | 2 +- trunk/drivers/usb/misc/iowarrior.c | 4 +- trunk/drivers/usb/musb/cppi_dma.c | 1 - trunk/drivers/usb/musb/musb_debugfs.c | 5 +- trunk/drivers/usb/musb/musb_gadget.c | 75 +- trunk/drivers/usb/musb/musb_gadget.h | 2 - trunk/drivers/usb/musb/musb_gadget_ep0.c | 9 - trunk/drivers/usb/musb/musb_host.c | 6 - trunk/drivers/usb/otg/twl4030-usb.c | 74 +- trunk/drivers/usb/serial/cp210x.c | 15 +- trunk/drivers/usb/serial/ftdi_sio.c | 15 +- trunk/drivers/usb/serial/ftdi_sio_ids.h | 21 - trunk/drivers/usb/serial/generic.c | 11 +- trunk/drivers/usb/serial/io_ti.c | 4 +- trunk/drivers/usb/serial/mos7720.c | 3 - trunk/drivers/usb/serial/mos7840.c | 35 +- trunk/drivers/usb/serial/navman.c | 1 - trunk/drivers/usb/serial/option.c | 126 +- trunk/drivers/usb/serial/pl2303.c | 3 +- trunk/drivers/usb/serial/pl2303.h | 4 - trunk/drivers/usb/serial/ssu100.c | 258 +- trunk/drivers/usb/serial/usb-serial.c | 23 +- trunk/drivers/vhost/net.c | 18 +- trunk/drivers/vhost/vhost.c | 114 +- trunk/drivers/vhost/vhost.h | 10 +- trunk/drivers/video/amba-clcd.c | 10 +- trunk/drivers/video/console/fbcon.c | 5 +- trunk/drivers/video/efifb.c | 103 +- trunk/drivers/video/matrox/matroxfb_base.h | 4 +- trunk/drivers/video/pxa168fb.c | 10 +- trunk/drivers/video/sis/sis_main.c | 3 - trunk/drivers/video/via/ioctl.c | 2 - trunk/drivers/watchdog/Kconfig | 25 +- trunk/drivers/watchdog/hpwdt.c | 306 +- trunk/drivers/watchdog/sb_wdog.c | 12 +- trunk/drivers/watchdog/ts72xx_wdt.c | 3 - trunk/drivers/xen/events.c | 21 +- trunk/drivers/xen/manage.c | 2 +- trunk/drivers/xen/xenbus/xenbus_probe.c | 9 +- trunk/firmware/Makefile | 2 +- trunk/fs/9p/fid.c | 3 +- trunk/fs/9p/vfs_dir.c | 6 +- trunk/fs/9p/vfs_inode.c | 9 +- trunk/fs/9p/vfs_super.c | 20 +- trunk/fs/affs/super.c | 4 +- trunk/fs/afs/cell.c | 56 +- trunk/fs/afs/dir.c | 47 +- trunk/fs/afs/inode.c | 86 - trunk/fs/afs/internal.h | 11 +- trunk/fs/afs/mntpt.c | 78 +- trunk/fs/afs/proc.c | 2 +- trunk/fs/afs/super.c | 20 +- trunk/fs/aio.c | 13 +- trunk/fs/bad_inode.c | 7 + trunk/fs/binfmt_aout.c | 4 + trunk/fs/binfmt_misc.c | 4 +- trunk/fs/binfmt_script.c | 3 +- trunk/fs/bio-integrity.c | 4 +- trunk/fs/buffer.c | 69 +- trunk/fs/ceph/Kconfig | 15 +- trunk/fs/ceph/Makefile | 11 +- trunk/fs/ceph/README | 20 + trunk/fs/ceph/addr.c | 84 +- trunk/{net => fs}/ceph/armor.c | 0 trunk/{net => fs}/ceph/auth.c | 10 +- trunk/{include/linux => fs}/ceph/auth.h | 4 +- trunk/{net => fs}/ceph/auth_none.c | 7 +- trunk/{net => fs}/ceph/auth_none.h | 3 +- trunk/{net => fs}/ceph/auth_x.c | 24 +- trunk/{net => fs}/ceph/auth_x.h | 3 +- trunk/{net => fs}/ceph/auth_x_protocol.h | 0 trunk/{net => fs}/ceph/buffer.c | 9 +- trunk/{include/linux => fs}/ceph/buffer.h | 0 trunk/fs/ceph/caps.c | 140 +- trunk/{include/linux => fs}/ceph/ceph_debug.h | 5 +- trunk/fs/ceph/ceph_frag.c | 3 +- trunk/{include/linux => fs}/ceph/ceph_frag.h | 0 trunk/{net => fs}/ceph/ceph_fs.c | 5 +- trunk/{include/linux => fs}/ceph/ceph_fs.h | 1 - trunk/{net => fs}/ceph/ceph_hash.c | 2 +- trunk/{include/linux => fs}/ceph/ceph_hash.h | 0 trunk/fs/ceph/{strings.c => ceph_strings.c} | 82 +- trunk/{net => fs}/ceph/crush/crush.c | 2 +- .../{include/linux => fs/ceph}/crush/crush.h | 0 trunk/{net => fs}/ceph/crush/hash.c | 2 +- trunk/{include/linux => fs/ceph}/crush/hash.h | 0 trunk/{net => fs}/ceph/crush/mapper.c | 4 +- .../{include/linux => fs/ceph}/crush/mapper.h | 0 trunk/{net => fs}/ceph/crypto.c | 4 +- trunk/{net => fs}/ceph/crypto.h | 4 +- trunk/fs/ceph/debugfs.c | 410 ++- trunk/{include/linux => fs}/ceph/decode.h | 5 - trunk/fs/ceph/dir.c | 109 +- trunk/fs/ceph/export.c | 26 +- trunk/fs/ceph/file.c | 209 +- trunk/fs/ceph/inode.c | 35 +- trunk/fs/ceph/ioctl.c | 77 +- trunk/fs/ceph/ioctl.h | 4 +- trunk/fs/ceph/locks.c | 37 +- trunk/fs/ceph/mds_client.c | 224 +- trunk/fs/ceph/mds_client.h | 23 +- trunk/fs/ceph/mdsmap.c | 11 +- trunk/{include/linux => fs}/ceph/mdsmap.h | 0 trunk/{net => fs}/ceph/messenger.c | 296 +- trunk/{include/linux => fs}/ceph/messenger.h | 12 +- trunk/{net => fs}/ceph/mon_client.c | 73 +- trunk/{include/linux => fs}/ceph/mon_client.h | 1 - trunk/{net => fs}/ceph/msgpool.c | 4 +- trunk/{include/linux => fs}/ceph/msgpool.h | 0 trunk/{include/linux => fs}/ceph/msgr.h | 0 trunk/{net => fs}/ceph/osd_client.c | 404 +-- trunk/{include/linux => fs}/ceph/osd_client.h | 67 - trunk/{net => fs}/ceph/osdmap.c | 30 +- trunk/{include/linux => fs}/ceph/osdmap.h | 4 +- trunk/fs/ceph/pagelist.c | 55 + trunk/{include/linux => fs}/ceph/pagelist.h | 23 +- trunk/{include/linux => fs}/ceph/rados.h | 0 trunk/fs/ceph/snap.c | 187 +- trunk/fs/ceph/super.c | 1154 ++++--- trunk/fs/ceph/super.h | 416 ++- trunk/{include/linux => fs}/ceph/types.h | 0 trunk/fs/ceph/xattr.c | 19 +- trunk/fs/char_dev.c | 4 +- trunk/fs/cifs/README | 10 - trunk/fs/cifs/cifs_unicode.h | 18 +- trunk/fs/cifs/cifs_uniupr.h | 16 +- trunk/fs/cifs/cifsencrypt.c | 57 + trunk/fs/cifs/cifsproto.h | 5 +- trunk/fs/cifs/cifssmb.c | 49 +- trunk/fs/cifs/connect.c | 68 +- trunk/fs/cifs/dir.c | 157 +- trunk/fs/cifs/file.c | 3 +- trunk/fs/cifs/inode.c | 34 +- trunk/fs/cifs/netmisc.c | 22 +- trunk/fs/coda/psdev.c | 4 +- trunk/fs/compat.c | 25 +- trunk/fs/compat_ioctl.c | 3 +- trunk/fs/cramfs/inode.c | 2 +- trunk/fs/dcache.c | 73 +- trunk/fs/direct-io.c | 4 +- trunk/fs/ecryptfs/crypto.c | 3 +- trunk/fs/ecryptfs/inode.c | 31 +- trunk/fs/ecryptfs/keystore.c | 2 - trunk/fs/ecryptfs/kthread.c | 2 +- trunk/fs/ecryptfs/messaging.c | 2 +- trunk/fs/ecryptfs/miscdev.c | 2 +- trunk/fs/exec.c | 79 +- trunk/fs/exofs/inode.c | 8 +- trunk/fs/fat/misc.c | 4 +- trunk/fs/fcntl.c | 10 +- trunk/fs/file_table.c | 133 +- trunk/fs/fs-writeback.c | 14 +- trunk/fs/fs_struct.c | 32 +- trunk/fs/fuse/dev.c | 44 +- trunk/fs/fuse/file.c | 8 +- trunk/fs/generic_acl.c | 1 - trunk/fs/gfs2/Kconfig | 2 +- trunk/fs/gfs2/aops.c | 24 +- trunk/fs/gfs2/bmap.c | 255 +- trunk/fs/gfs2/bmap.h | 20 +- trunk/fs/gfs2/dentry.c | 2 +- trunk/fs/gfs2/dir.c | 31 +- trunk/fs/gfs2/dir.h | 34 +- trunk/fs/gfs2/export.c | 9 +- trunk/fs/gfs2/file.c | 6 +- trunk/fs/gfs2/glock.c | 23 +- trunk/fs/gfs2/glock.h | 2 +- trunk/fs/gfs2/glops.c | 6 +- trunk/fs/gfs2/incore.h | 8 +- trunk/fs/gfs2/inode.c | 9 +- trunk/fs/gfs2/inode.h | 15 - trunk/fs/gfs2/lock_dlm.c | 4 +- trunk/fs/gfs2/log.c | 2 +- trunk/fs/gfs2/main.c | 6 +- trunk/fs/gfs2/ops_fstype.c | 79 +- trunk/fs/gfs2/ops_inode.c | 326 +- trunk/fs/gfs2/quota.c | 16 +- trunk/fs/gfs2/recovery.c | 15 +- trunk/fs/gfs2/rgrp.c | 50 +- trunk/fs/gfs2/rgrp.h | 8 +- trunk/fs/gfs2/super.c | 26 +- trunk/fs/gfs2/sys.c | 22 +- trunk/fs/gfs2/trace_gfs2.h | 3 +- trunk/fs/gfs2/trans.h | 9 - trunk/fs/gfs2/xattr.c | 2 +- trunk/fs/hfs/bfind.c | 4 +- trunk/fs/hfs/btree.c | 2 +- trunk/fs/hfs/btree.h | 2 +- trunk/fs/hfsplus/bfind.c | 17 +- trunk/fs/hfsplus/bitmap.c | 20 +- trunk/fs/hfsplus/brec.c | 29 +- trunk/fs/hfsplus/btree.c | 67 +- trunk/fs/hfsplus/catalog.c | 50 +- trunk/fs/hfsplus/dir.c | 201 +- trunk/fs/hfsplus/extents.c | 223 +- trunk/fs/hfsplus/hfsplus_fs.h | 85 +- trunk/fs/hfsplus/hfsplus_raw.h | 3 +- trunk/fs/hfsplus/inode.c | 185 +- trunk/fs/hfsplus/ioctl.c | 153 +- trunk/fs/hfsplus/options.c | 10 +- trunk/fs/hfsplus/part_tbl.c | 5 +- trunk/fs/hfsplus/super.c | 310 +- trunk/fs/hfsplus/unicode.c | 16 +- trunk/fs/hfsplus/wrapper.c | 40 +- trunk/fs/hostfs/hostfs_kern.c | 4 +- trunk/fs/internal.h | 7 +- trunk/fs/ioctl.c | 18 +- trunk/fs/jbd/checkpoint.c | 4 +- trunk/fs/jbd/commit.c | 49 +- trunk/fs/jbd/journal.c | 2 +- trunk/fs/jbd/revoke.c | 2 +- trunk/fs/jbd2/checkpoint.c | 4 +- trunk/fs/jbd2/commit.c | 39 +- trunk/fs/jbd2/journal.c | 2 +- trunk/fs/jbd2/revoke.c | 2 +- trunk/fs/jbd2/transaction.c | 46 +- trunk/fs/logfs/dir.c | 2 +- trunk/fs/logfs/file.c | 6 +- trunk/fs/logfs/logfs.h | 3 +- trunk/fs/mbcache.c | 30 +- trunk/fs/minix/namei.c | 2 +- trunk/fs/namei.c | 119 +- trunk/fs/namespace.c | 200 +- trunk/fs/nfs/Kconfig | 19 +- trunk/fs/nfs/client.c | 2 +- trunk/fs/nfs/dir.c | 9 +- trunk/fs/nfs/dns_resolve.c | 24 - trunk/fs/nfs/dns_resolve.h | 12 - trunk/fs/nfs/file.c | 6 +- trunk/fs/nfs/nfs4proc.c | 11 +- trunk/fs/nfs/super.c | 15 - trunk/fs/nfsd/Kconfig | 2 +- trunk/fs/nfsd/nfs4state.c | 28 +- trunk/fs/nfsd/nfsfh.h | 2 + trunk/fs/nfsd/state.h | 14 +- trunk/fs/nfsd/vfs.c | 14 +- trunk/fs/nilfs2/super.c | 32 +- trunk/fs/nilfs2/the_nilfs.c | 9 +- trunk/fs/notify/Kconfig | 2 +- trunk/fs/notify/fanotify/fanotify.c | 11 +- trunk/fs/notify/fanotify/fanotify_user.c | 35 +- trunk/fs/notify/fsnotify.c | 80 +- trunk/fs/notify/inotify/inotify_fsnotify.c | 12 +- trunk/fs/notify/notification.c | 33 +- trunk/fs/ocfs2/acl.c | 36 +- trunk/fs/ocfs2/alloc.c | 2 +- trunk/fs/ocfs2/blockcheck.c | 4 +- trunk/fs/ocfs2/cluster/tcp.c | 19 +- trunk/fs/ocfs2/dir.c | 24 +- trunk/fs/ocfs2/dlm/dlmcommon.h | 1 - trunk/fs/ocfs2/dlm/dlmdebug.c | 9 +- trunk/fs/ocfs2/dlm/dlmdomain.c | 1 - trunk/fs/ocfs2/dlm/dlmmaster.c | 49 +- trunk/fs/ocfs2/dlm/dlmrecovery.c | 22 +- trunk/fs/ocfs2/dlm/dlmthread.c | 114 +- trunk/fs/ocfs2/dlmglue.h | 1 - trunk/fs/ocfs2/file.c | 15 +- trunk/fs/ocfs2/inode.c | 6 +- trunk/fs/ocfs2/mmap.c | 8 +- trunk/fs/ocfs2/namei.c | 302 +- trunk/fs/ocfs2/ocfs2_fs.h | 37 +- trunk/fs/ocfs2/ocfs2_ioctl.h | 8 +- trunk/fs/ocfs2/refcounttree.c | 30 +- trunk/fs/ocfs2/reservations.c | 22 +- trunk/fs/ocfs2/suballoc.c | 223 +- trunk/fs/ocfs2/suballoc.h | 21 - trunk/fs/ocfs2/symlink.c | 2 +- trunk/fs/ocfs2/xattr.c | 4 +- trunk/fs/open.c | 4 +- trunk/fs/partitions/ibm.c | 2 +- trunk/fs/pnode.c | 11 +- trunk/fs/proc/base.c | 4 +- trunk/fs/proc/inode.c | 17 +- trunk/fs/proc/page.c | 2 +- trunk/fs/proc/task_mmu.c | 13 +- trunk/fs/proc/vmcore.c | 2 +- trunk/fs/reiserfs/inode.c | 1 - trunk/fs/reiserfs/ioctl.c | 7 +- trunk/fs/reiserfs/journal.c | 2 +- trunk/fs/stat.c | 29 +- trunk/fs/super.c | 18 - trunk/fs/sysfs/file.c | 2 +- trunk/fs/ufs/balloc.c | 24 +- trunk/fs/ufs/ialloc.c | 18 +- trunk/fs/ufs/truncate.c | 18 +- trunk/fs/ufs/util.c | 20 +- trunk/fs/ufs/util.h | 3 +- trunk/fs/utimes.c | 7 +- trunk/fs/xfs/linux-2.6/xfs_aops.c | 13 +- trunk/fs/xfs/linux-2.6/xfs_buf.c | 11 +- trunk/fs/xfs/linux-2.6/xfs_buf.h | 1 + trunk/fs/xfs/linux-2.6/xfs_ioctl.c | 9 - trunk/fs/xfs/linux-2.6/xfs_iops.c | 2 +- trunk/fs/xfs/linux-2.6/xfs_super.c | 9 +- trunk/fs/xfs/linux-2.6/xfs_sync.c | 61 +- trunk/fs/xfs/xfs_bmap.c | 14 +- trunk/fs/xfs/xfs_fs.h | 4 +- trunk/fs/xfs/xfs_fsops.c | 31 +- trunk/fs/xfs/xfs_fsops.h | 2 +- trunk/fs/xfs/xfs_ialloc.c | 16 +- trunk/fs/xfs/xfs_inode.c | 49 +- trunk/fs/xfs/xfs_log.c | 7 +- trunk/fs/xfs/xfs_log_cil.c | 271 +- trunk/fs/xfs/xfs_log_priv.h | 50 +- trunk/fs/xfs/xfs_trans.c | 5 +- trunk/fs/xfs/xfs_trans_priv.h | 3 +- trunk/fs/xfs/xfs_vnodeops.c | 13 +- trunk/include/acpi/acpi_bus.h | 3 + trunk/include/acpi/acpixf.h | 4 +- trunk/include/acpi/processor.h | 1 + trunk/include/asm-generic/Kbuild | 9 +- trunk/include/asm-generic/Kbuild.asm | 67 +- trunk/include/asm-generic/gpio.h | 14 +- trunk/include/asm-generic/hardirq.h | 2 +- trunk/include/asm-generic/percpu.h | 15 +- trunk/include/asm-generic/syscalls.h | 6 +- trunk/include/asm-generic/unistd.h | 6 +- trunk/include/asm-generic/vmlinux.lds.h | 10 - trunk/include/drm/Kbuild | 26 +- trunk/include/drm/drmP.h | 35 +- trunk/include/drm/drm_crtc.h | 10 +- trunk/include/drm/drm_pciids.h | 2 +- trunk/include/drm/i830_drm.h | 28 +- trunk/include/drm/i915_drm.h | 1 - trunk/include/drm/mga_drm.h | 2 +- trunk/include/drm/nouveau_drm.h | 13 - trunk/include/drm/radeon_drm.h | 4 +- trunk/include/drm/savage_drm.h | 8 +- trunk/include/drm/ttm/ttm_bo_api.h | 4 +- trunk/include/linux/Kbuild | 467 +-- trunk/include/linux/acpi.h | 4 +- trunk/include/linux/acpi_pmtmr.h | 2 + trunk/include/linux/amba/clcd.h | 1 - trunk/include/linux/binfmts.h | 7 +- trunk/include/linux/buffer_head.h | 4 +- trunk/include/linux/byteorder/Kbuild | 4 +- trunk/include/linux/ceph/debugfs.h | 33 - trunk/include/linux/ceph/libceph.h | 249 -- trunk/include/linux/cgroup.h | 16 +- trunk/include/linux/compat.h | 9 +- trunk/include/linux/compiler.h | 4 - trunk/include/linux/coredump.h | 34 +- trunk/include/linux/cper.h | 8 +- trunk/include/linux/cpuidle.h | 1 - trunk/include/linux/cred.h | 2 +- trunk/include/linux/debug_locks.h | 5 + trunk/include/linux/dma-mapping.h | 6 - trunk/include/linux/dmaengine.h | 2 +- trunk/include/linux/dvb/Kbuild | 7 +- trunk/include/linux/dynamic_debug.h | 39 +- trunk/include/linux/elevator.h | 2 - trunk/include/linux/etherdevice.h | 2 +- trunk/include/linux/fanotify.h | 13 +- trunk/include/linux/fdtable.h | 6 +- trunk/include/linux/fs.h | 38 +- trunk/include/linux/fs_struct.h | 14 +- trunk/include/linux/fsnotify.h | 37 +- trunk/include/linux/fsnotify_backend.h | 17 +- trunk/include/linux/ftrace_event.h | 8 +- trunk/include/linux/genhd.h | 6 +- trunk/include/linux/gpio.h | 1 - trunk/include/linux/hardirq.h | 11 +- trunk/include/linux/i2c/ltc4245.h | 21 - trunk/include/linux/i2c/sx150x.h | 4 - trunk/include/linux/idr.h | 4 +- trunk/include/linux/if_ether.h | 2 +- trunk/include/linux/if_fddi.h | 8 +- trunk/include/linux/if_hippi.h | 8 +- trunk/include/linux/if_pppox.h | 10 +- trunk/include/linux/init_task.h | 14 +- trunk/include/linux/input.h | 2 +- trunk/include/linux/intel-gtt.h | 20 - trunk/include/linux/interrupt.h | 8 +- trunk/include/linux/io-mapping.h | 24 +- trunk/include/linux/iocontext.h | 2 +- trunk/include/linux/ipv6.h | 4 +- trunk/include/linux/irq_work.h | 20 - trunk/include/linux/jump_label.h | 74 - trunk/include/linux/jump_label_ref.h | 44 - trunk/include/linux/kernel.h | 13 +- trunk/include/linux/key.h | 3 +- trunk/include/linux/kfifo.h | 60 +- trunk/include/linux/kobject.h | 35 +- trunk/include/linux/kobject_ns.h | 56 - trunk/include/linux/ksm.h | 20 +- trunk/include/linux/kvm_host.h | 2 +- trunk/include/linux/lglock.h | 172 -- trunk/include/linux/libata.h | 4 +- trunk/include/linux/lockdep.h | 13 +- trunk/include/linux/miscdevice.h | 1 - trunk/include/linux/mm.h | 22 +- trunk/include/linux/mm_types.h | 4 +- trunk/include/linux/mmc/sdio.h | 2 - trunk/include/linux/mmzone.h | 13 - trunk/include/linux/module.h | 10 +- trunk/include/linux/mutex.h | 8 - trunk/include/linux/nbd.h | 2 +- trunk/include/linux/ncp.h | 10 +- trunk/include/linux/netfilter/Kbuild | 19 +- .../linux/netfilter/nfnetlink_conntrack.h | 10 +- trunk/include/linux/netfilter/xt_IDLETIMER.h | 2 +- trunk/include/linux/netfilter/xt_SECMARK.h | 12 +- trunk/include/linux/netfilter/xt_ipvs.h | 2 - trunk/include/linux/netfilter_arp/Kbuild | 3 +- trunk/include/linux/netfilter_bridge/Kbuild | 5 +- trunk/include/linux/netfilter_ipv4/Kbuild | 5 +- trunk/include/linux/netfilter_ipv6/Kbuild | 5 +- trunk/include/linux/netlink.h | 4 +- trunk/include/linux/netpoll.h | 10 +- trunk/include/linux/nfs_fs.h | 2 +- trunk/include/linux/nfsd/Kbuild | 12 +- trunk/include/linux/notifier.h | 10 +- trunk/include/linux/oprofile.h | 7 - trunk/include/linux/pci.h | 3 - trunk/include/linux/pci_ids.h | 6 - trunk/include/linux/percpu.h | 11 +- trunk/include/linux/perf_event.h | 212 +- trunk/include/linux/phonet.h | 4 +- trunk/include/linux/pxa168_eth.h | 30 - trunk/include/linux/quotaops.h | 10 +- trunk/include/linux/radix-tree.h | 4 +- trunk/include/linux/rculist.h | 62 +- trunk/include/linux/rculist_nulls.h | 16 +- trunk/include/linux/rcupdate.h | 490 +-- trunk/include/linux/rcutiny.h | 104 +- trunk/include/linux/rcutree.h | 57 +- trunk/include/linux/rfkill.h | 2 +- trunk/include/linux/sched.h | 52 +- trunk/include/linux/security.h | 45 +- trunk/include/linux/selinux.h | 63 + trunk/include/linux/semaphore.h | 3 - trunk/include/linux/serial.h | 3 +- trunk/include/linux/serial_core.h | 5 +- trunk/include/linux/slub_def.h | 2 +- trunk/include/linux/socket.h | 2 +- trunk/include/linux/spi/dw_spi.h | 2 - trunk/include/linux/spi/spi.h | 15 - trunk/include/linux/spi/spi_gpio.h | 5 - trunk/include/linux/srcu.h | 34 +- trunk/include/linux/stop_machine.h | 10 +- trunk/include/linux/sunrpc/Kbuild | 2 +- trunk/include/linux/sunrpc/auth_gss.h | 4 +- trunk/include/linux/sunrpc/clnt.h | 2 +- trunk/include/linux/swap.h | 11 +- trunk/include/linux/syscalls.h | 22 +- trunk/include/linux/sysfs.h | 1 - trunk/include/linux/sysrq.h | 16 +- trunk/include/linux/time.h | 2 +- trunk/include/linux/topology.h | 6 - trunk/include/linux/tracepoint.h | 5 +- trunk/include/linux/tty.h | 9 - trunk/include/linux/types.h | 15 +- trunk/include/linux/uinput.h | 1 + trunk/include/linux/usb/composite.h | 1 - trunk/include/linux/usb/serial.h | 3 +- trunk/include/linux/vgaarb.h | 15 +- trunk/include/linux/vmstat.h | 22 - trunk/include/linux/wait.h | 1 - trunk/include/linux/workqueue.h | 22 +- trunk/include/media/videobuf-dma-sg.h | 1 - trunk/include/net/addrconf.h | 1 - trunk/include/net/bluetooth/bluetooth.h | 18 - trunk/include/net/bluetooth/l2cap.h | 4 +- trunk/include/net/cls_cgroup.h | 13 +- trunk/include/net/dst.h | 1 - trunk/include/net/ip_vs.h | 3 - trunk/include/net/netfilter/nf_conntrack.h | 2 +- trunk/include/net/route.h | 2 - trunk/include/net/sock.h | 5 +- trunk/include/net/tcp.h | 36 +- trunk/include/net/udp.h | 1 - trunk/include/net/xfrm.h | 4 +- trunk/include/sound/Kbuild | 9 +- trunk/include/sound/emu10k1.h | 1 - trunk/include/trace/events/irq.h | 26 +- trunk/include/trace/events/napi.h | 25 +- trunk/include/trace/events/net.h | 82 - trunk/include/trace/events/power.h | 90 +- trunk/include/trace/events/sched.h | 29 - trunk/include/trace/events/skb.h | 17 - trunk/include/trace/events/timer.h | 8 +- trunk/include/trace/events/workqueue.h | 62 - trunk/include/video/Kbuild | 5 +- trunk/include/xen/platform_pci.h | 14 +- trunk/init/Kconfig | 34 +- trunk/init/do_mounts_initrd.c | 7 +- trunk/init/main.c | 6 +- trunk/ipc/sem.c | 2 - trunk/kernel/Makefile | 5 +- trunk/kernel/audit_watch.c | 4 +- trunk/kernel/cgroup.c | 15 +- trunk/kernel/compat.c | 21 - trunk/kernel/cpuset.c | 4 +- trunk/kernel/debug/debug_core.c | 2 +- trunk/kernel/debug/kdb/kdb_bp.c | 2 + trunk/kernel/debug/kdb/kdb_main.c | 2 +- trunk/kernel/debug/kdb/kdb_private.h | 7 - trunk/kernel/debug/kdb/kdb_support.c | 4 +- trunk/kernel/exit.c | 9 +- trunk/kernel/fork.c | 19 +- trunk/kernel/gcov/fs.c | 244 +- trunk/kernel/groups.c | 5 +- trunk/kernel/hrtimer.c | 16 +- trunk/kernel/hung_task.c | 4 +- trunk/kernel/hw_breakpoint.c | 74 +- trunk/kernel/irq_work.c | 164 - trunk/kernel/jump_label.c | 429 --- trunk/kernel/kfifo.c | 11 +- trunk/kernel/kmod.c | 4 +- trunk/kernel/kprobes.c | 26 +- trunk/kernel/lockdep.c | 51 +- trunk/kernel/module.c | 10 - trunk/kernel/mutex.c | 23 +- trunk/kernel/perf_event.c | 2682 +++++++--------- trunk/kernel/pid.c | 3 +- trunk/kernel/pm_qos_params.c | 16 +- trunk/kernel/power/hibernate.c | 1 + trunk/kernel/power/poweroff.c | 2 +- trunk/kernel/power/snapshot.c | 86 +- trunk/kernel/power/swap.c | 6 +- trunk/kernel/printk.c | 4 +- trunk/kernel/rcupdate.c | 8 +- trunk/kernel/rcutiny.c | 33 +- trunk/kernel/rcutiny_plugin.h | 582 +--- trunk/kernel/rcutorture.c | 17 +- trunk/kernel/rcutree.c | 92 +- trunk/kernel/rcutree.h | 20 +- trunk/kernel/rcutree_plugin.h | 47 +- trunk/kernel/rcutree_trace.c | 12 +- trunk/kernel/sched.c | 333 +- trunk/kernel/sched_fair.c | 96 +- trunk/kernel/sched_features.h | 5 - trunk/kernel/sched_rt.c | 40 +- trunk/kernel/sched_stoptask.c | 108 - trunk/kernel/signal.c | 8 - trunk/kernel/smp.c | 17 +- trunk/kernel/softirq.c | 64 +- trunk/kernel/srcu.c | 2 + trunk/kernel/stop_machine.c | 8 +- trunk/kernel/sys.c | 2 - trunk/kernel/sysctl.c | 7 +- trunk/kernel/sysctl_check.c | 9 + trunk/kernel/test_kprobes.c | 12 +- trunk/kernel/time/timekeeping.c | 7 +- trunk/kernel/timer.c | 7 +- trunk/kernel/trace/Kconfig | 5 - trunk/kernel/trace/ftrace.c | 142 +- trunk/kernel/trace/ring_buffer.c | 28 +- trunk/kernel/trace/trace.c | 13 +- trunk/kernel/trace/trace.h | 4 - trunk/kernel/trace/trace_event_perf.c | 31 +- trunk/kernel/trace/trace_events.c | 188 +- trunk/kernel/trace/trace_functions_graph.c | 219 +- trunk/kernel/trace/trace_irqsoff.c | 152 +- trunk/kernel/trace/trace_kprobe.c | 43 +- trunk/kernel/trace/trace_sched_wakeup.c | 256 +- trunk/kernel/trace/trace_stack.c | 2 +- trunk/kernel/trace/trace_workqueue.c | 10 +- trunk/kernel/tracepoint.c | 14 +- trunk/kernel/watchdog.c | 63 +- trunk/kernel/workqueue.c | 89 +- trunk/lib/Kconfig.debug | 54 +- trunk/lib/bug.c | 6 +- trunk/lib/dynamic_debug.c | 42 +- trunk/lib/kobject_uevent.c | 4 +- trunk/lib/list_sort.c | 2 +- trunk/lib/radix-tree.c | 70 +- trunk/lib/raid6/.gitignore | 4 - trunk/lib/scatterlist.c | 14 +- trunk/mm/Kconfig | 2 +- trunk/mm/backing-dev.c | 9 +- trunk/mm/bounce.c | 2 +- trunk/mm/compaction.c | 7 +- trunk/mm/fremap.c | 7 +- trunk/mm/hugetlb.c | 24 +- trunk/mm/ksm.c | 9 +- trunk/mm/memcontrol.c | 10 +- trunk/mm/memory-failure.c | 12 +- trunk/mm/memory.c | 87 +- trunk/mm/memory_hotplug.c | 16 +- trunk/mm/mlock.c | 13 - trunk/mm/mmap.c | 25 +- trunk/mm/mmzone.c | 21 - trunk/mm/nommu.c | 12 +- trunk/mm/oom_kill.c | 65 +- trunk/mm/page-writeback.c | 34 +- trunk/mm/page_alloc.c | 37 +- trunk/mm/percpu.c | 8 +- trunk/mm/percpu_up.c | 4 +- trunk/mm/rmap.c | 42 +- trunk/mm/shmem.c | 8 +- trunk/mm/slab.c | 4 +- trunk/mm/swapfile.c | 129 +- trunk/mm/vmscan.c | 43 +- trunk/mm/vmstat.c | 16 +- trunk/net/8021q/vlan_core.c | 14 +- trunk/net/8021q/vlan_dev.c | 3 +- trunk/net/9p/client.c | 7 +- trunk/net/9p/trans_rdma.c | 29 +- trunk/net/9p/trans_virtio.c | 3 +- trunk/net/Kconfig | 3 +- trunk/net/Makefile | 1 - trunk/net/atm/br2684.c | 12 +- trunk/net/atm/mpc.c | 2 +- trunk/net/ax25/ax25_ds_timer.c | 2 +- trunk/net/bluetooth/l2cap.c | 73 +- trunk/net/bluetooth/rfcomm/sock.c | 4 - trunk/net/bridge/br_netfilter.c | 8 +- trunk/net/caif/caif_socket.c | 21 +- trunk/net/caif/cfpkt_skbuff.c | 2 +- trunk/net/caif/cfrfml.c | 2 +- trunk/net/can/bcm.c | 41 +- trunk/net/ceph/Kconfig | 28 - trunk/net/ceph/Makefile | 37 - trunk/net/ceph/ceph_common.c | 529 ---- trunk/net/ceph/ceph_strings.c | 84 - trunk/net/ceph/debugfs.c | 267 -- trunk/net/ceph/pagelist.c | 154 - trunk/net/ceph/pagevec.c | 223 -- trunk/net/core/datagram.c | 1 - trunk/net/core/dev.c | 28 +- trunk/net/core/ethtool.c | 8 +- trunk/net/core/gen_estimator.c | 12 +- trunk/net/core/iovec.c | 5 +- trunk/net/core/net-traces.c | 1 - trunk/net/core/skbuff.c | 7 +- trunk/net/core/sock.c | 13 +- trunk/net/core/stream.c | 8 +- trunk/net/dns_resolver/dns_key.c | 92 +- trunk/net/dns_resolver/dns_query.c | 5 - trunk/net/dsa/Kconfig | 2 +- trunk/net/ipv4/Kconfig | 5 +- trunk/net/ipv4/datagram.c | 5 +- trunk/net/ipv4/fib_frontend.c | 15 +- trunk/net/ipv4/fib_trie.c | 8 +- trunk/net/ipv4/igmp.c | 12 - trunk/net/ipv4/ip_gre.c | 8 +- trunk/net/ipv4/ip_output.c | 19 +- trunk/net/ipv4/ip_sockglue.c | 3 - trunk/net/ipv4/netfilter/arp_tables.c | 5 - trunk/net/ipv4/netfilter/ip_tables.c | 5 - trunk/net/ipv4/netfilter/ipt_REJECT.c | 1 - .../nf_conntrack_l3proto_ipv4_compat.c | 28 +- trunk/net/ipv4/netfilter/nf_defrag_ipv4.c | 4 +- trunk/net/ipv4/netfilter/nf_nat_core.c | 2 +- trunk/net/ipv4/netfilter/nf_nat_snmp_basic.c | 6 +- trunk/net/ipv4/route.c | 9 +- trunk/net/ipv4/tcp.c | 41 +- trunk/net/ipv4/tcp_cong.c | 5 +- trunk/net/ipv4/tcp_input.c | 5 +- trunk/net/ipv4/tcp_timer.c | 32 +- trunk/net/ipv4/udp.c | 44 - trunk/net/ipv4/xfrm4_policy.c | 2 +- trunk/net/ipv4/xfrm4_state.c | 33 +- trunk/net/ipv6/addrconf.c | 11 +- trunk/net/ipv6/addrlabel.c | 5 - trunk/net/ipv6/datagram.c | 7 +- trunk/net/ipv6/ip6_output.c | 18 +- trunk/net/ipv6/netfilter/ip6_tables.c | 5 - trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 80 +- trunk/net/ipv6/reassembly.c | 71 +- trunk/net/ipv6/route.c | 34 +- trunk/net/ipv6/udp.c | 10 - trunk/net/ipv6/xfrm6_state.c | 33 +- trunk/net/irda/af_irda.c | 4 +- trunk/net/irda/irlan/irlan_common.c | 2 +- trunk/net/irda/irlan/irlan_eth.c | 4 +- trunk/net/l2tp/l2tp_eth.c | 2 +- trunk/net/llc/af_llc.c | 3 +- trunk/net/llc/llc_station.c | 2 +- trunk/net/mac80211/agg-tx.c | 2 - trunk/net/mac80211/main.c | 6 - trunk/net/mac80211/rx.c | 4 + trunk/net/mac80211/status.c | 4 +- trunk/net/netfilter/core.c | 2 +- trunk/net/netfilter/ipvs/ip_vs_core.c | 1 - trunk/net/netfilter/ipvs/ip_vs_ftp.c | 9 +- trunk/net/netfilter/ipvs/ip_vs_xmit.c | 18 +- trunk/net/netfilter/nf_conntrack_ecache.c | 4 +- trunk/net/netfilter/nf_conntrack_extend.c | 6 +- trunk/net/netfilter/nf_conntrack_netlink.c | 44 +- trunk/net/netfilter/nf_conntrack_proto.c | 4 +- trunk/net/netfilter/nf_conntrack_sip.c | 2 +- trunk/net/netfilter/nf_conntrack_standalone.c | 28 +- trunk/net/netfilter/nf_log.c | 2 +- trunk/net/netfilter/nf_queue.c | 2 +- trunk/net/netfilter/nf_tproxy_core.c | 6 +- trunk/net/netfilter/xt_CT.c | 1 + trunk/net/netfilter/xt_SECMARK.c | 35 +- trunk/net/netlink/af_netlink.c | 78 +- trunk/net/phonet/pep.c | 3 +- trunk/net/rds/page.c | 27 +- trunk/net/rds/recv.c | 2 +- trunk/net/rds/tcp_connect.c | 4 +- trunk/net/rds/tcp_listen.c | 4 +- trunk/net/rds/tcp_recv.c | 4 +- trunk/net/rds/tcp_send.c | 4 +- trunk/net/rose/af_rose.c | 4 +- trunk/net/sched/act_gact.c | 21 +- trunk/net/sched/act_mirred.c | 15 +- trunk/net/sched/act_nat.c | 22 +- trunk/net/sched/act_police.c | 21 +- trunk/net/sched/act_simple.c | 11 +- trunk/net/sched/act_skbedit.c | 11 +- trunk/net/sched/cls_cgroup.c | 2 +- trunk/net/sched/cls_u32.c | 2 +- trunk/net/sched/sch_api.c | 22 +- trunk/net/sched/sch_atm.c | 8 +- trunk/net/sched/sch_hfsc.c | 2 +- trunk/net/sched/sch_sfq.c | 14 +- trunk/net/sched/sch_tbf.c | 4 +- trunk/net/sched/sch_teql.c | 2 +- trunk/net/sctp/auth.c | 8 +- trunk/net/sctp/output.c | 1 + trunk/net/sctp/sm_statefuns.c | 46 +- trunk/net/sctp/socket.c | 13 +- trunk/net/sunrpc/Kconfig | 9 +- trunk/net/sunrpc/auth.c | 2 +- trunk/net/sunrpc/auth_gss/auth_gss.c | 9 +- trunk/net/sunrpc/auth_gss/gss_krb5_mech.c | 10 +- trunk/net/sunrpc/auth_gss/gss_spkm3_mech.c | 5 +- trunk/net/sunrpc/clnt.c | 116 +- trunk/net/sunrpc/rpc_pipe.c | 20 +- trunk/net/sunrpc/xprtrdma/rpc_rdma.c | 2 - trunk/net/sunrpc/xprtrdma/verbs.c | 22 +- trunk/net/sunrpc/xprtsock.c | 56 +- trunk/net/unix/af_unix.c | 15 +- trunk/net/wireless/core.c | 21 +- trunk/net/wireless/mlme.c | 8 +- trunk/net/wireless/wext-compat.c | 3 - trunk/net/wireless/wext-core.c | 16 - trunk/net/wireless/wext-priv.c | 2 +- trunk/net/xfrm/xfrm_output.c | 2 +- trunk/net/xfrm/xfrm_policy.c | 5 +- trunk/net/xfrm/xfrm_state.c | 45 +- trunk/net/xfrm/xfrm_user.c | 4 +- trunk/samples/kfifo/bytestream-example.c | 42 +- trunk/samples/kfifo/dma-example.c | 120 +- trunk/samples/kfifo/inttype-example.c | 43 +- trunk/samples/kfifo/record-example.c | 39 +- trunk/scripts/Makefile | 1 - trunk/scripts/Makefile.build | 10 - trunk/scripts/Makefile.headersinst | 3 +- trunk/scripts/Makefile.lib | 11 +- trunk/scripts/basic/Makefile | 2 +- trunk/scripts/basic/docproc.c | 129 +- trunk/scripts/basic/hash.c | 64 + trunk/scripts/gcc-goto.sh | 5 - trunk/scripts/kconfig/conf.c | 17 +- trunk/scripts/kconfig/confdata.c | 115 +- trunk/scripts/kconfig/expr.c | 2 +- trunk/scripts/kconfig/expr.h | 1 + trunk/scripts/kconfig/lkc.h | 10 - trunk/scripts/kconfig/menu.c | 7 +- trunk/scripts/kconfig/nconf.c | 2 - trunk/scripts/kconfig/symbol.c | 4 - trunk/scripts/kernel-doc | 54 +- trunk/scripts/mkmakefile | 4 +- trunk/scripts/recordmcount.c | 363 --- trunk/scripts/recordmcount.h | 366 --- trunk/scripts/recordmcount.pl | 7 +- trunk/scripts/setlocalversion | 6 +- trunk/security/apparmor/.gitignore | 1 - trunk/security/apparmor/apparmorfs.c | 4 +- trunk/security/apparmor/include/resource.h | 4 +- trunk/security/apparmor/lib.c | 2 +- trunk/security/apparmor/lsm.c | 6 +- trunk/security/apparmor/path.c | 47 +- trunk/security/apparmor/policy.c | 6 +- trunk/security/apparmor/resource.c | 20 +- trunk/security/capability.c | 17 +- trunk/security/commoncap.c | 7 +- trunk/security/integrity/ima/ima.h | 1 - trunk/security/integrity/ima/ima_iint.c | 4 +- trunk/security/integrity/ima/ima_main.c | 8 +- trunk/security/keys/keyctl.c | 6 +- trunk/security/security.c | 35 +- trunk/security/selinux/Makefile | 21 +- trunk/security/selinux/exports.c | 49 + trunk/security/selinux/hooks.c | 37 +- trunk/security/selinux/include/classmap.h | 2 +- trunk/security/selinux/include/security.h | 23 - trunk/security/selinux/selinuxfs.c | 195 -- trunk/security/selinux/ss/Makefile | 9 + trunk/security/selinux/ss/avtab.c | 46 +- trunk/security/selinux/ss/avtab.h | 3 +- trunk/security/selinux/ss/conditional.c | 123 - trunk/security/selinux/ss/conditional.h | 2 - trunk/security/selinux/ss/ebitmap.c | 81 +- trunk/security/selinux/ss/ebitmap.h | 1 - trunk/security/selinux/ss/policydb.c | 861 +----- trunk/security/selinux/ss/policydb.h | 20 - trunk/security/selinux/ss/services.c | 63 +- trunk/security/selinux/ss/status.c | 126 - trunk/security/smack/smack_lsm.c | 8 +- trunk/security/tomoyo/common.c | 23 +- trunk/security/tomoyo/common.h | 3 + trunk/sound/core/control.c | 5 - trunk/sound/core/pcm.c | 39 +- trunk/sound/core/pcm_native.c | 6 - trunk/sound/core/rawmidi.c | 6 +- trunk/sound/core/seq/oss/seq_oss_init.c | 9 +- trunk/sound/i2c/other/ak4xxx-adda.c | 2 +- trunk/sound/isa/msnd/msnd_pinnacle.c | 8 +- trunk/sound/oss/sh_dac_audio.c | 1 + trunk/sound/oss/sound_timer.c | 2 +- trunk/sound/oss/soundcard.c | 4 +- trunk/sound/pci/asihpi/hpi6205.c | 7 +- trunk/sound/pci/emu10k1/emu10k1.c | 4 - trunk/sound/pci/emu10k1/emupcm.c | 30 +- trunk/sound/pci/emu10k1/memory.c | 4 +- trunk/sound/pci/hda/hda_codec.c | 61 +- trunk/sound/pci/hda/hda_codec.h | 7 +- trunk/sound/pci/hda/hda_eld.c | 49 - trunk/sound/pci/hda/hda_intel.c | 3 - trunk/sound/pci/hda/hda_local.h | 2 - trunk/sound/pci/hda/patch_analog.c | 1 - trunk/sound/pci/hda/patch_cirrus.c | 52 +- trunk/sound/pci/hda/patch_conexant.c | 63 +- trunk/sound/pci/hda/patch_hdmi.c | 59 +- trunk/sound/pci/hda/patch_intelhdmi.c | 9 +- trunk/sound/pci/hda/patch_nvhdmi.c | 14 +- trunk/sound/pci/hda/patch_realtek.c | 212 +- trunk/sound/pci/hda/patch_sigmatel.c | 17 - trunk/sound/pci/intel8x0.c | 6 - trunk/sound/pci/oxygen/oxygen.c | 4 - trunk/sound/pci/oxygen/oxygen.h | 1 - trunk/sound/pci/oxygen/oxygen_lib.c | 21 +- trunk/sound/pci/oxygen/virtuoso.c | 1 - trunk/sound/pci/oxygen/xonar_wm87x6.c | 22 +- trunk/sound/pci/riptide/riptide.c | 11 +- trunk/sound/pci/rme9652/hdsp.c | 1 - trunk/sound/pci/rme9652/hdspm.c | 1 - trunk/sound/ppc/snd_ps3.c | 2 +- trunk/sound/soc/codecs/wm8776.c | 7 + trunk/sound/soc/codecs/wm8994.c | 23 +- trunk/sound/soc/imx/imx-ssi.c | 3 - trunk/sound/soc/s3c24xx/s3c-dma.c | 3 +- trunk/sound/soc/sh/migor.c | 15 +- trunk/sound/soc/soc-cache.c | 5 +- trunk/sound/soc/soc-core.c | 2 +- trunk/sound/usb/card.c | 19 +- trunk/sound/usb/clock.c | 3 +- trunk/sound/usb/endpoint.c | 11 +- trunk/sound/usb/format.c | 14 +- trunk/sound/usb/mixer.c | 10 +- trunk/sound/usb/pcm.c | 3 +- .../perf/Documentation/perf-annotate.txt | 11 +- .../tools/perf/Documentation/perf-report.txt | 7 - trunk/tools/perf/Makefile | 87 +- trunk/tools/perf/builtin-annotate.c | 28 +- trunk/tools/perf/builtin-report.c | 45 +- trunk/tools/perf/builtin-timechart.c | 4 +- trunk/tools/perf/builtin-trace.c | 19 +- trunk/tools/perf/feature-tests.mak | 13 +- trunk/tools/perf/perf.h | 12 - .../scripts/python/bin/netdev-times-record | 8 - .../scripts/python/bin/netdev-times-report | 5 - .../tools/perf/scripts/python/netdev-times.py | 464 --- trunk/tools/perf/util/cache.h | 2 - trunk/tools/perf/util/callchain.c | 98 +- trunk/tools/perf/util/callchain.h | 26 +- trunk/tools/perf/util/debug.c | 2 +- trunk/tools/perf/util/debug.h | 9 +- trunk/tools/perf/util/hist.c | 20 +- trunk/tools/perf/util/hist.h | 3 +- trunk/tools/perf/util/include/linux/list.h | 8 - trunk/tools/perf/util/include/linux/types.h | 12 - trunk/tools/perf/util/newt.c | 1568 ++++++++++ trunk/tools/perf/util/path.c | 3 +- trunk/tools/perf/util/probe-event.c | 12 +- trunk/tools/perf/util/probe-finder.c | 39 +- trunk/tools/perf/util/pstack.h | 2 - trunk/tools/perf/util/sort.c | 6 +- trunk/tools/perf/util/sort.h | 2 +- trunk/tools/perf/util/symbol.c | 61 +- trunk/tools/perf/util/symbol.h | 5 +- trunk/tools/perf/util/trace-event-scripting.c | 4 +- trunk/tools/perf/util/ui/browser.c | 338 -- trunk/tools/perf/util/ui/browser.h | 51 - trunk/tools/perf/util/ui/browsers/annotate.c | 237 -- trunk/tools/perf/util/ui/browsers/hists.c | 1013 ------ trunk/tools/perf/util/ui/browsers/map.c | 155 - trunk/tools/perf/util/ui/browsers/map.h | 6 - trunk/tools/perf/util/ui/helpline.c | 69 - trunk/tools/perf/util/ui/helpline.h | 11 - trunk/tools/perf/util/ui/libslang.h | 27 - trunk/tools/perf/util/ui/progress.c | 60 - trunk/tools/perf/util/ui/progress.h | 11 - trunk/tools/perf/util/ui/setup.c | 42 - trunk/tools/perf/util/ui/util.c | 112 - trunk/tools/perf/util/ui/util.h | 10 - trunk/tools/perf/util/util.h | 13 + trunk/virt/kvm/eventfd.c | 3 +- trunk/virt/kvm/kvm_main.c | 9 +- 2486 files changed, 238961 insertions(+), 54219 deletions(-) delete mode 100644 trunk/Documentation/block/cfq-iosched.txt delete mode 100644 trunk/Documentation/hwmon/emc2103 delete mode 100644 trunk/Documentation/networking/e1000e.txt mode change 100644 => 100755 trunk/Documentation/networking/ixgbevf.txt delete mode 100644 trunk/Documentation/scsi/scsi-parameters.txt delete mode 100644 trunk/Documentation/workqueue.txt delete mode 100644 trunk/arch/arm/mach-s3c64xx/mach-real6410.c delete mode 100644 trunk/arch/arm/mach-shmobile/pm_runtime.c delete mode 100644 trunk/arch/arm/mach-w90x900/include/mach/i2c.h rename trunk/arch/{mn10300/mm/cache-disabled.c => frv/lib/perf_event.c} (53%) delete mode 100644 trunk/arch/m32r/kernel/.gitignore create mode 100644 trunk/arch/sh/oprofile/op_impl.h delete mode 100644 trunk/arch/sparc/include/asm/jump_label.h create mode 100644 trunk/arch/sparc/include/asm/rwsem-const.h delete mode 100644 trunk/arch/sparc/kernel/jump_label.c create mode 100644 trunk/arch/sparc/lib/rwsem_64.S delete mode 100644 trunk/arch/x86/include/asm/jump_label.h rename trunk/arch/x86/include/asm/{amd_nb.h => k8.h} (61%) delete mode 100644 trunk/arch/x86/kernel/irq_work.c delete mode 100644 trunk/arch/x86/kernel/jump_label.c rename trunk/arch/x86/kernel/{amd_nb.c => k8.c} (66%) create mode 100644 trunk/arch/x86/kernel/pmtimer_64.c delete mode 100644 trunk/drivers/acpi/apei/erst-dbg.c create mode 100644 trunk/drivers/acpi/debug.c delete mode 100644 trunk/drivers/acpi/debugfs.c rename trunk/drivers/acpi/{sysfs.c => system.c} (56%) create mode 100644 trunk/drivers/ata/pata_winbond.c delete mode 100644 trunk/drivers/block/rbd.c delete mode 100644 trunk/drivers/block/rbd_types.h rename trunk/drivers/{scsi => firmware}/iscsi_boot_sysfs.c (100%) delete mode 100644 trunk/drivers/gpu/drm/i915/i915_gem_evict.c delete mode 100644 trunk/drivers/gpu/drm/i915/intel_panel.c delete mode 100644 trunk/drivers/hwmon/emc2103.c delete mode 100644 trunk/drivers/i2c/busses/i2c-nuc900.c mode change 100644 => 100755 trunk/drivers/idle/intel_idle.c create mode 100644 trunk/drivers/md/.gitignore rename trunk/drivers/misc/{vmw_balloon.c => vmware_balloon.c} (100%) delete mode 100644 trunk/drivers/net/pxa168_eth.c delete mode 100644 trunk/drivers/oprofile/oprofile_perf.c create mode 100644 trunk/drivers/pci/pcie/pme/Makefile rename trunk/drivers/pci/pcie/{pme.c => pme/pcie_pme.c} (83%) create mode 100644 trunk/drivers/pci/pcie/pme/pcie_pme.h create mode 100644 trunk/drivers/pci/pcie/pme/pcie_pme_acpi.c delete mode 100644 trunk/drivers/pci/pcie/portdrv_acpi.c delete mode 100644 trunk/drivers/platform/x86/ideapad_acpi.c create mode 100644 trunk/drivers/staging/sep/Kconfig create mode 100644 trunk/drivers/staging/sep/Makefile create mode 100644 trunk/drivers/staging/sep/TODO create mode 100644 trunk/drivers/staging/sep/sep_dev.h create mode 100644 trunk/drivers/staging/sep/sep_driver.c create mode 100644 trunk/drivers/staging/sep/sep_driver_api.h create mode 100644 trunk/drivers/staging/sep/sep_driver_config.h create mode 100644 trunk/drivers/staging/sep/sep_driver_hw_defs.h create mode 100644 trunk/fs/ceph/README rename trunk/{net => fs}/ceph/armor.c (100%) rename trunk/{net => fs}/ceph/auth.c (97%) rename trunk/{include/linux => fs}/ceph/auth.h (97%) rename trunk/{net => fs}/ceph/auth_none.c (96%) rename trunk/{net => fs}/ceph/auth_none.h (94%) rename trunk/{net => fs}/ceph/auth_x.c (98%) rename trunk/{net => fs}/ceph/auth_x.h (96%) rename trunk/{net => fs}/ceph/auth_x_protocol.h (100%) rename trunk/{net => fs}/ceph/buffer.c (86%) rename trunk/{include/linux => fs}/ceph/buffer.h (100%) rename trunk/{include/linux => fs}/ceph/ceph_debug.h (86%) rename trunk/{include/linux => fs}/ceph/ceph_frag.h (100%) rename trunk/{net => fs}/ceph/ceph_fs.c (92%) rename trunk/{include/linux => fs}/ceph/ceph_fs.h (99%) rename trunk/{net => fs}/ceph/ceph_hash.c (98%) rename trunk/{include/linux => fs}/ceph/ceph_hash.h (100%) rename trunk/fs/ceph/{strings.c => ceph_strings.c} (59%) rename trunk/{net => fs}/ceph/crush/crush.c (99%) rename trunk/{include/linux => fs/ceph}/crush/crush.h (100%) rename trunk/{net => fs}/ceph/crush/hash.c (99%) rename trunk/{include/linux => fs/ceph}/crush/hash.h (100%) rename trunk/{net => fs}/ceph/crush/mapper.c (99%) rename trunk/{include/linux => fs/ceph}/crush/mapper.h (100%) rename trunk/{net => fs}/ceph/crypto.c (99%) rename trunk/{net => fs}/ceph/crypto.h (95%) rename trunk/{include/linux => fs}/ceph/decode.h (96%) rename trunk/{include/linux => fs}/ceph/mdsmap.h (100%) rename trunk/{net => fs}/ceph/messenger.c (89%) rename trunk/{include/linux => fs}/ceph/messenger.h (95%) rename trunk/{net => fs}/ceph/mon_client.c (94%) rename trunk/{include/linux => fs}/ceph/mon_client.h (99%) rename trunk/{net => fs}/ceph/msgpool.c (95%) rename trunk/{include/linux => fs}/ceph/msgpool.h (100%) rename trunk/{include/linux => fs}/ceph/msgr.h (100%) rename trunk/{net => fs}/ceph/osd_client.c (84%) rename trunk/{include/linux => fs}/ceph/osd_client.h (76%) rename trunk/{net => fs}/ceph/osdmap.c (97%) rename trunk/{include/linux => fs}/ceph/osdmap.h (97%) create mode 100644 trunk/fs/ceph/pagelist.c rename trunk/{include/linux => fs}/ceph/pagelist.h (62%) rename trunk/{include/linux => fs}/ceph/rados.h (100%) rename trunk/{include/linux => fs}/ceph/types.h (100%) delete mode 100644 trunk/include/linux/ceph/debugfs.h delete mode 100644 trunk/include/linux/ceph/libceph.h delete mode 100644 trunk/include/linux/i2c/ltc4245.h delete mode 100644 trunk/include/linux/intel-gtt.h delete mode 100644 trunk/include/linux/irq_work.h delete mode 100644 trunk/include/linux/jump_label.h delete mode 100644 trunk/include/linux/jump_label_ref.h delete mode 100644 trunk/include/linux/kobject_ns.h delete mode 100644 trunk/include/linux/lglock.h delete mode 100644 trunk/include/linux/pxa168_eth.h delete mode 100644 trunk/include/trace/events/net.h delete mode 100644 trunk/include/trace/events/workqueue.h delete mode 100644 trunk/kernel/irq_work.c delete mode 100644 trunk/kernel/jump_label.c delete mode 100644 trunk/kernel/sched_stoptask.c delete mode 100644 trunk/lib/raid6/.gitignore delete mode 100644 trunk/net/ceph/Kconfig delete mode 100644 trunk/net/ceph/Makefile delete mode 100644 trunk/net/ceph/ceph_common.c delete mode 100644 trunk/net/ceph/ceph_strings.c delete mode 100644 trunk/net/ceph/debugfs.c delete mode 100644 trunk/net/ceph/pagelist.c delete mode 100644 trunk/net/ceph/pagevec.c create mode 100644 trunk/scripts/basic/hash.c delete mode 100644 trunk/scripts/gcc-goto.sh delete mode 100644 trunk/scripts/recordmcount.c delete mode 100644 trunk/scripts/recordmcount.h create mode 100644 trunk/security/selinux/ss/Makefile delete mode 100644 trunk/security/selinux/ss/status.c delete mode 100644 trunk/tools/perf/scripts/python/bin/netdev-times-record delete mode 100644 trunk/tools/perf/scripts/python/bin/netdev-times-report delete mode 100644 trunk/tools/perf/scripts/python/netdev-times.py create mode 100644 trunk/tools/perf/util/newt.c delete mode 100644 trunk/tools/perf/util/ui/browser.c delete mode 100644 trunk/tools/perf/util/ui/browser.h delete mode 100644 trunk/tools/perf/util/ui/browsers/annotate.c delete mode 100644 trunk/tools/perf/util/ui/browsers/hists.c delete mode 100644 trunk/tools/perf/util/ui/browsers/map.c delete mode 100644 trunk/tools/perf/util/ui/browsers/map.h delete mode 100644 trunk/tools/perf/util/ui/helpline.c delete mode 100644 trunk/tools/perf/util/ui/helpline.h delete mode 100644 trunk/tools/perf/util/ui/libslang.h delete mode 100644 trunk/tools/perf/util/ui/progress.c delete mode 100644 trunk/tools/perf/util/ui/progress.h delete mode 100644 trunk/tools/perf/util/ui/setup.c delete mode 100644 trunk/tools/perf/util/ui/util.c delete mode 100644 trunk/tools/perf/util/ui/util.h diff --git a/[refs] b/[refs] index d582722bbd81..8d7d585c2152 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 214515b5787a1035b2c8807abe8be569de63b2f6 +refs/heads/master: 1f999ab5a1360afc388868cc0ef9afe8edeef3be diff --git a/trunk/CREDITS b/trunk/CREDITS index 41d8e63d5165..72b487869788 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -3554,12 +3554,12 @@ E: cvance@nai.com D: portions of the Linux Security Module (LSM) framework and security modules N: Petr Vandrovec -E: petr@vandrovec.name +E: vandrove@vc.cvut.cz D: Small contributions to ncpfs D: Matrox framebuffer driver -S: 21513 Conradia Ct -S: Cupertino, CA 95014 -S: USA +S: Chudenicka 8 +S: 10200 Prague 10, Hostivar +S: Czech Republic N: Thibaut Varene E: T-Bone@parisc-linux.org diff --git a/trunk/Documentation/DMA-API-HOWTO.txt b/trunk/Documentation/DMA-API-HOWTO.txt index d568bc235bc0..3c4e07123e59 100644 --- a/trunk/Documentation/DMA-API-HOWTO.txt +++ b/trunk/Documentation/DMA-API-HOWTO.txt @@ -738,17 +738,17 @@ to "Closing". CONFIG_NEED_SG_DMA_LENGTH if the architecture supports IOMMUs (including software IOMMU). -2) ARCH_DMA_MINALIGN +2) ARCH_KMALLOC_MINALIGN Architectures must ensure that kmalloc'ed buffer is DMA-safe. Drivers and subsystems depend on it. If an architecture isn't fully DMA-coherent (i.e. hardware doesn't ensure that data in the CPU cache is identical to data in main memory), - ARCH_DMA_MINALIGN must be set so that the memory allocator + ARCH_KMALLOC_MINALIGN must be set so that the memory allocator makes sure that kmalloc'ed buffer doesn't share a cache line with the others. See arch/arm/include/asm/cache.h as an example. - Note that ARCH_DMA_MINALIGN is about DMA memory alignment + Note that ARCH_KMALLOC_MINALIGN is about DMA memory alignment constraints. You don't need to worry about the architecture data alignment constraints (e.g. the alignment constraints about 64-bit objects). diff --git a/trunk/Documentation/DocBook/device-drivers.tmpl b/trunk/Documentation/DocBook/device-drivers.tmpl index feca0758391e..ecd35e9d4410 100644 --- a/trunk/Documentation/DocBook/device-drivers.tmpl +++ b/trunk/Documentation/DocBook/device-drivers.tmpl @@ -46,6 +46,7 @@ Atomic and pointer manipulation !Iarch/x86/include/asm/atomic.h +!Iarch/x86/include/asm/unaligned.h Delaying, scheduling, and timer routines diff --git a/trunk/Documentation/DocBook/kernel-api.tmpl b/trunk/Documentation/DocBook/kernel-api.tmpl index 6899f471fb15..a20c6f6fffc3 100644 --- a/trunk/Documentation/DocBook/kernel-api.tmpl +++ b/trunk/Documentation/DocBook/kernel-api.tmpl @@ -57,6 +57,7 @@ String Conversions +!Ilib/vsprintf.c !Elib/vsprintf.c String Manipulation diff --git a/trunk/Documentation/DocBook/kernel-locking.tmpl b/trunk/Documentation/DocBook/kernel-locking.tmpl index f66f4df18690..084f6ad7b7a0 100644 --- a/trunk/Documentation/DocBook/kernel-locking.tmpl +++ b/trunk/Documentation/DocBook/kernel-locking.tmpl @@ -1645,9 +1645,7 @@ the amount of locking which needs to be done. all the readers who were traversing the list when we deleted the element are finished. We use call_rcu() to register a callback which will actually destroy the object once - all pre-existing readers are finished. Alternatively, - synchronize_rcu() may be used to block until - all pre-existing are finished. + the readers are finished. But how does Read Copy Update know when the readers are @@ -1716,7 +1714,7 @@ the amount of locking which needs to be done. - object_put(obj); + list_del_rcu(&obj->list); cache_num--; -+ call_rcu(&obj->rcu, cache_delete_rcu); ++ call_rcu(&obj->rcu, cache_delete_rcu, obj); } /* Must be holding cache_lock */ @@ -1727,6 +1725,14 @@ the amount of locking which needs to be done. if (++cache_num > MAX_CACHE_SIZE) { struct object *i, *outcast = NULL; list_for_each_entry(i, &cache, list) { +@@ -85,6 +94,7 @@ + obj->popularity = 0; + atomic_set(&obj->refcnt, 1); /* The cache holds a reference */ + spin_lock_init(&obj->lock); ++ INIT_RCU_HEAD(&obj->rcu); + + spin_lock_irqsave(&cache_lock, flags); + __cache_add(obj); @@ -104,12 +114,11 @@ struct object *cache_find(int id) { @@ -1916,12 +1922,9 @@ machines due to caching. mutex_lock() - There is a mutex_trylock() which does not - sleep. Still, it must not be used inside interrupt context since - its implementation is not safe for that. + There is a mutex_trylock() which can be + used inside interrupt context, as it will not sleep. mutex_unlock() will also never sleep. - It cannot be used in interrupt context either since a mutex - must be released by the same task that acquired it. @@ -1955,12 +1958,6 @@ machines due to caching. - - Mutex API reference -!Iinclude/linux/mutex.h -!Ekernel/mutex.c - - Further reading diff --git a/trunk/Documentation/DocBook/tracepoint.tmpl b/trunk/Documentation/DocBook/tracepoint.tmpl index b57a9ede3224..e8473eae2a20 100644 --- a/trunk/Documentation/DocBook/tracepoint.tmpl +++ b/trunk/Documentation/DocBook/tracepoint.tmpl @@ -104,9 +104,4 @@ Block IO !Iinclude/trace/events/block.h - - - Workqueue -!Iinclude/trace/events/workqueue.h - diff --git a/trunk/Documentation/RCU/checklist.txt b/trunk/Documentation/RCU/checklist.txt index 0c134f8afc6f..790d1a812376 100644 --- a/trunk/Documentation/RCU/checklist.txt +++ b/trunk/Documentation/RCU/checklist.txt @@ -218,22 +218,13 @@ over a rather long period of time, but improvements are always welcome! include: a. Keeping a count of the number of data-structure elements - used by the RCU-protected data structure, including - those waiting for a grace period to elapse. Enforce a - limit on this number, stalling updates as needed to allow - previously deferred frees to complete. Alternatively, - limit only the number awaiting deferred free rather than - the total number of elements. - - One way to stall the updates is to acquire the update-side - mutex. (Don't try this with a spinlock -- other CPUs - spinning on the lock could prevent the grace period - from ever ending.) Another way to stall the updates - is for the updates to use a wrapper function around - the memory allocator, so that this wrapper function - simulates OOM when there is too much memory awaiting an - RCU grace period. There are of course many other - variations on this theme. + used by the RCU-protected data structure, including those + waiting for a grace period to elapse. Enforce a limit + on this number, stalling updates as needed to allow + previously deferred frees to complete. + + Alternatively, limit only the number awaiting deferred + free rather than the total number of elements. b. Limiting update rate. For example, if updates occur only once per hour, then no explicit rate limiting is required, @@ -374,26 +365,3 @@ over a rather long period of time, but improvements are always welcome! and the compiler to freely reorder code into and out of RCU read-side critical sections. It is the responsibility of the RCU update-side primitives to deal with this. - -17. Use CONFIG_PROVE_RCU, CONFIG_DEBUG_OBJECTS_RCU_HEAD, and - the __rcu sparse checks to validate your RCU code. These - can help find problems as follows: - - CONFIG_PROVE_RCU: check that accesses to RCU-protected data - structures are carried out under the proper RCU - read-side critical section, while holding the right - combination of locks, or whatever other conditions - are appropriate. - - CONFIG_DEBUG_OBJECTS_RCU_HEAD: check that you don't pass the - same object to call_rcu() (or friends) before an RCU - grace period has elapsed since the last time that you - passed that same object to call_rcu() (or friends). - - __rcu sparse checks: tag the pointer to the RCU-protected data - structure with __rcu, and sparse will warn you if you - access that pointer without the services of one of the - variants of rcu_dereference(). - - These debugging aids can help you find problems that are - otherwise extremely difficult to spot. diff --git a/trunk/Documentation/RCU/stallwarn.txt b/trunk/Documentation/RCU/stallwarn.txt index 862c08ef1fde..44c6dcc93d6d 100644 --- a/trunk/Documentation/RCU/stallwarn.txt +++ b/trunk/Documentation/RCU/stallwarn.txt @@ -80,24 +80,6 @@ o A CPU looping with bottom halves disabled. This condition can o For !CONFIG_PREEMPT kernels, a CPU looping anywhere in the kernel without invoking schedule(). -o A CPU-bound real-time task in a CONFIG_PREEMPT kernel, which might - happen to preempt a low-priority task in the middle of an RCU - read-side critical section. This is especially damaging if - that low-priority task is not permitted to run on any other CPU, - in which case the next RCU grace period can never complete, which - will eventually cause the system to run out of memory and hang. - While the system is in the process of running itself out of - memory, you might see stall-warning messages. - -o A CPU-bound real-time task in a CONFIG_PREEMPT_RT kernel that - is running at a higher priority than the RCU softirq threads. - This will prevent RCU callbacks from ever being invoked, - and in a CONFIG_TREE_PREEMPT_RCU kernel will further prevent - RCU grace periods from ever completing. Either way, the - system will eventually run out of memory and hang. In the - CONFIG_TREE_PREEMPT_RCU case, you might see stall-warning - messages. - o A bug in the RCU implementation. o A hardware failure. This is quite unlikely, but has occurred diff --git a/trunk/Documentation/RCU/trace.txt b/trunk/Documentation/RCU/trace.txt index a851118775d8..efd8cc95c06b 100644 --- a/trunk/Documentation/RCU/trace.txt +++ b/trunk/Documentation/RCU/trace.txt @@ -125,17 +125,6 @@ o "b" is the batch limit for this CPU. If more than this number of RCU callbacks is ready to invoke, then the remainder will be deferred. -o "ci" is the number of RCU callbacks that have been invoked for - this CPU. Note that ci+ql is the number of callbacks that have - been registered in absence of CPU-hotplug activity. - -o "co" is the number of RCU callbacks that have been orphaned due to - this CPU going offline. - -o "ca" is the number of RCU callbacks that have been adopted due to - other CPUs going offline. Note that ci+co-ca+ql is the number of - RCU callbacks registered on this CPU. - There is also an rcu/rcudata.csv file with the same information in comma-separated-variable spreadsheet format. @@ -191,7 +180,7 @@ o "s" is the "signaled" state that drives force_quiescent_state()'s o "jfq" is the number of jiffies remaining for this grace period before force_quiescent_state() is invoked to help push things - along. Note that CPUs in dyntick-idle mode throughout the grace + along. Note that CPUs in dyntick-idle mode thoughout the grace period will not report on their own, but rather must be check by some other CPU via force_quiescent_state(). diff --git a/trunk/Documentation/acpi/method-customizing.txt b/trunk/Documentation/acpi/method-customizing.txt index 3e1d25aee3fb..e628cd23ca80 100644 --- a/trunk/Documentation/acpi/method-customizing.txt +++ b/trunk/Documentation/acpi/method-customizing.txt @@ -19,8 +19,6 @@ Note: Only ACPI METHOD can be overridden, any other object types like "Device", "OperationRegion", are not recognized. Note: The same ACPI control method can be overridden for many times, and it's always the latest one that used by Linux/kernel. -Note: To get the ACPI debug object output (Store (AAAA, Debug)), - please run "echo 1 > /sys/module/acpi/parameters/aml_debug_output". 1. override an existing method a) get the ACPI table via ACPI sysfs I/F. e.g. to get the DSDT, diff --git a/trunk/Documentation/block/cfq-iosched.txt b/trunk/Documentation/block/cfq-iosched.txt deleted file mode 100644 index e578feed6d81..000000000000 --- a/trunk/Documentation/block/cfq-iosched.txt +++ /dev/null @@ -1,45 +0,0 @@ -CFQ ioscheduler tunables -======================== - -slice_idle ----------- -This specifies how long CFQ should idle for next request on certain cfq queues -(for sequential workloads) and service trees (for random workloads) before -queue is expired and CFQ selects next queue to dispatch from. - -By default slice_idle is a non-zero value. That means by default we idle on -queues/service trees. This can be very helpful on highly seeky media like -single spindle SATA/SAS disks where we can cut down on overall number of -seeks and see improved throughput. - -Setting slice_idle to 0 will remove all the idling on queues/service tree -level and one should see an overall improved throughput on faster storage -devices like multiple SATA/SAS disks in hardware RAID configuration. The down -side is that isolation provided from WRITES also goes down and notion of -IO priority becomes weaker. - -So depending on storage and workload, it might be useful to set slice_idle=0. -In general I think for SATA/SAS disks and software RAID of SATA/SAS disks -keeping slice_idle enabled should be useful. For any configurations where -there are multiple spindles behind single LUN (Host based hardware RAID -controller or for storage arrays), setting slice_idle=0 might end up in better -throughput and acceptable latencies. - -CFQ IOPS Mode for group scheduling -=================================== -Basic CFQ design is to provide priority based time slices. Higher priority -process gets bigger time slice and lower priority process gets smaller time -slice. Measuring time becomes harder if storage is fast and supports NCQ and -it would be better to dispatch multiple requests from multiple cfq queues in -request queue at a time. In such scenario, it is not possible to measure time -consumed by single queue accurately. - -What is possible though is to measure number of requests dispatched from a -single queue and also allow dispatch from multiple cfq queue at the same time. -This effectively becomes the fairness in terms of IOPS (IO operations per -second). - -If one sets slice_idle=0 and if storage supports NCQ, CFQ internally switches -to IOPS mode and starts providing fairness in terms of number of requests -dispatched. Note that this mode switching takes effect only for group -scheduling. For non-cgroup users nothing should change. diff --git a/trunk/Documentation/cgroups/blkio-controller.txt b/trunk/Documentation/cgroups/blkio-controller.txt index 6919d62591d9..48e0b21b0059 100644 --- a/trunk/Documentation/cgroups/blkio-controller.txt +++ b/trunk/Documentation/cgroups/blkio-controller.txt @@ -217,7 +217,6 @@ Details of cgroup files CFQ sysfs tunable ================= /sys/block//queue/iosched/group_isolation ------------------------------------------------ If group_isolation=1, it provides stronger isolation between groups at the expense of throughput. By default group_isolation is 0. In general that @@ -244,33 +243,6 @@ By default one should run with group_isolation=0. If that is not sufficient and one wants stronger isolation between groups, then set group_isolation=1 but this will come at cost of reduced throughput. -/sys/block//queue/iosched/slice_idle ------------------------------------------- -On a faster hardware CFQ can be slow, especially with sequential workload. -This happens because CFQ idles on a single queue and single queue might not -drive deeper request queue depths to keep the storage busy. In such scenarios -one can try setting slice_idle=0 and that would switch CFQ to IOPS -(IO operations per second) mode on NCQ supporting hardware. - -That means CFQ will not idle between cfq queues of a cfq group and hence be -able to driver higher queue depth and achieve better throughput. That also -means that cfq provides fairness among groups in terms of IOPS and not in -terms of disk time. - -/sys/block//queue/iosched/group_idle ------------------------------------------- -If one disables idling on individual cfq queues and cfq service trees by -setting slice_idle=0, group_idle kicks in. That means CFQ will still idle -on the group in an attempt to provide fairness among groups. - -By default group_idle is same as slice_idle and does not do anything if -slice_idle is enabled. - -One can experience an overall throughput drop if you have created multiple -groups and put applications in that group which are not driving enough -IO to keep disk busy. In that case set group_idle=0, and CFQ will not idle -on individual groups and throughput should improve. - What works ========== - Currently only sync IO queues are support. All the buffered writes are diff --git a/trunk/Documentation/cputopology.txt b/trunk/Documentation/cputopology.txt index 902d3151f527..f1c5c4bccd3e 100644 --- a/trunk/Documentation/cputopology.txt +++ b/trunk/Documentation/cputopology.txt @@ -14,39 +14,25 @@ to /proc/cpuinfo. identifier (rather than the kernel's). The actual value is architecture and platform dependent. -3) /sys/devices/system/cpu/cpuX/topology/book_id: - - the book ID of cpuX. Typically it is the hardware platform's - identifier (rather than the kernel's). The actual value is - architecture and platform dependent. - -4) /sys/devices/system/cpu/cpuX/topology/thread_siblings: +3) /sys/devices/system/cpu/cpuX/topology/thread_siblings: internel kernel map of cpuX's hardware threads within the same core as cpuX -5) /sys/devices/system/cpu/cpuX/topology/core_siblings: +4) /sys/devices/system/cpu/cpuX/topology/core_siblings: internal kernel map of cpuX's hardware threads within the same physical_package_id. -6) /sys/devices/system/cpu/cpuX/topology/book_siblings: - - internal kernel map of cpuX's hardware threads within the same - book_id. - To implement it in an architecture-neutral way, a new source file, -drivers/base/topology.c, is to export the 4 or 6 attributes. The two book -related sysfs files will only be created if CONFIG_SCHED_BOOK is selected. +drivers/base/topology.c, is to export the 4 attributes. For an architecture to support this feature, it must define some of these macros in include/asm-XXX/topology.h: #define topology_physical_package_id(cpu) #define topology_core_id(cpu) -#define topology_book_id(cpu) #define topology_thread_cpumask(cpu) #define topology_core_cpumask(cpu) -#define topology_book_cpumask(cpu) The type of **_id is int. The type of siblings is (const) struct cpumask *. @@ -59,9 +45,6 @@ not defined by include/asm-XXX/topology.h: 3) thread_siblings: just the given CPU 4) core_siblings: just the given CPU -For architectures that don't support books (CONFIG_SCHED_BOOK) there are no -default definitions for topology_book_id() and topology_book_cpumask(). - Additionally, CPU topology information is provided under /sys/devices/system/cpu and includes these files. The internal source for the output is in brackets ("[]"). diff --git a/trunk/Documentation/filesystems/Locking b/trunk/Documentation/filesystems/Locking index 2db4283efa8d..bbcc15651a21 100644 --- a/trunk/Documentation/filesystems/Locking +++ b/trunk/Documentation/filesystems/Locking @@ -374,6 +374,8 @@ prototypes: ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t); int (*readdir) (struct file *, void *, filldir_t); unsigned int (*poll) (struct file *, struct poll_table_struct *); + int (*ioctl) (struct inode *, struct file *, unsigned int, + unsigned long); long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); long (*compat_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *); @@ -407,7 +409,8 @@ write: no aio_write: no readdir: no poll: no -unlocked_ioctl: no +ioctl: yes (see below) +unlocked_ioctl: no (see below) compat_ioctl: no mmap: no open: no @@ -450,6 +453,9 @@ move ->readdir() to inode_operations and use a separate method for directory anything that resembles union-mount we won't have a struct file for all components. And there are other reasons why the current interface is a mess... +->ioctl() on regular files is superceded by the ->unlocked_ioctl() that +doesn't take the BKL. + ->read on directories probably must go away - we should just enforce -EISDIR in sys_read() and friends. diff --git a/trunk/Documentation/filesystems/vfs.txt b/trunk/Documentation/filesystems/vfs.txt index ed7e5efc06d8..94677e7dcb13 100644 --- a/trunk/Documentation/filesystems/vfs.txt +++ b/trunk/Documentation/filesystems/vfs.txt @@ -727,6 +727,7 @@ struct file_operations { ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t); int (*readdir) (struct file *, void *, filldir_t); unsigned int (*poll) (struct file *, struct poll_table_struct *); + int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long); long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); long (*compat_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *); @@ -767,7 +768,10 @@ otherwise noted. activity on this file and (optionally) go to sleep until there is activity. Called by the select(2) and poll(2) system calls - unlocked_ioctl: called by the ioctl(2) system call. + ioctl: called by the ioctl(2) system call + + unlocked_ioctl: called by the ioctl(2) system call. Filesystems that do not + require the BKL should use this method instead of the ioctl() above. compat_ioctl: called by the ioctl(2) system call when 32 bit system calls are used on 64 bit kernels. diff --git a/trunk/Documentation/gpio.txt b/trunk/Documentation/gpio.txt index 9633da01ff46..d96a6dba5748 100644 --- a/trunk/Documentation/gpio.txt +++ b/trunk/Documentation/gpio.txt @@ -109,19 +109,17 @@ use numbers 2000-2063 to identify GPIOs in a bank of I2C GPIO expanders. If you want to initialize a structure with an invalid GPIO number, use some negative number (perhaps "-EINVAL"); that will never be valid. To -test if such number from such a structure could reference a GPIO, you -may use this predicate: +test if a number could reference a GPIO, you may use this predicate: int gpio_is_valid(int number); A number that's not valid will be rejected by calls which may request or free GPIOs (see below). Other numbers may also be rejected; for -example, a number might be valid but temporarily unused on a given board. +example, a number might be valid but unused on a given board. + +Whether a platform supports multiple GPIO controllers is currently a +platform-specific implementation issue. -Whether a platform supports multiple GPIO controllers is a platform-specific -implementation issue, as are whether that support can leave "holes" in the space -of GPIO numbers, and whether new controllers can be added at runtime. Such issues -can affect things including whether adjacent GPIO numbers are both valid. Using GPIOs ----------- @@ -482,16 +480,12 @@ To support this framework, a platform's Kconfig will "select" either ARCH_REQUIRE_GPIOLIB or ARCH_WANT_OPTIONAL_GPIOLIB and arrange that its includes and defines three functions: gpio_get_value(), gpio_set_value(), and gpio_cansleep(). +They may also want to provide a custom value for ARCH_NR_GPIOS. -It may also provide a custom value for ARCH_NR_GPIOS, so that it better -reflects the number of GPIOs in actual use on that platform, without -wasting static table space. (It should count both built-in/SoC GPIOs and -also ones on GPIO expanders. - -ARCH_REQUIRE_GPIOLIB means that the gpiolib code will always get compiled +ARCH_REQUIRE_GPIOLIB means that the gpio-lib code will always get compiled into the kernel on that architecture. -ARCH_WANT_OPTIONAL_GPIOLIB means the gpiolib code defaults to off and the user +ARCH_WANT_OPTIONAL_GPIOLIB means the gpio-lib code defaults to off and the user can enable it and build it into the kernel optionally. If neither of these options are selected, the platform does not support diff --git a/trunk/Documentation/hwmon/emc2103 b/trunk/Documentation/hwmon/emc2103 deleted file mode 100644 index a12b2c127140..000000000000 --- a/trunk/Documentation/hwmon/emc2103 +++ /dev/null @@ -1,33 +0,0 @@ -Kernel driver emc2103 -====================== - -Supported chips: - * SMSC EMC2103 - Addresses scanned: I2C 0x2e - Prefix: 'emc2103' - Datasheet: Not public - -Authors: - Steve Glendinning - -Description ------------ - -The Standard Microsystems Corporation (SMSC) EMC2103 chips -contain up to 4 temperature sensors and a single fan controller. - -Fan rotation speeds are reported in RPM (rotations per minute). An alarm is -triggered if the rotation speed has dropped below a programmable limit. Fan -readings can be divided by a programmable divider (1, 2, 4 or 8) to give -the readings more range or accuracy. Not all RPM values can accurately be -represented, so some rounding is done. With a divider of 1, the lowest -representable value is 480 RPM. - -This driver supports RPM based control, to use this a fan target -should be written to fan1_target and pwm1_enable should be set to 3. - -The 2103-2 and 2103-4 variants have a third temperature sensor, which can -be connected to two anti-parallel diodes. These values can be read -as temp3 and temp4. If only one diode is attached to this channel, temp4 -will show as "fault". The module parameter "apd=0" can be used to suppress -this 4th channel when anti-parallel diodes are not fitted. diff --git a/trunk/Documentation/hwmon/f71882fg b/trunk/Documentation/hwmon/f71882fg index a7952c2bd959..1a07fd674cd0 100644 --- a/trunk/Documentation/hwmon/f71882fg +++ b/trunk/Documentation/hwmon/f71882fg @@ -2,6 +2,10 @@ Kernel driver f71882fg ====================== Supported chips: + * Fintek F71808E + Prefix: 'f71808fg' + Addresses scanned: none, address read from Super I/O config space + Datasheet: Not public * Fintek F71858FG Prefix: 'f71858fg' Addresses scanned: none, address read from Super I/O config space diff --git a/trunk/Documentation/hwmon/ltc4245 b/trunk/Documentation/hwmon/ltc4245 index b478b0864965..86b5880d8502 100644 --- a/trunk/Documentation/hwmon/ltc4245 +++ b/trunk/Documentation/hwmon/ltc4245 @@ -72,31 +72,9 @@ in6_min_alarm 5v output undervoltage alarm in7_min_alarm 3v output undervoltage alarm in8_min_alarm Vee (-12v) output undervoltage alarm -in9_input GPIO voltage data (see note 1) -in10_input GPIO voltage data (see note 1) -in11_input GPIO voltage data (see note 1) +in9_input GPIO voltage data power1_input 12v power usage (mW) power2_input 5v power usage (mW) power3_input 3v power usage (mW) power4_input Vee (-12v) power usage (mW) - - -Note 1 ------- - -If you have NOT configured the driver to sample all GPIO pins as analog -voltages, then the in10_input and in11_input sysfs attributes will not be -created. The driver will sample the GPIO pin that is currently connected to the -ADC as an analog voltage, and report the value in in9_input. - -If you have configured the driver to sample all GPIO pins as analog voltages, -then they will be sampled in round-robin fashion. If userspace reads too -slowly, -EAGAIN will be returned when you read the sysfs attribute containing -the sensor reading. - -The LTC4245 chip can be configured to sample all GPIO pins with two methods: -1) platform data -- see include/linux/i2c/ltc4245.h -2) OF device tree -- add the "ltc4245,use-extra-gpios" property to each chip - -The default mode of operation is to sample a single GPIO pin. diff --git a/trunk/Documentation/hwmon/pc87427 b/trunk/Documentation/hwmon/pc87427 index 8fdd08c9e48b..db5cc1227a83 100644 --- a/trunk/Documentation/hwmon/pc87427 +++ b/trunk/Documentation/hwmon/pc87427 @@ -18,11 +18,10 @@ Description The National Semiconductor Super I/O chip includes complete hardware monitoring capabilities. It can monitor up to 18 voltages, 8 fans and -6 temperature sensors. Only the fans and temperatures are supported at -the moment, voltages aren't. +6 temperature sensors. Only the fans are supported at the moment. -This chip also has fan controlling features (up to 4 PWM outputs), -which are partly supported by this driver. +This chip also has fan controlling features, which are not yet supported +by this driver either. The driver assumes that no more than one chip is present, which seems reasonable. @@ -37,23 +36,3 @@ signal. Speeds down to 83 RPM can be measured. An alarm is triggered if the rotation speed drops below a programmable limit. Another alarm is triggered if the speed is too low to be measured (including stalled or missing fan). - - -Fan Speed Control ------------------ - -Fan speed can be controlled by PWM outputs. There are 4 possible modes: -always off, always on, manual and automatic. The latter isn't supported -by the driver: you can only return to that mode if it was the original -setting, and the configuration interface is missing. - - -Temperature Monitoring ----------------------- - -The PC87427 relies on external sensors (following the SensorPath -standard), so the resolution and range depend on the type of sensor -connected. The integer part can be 8-bit or 9-bit, and can be signed or -not. I couldn't find a way to figure out the external sensor data -temperature format, so user-space adjustment (typically by a factor 2) -may be required. diff --git a/trunk/Documentation/hwmon/sysfs-interface b/trunk/Documentation/hwmon/sysfs-interface index 48ceabedf55d..d4e2917c6f18 100644 --- a/trunk/Documentation/hwmon/sysfs-interface +++ b/trunk/Documentation/hwmon/sysfs-interface @@ -91,11 +91,12 @@ name The chip name. I2C devices get this attribute created automatically. RO -update_interval The interval at which the chip will update readings. +update_rate The rate at which the chip will update readings. Unit: millisecond RW - Some devices have a variable update rate or interval. - This attribute can be used to change it to the desired value. + Some devices have a variable update rate. This attribute + can be used to change the update rate to the desired + frequency. ************ @@ -106,24 +107,10 @@ in[0-*]_min Voltage min value. Unit: millivolt RW -in[0-*]_lcrit Voltage critical min value. - Unit: millivolt - RW - If voltage drops to or below this limit, the system may - take drastic action such as power down or reset. At the very - least, it should report a fault. - in[0-*]_max Voltage max value. Unit: millivolt RW -in[0-*]_crit Voltage critical max value. - Unit: millivolt - RW - If voltage reaches or exceeds this limit, the system may - take drastic action such as power down or reset. At the very - least, it should report a fault. - in[0-*]_input Voltage input value. Unit: millivolt RO @@ -297,7 +284,7 @@ temp[1-*]_input Temperature input value. Unit: millidegree Celsius RO -temp[1-*]_crit Temperature critical max value, typically greater than +temp[1-*]_crit Temperature critical value, typically greater than corresponding temp_max values. Unit: millidegree Celsius RW @@ -309,11 +296,6 @@ temp[1-*]_crit_hyst from the critical value. RW -temp[1-*]_lcrit Temperature critical min value, typically lower than - corresponding temp_min values. - Unit: millidegree Celsius - RW - temp[1-*]_offset Temperature offset which is added to the temperature reading by the chip. @@ -362,6 +344,9 @@ Also see the Alarms section for status flags associated with temperatures. * Currents * ************ +Note that no known chip provides current measurements as of writing, +so this part is theoretical, so to say. + curr[1-*]_max Current max value Unit: milliampere RW @@ -486,7 +471,6 @@ limit-related alarms, not both. The driver should just reflect the hardware implementation. in[0-*]_alarm -curr[1-*]_alarm fan[1-*]_alarm temp[1-*]_alarm Channel alarm @@ -498,8 +482,6 @@ OR in[0-*]_min_alarm in[0-*]_max_alarm -curr[1-*]_min_alarm -curr[1-*]_max_alarm fan[1-*]_min_alarm fan[1-*]_max_alarm temp[1-*]_min_alarm @@ -515,6 +497,7 @@ 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-*]_fault fan[1-*]_fault temp[1-*]_fault Input fault condition @@ -530,7 +513,6 @@ beep_enable Master beep enable RW in[0-*]_beep -curr[1-*]_beep fan[1-*]_beep temp[1-*]_beep Channel beep diff --git a/trunk/Documentation/hwmon/w83627ehf b/trunk/Documentation/hwmon/w83627ehf index 13d556112fc0..b7e42ec4b26b 100644 --- a/trunk/Documentation/hwmon/w83627ehf +++ b/trunk/Documentation/hwmon/w83627ehf @@ -20,10 +20,6 @@ Supported chips: Prefix: 'w83667hg' Addresses scanned: ISA address retrieved from Super I/O registers Datasheet: not available - * Winbond W83667HG-B - Prefix: 'w83667hg' - Addresses scanned: ISA address retrieved from Super I/O registers - Datasheet: Available from Nuvoton upon request Authors: Jean Delvare @@ -36,8 +32,8 @@ Description ----------- This driver implements support for the Winbond W83627EHF, W83627EHG, -W83627DHG, W83627DHG-P, W83667HG and W83667HG-B super I/O chips. -We will refer to them collectively as Winbond chips. +W83627DHG, W83627DHG-P and W83667HG 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), one @@ -72,15 +68,14 @@ follows: temp1 -> pwm1 temp2 -> pwm2 temp3 -> pwm3 -prog -> pwm4 (not on 667HG and 667HG-B; the programmable setting is not - supported by the driver) +prog -> pwm4 (not on 667HG; the programmable setting is not supported by + the driver) /sys files ---------- name - this is a standard hwmon device entry. For the W83627EHF and W83627EHG, - it is set to "w83627ehf", for the W83627DHG it is set to "w83627dhg", - and for the W83667HG it is set to "w83667hg". + it is set to "w83627ehf" and for the W83627DHG it is set to "w83627dhg" pwm[1-4] - this file stores PWM duty cycle or DC value (fan speed) in range: 0 (stop) to 255 (full) diff --git a/trunk/Documentation/kbuild/makefiles.txt b/trunk/Documentation/kbuild/makefiles.txt index c787ae512120..c375313cb128 100644 --- a/trunk/Documentation/kbuild/makefiles.txt +++ b/trunk/Documentation/kbuild/makefiles.txt @@ -45,6 +45,7 @@ This document describes the Linux kernel Makefiles. --- 7.1 header-y --- 7.2 objhdr-y --- 7.3 destination-y + --- 7.4 unifdef-y (deprecated) === 8 Kbuild Variables === 9 Makefile language @@ -1244,6 +1245,11 @@ See subsequent chapter for the syntax of the Kbuild file. will be located in the directory "include/linux" when exported. + --- 7.4 unifdef-y (deprecated) + + unifdef-y is deprecated. A direct replacement is header-y. + + === 8 Kbuild Variables The top Makefile exports the following variables: diff --git a/trunk/Documentation/kernel-doc-nano-HOWTO.txt b/trunk/Documentation/kernel-doc-nano-HOWTO.txt index 3d8a97747f77..27a52b35d55b 100644 --- a/trunk/Documentation/kernel-doc-nano-HOWTO.txt +++ b/trunk/Documentation/kernel-doc-nano-HOWTO.txt @@ -345,10 +345,5 @@ documentation, in , for the functions listed. section titled
from . Spaces are allowed in
; do not quote the
. -!C is replaced by nothing, but makes the tools check that -all DOC: sections and documented functions, symbols, etc. are used. -This makes sense to use when you use !F/!P only and want to verify -that all documentation is included. - Tim. */ diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index a2ffd6be0ef7..873b68090098 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -88,8 +88,8 @@ parameter is applicable: RAM RAM disk support is enabled. S390 S390 architecture is enabled. SCSI Appropriate SCSI support is enabled. - A lot of drivers have their options described inside - the Documentation/scsi/ sub-directory. + A lot of drivers has their options described inside of + Documentation/scsi/. SECURITY Different security models are enabled. SELINUX SELinux support is enabled. APPARMOR AppArmor support is enabled. @@ -284,12 +284,27 @@ and is between 256 and 4096 characters. It is defined in the file add_efi_memmap [EFI; X86] Include EFI memory map in kernel's map of available physical RAM. + advansys= [HW,SCSI] + See header of drivers/scsi/advansys.c. + agp= [AGP] { off | try_unsupported } off: disable AGP support try_unsupported: try to drive unsupported chipsets (may crash computer or cause data corruption) + aha152x= [HW,SCSI] + See Documentation/scsi/aha152x.txt. + + aha1542= [HW,SCSI] + Format: [,,[,]] + + aic7xxx= [HW,SCSI] + See Documentation/scsi/aic7xxx.txt. + + aic79xx= [HW,SCSI] + See Documentation/scsi/aic79xx.txt. + ALSA [HW,ALSA] See Documentation/sound/alsa/alsa-parameters.txt @@ -353,6 +368,8 @@ and is between 256 and 4096 characters. It is defined in the file atarimouse= [HW,MOUSE] Atari Mouse + atascsi= [HW,SCSI] Atari SCSI + atkbd.extra= [HW] Enable extra LEDs and keys on IBM RapidAccess, EzKey and similar keyboards @@ -402,6 +419,10 @@ and is between 256 and 4096 characters. It is defined in the file bttv.pll= See Documentation/video4linux/bttv/Insmod-options bttv.tuner= and Documentation/video4linux/bttv/CARDLIST + BusLogic= [HW,SCSI] + See drivers/scsi/BusLogic.c, comment before function + BusLogic_ParseDriverOptions(). + c101= [NET] Moxa C101 synchronous serial card cachesize= [BUGS=X86-32] Override level 2 CPU cache size detection. @@ -650,6 +671,8 @@ and is between 256 and 4096 characters. It is defined in the file dscc4.setup= [NET] + dtc3181e= [HW,SCSI] + dynamic_printk Enables pr_debug()/dev_dbg() calls if CONFIG_DYNAMIC_PRINTK_DEBUG has been enabled. These can also be switched on/off via @@ -690,6 +713,8 @@ and is between 256 and 4096 characters. It is defined in the file This is desgined to be used in conjunction with the boot argument: earlyprintk=vga + eata= [HW,SCSI] + edd= [EDD] Format: {"off" | "on" | "skip[mbr]"} @@ -745,6 +770,12 @@ and is between 256 and 4096 characters. It is defined in the file Format: ,,, See also /Documentation/fault-injection/. + fd_mcs= [HW,SCSI] + See header of drivers/scsi/fd_mcs.c. + + fdomain= [HW,SCSI] + See header of drivers/scsi/fdomain.c. + floppy= [HW] See Documentation/blockdev/floppy.txt. @@ -804,9 +835,14 @@ and is between 256 and 4096 characters. It is defined in the file When zero, profiling data is discarded and associated debugfs files are removed at module unload time. + gdth= [HW,SCSI] + See header of drivers/scsi/gdth.c. + gpt [EFI] Forces disk with valid GPT signature but invalid Protective MBR to be treated as GPT. + gvp11= [HW,SCSI] + hashdist= [KNL,NUMA] Large hashes allocated during boot are distributed across NUMA nodes. Defaults on for 64bit NUMA, off otherwise. @@ -895,6 +931,9 @@ and is between 256 and 4096 characters. It is defined in the file i8k.restricted [HW] Allow controlling fans only if SYS_ADMIN capability is set. + ibmmcascsi= [HW,MCA,SCSI] IBM MicroChannel SCSI adapter + See Documentation/mca.txt. + icn= [HW,ISDN] Format: [,[,[,]]] @@ -944,6 +983,9 @@ and is between 256 and 4096 characters. It is defined in the file programs exec'd, files mmap'd for exec, and all files opened for read by uid=0. + in2000= [HW,SCSI] + See header of drivers/scsi/in2000.c. + init= [KNL] Format: Run specified binary instead of /sbin/init as init @@ -981,12 +1023,6 @@ and is between 256 and 4096 characters. It is defined in the file result in a hardware IOTLB flush operation as opposed to batching them for performance. - intremap= [X86-64, Intel-IOMMU] - Format: { on (default) | off | nosid } - on enable Interrupt Remapping (default) - off disable Interrupt Remapping - nosid disable Source ID checking - inttest= [IA64] iomem= Disable strict checking of access to MMIO memory @@ -1027,6 +1063,9 @@ and is between 256 and 4096 characters. It is defined in the file 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. + irqfixup [HW] When an interrupt is not handled search all handlers for it. Intended to get systems with badly broken @@ -1302,6 +1341,9 @@ and is between 256 and 4096 characters. It is defined in the file ltpc= [NET] Format: ,, + mac5380= [HW,SCSI] Format: + ,,,, + machvec= [IA64] Force the use of a particular machine-vector (machvec) in a generic kernel. Example: machvec=hpzx1_swiotlb @@ -1323,6 +1365,13 @@ and is between 256 and 4096 characters. It is defined in the file be mounted Format: <1-256> + max_luns= [SCSI] Maximum number of LUNs to probe. + Should be between 1 and 2^32-1. + + max_report_luns= + [SCSI] Maximum number of LUNs received. + Should be between 1 and 16384. + mcatest= [IA-64] mce [X86-32] Machine Check Exception @@ -1519,6 +1568,19 @@ and is between 256 and 4096 characters. It is defined in the file n2= [NET] SDL Inc. RISCom/N2 synchronous serial card + NCR_D700= [HW,SCSI] + See header of drivers/scsi/NCR_D700.c. + + ncr5380= [HW,SCSI] + + ncr53c400= [HW,SCSI] + + ncr53c400a= [HW,SCSI] + + ncr53c406a= [HW,SCSI] + + ncr53c8xx= [HW,SCSI] + netdev= [NET] Network devices parameters Format: ,,,, Note that mem_start is often overloaded to mean @@ -1687,7 +1749,6 @@ and is between 256 and 4096 characters. It is defined in the file nointremap [X86-64, Intel-IOMMU] Do not enable interrupt remapping. - [Deprecated - use intremap=off] nointroute [IA-64] @@ -1798,6 +1859,10 @@ and is between 256 and 4096 characters. It is defined in the file OSS [HW,OSS] See Documentation/sound/oss/oss-parameters.txt + osst= [HW,SCSI] SCSI Tape Driver + Format: , + See also Documentation/scsi/st.txt. + panic= [KNL] Kernel behaviour on panic Format: @@ -1830,6 +1895,9 @@ and is between 256 and 4096 characters. It is defined in the file Currently this function knows 686a and 8231 chips. Format: [spp|ps2|epp|ecp|ecpepp] + pas16= [HW,SCSI] + See header of drivers/scsi/pas16.c. + pause_on_oops= Halt all CPUs after the first oops has been printed for the specified number of seconds. This is to be used if @@ -1974,18 +2042,15 @@ and is between 256 and 4096 characters. It is defined in the file force Enable ASPM even on devices that claim not to support it. WARNING: Forcing ASPM on may cause system lockups. - pcie_ports= [PCIE] PCIe ports handling: - auto Ask the BIOS whether or not to use native PCIe services - associated with PCIe ports (PME, hot-plug, AER). Use - them only if that is allowed by the BIOS. - native Use native PCIe services associated with PCIe ports - unconditionally. - compat Treat PCIe ports as PCI-to-PCI bridges, disable the PCIe - ports driver. - pcie_pme= [PCIE,PM] Native PCIe PME signaling options: + Format: {auto|force}[,nomsi] + auto Use native PCIe PME signaling if the BIOS allows the + kernel to control PCIe config registers of root ports. + force Use native PCIe PME signaling even if the BIOS refuses + to allow the kernel to control the relevant PCIe config + registers. nomsi Do not use MSI for native PCIe PME signaling (this makes - all PCIe root ports use INTx for all services). + all PCIe root ports use INTx for everything). pcmv= [HW,PCMCIA] BadgePAD 4 @@ -2153,11 +2218,6 @@ and is between 256 and 4096 characters. It is defined in the file Reserves a hole at the top of the kernel virtual address space. - reservelow= [X86] - Format: nn[K] - Set the amount of memory to reserve for BIOS at - the bottom of the address space. - reset_devices [KNL] Force drivers to reset the underlying device during initialization. @@ -2204,6 +2264,30 @@ and is between 256 and 4096 characters. It is defined in the file sched_debug [KNL] Enables verbose scheduler debug messages. + scsi_debug_*= [SCSI] + See drivers/scsi/scsi_debug.c. + + scsi_default_dev_flags= + [SCSI] SCSI default device flags + Format: + + scsi_dev_flags= [SCSI] Black/white list entry for vendor and model + Format: :: + (flags are integer value) + + scsi_logging_level= [SCSI] a bit mask of logging levels + See drivers/scsi/scsi_logging.h for bits. Also + settable via sysctl at dev.scsi.logging_level + (/proc/sys/dev/scsi/logging_level). + There is also a nice 'scsi_logging_level' script in the + S390-tools package, available for download at + http://www-128.ibm.com/developerworks/linux/linux390/s390-tools-1.5.4.html + + scsi_mod.scan= [SCSI] sync (default) scans SCSI busses as they are + discovered. async scans them in kernel threads, + allowing boot to proceed. none ignores them, expecting + user space to do the scan. + security= [SECURITY] Choose a security module to enable at boot. If this boot parameter is not specified, only the first security module asking for security registration will be @@ -2237,6 +2321,9 @@ and is between 256 and 4096 characters. It is defined in the file The parameter means the number of CPUs to show, for example 1 means boot CPU only. + sim710= [SCSI,HW] + See header of drivers/scsi/sim710.c. + simeth= [IA-64] simscsi= @@ -2308,6 +2395,9 @@ and is between 256 and 4096 characters. It is defined in the file spia_pedr= spia_peddr= + st= [HW,SCSI] SCSI tape parameters (buffers, etc.) + See Documentation/scsi/st.txt. + stacktrace [FTRACE] Enabled the stack tracer on boot up. @@ -2365,12 +2455,18 @@ and is between 256 and 4096 characters. It is defined in the file switches= [HW,M68k] + sym53c416= [HW,SCSI] + See header of drivers/scsi/sym53c416.c. + sysrq_always_enabled [KNL] Ignore sysrq setting - this boot parameter will neutralize any effect of /proc/sys/kernel/sysrq. Useful for debugging. + t128= [HW,SCSI] + See header of drivers/scsi/t128.c. + tdfx= [HW,DRM] test_suspend= [SUSPEND] @@ -2407,6 +2503,10 @@ and is between 256 and 4096 characters. It is defined in the file : poll all this frequency 0: no polling (default) + tmscsim= [HW,SCSI] + See comment before function dc390_setup() in + drivers/scsi/tmscsim.c. + topology= [S390] Format: {off | on} Specify if the kernel should make use of the cpu @@ -2440,10 +2540,6 @@ and is between 256 and 4096 characters. It is defined in the file disables clocksource verification at runtime. Used to enable high-resolution timer mode on older hardware, and in virtualized environment. - [x86] noirqtime: Do not use TSC to do irq accounting. - Used to run time disable IRQ_TIME_ACCOUNTING on any - platforms where RDTSC is slow and this accounting - can add overhead. turbografx.map[2|3]= [HW,JOY] TurboGraFX parallel port interface @@ -2451,6 +2547,9 @@ and is between 256 and 4096 characters. It is defined in the file ,,,,,,, See also Documentation/input/joystick-parport.txt + u14-34f= [HW,SCSI] UltraStor 14F/34F SCSI host adapter + See header of drivers/scsi/u14-34f.c. + uhash_entries= [KNL,NET] Set number of hash buckets for UDP/UDP-Lite connections @@ -2616,6 +2715,12 @@ and is between 256 and 4096 characters. It is defined in the file overridden by individual drivers. 0 will hide cursors, 1 will display them. + wd33c93= [HW,SCSI] + See header of drivers/scsi/wd33c93.c. + + wd7000= [HW,SCSI] + See header of drivers/scsi/wd7000.c. + watchdog timers [HW,WDT] For information on watchdog timers, see Documentation/watchdog/watchdog-parameters.txt or other driver-specific files in the @@ -2641,10 +2746,8 @@ and is between 256 and 4096 characters. It is defined in the file aux-ide-disks -- unplug non-primary-master IDE devices nics -- unplug network devices all -- unplug all emulated devices (NICs and IDE disks) - unnecessary -- unplugging emulated devices is - unnecessary even if the host did not respond to - the unplug protocol - never -- do not unplug even if version check succeeds + ignore -- continue loading the Xen platform PCI driver even + if the version check failed xirc2ps_cs= [NET,PCMCIA] Format: diff --git a/trunk/Documentation/kprobes.txt b/trunk/Documentation/kprobes.txt index 741fe66d6eca..1762b81fcdf2 100644 --- a/trunk/Documentation/kprobes.txt +++ b/trunk/Documentation/kprobes.txt @@ -542,11 +542,9 @@ Kprobes does not use mutexes or allocate memory except during registration and unregistration. Probe handlers are run with preemption disabled. Depending on the -architecture and optimization state, handlers may also run with -interrupts disabled (e.g., kretprobe handlers and optimized kprobe -handlers run without interrupt disabled on x86/x86-64). In any case, -your handler should not yield the CPU (e.g., by attempting to acquire -a semaphore). +architecture, handlers may also run with interrupts disabled. In any +case, your handler should not yield the CPU (e.g., by attempting to +acquire a semaphore). Since a return probe is implemented by replacing the return address with the trampoline's address, stack backtraces and calls diff --git a/trunk/Documentation/laptops/thinkpad-acpi.txt b/trunk/Documentation/laptops/thinkpad-acpi.txt index 1565eefd6fd5..f6f80257addb 100644 --- a/trunk/Documentation/laptops/thinkpad-acpi.txt +++ b/trunk/Documentation/laptops/thinkpad-acpi.txt @@ -1024,10 +1024,6 @@ ThinkPad-specific interface. The driver will disable its native backlight brightness control interface if it detects that the standard ACPI interface is available in the ThinkPad. -If you want to use the thinkpad-acpi backlight brightness control -instead of the generic ACPI video backlight brightness control for some -reason, you should use the acpi_backlight=vendor kernel parameter. - The brightness_enable module parameter can be used to control whether the LCD brightness control feature will be enabled when available. brightness_enable=0 forces it to be disabled. brightness_enable=1 diff --git a/trunk/Documentation/lguest/Makefile b/trunk/Documentation/lguest/Makefile index bebac6b4f332..28c8cdfcafd8 100644 --- a/trunk/Documentation/lguest/Makefile +++ b/trunk/Documentation/lguest/Makefile @@ -1,6 +1,5 @@ # This creates the demonstration utility "lguest" which runs a Linux guest. -# Missing headers? Add "-I../../include -I../../arch/x86/include" -CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE +CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE all: lguest diff --git a/trunk/Documentation/lguest/lguest.c b/trunk/Documentation/lguest/lguest.c index 8a6a8c6d4980..e9ce3c554514 100644 --- a/trunk/Documentation/lguest/lguest.c +++ b/trunk/Documentation/lguest/lguest.c @@ -39,14 +39,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include "../../include/linux/lguest_launcher.h" +#include "linux/lguest_launcher.h" +#include "linux/virtio_config.h" +#include "linux/virtio_net.h" +#include "linux/virtio_blk.h" +#include "linux/virtio_console.h" +#include "linux/virtio_rng.h" +#include "linux/virtio_ring.h" +#include "asm/bootparam.h" /*L:110 * We can ignore the 42 include files we need for this program, but I do want * to draw attention to the use of kernel-style types. @@ -1447,15 +1447,14 @@ static void add_to_bridge(int fd, const char *if_name, const char *br_name) static void configure_device(int fd, const char *tapif, u32 ipaddr) { struct ifreq ifr; - struct sockaddr_in sin; + struct sockaddr_in *sin = (struct sockaddr_in *)&ifr.ifr_addr; memset(&ifr, 0, sizeof(ifr)); strcpy(ifr.ifr_name, tapif); /* Don't read these incantations. Just cut & paste them like I did! */ - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = htonl(ipaddr); - memcpy(&ifr.ifr_addr, &sin, sizeof(sin)); + sin->sin_family = AF_INET; + sin->sin_addr.s_addr = htonl(ipaddr); if (ioctl(fd, SIOCSIFADDR, &ifr) != 0) err(1, "Setting %s interface address", tapif); ifr.ifr_flags = IFF_UP; diff --git a/trunk/Documentation/mutex-design.txt b/trunk/Documentation/mutex-design.txt index 38c10fd7f411..c91ccc0720fa 100644 --- a/trunk/Documentation/mutex-design.txt +++ b/trunk/Documentation/mutex-design.txt @@ -9,7 +9,7 @@ firstly, there's nothing wrong with semaphores. But if the simpler mutex semantics are sufficient for your code, then there are a couple of advantages of mutexes: - - 'struct mutex' is smaller on most architectures: E.g. on x86, + - 'struct mutex' is smaller on most architectures: .e.g on x86, 'struct semaphore' is 20 bytes, 'struct mutex' is 16 bytes. A smaller structure size means less RAM footprint, and better CPU-cache utilization. @@ -136,4 +136,3 @@ the APIs of 'struct mutex' have been streamlined: void mutex_lock_nested(struct mutex *lock, unsigned int subclass); int mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass); - int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); diff --git a/trunk/Documentation/networking/e1000.txt b/trunk/Documentation/networking/e1000.txt index d9271e74e488..2df71861e578 100644 --- a/trunk/Documentation/networking/e1000.txt +++ b/trunk/Documentation/networking/e1000.txt @@ -1,35 +1,82 @@ Linux* Base Driver for the Intel(R) PRO/1000 Family of Adapters =============================================================== -Intel Gigabit Linux driver. -Copyright(c) 1999 - 2010 Intel Corporation. +September 26, 2006 + Contents ======== +- In This Release - Identifying Your Adapter +- Building and Installation - Command Line Parameters - Speed and Duplex Configuration - Additional Configurations +- Known Issues - Support + +In This Release +=============== + +This file describes the Linux* Base Driver for the Intel(R) PRO/1000 Family +of Adapters. This driver includes support for Itanium(R)2-based systems. + +For questions related to hardware requirements, refer to the documentation +supplied with your Intel PRO/1000 adapter. All hardware requirements listed +apply to use with Linux. + +The following features are now available in supported kernels: + - Native VLANs + - Channel Bonding (teaming) + - SNMP + +Channel Bonding documentation can be found in the Linux kernel source: +/Documentation/networking/bonding.txt + +The driver information previously displayed in the /proc filesystem is not +supported in this release. Alternatively, you can use ethtool (version 1.6 +or later), lspci, and ifconfig to obtain the same information. + +Instructions on updating ethtool can be found in the section "Additional +Configurations" later in this document. + +NOTE: The Intel(R) 82562v 10/100 Network Connection only provides 10/100 +support. + + Identifying Your Adapter ======================== For more information on how to identify your adapter, go to the Adapter & Driver ID Guide at: - http://support.intel.com/support/go/network/adapter/idguide.htm + http://support.intel.com/support/network/adapter/pro100/21397.htm For the latest Intel network drivers for Linux, refer to the following website. In the search field, enter your adapter name or type, or use the networking link on the left to search for your adapter: - http://support.intel.com/support/go/network/adapter/home.htm + http://downloadfinder.intel.com/scripts-df/support_intel.asp + Command Line Parameters ======================= +If the driver is built as a module, the following optional parameters +are used by entering them on the command line with the modprobe command +using this syntax: + + modprobe e1000 [