From 08ff5930c3fac10b78ee234b3ed471fa224200b4 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 11 Oct 2010 10:19:24 -0700 Subject: [PATCH] --- yaml --- r: 211455 b: refs/heads/master c: 29979aa8bd69becd94cbad59093807a417ce2a9e h: refs/heads/master i: 211453: 248590d394237f4d9411953fb180ff9f3d8909e1 211451: be7d910548e15cbacb22f90adcdfd30ffc366346 211447: bee6be037007723f4c412b6c8ffeb4f0d87101ef 211439: 80c80e86e6fcbbd411baad640f1c13f4c18386a3 211423: 1057ded866c50d2bbb7677caca5f8acdbfb8f441 211391: 6111985a60f84621d2e00cfdda840e3d75b80ba3 211327: 4564a1d900dab4540ef3f525bf66392455dca5a5 211199: c08a8cbfbee65c8454b884ebb433b589c69f0f30 210943: a9c5b849dc3a01cb102c8f659d5617d2ac5b8508 v: v3 --- [refs] | 2 +- trunk/CREDITS | 8 +- .../Documentation/DocBook/device-drivers.tmpl | 1 - trunk/Documentation/DocBook/kernel-api.tmpl | 1 - .../Documentation/DocBook/kernel-locking.tmpl | 13 +- trunk/Documentation/DocBook/tracepoint.tmpl | 5 + trunk/Documentation/block/cfq-iosched.txt | 45 + .../cgroups/blkio-controller.txt | 28 + trunk/Documentation/gpio.txt | 22 +- trunk/Documentation/hwmon/f71882fg | 4 - trunk/Documentation/hwmon/sysfs-interface | 7 +- trunk/Documentation/kernel-doc-nano-HOWTO.txt | 5 + trunk/Documentation/kernel-parameters.txt | 23 +- 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 +- .../sound/alsa/HD-Audio-Models.txt | 1 + trunk/Documentation/vm/page-types.c | 2 +- trunk/Documentation/workqueue.txt | 380 +++ trunk/MAINTAINERS | 201 +- trunk/Makefile | 2 +- trunk/arch/Kconfig | 4 +- trunk/arch/alpha/include/asm/cache.h | 1 - trunk/arch/alpha/include/asm/cacheflush.h | 2 + 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 | 11 +- trunk/arch/alpha/kernel/pci-sysfs.c | 2 +- trunk/arch/alpha/kernel/perf_event.c | 18 +- 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 | 10 +- trunk/arch/alpha/kernel/traps.c | 3 - trunk/arch/arm/Kconfig | 116 +- 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/dma-mapping.h | 8 - trunk/arch/arm/include/asm/perf_event.h | 2 +- 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/perf_event.c | 12 +- trunk/arch/arm/kernel/sys_arm.c | 14 +- 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 +- 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-imx/mach-cpuimx27.c | 4 +- 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 + .../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-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-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/dev-spi.c | 3 +- .../arm/mach-s3c64xx/include/mach/vmalloc.h | 2 +- trunk/arch/arm/mach-s3c64xx/mach-real6410.c | 104 +- 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 | 8 +- 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/mmu.c | 31 +- trunk/arch/arm/mm/proc-v7.S | 62 +- trunk/arch/arm/oprofile/common.c | 7 +- 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/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/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/kernel/module.c | 3 +- trunk/arch/avr32/kernel/process.c | 5 +- trunk/arch/avr32/kernel/sys_avr32.c | 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 - .../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 - .../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/frv/kernel/process.c | 5 +- trunk/arch/frv/kernel/signal.c | 51 +- 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/hp/sim/simserial.c | 2 +- trunk/arch/ia64/include/asm/compat.h | 2 +- trunk/arch/ia64/include/asm/unistd.h | 2 - trunk/arch/ia64/kernel/fsys.S | 30 +- trunk/arch/ia64/kernel/process.c | 4 +- trunk/arch/m32r/include/asm/signal.h | 1 - trunk/arch/m32r/include/asm/unistd.h | 1 + trunk/arch/m32r/kernel/entry.S | 5 +- trunk/arch/m32r/kernel/process.c | 4 +- trunk/arch/m32r/kernel/ptrace.c | 7 +- trunk/arch/m32r/kernel/signal.c | 105 +- trunk/arch/m32r/kernel/sys_m32r.c | 4 +- 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 +- 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/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/Kconfig | 21 +- trunk/arch/mips/alchemy/common/prom.c | 5 +- trunk/arch/mips/boot/compressed/Makefile | 2 +- trunk/arch/mips/cavium-octeon/Kconfig | 4 + trunk/arch/mips/cavium-octeon/cpu.c | 2 +- .../mips/cavium-octeon/executive/Makefile | 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/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/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/scall32-o32.S | 5 +- trunk/arch/mips/kernel/scall64-64.S | 7 +- trunk/arch/mips/kernel/scall64-n32.S | 5 +- trunk/arch/mips/kernel/scall64-o32.S | 5 +- trunk/arch/mips/kernel/syscall.c | 10 +- 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/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/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 | 4 +- trunk/arch/mn10300/kernel/signal.c | 35 +- trunk/arch/mn10300/mm/Makefile | 14 +- trunk/arch/mn10300/mm/cache-disabled.c | 21 + trunk/arch/mn10300/mm/cache.c | 20 +- trunk/arch/mn10300/mm/dma-alloc.c | 3 +- trunk/arch/parisc/hpux/fs.c | 6 +- trunk/arch/parisc/include/asm/compat.h | 2 +- trunk/arch/parisc/kernel/module.c | 3 +- trunk/arch/parisc/kernel/process.c | 15 +- trunk/arch/powerpc/Makefile | 2 +- trunk/arch/powerpc/boot/dts/canyonlands.dts | 8 + 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/reg.h | 9 +- trunk/arch/powerpc/include/asm/rwsem.h | 64 +- trunk/arch/powerpc/include/asm/systbl.h | 3 + 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/process.c | 25 +- 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 | 8 + trunk/arch/powerpc/kernel/time.c | 23 +- 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/include/asm/compat.h | 2 +- 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/pgtable.h | 6 +- trunk/arch/s390/include/asm/tlb.h | 3 +- trunk/arch/s390/include/asm/tlbflush.h | 6 +- trunk/arch/s390/kernel/entry.h | 4 +- trunk/arch/s390/kernel/module.c | 3 +- trunk/arch/s390/kernel/process.c | 5 +- trunk/arch/s390/kernel/smp.c | 2 + trunk/arch/s390/mm/init.c | 2 + trunk/arch/score/kernel/sys_score.c | 10 +- trunk/arch/sh/kernel/module.c | 2 - trunk/arch/sh/kernel/process_32.c | 7 +- trunk/arch/sh/kernel/process_64.c | 4 +- trunk/arch/sh/kernel/sys_sh32.c | 4 +- trunk/arch/sh/kernel/sys_sh64.c | 4 +- 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/oplib_64.h | 27 +- 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/perf_event.c | 14 +- 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_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/include/arch/chip_tile64.h | 3 + trunk/arch/tile/include/arch/chip_tilepro.h | 3 + trunk/arch/tile/include/asm/compat.h | 7 +- trunk/arch/tile/include/asm/io.h | 8 +- trunk/arch/tile/include/asm/processor.h | 12 + trunk/arch/tile/include/asm/ptrace.h | 15 +- trunk/arch/tile/include/asm/sigcontext.h | 18 +- trunk/arch/tile/include/asm/signal.h | 1 + trunk/arch/tile/include/asm/syscalls.h | 21 +- trunk/arch/tile/kernel/intvec_32.S | 7 - trunk/arch/tile/kernel/process.c | 35 +- trunk/arch/tile/kernel/signal.c | 27 +- trunk/arch/tile/kernel/stack.c | 2 +- trunk/arch/um/drivers/mconsole_kern.c | 2 +- trunk/arch/um/drivers/net_kern.c | 17 +- 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 | 9 +- trunk/arch/x86/Makefile | 2 +- trunk/arch/x86/boot/early_serial_console.c | 14 +- trunk/arch/x86/ia32/ia32entry.S | 22 +- trunk/arch/x86/include/asm/amd_iommu_proto.h | 6 + trunk/arch/x86/include/asm/amd_iommu_types.h | 12 + trunk/arch/x86/include/asm/bitops.h | 2 +- trunk/arch/x86/include/asm/compat.h | 2 +- trunk/arch/x86/include/asm/cpufeature.h | 5 +- trunk/arch/x86/include/asm/hpet.h | 1 - trunk/arch/x86/include/asm/hw_breakpoint.h | 2 +- trunk/arch/x86/include/asm/iomap.h | 4 +- trunk/arch/x86/include/asm/kvm_emulate.h | 7 +- trunk/arch/x86/include/asm/pci.h | 6 +- trunk/arch/x86/include/asm/pgtable_32.h | 1 + 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/kernel/Makefile | 2 + trunk/arch/x86/kernel/acpi/cstate.c | 2 +- trunk/arch/x86/kernel/amd_iommu.c | 4 +- trunk/arch/x86/kernel/amd_iommu_init.c | 67 +- trunk/arch/x86/kernel/apic/io_apic.c | 13 +- trunk/arch/x86/kernel/apic/x2apic_uv_x.c | 6 +- trunk/arch/x86/kernel/cpu/amd.c | 2 +- trunk/arch/x86/kernel/cpu/common.c | 2 +- trunk/arch/x86/kernel/cpu/cpu.h | 1 + .../arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 18 +- trunk/arch/x86/kernel/cpu/intel.c | 1 + trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +- .../arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 +- trunk/arch/x86/kernel/cpu/perf_event.c | 71 +- trunk/arch/x86/kernel/cpu/perf_event_intel.c | 96 +- trunk/arch/x86/kernel/cpu/perf_event_p4.c | 10 +- trunk/arch/x86/kernel/cpu/scattered.c | 1 + trunk/arch/x86/kernel/early-quirks.c | 18 - 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 | 1 + trunk/arch/x86/kernel/kgdb.c | 2 +- trunk/arch/x86/kernel/kprobes.c | 25 +- trunk/arch/x86/kernel/module.c | 3 +- trunk/arch/x86/kernel/process.c | 5 +- trunk/arch/x86/kernel/setup.c | 2 + trunk/arch/x86/kernel/smpboot.c | 51 +- trunk/arch/x86/kernel/sys_i386_32.c | 4 +- trunk/arch/x86/kernel/trampoline.c | 17 + trunk/arch/x86/kernel/tsc.c | 38 + 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/x86.c | 4 +- trunk/arch/x86/lguest/boot.c | 13 +- trunk/arch/x86/mm/iomap_32.c | 6 +- trunk/arch/x86/oprofile/nmi_int.c | 27 +- 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/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 | 2 +- trunk/drivers/acpi/acpi_pad.c | 34 +- trunk/drivers/acpi/acpica/aclocal.h | 1 + trunk/drivers/acpi/acpica/exutils.c | 2 +- trunk/drivers/acpi/acpica/rsutils.c | 2 +- trunk/drivers/acpi/apei/Kconfig | 2 +- trunk/drivers/acpi/apei/apei-base.c | 21 +- trunk/drivers/acpi/apei/einj.c | 4 +- trunk/drivers/acpi/apei/erst-dbg.c | 18 +- trunk/drivers/acpi/apei/erst.c | 29 +- trunk/drivers/acpi/apei/ghes.c | 2 +- trunk/drivers/acpi/apei/hest.c | 11 +- trunk/drivers/acpi/atomicio.c | 2 +- trunk/drivers/acpi/battery.c | 1 - trunk/drivers/acpi/blacklist.c | 35 + trunk/drivers/acpi/bus.c | 18 +- trunk/drivers/acpi/fan.c | 2 + trunk/drivers/acpi/pci_root.c | 97 +- trunk/drivers/acpi/processor_core.c | 7 +- trunk/drivers/acpi/processor_driver.c | 2 +- trunk/drivers/acpi/processor_perflib.c | 4 +- trunk/drivers/acpi/sleep.c | 22 + trunk/drivers/acpi/sysfs.c | 20 +- trunk/drivers/acpi/video_detect.c | 4 +- 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-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/base/firmware_class.c | 2 +- trunk/drivers/base/power/main.c | 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/virtio_blk.c | 6 +- trunk/drivers/block/xen-blkfront.c | 2 +- trunk/drivers/block/xsysace.c | 1 + 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/tty_io.c | 94 +- trunk/drivers/char/virtio_console.c | 6 +- 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/dca/dca-core.c | 85 +- trunk/drivers/dma/mv_xor.c | 2 +- trunk/drivers/dma/shdma.c | 3 +- trunk/drivers/edac/amd64_edac.c | 10 - 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 | 11 +- trunk/drivers/firewire/sbp2.c | 23 +- 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 | 10 +- 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 | 75 +- trunk/drivers/gpu/drm/radeon/r100.c | 24 +- trunk/drivers/gpu/drm/radeon/r600.c | 21 +- trunk/drivers/gpu/drm/radeon/r600_blit_kms.c | 25 + .../gpu/drm/radeon/r600_blit_shaders.h | 24 + trunk/drivers/gpu/drm/radeon/r600_cs.c | 5 +- trunk/drivers/gpu/drm/radeon/radeon.h | 8 +- 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 | 75 +- trunk/drivers/gpu/drm/radeon/radeon_clocks.c | 58 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 151 +- .../gpu/drm/radeon/radeon_connectors.c | 120 +- 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_pm.c | 7 +- trunk/drivers/gpu/drm/radeon/radeon_state.c | 56 +- trunk/drivers/gpu/drm/radeon/rv770.c | 61 +- 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-core.c | 5 +- trunk/drivers/hid/hid-egalax.c | 9 + trunk/drivers/hid/hid-ids.h | 5 + trunk/drivers/hid/hid-mosart.c | 1 + trunk/drivers/hid/hid-picolcd.c | 4 +- trunk/drivers/hid/hid-topseed.c | 1 + trunk/drivers/hid/usbhid/hid-core.c | 8 +- trunk/drivers/hid/usbhid/hid-quirks.c | 4 + trunk/drivers/hid/usbhid/hiddev.c | 13 +- trunk/drivers/hid/usbhid/usbhid.h | 1 + trunk/drivers/hwmon/Kconfig | 8 +- trunk/drivers/hwmon/adm1031.c | 43 +- trunk/drivers/hwmon/ads7871.c | 38 +- trunk/drivers/hwmon/coretemp.c | 58 +- trunk/drivers/hwmon/emc1403.c | 1 - trunk/drivers/hwmon/f71882fg.c | 115 +- trunk/drivers/hwmon/f75375s.c | 6 +- trunk/drivers/hwmon/hp_accel.c | 2 + trunk/drivers/hwmon/k8temp.c | 35 +- trunk/drivers/hwmon/lis3lv02d.c | 4 +- trunk/drivers/hwmon/lis3lv02d_i2c.c | 4 +- trunk/drivers/hwmon/lis3lv02d_spi.c | 4 +- trunk/drivers/hwmon/lm95241.c | 21 +- trunk/drivers/hwmon/pkgtemp.c | 23 +- trunk/drivers/hwmon/w83627ehf.c | 1 + trunk/drivers/i2c/busses/i2c-cpm.c | 5 + trunk/drivers/i2c/busses/i2c-davinci.c | 6 +- trunk/drivers/i2c/busses/i2c-ibm_iic.c | 3 + trunk/drivers/i2c/busses/i2c-mpc.c | 1 + 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-s3c2410.c | 4 +- trunk/drivers/i2c/i2c-core.c | 54 +- trunk/drivers/ide/ide-probe.c | 12 +- trunk/drivers/idle/intel_idle.c | 30 +- 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/input.c | 11 +- trunk/drivers/input/joydev.c | 3 + trunk/drivers/input/keyboard/hil_kbd.c | 12 +- trunk/drivers/input/keyboard/pxa27x_keypad.c | 2 - trunk/drivers/input/misc/uinput.c | 9 + trunk/drivers/input/mouse/bcm5974.c | 12 +- trunk/drivers/input/mousedev.c | 8 +- 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/sc/interrupt.c | 18 +- trunk/drivers/leds/leds-ns2.c | 9 +- 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/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 + .../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/smscoreapi.c | 31 +- .../media/radio/si470x/radio-si470x-i2c.c | 2 +- trunk/drivers/media/video/cx231xx/Makefile | 1 + .../media/video/cx231xx/cx231xx-cards.c | 17 +- .../media/video/cx25840/cx25840-core.c | 2 +- trunk/drivers/media/video/cx88/Kconfig | 2 +- trunk/drivers/media/video/gspca/gspca.c | 1 + trunk/drivers/media/video/gspca/sn9c20x.c | 3 +- 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 +- .../media/video/saa7134/saa7134-cards.c | 10 +- .../media/video/saa7164/saa7164-buffer.c | 5 +- trunk/drivers/media/video/uvc/uvc_driver.c | 24 + trunk/drivers/media/video/uvc/uvcvideo.h | 1 + .../drivers/media/video/videobuf-dma-contig.c | 6 +- trunk/drivers/media/video/videobuf-dma-sg.c | 11 +- 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/{vmware_balloon.c => vmw_balloon.c} | 0 trunk/drivers/mmc/core/host.c | 2 + trunk/drivers/mmc/core/sdio.c | 5 +- trunk/drivers/mmc/host/Kconfig | 2 +- trunk/drivers/mmc/host/at91_mci.c | 1 + trunk/drivers/mmc/host/imxmmc.c | 3 +- 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/maps/physmap_of.c | 1 + trunk/drivers/mtd/nand/bf5xx_nand.c | 9 +- trunk/drivers/mtd/nand/mxc_nand.c | 47 +- trunk/drivers/mtd/nand/nand_base.c | 11 +- trunk/drivers/mtd/nand/omap2.c | 2 +- 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/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 | 9 + 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/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 | 60 +- trunk/drivers/net/eql.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/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/phy/mdio_bus.c | 4 +- trunk/drivers/net/phy/phy_device.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 | 11 +- trunk/drivers/net/qlge/qlge_main.c | 4 +- trunk/drivers/net/r8169.c | 5 +- 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/tulip/de2104x.c | 43 +- trunk/drivers/net/usb/hso.c | 2 + trunk/drivers/net/usb/ipheth.c | 12 +- trunk/drivers/net/via-velocity.c | 2 +- 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 | 4 +- trunk/drivers/net/wireless/iwlwifi/iwl-3945.c | 4 +- trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-5000.c | 14 +- trunk/drivers/net/wireless/iwlwifi/iwl-6000.c | 32 +- .../net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 45 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 50 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.h | 3 - trunk/drivers/net/wireless/iwlwifi/iwl-dev.h | 3 +- .../net/wireless/iwlwifi/iwl3945-base.c | 53 +- 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 | 2 +- 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/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 | 117 +- 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 +- .../pci/pcie/{pme/pcie_pme.c => pme.c} | 66 +- trunk/drivers/pci/pcie/pme/Makefile | 8 - 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 | 4 +- 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/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/char/ctrlchar.c | 4 +- trunk/drivers/s390/char/keyboard.c | 2 +- trunk/drivers/s390/char/tape_block.c | 3 +- trunk/drivers/s390/net/ctcm_main.c | 4 +- trunk/drivers/scsi/arcmsr/arcmsr_hba.c | 1 + trunk/drivers/scsi/be2iscsi/be_iscsi.c | 5 +- trunk/drivers/scsi/be2iscsi/be_mgmt.c | 2 +- trunk/drivers/scsi/constants.c | 6 +- trunk/drivers/scsi/hpsa.c | 6 + trunk/drivers/scsi/osd/osd_initiator.c | 2 +- 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_glbl.h | 2 +- trunk/drivers/scsi/qla4xxx/ql4_nx.c | 2 +- trunk/drivers/scsi/scsi_lib.c | 2 +- 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/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 | 16 +- trunk/drivers/spi/coldfire_qspi.c | 1 + trunk/drivers/spi/dw_spi.c | 24 +- trunk/drivers/spi/spi.c | 14 +- trunk/drivers/spi/spi_gpio.c | 2 +- trunk/drivers/spi/spi_mpc8xxx.c | 10 +- trunk/drivers/spi/spi_s3c64xx.c | 37 +- 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 | 2 +- trunk/drivers/vhost/vhost.c | 92 +- 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 | 6 +- 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/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/aio.c | 13 +- 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 | 1 + trunk/fs/ceph/addr.c | 19 +- trunk/fs/ceph/auth_x.c | 15 +- trunk/fs/ceph/caps.c | 90 +- trunk/fs/ceph/debugfs.c | 4 + trunk/fs/ceph/dir.c | 12 +- trunk/fs/ceph/export.c | 21 +- trunk/fs/ceph/file.c | 2 +- trunk/fs/ceph/inode.c | 16 +- trunk/fs/ceph/locks.c | 14 +- trunk/fs/ceph/mds_client.c | 103 +- trunk/fs/ceph/mds_client.h | 3 +- trunk/fs/ceph/osd_client.c | 4 +- trunk/fs/ceph/pagelist.c | 12 +- trunk/fs/ceph/snap.c | 177 +- trunk/fs/ceph/super.h | 16 +- trunk/fs/ceph/xattr.c | 1 + trunk/fs/char_dev.c | 4 +- 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 | 2 +- trunk/fs/cramfs/inode.c | 2 +- trunk/fs/dcache.c | 71 +- 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 | 39 +- trunk/fs/exofs/inode.c | 8 +- trunk/fs/fat/misc.c | 4 +- trunk/fs/fcntl.c | 10 +- trunk/fs/file_table.c | 124 +- 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/log.c | 2 +- trunk/fs/hostfs/hostfs_kern.c | 4 +- trunk/fs/internal.h | 7 +- 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/mbcache.c | 30 +- trunk/fs/minix/namei.c | 2 +- trunk/fs/namei.c | 119 +- trunk/fs/namespace.c | 200 +- trunk/fs/nfs/Kconfig | 2 +- trunk/fs/nfs/client.c | 2 +- trunk/fs/nfs/dir.c | 9 +- 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/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/fanotify/fanotify.c | 3 - trunk/fs/notify/fanotify/fanotify_user.c | 29 +- trunk/fs/notify/fsnotify.c | 68 +- trunk/fs/ocfs2/acl.c | 3 + trunk/fs/ocfs2/alloc.c | 2 +- trunk/fs/ocfs2/blockcheck.c | 4 +- trunk/fs/ocfs2/cluster/tcp.c | 2 +- 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 | 40 + 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 | 10 +- 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/pnode.c | 11 +- trunk/fs/proc/base.c | 4 +- trunk/fs/proc/page.c | 2 +- trunk/fs/proc/task_mmu.c | 7 +- 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/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/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 | 2 +- trunk/include/asm-generic/gpio.h | 14 +- trunk/include/asm-generic/percpu.h | 15 +- trunk/include/asm-generic/syscalls.h | 6 +- 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/acpi.h | 4 +- trunk/include/linux/amba/clcd.h | 1 + trunk/include/linux/binfmts.h | 7 +- trunk/include/linux/buffer_head.h | 4 +- trunk/include/linux/cgroup.h | 12 +- trunk/include/linux/compat.h | 3 + trunk/include/linux/cpuidle.h | 1 + trunk/include/linux/dma-mapping.h | 4 + trunk/include/linux/dmaengine.h | 2 +- trunk/include/linux/elevator.h | 2 + trunk/include/linux/fanotify.h | 13 +- trunk/include/linux/fs.h | 25 +- trunk/include/linux/fs_struct.h | 14 +- trunk/include/linux/fsnotify_backend.h | 1 + trunk/include/linux/gpio.h | 1 + trunk/include/linux/i2c/sx150x.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/intel-gtt.h | 20 + trunk/include/linux/io-mapping.h | 24 +- trunk/include/linux/ipv6.h | 4 +- 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/lglock.h | 172 ++ trunk/include/linux/libata.h | 4 +- trunk/include/linux/miscdevice.h | 1 + trunk/include/linux/mm.h | 22 +- trunk/include/linux/mm_types.h | 2 +- trunk/include/linux/mmc/sdio.h | 2 + trunk/include/linux/mmzone.h | 13 + trunk/include/linux/module.h | 5 +- trunk/include/linux/mutex.h | 8 + trunk/include/linux/nbd.h | 2 +- trunk/include/linux/ncp.h | 10 +- trunk/include/linux/netfilter/xt_IDLETIMER.h | 2 +- trunk/include/linux/netfilter/xt_ipvs.h | 2 + trunk/include/linux/netlink.h | 4 +- trunk/include/linux/netpoll.h | 8 +- trunk/include/linux/pci.h | 3 + trunk/include/linux/pci_ids.h | 5 + trunk/include/linux/percpu.h | 2 +- trunk/include/linux/phonet.h | 4 +- trunk/include/linux/pxa168_eth.h | 30 + trunk/include/linux/quotaops.h | 10 +- trunk/include/linux/rcupdate.h | 2 +- trunk/include/linux/rfkill.h | 2 +- trunk/include/linux/sched.h | 4 +- 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 | 3 + trunk/include/linux/sunrpc/clnt.h | 2 +- trunk/include/linux/swap.h | 11 +- trunk/include/linux/syscalls.h | 2 +- trunk/include/linux/sysfs.h | 1 + trunk/include/linux/sysrq.h | 16 +- trunk/include/linux/tty.h | 9 + 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/cls_cgroup.h | 10 +- trunk/include/net/dst.h | 1 + trunk/include/net/ip_vs.h | 3 + trunk/include/net/route.h | 2 + trunk/include/net/sock.h | 1 + trunk/include/net/tcp.h | 36 +- trunk/include/net/udp.h | 1 + trunk/include/net/xfrm.h | 4 +- trunk/include/sound/emu10k1.h | 1 + trunk/include/trace/events/timer.h | 8 +- trunk/include/trace/events/workqueue.h | 62 + trunk/include/xen/platform_pci.h | 14 +- trunk/init/do_mounts_initrd.c | 7 +- trunk/init/main.c | 6 +- trunk/ipc/sem.c | 2 + trunk/kernel/cgroup.c | 13 +- trunk/kernel/compat.c | 21 + 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 | 5 +- trunk/kernel/fork.c | 19 +- trunk/kernel/gcov/fs.c | 244 +- trunk/kernel/groups.c | 5 +- trunk/kernel/hrtimer.c | 3 +- trunk/kernel/hw_breakpoint.c | 3 +- trunk/kernel/kfifo.c | 11 +- trunk/kernel/kmod.c | 4 +- trunk/kernel/module.c | 4 + trunk/kernel/mutex.c | 23 +- trunk/kernel/perf_event.c | 32 +- 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/sched.c | 24 +- trunk/kernel/sched_fair.c | 15 +- trunk/kernel/signal.c | 8 + trunk/kernel/smp.c | 17 +- trunk/kernel/sys.c | 2 + trunk/kernel/sysctl.c | 7 +- trunk/kernel/trace/ftrace.c | 19 +- trunk/kernel/trace/ring_buffer.c | 5 +- trunk/kernel/trace/trace.c | 11 +- trunk/kernel/trace/trace_event_perf.c | 3 + trunk/kernel/trace/trace_events.c | 207 +- trunk/kernel/trace/trace_functions_graph.c | 10 +- trunk/kernel/trace/trace_kprobe.c | 43 +- trunk/kernel/trace/trace_stack.c | 2 +- trunk/kernel/watchdog.c | 20 +- trunk/kernel/workqueue.c | 89 +- trunk/lib/Kconfig.debug | 5 +- trunk/lib/bug.c | 6 +- trunk/lib/kobject_uevent.c | 4 +- trunk/lib/list_sort.c | 2 +- trunk/lib/radix-tree.c | 68 +- 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 | 71 +- trunk/mm/memory_hotplug.c | 16 +- trunk/mm/mlock.c | 15 +- trunk/mm/mmap.c | 25 +- trunk/mm/mmzone.c | 21 + trunk/mm/nommu.c | 7 +- trunk/mm/oom_kill.c | 65 +- trunk/mm/page-writeback.c | 30 +- 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 | 2 +- trunk/net/atm/br2684.c | 12 +- trunk/net/ax25/ax25_ds_timer.c | 2 +- trunk/net/bluetooth/l2cap.c | 62 +- trunk/net/bluetooth/rfcomm/sock.c | 4 + trunk/net/bridge/br_netfilter.c | 8 +- trunk/net/caif/caif_socket.c | 21 +- trunk/net/caif/cfrfml.c | 2 +- trunk/net/core/dev.c | 20 +- trunk/net/core/ethtool.c | 2 +- trunk/net/core/gen_estimator.c | 12 +- trunk/net/core/iovec.c | 5 +- trunk/net/core/skbuff.c | 6 +- trunk/net/core/sock.c | 8 +- trunk/net/core/stream.c | 8 +- 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 + trunk/net/ipv4/netfilter/nf_defrag_ipv4.c | 4 +- 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/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_extend.c | 4 +- trunk/net/netfilter/nf_conntrack_sip.c | 2 +- trunk/net/netfilter/nf_tproxy_core.c | 6 +- trunk/net/netlink/af_netlink.c | 78 +- trunk/net/phonet/pep.c | 3 +- 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_u32.c | 2 +- trunk/net/sched/sch_atm.c | 4 - trunk/net/sched/sch_hfsc.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/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/basic/docproc.c | 129 +- trunk/scripts/kernel-doc | 54 +- trunk/scripts/recordmcount.pl | 7 +- 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/commoncap.c | 2 +- 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/selinux/hooks.c | 9 +- trunk/security/tomoyo/common.c | 6 +- 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 | 2 + 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/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 | 35 +- trunk/sound/pci/hda/hda_codec.h | 2 +- trunk/sound/pci/hda/hda_eld.c | 4 +- trunk/sound/pci/hda/hda_intel.c | 3 + trunk/sound/pci/hda/patch_analog.c | 1 + trunk/sound/pci/hda/patch_cirrus.c | 50 + trunk/sound/pci/hda/patch_conexant.c | 61 + trunk/sound/pci/hda/patch_hdmi.c | 21 +- trunk/sound/pci/hda/patch_intelhdmi.c | 8 - trunk/sound/pci/hda/patch_nvhdmi.c | 10 +- trunk/sound/pci/hda/patch_realtek.c | 210 +- 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/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 | 22 +- trunk/sound/usb/mixer.c | 10 +- trunk/sound/usb/pcm.c | 3 +- trunk/tools/perf/Makefile | 30 +- trunk/tools/perf/feature-tests.mak | 2 +- trunk/tools/perf/util/callchain.h | 1 + trunk/tools/perf/util/probe-event.c | 1 + trunk/tools/perf/util/probe-finder.c | 42 +- trunk/tools/perf/util/symbol.c | 7 + trunk/tools/perf/util/symbol.h | 3 +- trunk/tools/perf/util/trace-event-scripting.c | 4 +- trunk/tools/perf/util/ui/browsers/annotate.c | 3 +- trunk/tools/perf/util/ui/browsers/hists.c | 2 +- trunk/virt/kvm/eventfd.c | 3 +- trunk/virt/kvm/kvm_main.c | 9 +- 1555 files changed, 21718 insertions(+), 17092 deletions(-) create mode 100644 trunk/Documentation/block/cfq-iosched.txt create mode 100644 trunk/Documentation/networking/e1000e.txt mode change 100755 => 100644 trunk/Documentation/networking/ixgbevf.txt create mode 100644 trunk/Documentation/workqueue.txt create mode 100644 trunk/arch/arm/mach-shmobile/pm_runtime.c create mode 100644 trunk/arch/mn10300/mm/cache-disabled.c delete mode 100644 trunk/arch/sparc/include/asm/rwsem-const.h delete mode 100644 trunk/arch/sparc/lib/rwsem_64.S delete mode 100644 trunk/drivers/ata/pata_winbond.c create mode 100644 trunk/drivers/gpu/drm/i915/i915_gem_evict.c create mode 100644 trunk/drivers/gpu/drm/i915/intel_panel.c mode change 100755 => 100644 trunk/drivers/idle/intel_idle.c delete mode 100644 trunk/drivers/md/.gitignore rename trunk/drivers/misc/{vmware_balloon.c => vmw_balloon.c} (100%) create mode 100644 trunk/drivers/net/pxa168_eth.c rename trunk/drivers/pci/pcie/{pme/pcie_pme.c => pme.c} (83%) delete mode 100644 trunk/drivers/pci/pcie/pme/Makefile delete mode 100644 trunk/drivers/pci/pcie/pme/pcie_pme.h delete mode 100644 trunk/drivers/pci/pcie/pme/pcie_pme_acpi.c create mode 100644 trunk/drivers/pci/pcie/portdrv_acpi.c delete mode 100644 trunk/drivers/staging/sep/Kconfig delete mode 100644 trunk/drivers/staging/sep/Makefile delete mode 100644 trunk/drivers/staging/sep/TODO delete mode 100644 trunk/drivers/staging/sep/sep_dev.h delete mode 100644 trunk/drivers/staging/sep/sep_driver.c delete mode 100644 trunk/drivers/staging/sep/sep_driver_api.h delete mode 100644 trunk/drivers/staging/sep/sep_driver_config.h delete mode 100644 trunk/drivers/staging/sep/sep_driver_hw_defs.h create mode 100644 trunk/include/linux/intel-gtt.h create mode 100644 trunk/include/linux/kobject_ns.h create mode 100644 trunk/include/linux/lglock.h create mode 100644 trunk/include/linux/pxa168_eth.h create mode 100644 trunk/include/trace/events/workqueue.h create mode 100644 trunk/lib/raid6/.gitignore diff --git a/[refs] b/[refs] index 07bf79ec4387..8df9b24f8afa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9203c988234aa512bd45ca32b52e21c7bbfc414 +refs/heads/master: 29979aa8bd69becd94cbad59093807a417ce2a9e diff --git a/trunk/CREDITS b/trunk/CREDITS index 72b487869788..41d8e63d5165 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: vandrove@vc.cvut.cz +E: petr@vandrovec.name D: Small contributions to ncpfs D: Matrox framebuffer driver -S: Chudenicka 8 -S: 10200 Prague 10, Hostivar -S: Czech Republic +S: 21513 Conradia Ct +S: Cupertino, CA 95014 +S: USA N: Thibaut Varene E: T-Bone@parisc-linux.org diff --git a/trunk/Documentation/DocBook/device-drivers.tmpl b/trunk/Documentation/DocBook/device-drivers.tmpl index ecd35e9d4410..feca0758391e 100644 --- a/trunk/Documentation/DocBook/device-drivers.tmpl +++ b/trunk/Documentation/DocBook/device-drivers.tmpl @@ -46,7 +46,6 @@ 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 a20c6f6fffc3..6899f471fb15 100644 --- a/trunk/Documentation/DocBook/kernel-api.tmpl +++ b/trunk/Documentation/DocBook/kernel-api.tmpl @@ -57,7 +57,6 @@ 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 084f6ad7b7a0..a0d479d1e1dd 100644 --- a/trunk/Documentation/DocBook/kernel-locking.tmpl +++ b/trunk/Documentation/DocBook/kernel-locking.tmpl @@ -1922,9 +1922,12 @@ machines due to caching. mutex_lock() - There is a mutex_trylock() which can be - used inside interrupt context, as it will not sleep. + 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. 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. @@ -1958,6 +1961,12 @@ 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 e8473eae2a20..b57a9ede3224 100644 --- a/trunk/Documentation/DocBook/tracepoint.tmpl +++ b/trunk/Documentation/DocBook/tracepoint.tmpl @@ -104,4 +104,9 @@ Block IO !Iinclude/trace/events/block.h + + + Workqueue +!Iinclude/trace/events/workqueue.h + diff --git a/trunk/Documentation/block/cfq-iosched.txt b/trunk/Documentation/block/cfq-iosched.txt new file mode 100644 index 000000000000..e578feed6d81 --- /dev/null +++ b/trunk/Documentation/block/cfq-iosched.txt @@ -0,0 +1,45 @@ +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 48e0b21b0059..6919d62591d9 100644 --- a/trunk/Documentation/cgroups/blkio-controller.txt +++ b/trunk/Documentation/cgroups/blkio-controller.txt @@ -217,6 +217,7 @@ 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 @@ -243,6 +244,33 @@ 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/gpio.txt b/trunk/Documentation/gpio.txt index d96a6dba5748..9633da01ff46 100644 --- a/trunk/Documentation/gpio.txt +++ b/trunk/Documentation/gpio.txt @@ -109,17 +109,19 @@ 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 a number could reference a GPIO, you may use this predicate: +test if such number from such a structure 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 unused on a given board. - -Whether a platform supports multiple GPIO controllers is currently a -platform-specific implementation issue. +example, a number might be valid but temporarily unused on a given board. +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 ----------- @@ -480,12 +482,16 @@ 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. -ARCH_REQUIRE_GPIOLIB means that the gpio-lib code will always get compiled +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 into the kernel on that architecture. -ARCH_WANT_OPTIONAL_GPIOLIB means the gpio-lib code defaults to off and the user +ARCH_WANT_OPTIONAL_GPIOLIB means the gpiolib 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/f71882fg b/trunk/Documentation/hwmon/f71882fg index 1a07fd674cd0..a7952c2bd959 100644 --- a/trunk/Documentation/hwmon/f71882fg +++ b/trunk/Documentation/hwmon/f71882fg @@ -2,10 +2,6 @@ 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/sysfs-interface b/trunk/Documentation/hwmon/sysfs-interface index ff45d1f837c8..48ceabedf55d 100644 --- a/trunk/Documentation/hwmon/sysfs-interface +++ b/trunk/Documentation/hwmon/sysfs-interface @@ -91,12 +91,11 @@ name The chip name. I2C devices get this attribute created automatically. RO -update_rate The rate at which the chip will update readings. +update_interval The interval at which the chip will update readings. Unit: millisecond RW - Some devices have a variable update rate. This attribute - can be used to change the update rate to the desired - frequency. + Some devices have a variable update rate or interval. + This attribute can be used to change it to the desired value. ************ diff --git a/trunk/Documentation/kernel-doc-nano-HOWTO.txt b/trunk/Documentation/kernel-doc-nano-HOWTO.txt index 27a52b35d55b..3d8a97747f77 100644 --- a/trunk/Documentation/kernel-doc-nano-HOWTO.txt +++ b/trunk/Documentation/kernel-doc-nano-HOWTO.txt @@ -345,5 +345,10 @@ 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 2c85c0692b01..8dd7248508a9 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1974,15 +1974,18 @@ 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 everything). + all PCIe root ports use INTx for all services). pcmv= [HW,PCMCIA] BadgePAD 4 @@ -2629,8 +2632,10 @@ 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) - ignore -- continue loading the Xen platform PCI driver even - if the version check failed + 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 xirc2ps_cs= [NET,PCMCIA] Format: diff --git a/trunk/Documentation/laptops/thinkpad-acpi.txt b/trunk/Documentation/laptops/thinkpad-acpi.txt index f6f80257addb..1565eefd6fd5 100644 --- a/trunk/Documentation/laptops/thinkpad-acpi.txt +++ b/trunk/Documentation/laptops/thinkpad-acpi.txt @@ -1024,6 +1024,10 @@ 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 28c8cdfcafd8..bebac6b4f332 100644 --- a/trunk/Documentation/lguest/Makefile +++ b/trunk/Documentation/lguest/Makefile @@ -1,5 +1,6 @@ # This creates the demonstration utility "lguest" which runs a Linux guest. -CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE +# Missing headers? Add "-I../../include -I../../arch/x86/include" +CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE all: lguest diff --git a/trunk/Documentation/lguest/lguest.c b/trunk/Documentation/lguest/lguest.c index e9ce3c554514..8a6a8c6d4980 100644 --- a/trunk/Documentation/lguest/lguest.c +++ b/trunk/Documentation/lguest/lguest.c @@ -39,14 +39,14 @@ #include #include #include -#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" +#include +#include +#include +#include +#include +#include +#include +#include "../../include/linux/lguest_launcher.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,14 +1447,15 @@ 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 *)&ifr.ifr_addr; + struct sockaddr_in sin; 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); + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = htonl(ipaddr); + memcpy(&ifr.ifr_addr, &sin, sizeof(sin)); 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 c91ccc0720fa..38c10fd7f411 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,3 +136,4 @@ 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 2df71861e578..d9271e74e488 100644 --- a/trunk/Documentation/networking/e1000.txt +++ b/trunk/Documentation/networking/e1000.txt @@ -1,82 +1,35 @@ Linux* Base Driver for the Intel(R) PRO/1000 Family of Adapters =============================================================== -September 26, 2006 - +Intel Gigabit Linux driver. +Copyright(c) 1999 - 2010 Intel Corporation. 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/network/adapter/pro100/21397.htm + http://support.intel.com/support/go/network/adapter/idguide.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://downloadfinder.intel.com/scripts-df/support_intel.asp - + http://support.intel.com/support/go/network/adapter/home.htm 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 [