From 617829038bcaa357e61c7d08769e9dcbab37f156 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 21 Nov 2011 12:11:37 -0800 Subject: [PATCH] --- yaml --- r: 275761 b: refs/heads/master c: f8f5ed7c996ad9426847ce09b828d415cb19bc06 h: refs/heads/master i: 275759: 53751d848a9fd62cd088ac1afb4e00e8f43ae8ee v: v3 --- [refs] | 2 +- trunk/.mailmap | 2 + .../ABI/stable/sysfs-acpi-pmprofile | 22 + trunk/Documentation/ABI/testing/sysfs-block | 13 - trunk/Documentation/DocBook/drm.tmpl | 308 +- trunk/Documentation/DocBook/mtdnand.tmpl | 19 +- trunk/Documentation/blockdev/cciss.txt | 14 +- .../cgroups/freezer-subsystem.txt | 4 +- .../bindings/mtd/atmel-dataflash.txt | 14 + .../devicetree/bindings/powerpc/fsl/board.txt | 30 +- .../devicetree/bindings/powerpc/fsl/dcsr.txt | 395 +++ .../bindings/powerpc/fsl/msi-pic.txt | 42 + trunk/Documentation/networking/ip-sysctl.txt | 2 +- trunk/Documentation/oops-tracing.txt | 2 + .../Documentation/power/freezing-of-tasks.txt | 8 +- trunk/Documentation/power/runtime_pm.txt | 10 + .../sound/alsa/HD-Audio-Models.txt | 1 + trunk/Documentation/sound/alsa/HD-Audio.txt | 8 +- .../convert_drivers_to_kernel_api.txt | 195 ++ trunk/Kbuild | 8 +- trunk/MAINTAINERS | 37 +- trunk/Makefile | 10 +- trunk/arch/alpha/Kconfig | 5 - trunk/arch/alpha/kernel/core_irongate.c | 1 + trunk/arch/alpha/kernel/pci-sysfs.c | 1 + trunk/arch/alpha/kernel/pci_iommu.c | 1 + trunk/arch/alpha/kernel/setup.c | 1 + trunk/arch/arm/Kconfig | 15 +- trunk/arch/arm/Makefile | 2 +- trunk/arch/arm/boot/Makefile | 2 + trunk/arch/arm/boot/dts/tegra-ventana.dts | 3 +- trunk/arch/arm/common/it8152.c | 1 + trunk/arch/arm/common/scoop.c | 1 + trunk/arch/arm/configs/exynos4_defconfig | 9 +- .../arm/include/asm/hardware/cache-l2x0.h | 2 + trunk/arch/arm/include/asm/mach/arch.h | 1 + trunk/arch/arm/include/asm/unistd.h | 2 + trunk/arch/arm/kernel/armksyms.c | 2 +- trunk/arch/arm/kernel/bios32.c | 2 +- trunk/arch/arm/kernel/calls.S | 2 + trunk/arch/arm/kernel/devtree.c | 2 +- trunk/arch/arm/kernel/elf.c | 2 +- trunk/arch/arm/kernel/etm.c | 1 + trunk/arch/arm/kernel/head.S | 2 +- trunk/arch/arm/kernel/io.c | 2 +- trunk/arch/arm/kernel/irq.c | 1 - trunk/arch/arm/kernel/leds.c | 3 +- trunk/arch/arm/kernel/machine_kexec.c | 35 +- trunk/arch/arm/kernel/perf_event.c | 2 +- trunk/arch/arm/kernel/pj4-cp0.c | 1 - trunk/arch/arm/kernel/process.c | 2 +- trunk/arch/arm/kernel/ptrace.c | 1 + trunk/arch/arm/kernel/return_address.c | 2 +- trunk/arch/arm/kernel/setup.c | 8 +- trunk/arch/arm/kernel/stacktrace.c | 2 +- trunk/arch/arm/kernel/sys_arm.c | 2 +- trunk/arch/arm/kernel/time.c | 2 +- trunk/arch/arm/kernel/unwind.c | 2 +- trunk/arch/arm/kernel/xscale-cp0.c | 1 - trunk/arch/arm/mach-at91/Kconfig | 6 - trunk/arch/arm/mach-at91/at91cap9_devices.c | 7 +- trunk/arch/arm/mach-at91/at91rm9200_devices.c | 5 +- .../arch/arm/mach-at91/at91sam9260_devices.c | 5 +- .../arch/arm/mach-at91/at91sam9261_devices.c | 5 +- .../arch/arm/mach-at91/at91sam9263_devices.c | 5 +- .../arch/arm/mach-at91/at91sam9g45_devices.c | 7 +- trunk/arch/arm/mach-at91/at91sam9rl_devices.c | 7 +- trunk/arch/arm/mach-at91/board-afeb-9260v1.c | 9 +- trunk/arch/arm/mach-at91/board-cam60.c | 9 +- trunk/arch/arm/mach-at91/board-cap9adk.c | 9 +- trunk/arch/arm/mach-at91/board-kb9202.c | 9 +- trunk/arch/arm/mach-at91/board-neocore926.c | 9 +- trunk/arch/arm/mach-at91/board-qil-a9260.c | 9 +- trunk/arch/arm/mach-at91/board-rm9200dk.c | 9 +- trunk/arch/arm/mach-at91/board-sam9-l9260.c | 9 +- trunk/arch/arm/mach-at91/board-sam9260ek.c | 9 +- trunk/arch/arm/mach-at91/board-sam9261ek.c | 9 +- trunk/arch/arm/mach-at91/board-sam9263ek.c | 9 +- trunk/arch/arm/mach-at91/board-sam9g20ek.c | 9 +- trunk/arch/arm/mach-at91/board-sam9m10g45ek.c | 9 +- trunk/arch/arm/mach-at91/board-sam9rlek.c | 9 +- trunk/arch/arm/mach-at91/board-snapper9260.c | 10 +- trunk/arch/arm/mach-at91/board-usb-a926x.c | 9 +- trunk/arch/arm/mach-at91/board-yl-9200.c | 11 +- trunk/arch/arm/mach-at91/cpuidle.c | 42 +- trunk/arch/arm/mach-at91/include/mach/board.h | 3 +- .../arch/arm/mach-at91/include/mach/vmalloc.h | 2 + trunk/arch/arm/mach-bcmring/core.c | 2 +- trunk/arch/arm/mach-bcmring/dma.c | 2 + trunk/arch/arm/mach-bcmring/mm.c | 1 + trunk/arch/arm/mach-davinci/board-da830-evm.c | 2 +- trunk/arch/arm/mach-davinci/board-da850-evm.c | 2 +- trunk/arch/arm/mach-davinci/board-dm355-evm.c | 2 +- .../arm/mach-davinci/board-dm355-leopard.c | 2 +- trunk/arch/arm/mach-davinci/board-dm365-evm.c | 2 +- .../arch/arm/mach-davinci/board-dm644x-evm.c | 3 +- .../arch/arm/mach-davinci/board-dm646x-evm.c | 1 + .../arm/mach-davinci/board-mityomapl138.c | 3 +- .../arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- .../arm/mach-davinci/board-tnetv107x-evm.c | 2 +- trunk/arch/arm/mach-davinci/cdce949.c | 1 + trunk/arch/arm/mach-davinci/cpufreq.c | 1 + trunk/arch/arm/mach-davinci/cpuidle.c | 52 +- .../arch/arm/mach-davinci/include/mach/gpio.h | 2 + .../arch/arm/mach-davinci/include/mach/nand.h | 4 +- trunk/arch/arm/mach-ep93xx/core.c | 1 + trunk/arch/arm/mach-ep93xx/ts72xx.c | 23 +- .../arm/{mach-exynos4 => mach-exynos}/Kconfig | 88 +- .../{mach-exynos4 => mach-exynos}/Makefile | 13 +- .../Makefile.boot | 0 .../clock-exynos4210.c | 0 .../clock-exynos4212.c | 0 .../arm/{mach-exynos4 => mach-exynos}/clock.c | 207 +- .../arm/{mach-exynos4 => mach-exynos}/cpu.c | 71 +- .../{mach-exynos4 => mach-exynos}/cpuidle.c | 30 +- .../{mach-exynos4 => mach-exynos}/dev-ahci.c | 0 .../{mach-exynos4 => mach-exynos}/dev-audio.c | 0 .../{mach-exynos4 => mach-exynos}/dev-dwmci.c | 0 .../{mach-exynos4 => mach-exynos}/dev-pd.c | 0 .../dev-sysmmu.c | 1 + .../arm/{mach-exynos4 => mach-exynos}/dma.c | 1 + .../{mach-exynos4 => mach-exynos}/headsmp.S | 0 .../{mach-exynos4 => mach-exynos}/hotplug.c | 0 .../include/mach/debug-macro.S | 0 .../include/mach/dma.h | 0 .../include/mach/dwmci.h | 0 .../include/mach/entry-macro.S | 0 .../include/mach/exynos4-clock.h | 0 .../include/mach/gpio.h | 0 .../include/mach/hardware.h | 0 .../include/mach/io.h | 0 .../include/mach/irqs.h | 4 + .../include/mach/map.h | 34 +- .../include/mach/memory.h | 0 .../include/mach/pm-core.h | 8 +- .../include/mach/pmu.h | 7 + .../include/mach/regs-audss.h | 0 .../include/mach/regs-clock.h | 0 .../include/mach/regs-gpio.h | 0 .../include/mach/regs-irq.h | 0 .../include/mach/regs-mct.h | 0 .../include/mach/regs-mem.h | 0 .../include/mach/regs-pmu.h | 74 +- .../include/mach/regs-sysmmu.h | 0 .../include/mach/regs-usb-phy.h | 0 .../include/mach/sysmmu.h | 0 .../include/mach/system.h | 0 .../include/mach/timex.h | 0 .../include/mach/uncompress.h | 0 .../include/mach/vmalloc.h | 0 .../arm/{mach-exynos4 => mach-exynos}/init.c | 0 .../irq-combiner.c | 0 .../{mach-exynos4 => mach-exynos}/irq-eint.c | 0 .../mach-armlex4210.c | 0 .../{mach-exynos4 => mach-exynos}/mach-nuri.c | 192 +- trunk/arch/arm/mach-exynos/mach-origen.c | 700 +++++ .../mach-smdk4x12.c | 0 .../mach-smdkv310.c | 49 + .../mach-universal_c210.c | 307 +- .../arm/{mach-exynos4 => mach-exynos}/mct.c | 40 +- .../{mach-exynos4 => mach-exynos}/platsmp.c | 2 - .../arm/{mach-exynos4 => mach-exynos}/pm.c | 7 + trunk/arch/arm/mach-exynos/pmu.c | 230 ++ .../setup-fimc.c | 0 .../setup-fimd0.c | 0 .../setup-i2c0.c | 0 .../setup-i2c1.c | 0 .../setup-i2c2.c | 0 .../setup-i2c3.c | 0 .../setup-i2c4.c | 0 .../setup-i2c5.c | 0 .../setup-i2c6.c | 0 .../setup-i2c7.c | 0 .../setup-keypad.c | 0 .../setup-sdhci-gpio.c | 0 trunk/arch/arm/mach-exynos/setup-sdhci.c | 22 + .../setup-usb-phy.c | 0 .../arm/mach-exynos4/include/mach/clkdev.h | 7 - trunk/arch/arm/mach-exynos4/mach-origen.c | 108 - trunk/arch/arm/mach-exynos4/pmu.c | 175 -- trunk/arch/arm/mach-exynos4/setup-sdhci.c | 69 - trunk/arch/arm/mach-imx/Makefile.boot | 34 +- trunk/arch/arm/mach-imx/clock-imx6q.c | 17 +- trunk/arch/arm/mach-imx/mach-mx31lilly.c | 1 + trunk/arch/arm/mach-imx/mach-mx31lite.c | 1 + trunk/arch/arm/mach-imx/mach-mx31moboard.c | 1 + trunk/arch/arm/mach-iop13xx/pci.c | 1 + trunk/arch/arm/mach-ixp2000/core.c | 1 + trunk/arch/arm/mach-ixp4xx/common-pci.c | 1 + trunk/arch/arm/mach-ixp4xx/common.c | 1 + trunk/arch/arm/mach-kirkwood/cpuidle.c | 43 +- trunk/arch/arm/mach-mmp/Makefile | 2 +- trunk/arch/arm/mach-mmp/aspenite.c | 5 +- trunk/arch/arm/mach-mmp/brownstone.c | 11 + trunk/arch/arm/mach-mmp/include/mach/mmp2.h | 13 + trunk/arch/arm/mach-mmp/include/mach/sram.h | 35 + trunk/arch/arm/mach-mmp/mmp2.c | 3 + trunk/arch/arm/mach-mmp/sram.c | 168 + trunk/arch/arm/mach-msm/Makefile | 2 + trunk/arch/arm/mach-msm/board-msm7x30.c | 4 +- trunk/arch/arm/mach-msm/board-msm8960.c | 4 +- trunk/arch/arm/mach-msm/board-msm8x60.c | 4 +- trunk/arch/arm/mach-msm/io.c | 1 + trunk/arch/arm/mach-msm/scm.c | 3 + trunk/arch/arm/mach-mx5/clock-mx51-mx53.c | 6 +- trunk/arch/arm/mach-mxs/mach-mx28evk.c | 4 +- trunk/arch/arm/mach-netx/xc.c | 1 + trunk/arch/arm/mach-omap1/board-ams-delta.c | 1 + trunk/arch/arm/mach-omap1/board-palmz71.c | 1 - trunk/arch/arm/mach-omap1/board-sx1.c | 1 + trunk/arch/arm/mach-omap1/board-voiceblue.c | 1 + trunk/arch/arm/mach-omap1/mailbox.c | 1 + trunk/arch/arm/mach-omap1/pm.c | 2 +- trunk/arch/arm/mach-omap2/board-devkit8000.c | 1 - trunk/arch/arm/mach-omap2/board-generic.c | 8 + trunk/arch/arm/mach-omap2/board-h4.c | 122 +- trunk/arch/arm/mach-omap2/board-omap3evm.c | 1 + trunk/arch/arm/mach-omap2/clkt_dpll.c | 51 +- trunk/arch/arm/mach-omap2/clock.h | 2 + trunk/arch/arm/mach-omap2/clock2420_data.c | 12 - trunk/arch/arm/mach-omap2/clock2430_data.c | 12 - trunk/arch/arm/mach-omap2/clock3xxx_data.c | 12 - trunk/arch/arm/mach-omap2/clock44xx.h | 7 + trunk/arch/arm/mach-omap2/clock44xx_data.c | 43 +- trunk/arch/arm/mach-omap2/clockdomain.c | 1 + trunk/arch/arm/mach-omap2/cpuidle34xx.c | 133 +- trunk/arch/arm/mach-omap2/devices.c | 17 +- trunk/arch/arm/mach-omap2/display.c | 1 + trunk/arch/arm/mach-omap2/dpll3xxx.c | 9 +- trunk/arch/arm/mach-omap2/dpll44xx.c | 69 + trunk/arch/arm/mach-omap2/dsp.c | 1 + trunk/arch/arm/mach-omap2/gpmc-onenand.c | 1 + trunk/arch/arm/mach-omap2/hsmmc.c | 16 +- trunk/arch/arm/mach-omap2/id.c | 5 +- .../include/mach/ctrl_module_pad_core_44xx.h | 8 +- trunk/arch/arm/mach-omap2/io.c | 6 + trunk/arch/arm/mach-omap2/mailbox.c | 1 + trunk/arch/arm/mach-omap2/omap-iommu.c | 1 + trunk/arch/arm/mach-omap2/omap_hwmod.c | 2 +- .../arm/mach-omap2/omap_hwmod_3xxx_data.c | 17 +- trunk/arch/arm/mach-omap2/omap_l3_noc.c | 1 + trunk/arch/arm/mach-omap2/pm.c | 1 + trunk/arch/arm/mach-omap2/pm34xx.c | 70 +- trunk/arch/arm/mach-omap2/powerdomain.c | 14 +- trunk/arch/arm/mach-omap2/powerdomain.h | 2 +- trunk/arch/arm/mach-omap2/prcm.c | 1 + trunk/arch/arm/mach-omap2/smartreflex.c | 1 + trunk/arch/arm/mach-omap2/timer.c | 12 +- trunk/arch/arm/mach-omap2/usb-musb.c | 38 - trunk/arch/arm/mach-omap2/usb-tusb6010.c | 2 + trunk/arch/arm/mach-omap2/voltage.c | 1 + trunk/arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- .../mach-picoxcell/include/mach/debug-macro.S | 2 +- trunk/arch/arm/mach-pxa/cm-x300.c | 5 +- trunk/arch/arm/mach-pxa/colibri-pxa270.c | 1 + trunk/arch/arm/mach-pxa/colibri-pxa3xx.c | 5 +- trunk/arch/arm/mach-pxa/corgi.c | 1 + trunk/arch/arm/mach-pxa/eseries.c | 2 +- trunk/arch/arm/mach-pxa/eseries.h | 1 - .../arch/arm/mach-pxa/include/mach/gpio-pxa.h | 2 +- trunk/arch/arm/mach-pxa/littleton.c | 5 +- trunk/arch/arm/mach-pxa/mxm8x10.c | 9 +- trunk/arch/arm/mach-pxa/poodle.c | 1 + trunk/arch/arm/mach-pxa/raumfeld.c | 5 +- trunk/arch/arm/mach-pxa/spitz.c | 1 + trunk/arch/arm/mach-pxa/trizeps4.c | 1 + trunk/arch/arm/mach-pxa/zylonite.c | 5 +- trunk/arch/arm/mach-s3c2410/Kconfig | 1 - trunk/arch/arm/mach-s3c2410/include/mach/fb.h | 75 +- .../arm/mach-s3c2410/include/mach/gpio-fns.h | 99 +- .../arm/mach-s3c2410/include/mach/gpio-nrs.h | 2 +- .../mach-s3c2410/include/mach/gpio-track.h | 6 +- .../arch/arm/mach-s3c2410/include/mach/irqs.h | 4 +- .../arch/arm/mach-s3c2410/include/mach/map.h | 1 + .../arm/mach-s3c2410/include/mach/pm-core.h | 2 +- .../include/mach/regs-s3c2443-clock.h | 2 + trunk/arch/arm/mach-s3c2410/mach-h1940.c | 7 +- trunk/arch/arm/mach-s3c2410/mach-qt2410.c | 1 + trunk/arch/arm/mach-s3c2410/s3c2410.c | 4 +- trunk/arch/arm/mach-s3c2412/gpio.c | 62 + trunk/arch/arm/mach-s3c2416/Kconfig | 1 - trunk/arch/arm/mach-s3c2416/clock.c | 50 +- trunk/arch/arm/mach-s3c2416/s3c2416.c | 7 +- trunk/arch/arm/mach-s3c2416/setup-sdhci.c | 37 - trunk/arch/arm/mach-s3c2440/Kconfig | 2 - trunk/arch/arm/mach-s3c2440/mach-rx1950.c | 1 + trunk/arch/arm/mach-s3c2440/s3c2440.c | 4 +- trunk/arch/arm/mach-s3c2440/s3c2442.c | 4 +- trunk/arch/arm/mach-s3c2443/Kconfig | 1 - trunk/arch/arm/mach-s3c2443/clock.c | 160 +- trunk/arch/arm/mach-s3c2443/s3c2443.c | 7 +- trunk/arch/arm/mach-s3c64xx/Kconfig | 1 + trunk/arch/arm/mach-s3c64xx/Makefile | 5 +- trunk/arch/arm/mach-s3c64xx/clock.c | 13 +- trunk/arch/arm/mach-s3c64xx/cpu.c | 4 +- trunk/arch/arm/mach-s3c64xx/dev-audio.c | 1 + trunk/arch/arm/mach-s3c64xx/dev-onenand1.c | 53 - trunk/arch/arm/mach-s3c64xx/dma.c | 2 +- trunk/arch/arm/mach-s3c64xx/gpiolib.c | 290 -- .../arm/mach-s3c64xx/include/mach/clkdev.h | 7 - .../arm/mach-s3c64xx/include/mach/crag6410.h | 23 + .../arch/arm/mach-s3c64xx/include/mach/pll.h | 45 - .../arm/mach-s3c64xx/include/mach/pm-core.h | 2 +- .../arm/mach-s3c64xx/include/mach/pwm-clock.h | 56 - .../arm/mach-s3c64xx/include/mach/regs-sys.h | 3 + trunk/arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +- .../arm/mach-s3c64xx/mach-crag6410-module.c | 182 ++ trunk/arch/arm/mach-s3c64xx/mach-crag6410.c | 108 +- trunk/arch/arm/mach-s3c64xx/mach-hmt.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-ncp.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- trunk/arch/arm/mach-s3c64xx/pm.c | 4 + trunk/arch/arm/mach-s3c64xx/s3c6400.c | 2 +- trunk/arch/arm/mach-s3c64xx/s3c6410.c | 4 +- trunk/arch/arm/mach-s3c64xx/setup-sdhci.c | 48 - trunk/arch/arm/mach-s5p64x0/Kconfig | 14 + trunk/arch/arm/mach-s5p64x0/Makefile | 4 +- trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c | 1 + trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c | 1 + trunk/arch/arm/mach-s5p64x0/cpu.c | 3 + .../arm/mach-s5p64x0/include/mach/clkdev.h | 7 - .../arch/arm/mach-s5p64x0/include/mach/irqs.h | 4 + .../arch/arm/mach-s5p64x0/include/mach/map.h | 4 + .../arm/mach-s5p64x0/include/mach/pm-core.h | 117 + .../arm/mach-s5p64x0/include/mach/pwm-clock.h | 68 - .../mach-s5p64x0/include/mach/regs-clock.h | 33 + .../arm/mach-s5p64x0/include/mach/regs-gpio.h | 21 + trunk/arch/arm/mach-s5p64x0/irq-eint.c | 2 + trunk/arch/arm/mach-s5p64x0/irq-pm.c | 92 + trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c | 74 + trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c | 75 + trunk/arch/arm/mach-s5p64x0/pm.c | 204 ++ trunk/arch/arm/mach-s5p64x0/setup-fb-24bpp.c | 29 + trunk/arch/arm/mach-s5pc100/clock.c | 4 +- trunk/arch/arm/mach-s5pc100/dma.c | 1 + .../arm/mach-s5pc100/include/mach/clkdev.h | 7 - .../arm/mach-s5pc100/include/mach/pwm-clock.h | 56 - trunk/arch/arm/mach-s5pc100/setup-sdhci.c | 42 - trunk/arch/arm/mach-s5pv210/Kconfig | 4 + trunk/arch/arm/mach-s5pv210/Makefile | 2 +- trunk/arch/arm/mach-s5pv210/clock.c | 141 +- trunk/arch/arm/mach-s5pv210/cpu.c | 4 + trunk/arch/arm/mach-s5pv210/dma.c | 1 + .../arm/mach-s5pv210/include/mach/clkdev.h | 7 - .../arch/arm/mach-s5pv210/include/mach/irqs.h | 4 +- .../arch/arm/mach-s5pv210/include/mach/map.h | 13 + .../arm/mach-s5pv210/include/mach/pm-core.h | 2 +- .../arm/mach-s5pv210/include/mach/pwm-clock.h | 70 - .../mach-s5pv210/include/mach/regs-clock.h | 3 +- trunk/arch/arm/mach-s5pv210/mach-goni.c | 57 + trunk/arch/arm/mach-s5pv210/setup-sdhci.c | 41 - trunk/arch/arm/mach-s5pv210/sleep.S | 52 - trunk/arch/arm/mach-sa1100/collie.c | 1 + trunk/arch/arm/mach-sa1100/jornada720.c | 1 + trunk/arch/arm/mach-shmobile/Kconfig | 8 + trunk/arch/arm/mach-shmobile/Makefile | 3 +- trunk/arch/arm/mach-shmobile/board-ag5evm.c | 52 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 4 +- trunk/arch/arm/mach-shmobile/board-kota2.c | 454 +++ trunk/arch/arm/mach-shmobile/board-mackerel.c | 4 +- trunk/arch/arm/mach-shmobile/clock-sh7372.c | 8 +- trunk/arch/arm/mach-shmobile/clock.c | 1 + trunk/arch/arm/mach-shmobile/cpuidle.c | 52 +- .../arm/mach-shmobile/include/mach/common.h | 4 +- .../arm/mach-shmobile/include/mach/intc.h | 246 ++ .../arm/mach-shmobile/include/mach/sh73a0.h | 25 + trunk/arch/arm/mach-shmobile/intc-sh7367.c | 40 +- trunk/arch/arm/mach-shmobile/intc-sh7372.c | 72 +- trunk/arch/arm/mach-shmobile/intc-sh7377.c | 67 +- trunk/arch/arm/mach-shmobile/intc-sh73a0.c | 187 ++ trunk/arch/arm/mach-shmobile/pfc-sh7367.c | 122 +- trunk/arch/arm/mach-shmobile/pfc-sh7372.c | 262 +- trunk/arch/arm/mach-shmobile/pfc-sh7377.c | 159 +- trunk/arch/arm/mach-shmobile/pfc-sh73a0.c | 315 +- trunk/arch/arm/mach-shmobile/platsmp.c | 10 +- trunk/arch/arm/mach-shmobile/pm-sh7372.c | 47 +- trunk/arch/arm/mach-tegra/board-dt.c | 13 +- .../arm/mach-tegra/board-harmony-pinmux.c | 6 +- .../arch/arm/mach-tegra/board-paz00-pinmux.c | 6 +- .../arm/mach-tegra/board-seaboard-pinmux.c | 6 +- .../arm/mach-tegra/board-trimslice-pinmux.c | 5 +- trunk/arch/arm/mach-tegra/pcie.c | 1 + trunk/arch/arm/mach-w90x900/dev.c | 4 +- .../arch/arm/mach-w90x900/include/mach/mfp.h | 3 +- .../mach-w90x900/include/mach/nuc900_spi.h | 2 +- trunk/arch/arm/mach-w90x900/mfp.c | 48 +- trunk/arch/arm/mm/fault-armv.c | 1 - trunk/arch/arm/mm/init.c | 1 + trunk/arch/arm/plat-iop/gpio.c | 1 + trunk/arch/arm/plat-iop/time.c | 1 + trunk/arch/arm/plat-mxc/Kconfig | 4 +- trunk/arch/arm/plat-mxc/avic.c | 1 + trunk/arch/arm/plat-mxc/gic.c | 11 +- .../arm/plat-mxc/include/mach/entry-macro.S | 3 - trunk/arch/arm/plat-mxc/tzic.c | 1 + trunk/arch/arm/plat-omap/clock.c | 1 + trunk/arch/arm/plat-omap/dmtimer.c | 1 + trunk/arch/arm/plat-omap/i2c.c | 2 +- trunk/arch/arm/plat-omap/include/plat/cpu.h | 17 +- .../arch/arm/plat-omap/include/plat/dmtimer.h | 4 +- .../arm/plat-omap/include/plat/omap-alsa.h | 123 - .../arch/arm/plat-omap/include/plat/omap-pm.h | 4 +- .../arm/plat-omap/include/plat/omap_device.h | 2 +- .../arm/plat-omap/include/plat/omap_hwmod.h | 2 +- trunk/arch/arm/plat-omap/mailbox.c | 1 + trunk/arch/arm/plat-omap/omap-pm-noop.c | 24 +- trunk/arch/arm/plat-omap/omap_device.c | 3 +- .../arm/plat-pxa/include/plat/pxa3xx_nand.h | 20 +- trunk/arch/arm/plat-s3c24xx/Kconfig | 1 - trunk/arch/arm/plat-s3c24xx/Makefile | 4 +- trunk/arch/arm/plat-s3c24xx/dev-uart.c | 100 + trunk/arch/arm/plat-s3c24xx/devs.c | 528 ---- trunk/arch/arm/plat-s3c24xx/gpio.c | 96 - trunk/arch/arm/plat-s3c24xx/gpiolib.c | 229 -- .../arm/plat-s3c24xx/include/mach/clkdev.h | 7 - .../arm/plat-s3c24xx/include/mach/pwm-clock.h | 55 - .../arch/arm/plat-s3c24xx/include/plat/pll.h | 62 - .../arm/plat-s3c24xx/include/plat/regs-iis.h | 68 - .../arm/plat-s3c24xx/include/plat/regs-spi.h | 81 - trunk/arch/arm/plat-s3c24xx/s3c2443-clock.c | 192 +- trunk/arch/arm/plat-s5p/Kconfig | 27 +- trunk/arch/arm/plat-s5p/Makefile | 14 +- trunk/arch/arm/plat-s5p/cpu.c | 6 +- trunk/arch/arm/plat-s5p/dev-csis0.c | 34 - trunk/arch/arm/plat-s5p/dev-csis1.c | 34 - trunk/arch/arm/plat-s5p/dev-ehci.c | 57 - trunk/arch/arm/plat-s5p/dev-fimc0.c | 43 - trunk/arch/arm/plat-s5p/dev-fimc1.c | 43 - trunk/arch/arm/plat-s5p/dev-fimc2.c | 43 - trunk/arch/arm/plat-s5p/dev-fimc3.c | 43 - trunk/arch/arm/plat-s5p/dev-fimd0.c | 67 - trunk/arch/arm/plat-s5p/dev-mfc.c | 50 - trunk/arch/arm/plat-s5p/dev-onenand.c | 45 - trunk/arch/arm/plat-s5p/dev-pmu.c | 36 - trunk/arch/arm/plat-s5p/irq-gpioint.c | 10 +- .../arm/{mach-exynos4 => plat-s5p}/sleep.S | 13 +- trunk/arch/arm/plat-samsung/Kconfig | 27 - trunk/arch/arm/plat-samsung/Makefile | 33 +- trunk/arch/arm/plat-samsung/adc.c | 43 +- trunk/arch/arm/plat-samsung/dev-adc.c | 46 - trunk/arch/arm/plat-samsung/dev-asocdma.c | 35 - trunk/arch/arm/plat-samsung/dev-backlight.c | 2 + trunk/arch/arm/plat-samsung/dev-fb.c | 63 - trunk/arch/arm/plat-samsung/dev-hsmmc.c | 62 - trunk/arch/arm/plat-samsung/dev-hsmmc1.c | 62 - trunk/arch/arm/plat-samsung/dev-hsmmc2.c | 63 - trunk/arch/arm/plat-samsung/dev-hsmmc3.c | 66 - trunk/arch/arm/plat-samsung/dev-hwmon.c | 32 - trunk/arch/arm/plat-samsung/dev-i2c0.c | 70 - trunk/arch/arm/plat-samsung/dev-i2c1.c | 61 - trunk/arch/arm/plat-samsung/dev-i2c2.c | 62 - trunk/arch/arm/plat-samsung/dev-i2c3.c | 60 - trunk/arch/arm/plat-samsung/dev-i2c4.c | 60 - trunk/arch/arm/plat-samsung/dev-i2c5.c | 60 - trunk/arch/arm/plat-samsung/dev-i2c6.c | 60 - trunk/arch/arm/plat-samsung/dev-i2c7.c | 60 - trunk/arch/arm/plat-samsung/dev-ide.c | 44 - trunk/arch/arm/plat-samsung/dev-keypad.c | 50 - trunk/arch/arm/plat-samsung/dev-nand.c | 125 - trunk/arch/arm/plat-samsung/dev-onenand.c | 43 - trunk/arch/arm/plat-samsung/dev-pwm.c | 53 - trunk/arch/arm/plat-samsung/dev-rtc.c | 43 - trunk/arch/arm/plat-samsung/dev-ts.c | 59 - trunk/arch/arm/plat-samsung/dev-usb-hsotg.c | 48 - trunk/arch/arm/plat-samsung/dev-usb.c | 65 - trunk/arch/arm/plat-samsung/dev-wdt.c | 40 - trunk/arch/arm/plat-samsung/devs.c | 1463 +++++++++ trunk/arch/arm/plat-samsung/dma-ops.c | 1 + trunk/arch/arm/plat-samsung/gpio-config.c | 431 --- trunk/arch/arm/plat-samsung/gpio.c | 167 - .../arm/plat-samsung/include/plat/adc-core.h | 2 +- .../include/plat/audio-simtec.h | 2 +- .../include/plat/camport.h | 6 +- .../include/plat/common-smdk.h | 2 +- .../include/plat/cpu-freq-core.h | 5 +- .../arch/arm/plat-samsung/include/plat/cpu.h | 6 +- .../arch/arm/plat-samsung/include/plat/devs.h | 151 +- .../include/plat/ehci.h | 6 +- .../include/plat/exynos4.h | 8 +- .../plat-samsung/include/plat/fb-s3c2410.h | 72 + trunk/arch/arm/plat-samsung/include/plat/fb.h | 7 + .../include/plat/fiq.h | 2 +- .../include/plat/gpio-cfg-helpers.h | 172 +- .../arm/plat-samsung/include/plat/gpio-cfg.h | 34 +- .../arm/plat-samsung/include/plat/gpio-core.h | 97 +- .../arm/plat-samsung/include/plat/gpio-fns.h | 98 + .../arch/arm/plat-samsung/include/plat/iic.h | 1 + .../include/plat/irq.h | 25 +- .../include/plat/irqs.h | 8 +- .../include/plat/mci.h | 10 +- .../include/plat/mfc.h | 6 +- .../include/plat/mipi_csis.h | 6 +- .../include/plat/pll.h | 134 +- .../arm/plat-samsung/include/plat/pll6553x.h | 51 - trunk/arch/arm/plat-samsung/include/plat/pm.h | 10 +- .../include/plat}/pwm-clock.h | 39 +- .../arm/plat-samsung/include/plat/regs-adc.h | 3 + .../include/plat/regs-dma.h | 112 +- .../arm/plat-samsung/include/plat/regs-iis.h | 70 + .../arm/plat-samsung/include/plat/regs-spi.h | 48 + .../include/plat/regs-srom.h | 8 +- .../include/plat/regs-udc.h | 132 +- .../include/plat/reset.h | 8 +- .../include/plat/s3c2410.h | 2 +- .../include/plat/s3c2412.h | 2 +- .../include/plat/s3c2416.h | 2 +- .../include/plat/s3c2443.h | 9 +- .../include/plat/s3c244x.h | 2 +- .../include/plat}/s3c6400.h | 2 +- .../include/plat}/s3c6410.h | 2 +- .../include/plat/s5p-clock.h | 2 +- .../include/plat/s5p-time.h | 2 +- .../include/plat/s5p6440.h | 2 +- .../include/plat/s5p6450.h | 2 +- .../include/plat/s5pc100.h | 2 +- .../include/plat/s5pv210.h | 2 +- .../arm/plat-samsung/include/plat/sdhci.h | 57 - .../include/plat/sysmmu.h | 6 +- .../include/plat/system-reset.h | 2 +- .../arm/plat-samsung/include/plat/tv-core.h | 44 + .../include/plat/udc.h | 4 +- .../include/plat/usb-phy.h | 6 +- trunk/arch/arm/plat-samsung/platformdata.c | 3 +- trunk/arch/arm/plat-samsung/pm-gpio.c | 72 +- trunk/arch/arm/plat-samsung/pm.c | 6 +- trunk/arch/arm/plat-samsung/pwm-clock.c | 13 +- trunk/arch/arm/plat-samsung/pwm.c | 7 + trunk/arch/arm/plat-samsung/s3c-dma-ops.c | 1 + trunk/arch/arm/vfp/vfpmodule.c | 1 - trunk/arch/avr32/boards/atngw100/setup.c | 8 +- trunk/arch/avr32/boards/atstk1000/atstk1002.c | 9 +- trunk/arch/avr32/mach-at32ap/clock.c | 1 + trunk/arch/avr32/mach-at32ap/cpufreq.c | 1 + .../avr32/mach-at32ap/include/mach/board.h | 3 +- trunk/arch/avr32/mach-at32ap/intc.c | 1 + trunk/arch/avr32/mach-at32ap/pio.c | 1 + trunk/arch/avr32/mm/dma-coherent.c | 1 + trunk/arch/blackfin/include/asm/bfin_serial.h | 2 + trunk/arch/blackfin/kernel/dma-mapping.c | 1 + trunk/arch/blackfin/kernel/perf_event.c | 1 + trunk/arch/blackfin/kernel/sys_bfin.c | 1 + trunk/arch/blackfin/mach-bf518/boards/ezbrd.c | 15 +- .../blackfin/mach-bf518/boards/tcm-bf518.c | 14 +- .../blackfin/mach-bf527/boards/ad7160eval.c | 15 +- .../blackfin/mach-bf527/boards/cm_bf527.c | 15 +- trunk/arch/blackfin/mach-bf527/boards/ezbrd.c | 15 +- trunk/arch/blackfin/mach-bf527/boards/ezkit.c | 15 +- .../blackfin/mach-bf527/boards/tll6527m.c | 15 +- trunk/arch/blackfin/mach-bf533/boards/H8606.c | 7 +- .../blackfin/mach-bf533/boards/blackstamp.c | 7 +- .../blackfin/mach-bf533/boards/cm_bf533.c | 7 +- trunk/arch/blackfin/mach-bf533/boards/ezkit.c | 7 +- trunk/arch/blackfin/mach-bf533/boards/ip0x.c | 7 +- trunk/arch/blackfin/mach-bf533/boards/stamp.c | 7 +- .../blackfin/mach-bf537/boards/cm_bf537e.c | 15 +- .../blackfin/mach-bf537/boards/cm_bf537u.c | 15 +- .../arch/blackfin/mach-bf537/boards/dnp5370.c | 15 +- .../blackfin/mach-bf537/boards/minotaur.c | 14 +- .../arch/blackfin/mach-bf537/boards/pnav10.c | 16 +- trunk/arch/blackfin/mach-bf537/boards/stamp.c | 15 +- .../blackfin/mach-bf537/boards/tcm_bf537.c | 15 +- trunk/arch/blackfin/mach-bf538/boards/ezkit.c | 21 +- .../blackfin/mach-bf548/boards/cm_bf548.c | 28 +- trunk/arch/blackfin/mach-bf548/boards/ezkit.c | 28 +- .../arch/blackfin/mach-bf561/boards/acvilon.c | 7 +- .../blackfin/mach-bf561/boards/cm_bf561.c | 7 +- trunk/arch/blackfin/mach-bf561/boards/ezkit.c | 7 +- trunk/arch/blackfin/mach-bf561/boards/tepla.c | 7 +- trunk/arch/blackfin/mach-common/cpufreq.c | 1 + trunk/arch/blackfin/mm/init.c | 1 + trunk/arch/cris/arch-v10/drivers/Kconfig | 2 +- trunk/arch/cris/arch-v32/drivers/Kconfig | 2 +- .../cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +- .../cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +- trunk/arch/ia64/hp/common/hwsw_iommu.c | 1 + trunk/arch/ia64/include/asm/xen/grant_table.h | 29 - trunk/arch/ia64/include/asm/xen/interface.h | 1 + trunk/arch/ia64/kernel/dma-mapping.c | 1 + trunk/arch/ia64/kernel/topology.c | 1 + trunk/arch/ia64/pci/pci.c | 1 + trunk/arch/ia64/sn/kernel/io_acpi_init.c | 1 + trunk/arch/ia64/sn/kernel/io_init.c | 1 + trunk/arch/ia64/sn/pci/pcibr/pcibr_dma.c | 1 + trunk/arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 + trunk/arch/ia64/sn/pci/tioca_provider.c | 1 + trunk/arch/ia64/xen/grant-table.c | 62 - trunk/arch/ia64/xen/hypervisor.c | 1 + trunk/arch/m32r/Kconfig | 7 - trunk/arch/m68k/Kconfig | 4 +- trunk/arch/m68k/Kconfig.bus | 9 + trunk/arch/m68k/Kconfig.devices | 31 + trunk/arch/m68k/amiga/amiints.c | 168 +- trunk/arch/m68k/amiga/cia.c | 39 +- trunk/arch/m68k/apollo/dn_ints.c | 35 +- trunk/arch/m68k/atari/ataints.c | 274 +- trunk/arch/m68k/atari/time.c | 1 + trunk/arch/m68k/bvme6000/config.c | 2 +- trunk/arch/m68k/hp300/time.c | 2 +- trunk/arch/m68k/include/asm/hardirq.h | 5 + trunk/arch/m68k/include/asm/irq.h | 69 +- trunk/arch/m68k/include/asm/macintosh.h | 2 + trunk/arch/m68k/include/asm/q40ints.h | 3 - trunk/arch/m68k/kernel/Makefile | 9 +- trunk/arch/m68k/kernel/dma_mm.c | 1 + trunk/arch/m68k/kernel/dma_no.c | 1 + trunk/arch/m68k/kernel/entry_mm.S | 7 +- trunk/arch/m68k/kernel/ints.c | 323 +- trunk/arch/m68k/mac/baboon.c | 21 +- trunk/arch/m68k/mac/iop.c | 10 +- trunk/arch/m68k/mac/macints.c | 24 +- trunk/arch/m68k/mac/oss.c | 54 +- trunk/arch/m68k/mac/psc.c | 49 +- trunk/arch/m68k/mac/via.c | 74 +- trunk/arch/m68k/mvme147/config.c | 5 +- trunk/arch/m68k/mvme16x/config.c | 2 +- trunk/arch/m68k/q40/q40ints.c | 60 +- trunk/arch/m68k/sun3/sun3ints.c | 46 +- trunk/arch/microblaze/kernel/dma.c | 1 + trunk/arch/microblaze/kernel/irq.c | 1 + trunk/arch/microblaze/mm/init.c | 1 + trunk/arch/microblaze/pci/iomap.c | 1 + trunk/arch/microblaze/pci/pci-common.c | 1 + trunk/arch/mips/Kconfig | 14 - trunk/arch/mips/Makefile | 4 +- trunk/arch/mips/bcm47xx/gpio.c | 1 + trunk/arch/mips/bcm47xx/setup.c | 1 + trunk/arch/mips/cavium-octeon/csrc-octeon.c | 1 + trunk/arch/mips/cavium-octeon/dma-octeon.c | 1 + trunk/arch/mips/cavium-octeon/flash_setup.c | 10 +- trunk/arch/mips/cavium-octeon/smp.c | 5 +- trunk/arch/mips/emma/common/prom.c | 2 +- .../arch/mips/include/asm/mach-bcm47xx/gpio.h | 18 +- trunk/arch/mips/include/asm/unistd.h | 18 +- trunk/arch/mips/kernel/8250-platform.c | 1 - trunk/arch/mips/kernel/cevt-r4k.c | 38 +- trunk/arch/mips/kernel/cpu-probe.c | 3 +- .../mips/kernel/cpufreq/loongson2_clock.c | 1 + trunk/arch/mips/kernel/i8253.c | 2 +- trunk/arch/mips/kernel/init_task.c | 2 +- trunk/arch/mips/kernel/irq-msc01.c | 1 - trunk/arch/mips/kernel/irq.c | 1 - trunk/arch/mips/kernel/mips-mt.c | 2 +- trunk/arch/mips/kernel/mips_ksyms.c | 2 +- trunk/arch/mips/kernel/module.c | 1 - trunk/arch/mips/kernel/process.c | 2 +- trunk/arch/mips/kernel/prom.c | 2 +- trunk/arch/mips/kernel/reset.c | 2 +- trunk/arch/mips/kernel/rtlx.c | 1 - trunk/arch/mips/kernel/scall32-o32.S | 2 + trunk/arch/mips/kernel/scall64-64.S | 2 + trunk/arch/mips/kernel/scall64-n32.S | 2 + trunk/arch/mips/kernel/scall64-o32.S | 2 + trunk/arch/mips/kernel/setup.c | 2 +- trunk/arch/mips/kernel/spinlock_test.c | 2 +- trunk/arch/mips/kernel/stacktrace.c | 2 +- trunk/arch/mips/kernel/time.c | 2 +- trunk/arch/mips/kernel/traps.c | 4 +- trunk/arch/mips/kernel/unaligned.c | 1 - trunk/arch/mips/kernel/vpe.c | 1 - trunk/arch/mips/lantiq/clk.c | 2 +- trunk/arch/mips/lantiq/devices.c | 2 +- trunk/arch/mips/lantiq/prom.c | 2 +- trunk/arch/mips/lantiq/setup.c | 2 +- trunk/arch/mips/lantiq/xway/clk-ase.c | 2 +- trunk/arch/mips/lantiq/xway/clk-xway.c | 2 +- trunk/arch/mips/lantiq/xway/devices.c | 2 +- trunk/arch/mips/lantiq/xway/dma.c | 1 + trunk/arch/mips/lantiq/xway/gpio.c | 2 +- trunk/arch/mips/lantiq/xway/gpio_ebu.c | 2 +- trunk/arch/mips/lantiq/xway/gpio_stp.c | 2 +- trunk/arch/mips/lantiq/xway/prom-ase.c | 2 +- trunk/arch/mips/lantiq/xway/prom-xway.c | 2 +- trunk/arch/mips/lantiq/xway/reset.c | 2 +- trunk/arch/mips/loongson/common/platform.c | 1 + trunk/arch/mips/nxp/pnx8550/common/pci.c | 134 - trunk/arch/mips/nxp/pnx8550/common/setup.c | 143 - trunk/arch/mips/pci/pci-alchemy.c | 1 + trunk/arch/mips/pci/pci-ip27.c | 1 + trunk/arch/mips/pci/pci-lantiq.c | 1 + trunk/arch/mips/pci/pci.c | 1 + trunk/arch/mips/pmc-sierra/yosemite/prom.c | 2 +- trunk/arch/mips/powertv/Kconfig | 2 - trunk/arch/mips/powertv/asic/Kconfig | 28 - trunk/arch/mips/powertv/pci/fixup-powertv.c | 1 + trunk/arch/mips/powertv/powertv-usb.c | 1 + trunk/arch/mips/rb532/gpio.c | 1 + trunk/arch/mips/rb532/setup.c | 1 + trunk/arch/mips/txx9/generic/spi_eeprom.c | 1 + trunk/arch/mips/txx9/rbtx4939/setup.c | 1 + trunk/arch/mips/vr41xx/common/giu.c | 1 + trunk/arch/mips/vr41xx/common/rtc.c | 1 + trunk/arch/openrisc/Kconfig | 12 - trunk/arch/parisc/kernel/drivers.c | 1 + trunk/arch/parisc/kernel/pci-dma.c | 1 + trunk/arch/parisc/kernel/setup.c | 1 + trunk/arch/parisc/lib/iomap.c | 1 + trunk/arch/powerpc/Kconfig | 29 +- trunk/arch/powerpc/Kconfig.debug | 46 +- trunk/arch/powerpc/Makefile | 6 - trunk/arch/powerpc/boot/Makefile | 3 +- trunk/arch/powerpc/boot/dts/charon.dts | 236 ++ trunk/arch/powerpc/boot/dts/digsy_mtc.dts | 59 +- trunk/arch/powerpc/boot/dts/gef_ppc9a.dts | 33 +- trunk/arch/powerpc/boot/dts/gef_sbc310.dts | 33 +- trunk/arch/powerpc/boot/dts/gef_sbc610.dts | 33 +- trunk/arch/powerpc/boot/dts/hcu4.dts | 168 - trunk/arch/powerpc/boot/dts/ksi8560.dts | 2 +- trunk/arch/powerpc/boot/dts/mgcoge.dts | 9 + trunk/arch/powerpc/boot/dts/mpc5200b.dtsi | 2 + trunk/arch/powerpc/boot/dts/mpc8349emitx.dts | 3 +- trunk/arch/powerpc/boot/dts/p1022ds.dts | 2 +- trunk/arch/powerpc/boot/dts/p2020ds.dts | 5 + .../boot/dts/{p2040rdb.dts => p2041rdb.dts} | 17 +- .../boot/dts/{p2040si.dtsi => p2041si.dtsi} | 135 +- trunk/arch/powerpc/boot/dts/p3041ds.dts | 8 +- trunk/arch/powerpc/boot/dts/p3041si.dtsi | 71 +- trunk/arch/powerpc/boot/dts/p3060qds.dts | 238 ++ trunk/arch/powerpc/boot/dts/p3060si.dtsi | 719 +++++ trunk/arch/powerpc/boot/dts/p4080ds.dts | 12 +- trunk/arch/powerpc/boot/dts/p4080si.dtsi | 114 +- trunk/arch/powerpc/boot/dts/p5020ds.dts | 8 +- trunk/arch/powerpc/boot/dts/p5020si.dtsi | 68 +- trunk/arch/powerpc/boot/dts/sbc8560.dts | 2 +- trunk/arch/powerpc/boot/dts/yosemite.dts | 36 + trunk/arch/powerpc/configs/40x/hcu4_defconfig | 81 - .../powerpc/configs/52xx/tqm5200_defconfig | 20 +- .../powerpc/configs/85xx/p1023rds_defconfig | 2 +- .../configs/85xx/xes_mpc85xx_defconfig | 2 +- .../powerpc/configs/corenet32_smp_defconfig | 11 +- .../powerpc/configs/corenet64_smp_defconfig | 5 - trunk/arch/powerpc/configs/mgcoge_defconfig | 27 +- trunk/arch/powerpc/configs/mpc512x_defconfig | 19 +- trunk/arch/powerpc/configs/mpc5200_defconfig | 12 + trunk/arch/powerpc/configs/mpc85xx_defconfig | 5 +- .../powerpc/configs/mpc85xx_smp_defconfig | 6 +- trunk/arch/powerpc/configs/ppc40x_defconfig | 1 - trunk/arch/powerpc/configs/ppc64_defconfig | 4 + trunk/arch/powerpc/configs/ppc6xx_defconfig | 2 +- trunk/arch/powerpc/configs/pseries_defconfig | 4 + trunk/arch/powerpc/include/asm/atomic.h | 48 +- trunk/arch/powerpc/include/asm/bitops.h | 12 +- trunk/arch/powerpc/include/asm/device.h | 2 + trunk/arch/powerpc/include/asm/firmware.h | 10 + trunk/arch/powerpc/include/asm/floppy.h | 4 +- trunk/arch/powerpc/include/asm/futex.h | 7 +- trunk/arch/powerpc/include/asm/hugetlb.h | 63 +- trunk/arch/powerpc/include/asm/kexec.h | 2 +- trunk/arch/powerpc/include/asm/kvm.h | 8 - trunk/arch/powerpc/include/asm/kvm_book3s.h | 2 - trunk/arch/powerpc/include/asm/lv1call.h | 3 +- trunk/arch/powerpc/include/asm/machdep.h | 4 +- trunk/arch/powerpc/include/asm/mmu-book3e.h | 7 + trunk/arch/powerpc/include/asm/mmu-hash64.h | 3 +- trunk/arch/powerpc/include/asm/mmu.h | 18 +- trunk/arch/powerpc/include/asm/mpic.h | 2 - trunk/arch/powerpc/include/asm/opal.h | 443 +++ trunk/arch/powerpc/include/asm/paca.h | 8 + trunk/arch/powerpc/include/asm/page.h | 31 +- trunk/arch/powerpc/include/asm/page_64.h | 11 - trunk/arch/powerpc/include/asm/pte-book3e.h | 3 + trunk/arch/powerpc/include/asm/reg_booke.h | 5 +- trunk/arch/powerpc/include/asm/rtas.h | 6 +- trunk/arch/powerpc/include/asm/sections.h | 2 +- trunk/arch/powerpc/include/asm/smp.h | 1 + trunk/arch/powerpc/include/asm/sparsemem.h | 2 +- trunk/arch/powerpc/include/asm/spu.h | 1 + trunk/arch/powerpc/include/asm/synch.h | 9 +- trunk/arch/powerpc/include/asm/topology.h | 14 +- trunk/arch/powerpc/include/asm/udbg.h | 3 + trunk/arch/powerpc/include/asm/xics.h | 23 +- trunk/arch/powerpc/kernel/asm-offsets.c | 10 + trunk/arch/powerpc/kernel/btext.c | 2 +- trunk/arch/powerpc/kernel/clock.c | 2 +- trunk/arch/powerpc/kernel/cputable.c | 2 +- trunk/arch/powerpc/kernel/crash.c | 1 + trunk/arch/powerpc/kernel/dma-iommu.c | 29 +- trunk/arch/powerpc/kernel/dma-swiotlb.c | 16 + trunk/arch/powerpc/kernel/dma.c | 45 +- trunk/arch/powerpc/kernel/entry_32.S | 15 + trunk/arch/powerpc/kernel/exceptions-64s.S | 33 +- trunk/arch/powerpc/kernel/firmware.c | 3 +- trunk/arch/powerpc/kernel/head_32.S | 7 +- trunk/arch/powerpc/kernel/head_40x.S | 15 +- trunk/arch/powerpc/kernel/head_44x.S | 16 +- trunk/arch/powerpc/kernel/head_64.S | 22 +- trunk/arch/powerpc/kernel/head_8xx.S | 13 +- trunk/arch/powerpc/kernel/head_fsl_booke.S | 175 +- trunk/arch/powerpc/kernel/hw_breakpoint.c | 1 - trunk/arch/powerpc/kernel/ibmebus.c | 24 +- trunk/arch/powerpc/kernel/idle_e500.S | 2 +- trunk/arch/powerpc/kernel/init_task.c | 2 +- trunk/arch/powerpc/kernel/io-workarounds.c | 1 + trunk/arch/powerpc/kernel/io.c | 2 +- trunk/arch/powerpc/kernel/iomap.c | 1 + trunk/arch/powerpc/kernel/iommu.c | 8 + trunk/arch/powerpc/kernel/irq.c | 2 +- trunk/arch/powerpc/kernel/isa-bridge.c | 1 + trunk/arch/powerpc/kernel/jump_label.c | 2 + trunk/arch/powerpc/kernel/kvm.c | 2 +- trunk/arch/powerpc/kernel/legacy_serial.c | 25 + trunk/arch/powerpc/kernel/machine_kexec_64.c | 3 +- trunk/arch/powerpc/kernel/misc_32.S | 171 ++ trunk/arch/powerpc/kernel/module.c | 1 - trunk/arch/powerpc/kernel/of_platform.c | 2 +- trunk/arch/powerpc/kernel/paca.c | 2 +- trunk/arch/powerpc/kernel/pci-common.c | 12 + trunk/arch/powerpc/kernel/pci_32.c | 1 + trunk/arch/powerpc/kernel/pci_64.c | 1 + trunk/arch/powerpc/kernel/pci_dn.c | 1 + trunk/arch/powerpc/kernel/pci_of_scan.c | 1 + trunk/arch/powerpc/kernel/pmc.c | 2 +- trunk/arch/powerpc/kernel/power6-pmu.c | 4 +- trunk/arch/powerpc/kernel/power7-pmu.c | 2 + trunk/arch/powerpc/kernel/ppc_ksyms.c | 2 +- trunk/arch/powerpc/kernel/process.c | 26 +- trunk/arch/powerpc/kernel/prom.c | 21 +- trunk/arch/powerpc/kernel/prom_init.c | 389 ++- trunk/arch/powerpc/kernel/prom_init_check.sh | 4 +- trunk/arch/powerpc/kernel/prom_parse.c | 1 - trunk/arch/powerpc/kernel/ptrace.c | 21 +- trunk/arch/powerpc/kernel/rtas.c | 2 +- trunk/arch/powerpc/kernel/setup-common.c | 2 +- trunk/arch/powerpc/kernel/setup_32.c | 4 +- trunk/arch/powerpc/kernel/setup_64.c | 25 +- trunk/arch/powerpc/kernel/signal_32.c | 2 +- trunk/arch/powerpc/kernel/signal_64.c | 1 - trunk/arch/powerpc/kernel/smp.c | 34 +- trunk/arch/powerpc/kernel/stacktrace.c | 2 +- trunk/arch/powerpc/kernel/swsusp.c | 2 +- trunk/arch/powerpc/kernel/swsusp_64.c | 1 + trunk/arch/powerpc/kernel/sysfs.c | 2 +- trunk/arch/powerpc/kernel/time.c | 2 +- trunk/arch/powerpc/kernel/traps.c | 11 +- trunk/arch/powerpc/kernel/udbg.c | 6 + trunk/arch/powerpc/kernel/vdso.c | 1 - trunk/arch/powerpc/kernel/vio.c | 24 +- trunk/arch/powerpc/kvm/44x.c | 1 + trunk/arch/powerpc/kvm/book3s.c | 1 + trunk/arch/powerpc/kvm/book3s_exports.c | 2 +- trunk/arch/powerpc/kvm/book3s_hv.c | 2 + trunk/arch/powerpc/kvm/book3s_hv_builtin.c | 1 + trunk/arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +- trunk/arch/powerpc/kvm/book3s_pr.c | 15 +- trunk/arch/powerpc/kvm/powerpc.c | 2 - trunk/arch/powerpc/lib/checksum_wrappers_64.c | 2 +- trunk/arch/powerpc/lib/devres.c | 2 +- trunk/arch/powerpc/lib/feature-fixups.c | 23 + trunk/arch/powerpc/lib/locks.c | 2 +- trunk/arch/powerpc/lib/rheap.c | 2 +- trunk/arch/powerpc/math-emu/math_efp.c | 100 +- trunk/arch/powerpc/mm/Makefile | 1 + trunk/arch/powerpc/mm/dma-noncoherent.c | 1 + trunk/arch/powerpc/mm/fsl_booke_mmu.c | 43 +- trunk/arch/powerpc/mm/hash_utils_64.c | 10 +- trunk/arch/powerpc/mm/hugetlbpage-book3e.c | 121 + trunk/arch/powerpc/mm/hugetlbpage.c | 379 ++- trunk/arch/powerpc/mm/init_32.c | 9 + trunk/arch/powerpc/mm/mem.c | 40 +- trunk/arch/powerpc/mm/mmu_context_hash32.c | 1 + trunk/arch/powerpc/mm/mmu_context_hash64.c | 14 +- trunk/arch/powerpc/mm/mmu_context_nohash.c | 5 + trunk/arch/powerpc/mm/mmu_decl.h | 2 + trunk/arch/powerpc/mm/numa.c | 46 +- trunk/arch/powerpc/mm/pgtable.c | 3 +- trunk/arch/powerpc/mm/pgtable_64.c | 1 + trunk/arch/powerpc/mm/slice.c | 2 +- trunk/arch/powerpc/mm/tlb_hash32.c | 1 + trunk/arch/powerpc/mm/tlb_low_64e.S | 24 +- trunk/arch/powerpc/mm/tlb_nohash.c | 68 +- trunk/arch/powerpc/platforms/40x/Kconfig | 13 - trunk/arch/powerpc/platforms/40x/Makefile | 1 - trunk/arch/powerpc/platforms/40x/hcu4.c | 61 - trunk/arch/powerpc/platforms/44x/warp.c | 1 + trunk/arch/powerpc/platforms/512x/Kconfig | 1 + trunk/arch/powerpc/platforms/512x/clock.c | 1 + .../powerpc/platforms/52xx/mpc5200_simple.c | 1 + .../powerpc/platforms/52xx/mpc52xx_common.c | 1 + .../arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + .../powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 + trunk/arch/powerpc/platforms/82xx/km82xx.c | 4 + trunk/arch/powerpc/platforms/83xx/Kconfig | 9 +- .../powerpc/platforms/83xx/mcu_mpc8349emitx.c | 58 +- trunk/arch/powerpc/platforms/83xx/suspend.c | 1 + trunk/arch/powerpc/platforms/85xx/Kconfig | 30 +- trunk/arch/powerpc/platforms/85xx/Makefile | 3 +- .../arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 - .../arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 - trunk/arch/powerpc/platforms/85xx/p1022_ds.c | 11 +- .../85xx/{p2040_rdb.c => p2041_rdb.c} | 18 +- trunk/arch/powerpc/platforms/85xx/p3060_qds.c | 77 + trunk/arch/powerpc/platforms/85xx/sbc8548.c | 1 - trunk/arch/powerpc/platforms/85xx/sbc8560.c | 2 +- trunk/arch/powerpc/platforms/85xx/smp.c | 12 +- trunk/arch/powerpc/platforms/86xx/Kconfig | 1 + trunk/arch/powerpc/platforms/86xx/gef_gpio.c | 1 + .../arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 - trunk/arch/powerpc/platforms/Kconfig | 15 +- trunk/arch/powerpc/platforms/Kconfig.cputype | 12 +- trunk/arch/powerpc/platforms/Makefile | 1 + trunk/arch/powerpc/platforms/cell/axon_msi.c | 1 + trunk/arch/powerpc/platforms/cell/beat.c | 4 +- .../powerpc/platforms/cell/beat_spu_priv1.c | 2 - .../powerpc/platforms/cell/beat_wrapper.h | 1 + .../arch/powerpc/platforms/cell/cbe_cpufreq.c | 1 + .../powerpc/platforms/cell/cbe_cpufreq_pmi.c | 1 + .../powerpc/platforms/cell/cbe_powerbutton.c | 1 + trunk/arch/powerpc/platforms/cell/cbe_regs.c | 2 +- .../powerpc/platforms/cell/celleb_scc_pciex.c | 2 +- .../powerpc/platforms/cell/celleb_setup.c | 1 + .../platforms/cell/cpufreq_spudemand.c | 1 + trunk/arch/powerpc/platforms/cell/interrupt.c | 2 +- trunk/arch/powerpc/platforms/cell/iommu.c | 24 +- trunk/arch/powerpc/platforms/cell/pmu.c | 3 +- .../arch/powerpc/platforms/cell/qpace_setup.c | 1 + trunk/arch/powerpc/platforms/cell/setup.c | 1 + trunk/arch/powerpc/platforms/cell/smp.c | 1 - trunk/arch/powerpc/platforms/cell/spu_base.c | 9 +- .../powerpc/platforms/cell/spu_callbacks.c | 2 +- trunk/arch/powerpc/platforms/cell/spu_fault.c | 2 +- .../arch/powerpc/platforms/cell/spu_manage.c | 2 +- .../arch/powerpc/platforms/cell/spu_notify.c | 3 +- .../powerpc/platforms/cell/spu_priv1_mmio.c | 1 - .../platforms/cell/spufs/backing_ops.c | 1 - .../powerpc/platforms/cell/spufs/context.c | 2 +- .../powerpc/platforms/cell/spufs/coredump.c | 1 - .../arch/powerpc/platforms/cell/spufs/fault.c | 1 - .../arch/powerpc/platforms/cell/spufs/file.c | 2 +- .../powerpc/platforms/cell/spufs/hw_ops.c | 1 - .../arch/powerpc/platforms/cell/spufs/sched.c | 1 - .../powerpc/platforms/cell/spufs/switch.c | 2 +- .../powerpc/platforms/cell/spufs/syscalls.c | 2 +- .../powerpc/platforms/embedded6xx/Kconfig | 4 - .../powerpc/platforms/embedded6xx/holly.c | 1 + .../platforms/embedded6xx/mpc7448_hpc2.c | 1 + .../powerpc/platforms/iseries/hvlpconfig.c | 2 +- trunk/arch/powerpc/platforms/iseries/iommu.c | 2 +- trunk/arch/powerpc/platforms/iseries/ksyms.c | 2 +- .../arch/powerpc/platforms/iseries/lpardata.c | 1 - .../arch/powerpc/platforms/iseries/lpevents.c | 2 +- trunk/arch/powerpc/platforms/iseries/mf.c | 1 + trunk/arch/powerpc/platforms/iseries/pci.c | 1 - trunk/arch/powerpc/platforms/iseries/setup.c | 1 + trunk/arch/powerpc/platforms/iseries/smp.c | 1 - trunk/arch/powerpc/platforms/iseries/vio.c | 2 +- .../arch/powerpc/platforms/iseries/viopath.c | 2 +- trunk/arch/powerpc/platforms/maple/setup.c | 1 + trunk/arch/powerpc/platforms/pasemi/cpufreq.c | 1 + trunk/arch/powerpc/platforms/pasemi/dma_lib.c | 3 +- trunk/arch/powerpc/platforms/pasemi/setup.c | 1 + .../powerpc/platforms/powermac/backlight.c | 1 + .../arch/powerpc/platforms/powermac/feature.c | 1 + .../arch/powerpc/platforms/powermac/low_i2c.c | 2 +- trunk/arch/powerpc/platforms/powermac/nvram.c | 2 +- trunk/arch/powerpc/platforms/powermac/pic.c | 2 - trunk/arch/powerpc/platforms/powermac/setup.c | 1 + trunk/arch/powerpc/platforms/powermac/smp.c | 4 +- trunk/arch/powerpc/platforms/powernv/Kconfig | 16 + trunk/arch/powerpc/platforms/powernv/Makefile | 5 + .../powerpc/platforms/powernv/opal-nvram.c | 88 + .../arch/powerpc/platforms/powernv/opal-rtc.c | 97 + .../powerpc/platforms/powernv/opal-takeover.S | 140 + .../powerpc/platforms/powernv/opal-wrappers.S | 101 + trunk/arch/powerpc/platforms/powernv/opal.c | 322 ++ .../powerpc/platforms/powernv/pci-p5ioc2.c | 234 ++ trunk/arch/powerpc/platforms/powernv/pci.c | 427 +++ trunk/arch/powerpc/platforms/powernv/pci.h | 48 + .../arch/powerpc/platforms/powernv/powernv.h | 16 + trunk/arch/powerpc/platforms/powernv/setup.c | 196 ++ trunk/arch/powerpc/platforms/powernv/smp.c | 182 ++ trunk/arch/powerpc/platforms/prep/Kconfig | 9 - trunk/arch/powerpc/platforms/ps3/Kconfig | 12 + trunk/arch/powerpc/platforms/ps3/Makefile | 1 + .../arch/powerpc/platforms/ps3/device-init.c | 2 +- trunk/arch/powerpc/platforms/ps3/exports.c | 2 - trunk/arch/powerpc/platforms/ps3/gelic_udbg.c | 273 ++ trunk/arch/powerpc/platforms/ps3/interrupt.c | 25 +- trunk/arch/powerpc/platforms/ps3/mm.c | 2 +- trunk/arch/powerpc/platforms/ps3/os-area.c | 1 + trunk/arch/powerpc/platforms/ps3/platform.h | 1 + trunk/arch/powerpc/platforms/ps3/repository.c | 32 +- trunk/arch/powerpc/platforms/ps3/setup.c | 1 + trunk/arch/powerpc/platforms/ps3/smp.c | 62 +- trunk/arch/powerpc/platforms/ps3/spu.c | 1 + trunk/arch/powerpc/platforms/ps3/system-bus.c | 9 +- trunk/arch/powerpc/platforms/pseries/Kconfig | 1 + trunk/arch/powerpc/platforms/pseries/dlpar.c | 4 + trunk/arch/powerpc/platforms/pseries/eeh.c | 4 +- .../powerpc/platforms/pseries/eeh_event.c | 1 + .../powerpc/platforms/pseries/eeh_sysfs.c | 1 + .../powerpc/platforms/pseries/hotplug-cpu.c | 1 + .../powerpc/platforms/pseries/hvconsole.c | 3 +- .../powerpc/platforms/pseries/io_event_irq.c | 2 +- trunk/arch/powerpc/platforms/pseries/iommu.c | 35 +- trunk/arch/powerpc/platforms/pseries/lpar.c | 1 + .../arch/powerpc/platforms/pseries/mobility.c | 1 + trunk/arch/powerpc/platforms/pseries/nvram.c | 171 +- .../powerpc/platforms/pseries/pci_dlpar.c | 1 + .../platforms/pseries/plpar_wrappers.h | 3 + trunk/arch/powerpc/platforms/pseries/setup.c | 2 +- trunk/arch/powerpc/platforms/pseries/smp.c | 1 - .../arch/powerpc/platforms/pseries/suspend.c | 1 + trunk/arch/powerpc/platforms/wsp/Kconfig | 16 +- trunk/arch/powerpc/platforms/wsp/Makefile | 2 + trunk/arch/powerpc/platforms/wsp/ics.c | 48 + trunk/arch/powerpc/platforms/wsp/ics.h | 5 + trunk/arch/powerpc/platforms/wsp/msi.c | 102 + trunk/arch/powerpc/platforms/wsp/msi.h | 19 + trunk/arch/powerpc/platforms/wsp/psr2.c | 4 + trunk/arch/powerpc/platforms/wsp/wsp.h | 3 + trunk/arch/powerpc/platforms/wsp/wsp_pci.c | 1133 +++++++ trunk/arch/powerpc/platforms/wsp/wsp_pci.h | 268 ++ trunk/arch/powerpc/sysdev/Makefile | 1 - trunk/arch/powerpc/sysdev/bestcomm/sram.c | 2 +- trunk/arch/powerpc/sysdev/cpm_common.c | 4 +- trunk/arch/powerpc/sysdev/dcr.c | 1 + trunk/arch/powerpc/sysdev/fsl_gtm.c | 1 + trunk/arch/powerpc/sysdev/fsl_lbc.c | 3 +- trunk/arch/powerpc/sysdev/fsl_msi.c | 28 +- trunk/arch/powerpc/sysdev/fsl_msi.h | 3 +- trunk/arch/powerpc/sysdev/fsl_pmc.c | 1 + trunk/arch/powerpc/sysdev/fsl_soc.c | 2 +- trunk/arch/powerpc/sysdev/mpc5xxx_clocks.c | 1 + trunk/arch/powerpc/sysdev/mpc8xx_pic.c | 1 - trunk/arch/powerpc/sysdev/mpic.c | 36 +- trunk/arch/powerpc/sysdev/mv64x60_pci.c | 1 + trunk/arch/powerpc/sysdev/pmi.c | 1 + trunk/arch/powerpc/sysdev/ppc4xx_msi.c | 1 + trunk/arch/powerpc/sysdev/ppc4xx_pci.c | 101 +- trunk/arch/powerpc/sysdev/ppc4xx_pci.h | 12 + trunk/arch/powerpc/sysdev/ppc4xx_soc.c | 2 +- trunk/arch/powerpc/sysdev/qe_lib/gpio.c | 1 + trunk/arch/powerpc/sysdev/qe_lib/ucc.c | 2 +- trunk/arch/powerpc/sysdev/qe_lib/ucc_fast.c | 2 +- trunk/arch/powerpc/sysdev/qe_lib/ucc_slow.c | 2 +- trunk/arch/powerpc/sysdev/qe_lib/usb.c | 1 + trunk/arch/powerpc/sysdev/rtc_cmos_setup.c | 1 + trunk/arch/powerpc/sysdev/scom.c | 1 + trunk/arch/powerpc/sysdev/simple_gpio.c | 1 - trunk/arch/powerpc/sysdev/tsi108_dev.c | 2 +- trunk/arch/powerpc/sysdev/xics/Makefile | 1 + trunk/arch/powerpc/sysdev/xics/icp-native.c | 2 +- trunk/arch/powerpc/sysdev/xics/ics-opal.c | 244 ++ trunk/arch/powerpc/sysdev/xics/xics-common.c | 13 +- trunk/arch/powerpc/xmon/xmon.c | 6 +- trunk/arch/s390/Kconfig | 1 + trunk/arch/s390/crypto/crypt_s390.h | 7 +- trunk/arch/s390/crypto/sha_common.c | 1 + trunk/arch/s390/include/asm/kvm_host.h | 3 +- trunk/arch/s390/include/asm/pgtable.h | 12 +- trunk/arch/s390/include/asm/setup.h | 3 + trunk/arch/s390/include/asm/timex.h | 2 +- trunk/arch/s390/include/asm/unistd.h | 4 +- trunk/arch/s390/kernel/compat_wrapper.S | 20 + trunk/arch/s390/kernel/early.c | 2 + trunk/arch/s390/kernel/jump_label.c | 51 +- trunk/arch/s390/kernel/setup.c | 4 +- trunk/arch/s390/kernel/syscalls.S | 2 + trunk/arch/s390/kernel/topology.c | 45 +- trunk/arch/s390/kernel/vmlinux.lds.S | 2 + trunk/arch/s390/kvm/diag.c | 2 +- trunk/arch/s390/kvm/intercept.c | 3 +- trunk/arch/s390/kvm/interrupt.c | 1 + trunk/arch/s390/kvm/kvm-s390.c | 12 +- trunk/arch/s390/kvm/priv.c | 10 +- trunk/arch/s390/kvm/sigp.c | 45 +- trunk/arch/s390/mm/fault.c | 9 +- trunk/arch/s390/mm/init.c | 1 + trunk/arch/score/Kconfig | 19 - trunk/arch/sh/drivers/dma/dma-sysfs.c | 1 + trunk/arch/sh/drivers/pci/pci.c | 1 + trunk/arch/sh/include/asm/page.h | 5 + trunk/arch/sh/include/asm/unistd_32.h | 4 +- trunk/arch/sh/include/asm/unistd_64.h | 4 +- trunk/arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 16 +- trunk/arch/sh/kernel/cpu/shmobile/cpuidle.c | 29 +- trunk/arch/sh/kernel/perf_event.c | 1 + trunk/arch/sh/kernel/syscalls_32.S | 2 + trunk/arch/sh/kernel/syscalls_64.S | 2 + trunk/arch/sh/kernel/topology.c | 1 + trunk/arch/sh/mm/init.c | 1 + trunk/arch/sparc/Kconfig | 7 +- trunk/arch/sparc/include/asm/pgtable_32.h | 20 +- trunk/arch/sparc/include/asm/pgtable_64.h | 20 +- trunk/arch/sparc/include/asm/termios.h | 1 - trunk/arch/sparc/include/asm/unistd.h | 4 +- trunk/arch/sparc/kernel/apc.c | 1 + trunk/arch/sparc/kernel/auxio_32.c | 1 + trunk/arch/sparc/kernel/btext.c | 1 - trunk/arch/sparc/kernel/central.c | 1 + trunk/arch/sparc/kernel/cpu.c | 2 +- trunk/arch/sparc/kernel/cpumap.c | 2 +- trunk/arch/sparc/kernel/dma.c | 1 - trunk/arch/sparc/kernel/ebus.c | 2 +- trunk/arch/sparc/kernel/entry.h | 7 + trunk/arch/sparc/kernel/hvapi.c | 2 +- trunk/arch/sparc/kernel/idprom.c | 2 +- trunk/arch/sparc/kernel/iommu.c | 2 +- trunk/arch/sparc/kernel/irq_32.c | 1 + trunk/arch/sparc/kernel/irq_64.c | 1 - trunk/arch/sparc/kernel/jump_label.c | 8 - trunk/arch/sparc/kernel/ldc.c | 2 +- trunk/arch/sparc/kernel/leon_kernel.c | 1 - trunk/arch/sparc/kernel/leon_pci.c | 1 + trunk/arch/sparc/kernel/leon_pci_grpci2.c | 2 +- trunk/arch/sparc/kernel/mdesc.c | 2 + trunk/arch/sparc/kernel/module.c | 27 + trunk/arch/sparc/kernel/nmi.c | 2 +- trunk/arch/sparc/kernel/of_device_32.c | 1 - trunk/arch/sparc/kernel/of_device_64.c | 3 +- trunk/arch/sparc/kernel/of_device_common.c | 2 +- trunk/arch/sparc/kernel/pci.c | 2 +- trunk/arch/sparc/kernel/pci_fire.c | 1 + trunk/arch/sparc/kernel/pci_psycho.c | 1 + trunk/arch/sparc/kernel/pci_sabre.c | 1 + trunk/arch/sparc/kernel/pci_schizo.c | 1 + trunk/arch/sparc/kernel/pci_sun4v.c | 1 + trunk/arch/sparc/kernel/pcic.c | 1 + trunk/arch/sparc/kernel/pcr.c | 3 +- trunk/arch/sparc/kernel/pmc.c | 1 + trunk/arch/sparc/kernel/power.c | 2 +- trunk/arch/sparc/kernel/process_64.c | 2 +- trunk/arch/sparc/kernel/prom_32.c | 1 - trunk/arch/sparc/kernel/prom_64.c | 1 - trunk/arch/sparc/kernel/prom_common.c | 2 +- trunk/arch/sparc/kernel/reboot.c | 2 +- trunk/arch/sparc/kernel/sbus.c | 1 + trunk/arch/sparc/kernel/setup_32.c | 1 + trunk/arch/sparc/kernel/setup_64.c | 48 +- trunk/arch/sparc/kernel/signal32.c | 18 +- trunk/arch/sparc/kernel/signal_32.c | 30 +- trunk/arch/sparc/kernel/signal_64.c | 42 +- trunk/arch/sparc/kernel/sigutil_64.c | 1 + trunk/arch/sparc/kernel/smp_64.c | 2 +- trunk/arch/sparc/kernel/sparc_ksyms_64.c | 2 +- trunk/arch/sparc/kernel/stacktrace.c | 2 +- trunk/arch/sparc/kernel/sys_sparc32.c | 1 - trunk/arch/sparc/kernel/sys_sparc_64.c | 2 +- trunk/arch/sparc/kernel/systbls_32.S | 2 +- trunk/arch/sparc/kernel/systbls_64.S | 4 +- trunk/arch/sparc/kernel/time_64.c | 2 +- trunk/arch/sparc/kernel/traps_32.c | 1 + trunk/arch/sparc/kernel/unaligned_32.c | 1 - trunk/arch/sparc/kernel/vio.c | 1 + trunk/arch/sparc/kernel/viohs.c | 2 +- trunk/arch/sparc/mm/Makefile | 1 - trunk/arch/sparc/mm/fault_32.c | 1 - trunk/arch/sparc/mm/generic_32.c | 98 - trunk/arch/sparc/mm/generic_64.c | 164 - trunk/arch/sparc/mm/highmem.c | 1 + trunk/arch/sparc/mm/hugetlbpage.c | 1 - trunk/arch/unicore32/Kconfig | 4 +- trunk/arch/unicore32/Kconfig.debug | 14 - trunk/arch/unicore32/boot/compressed/Makefile | 4 +- trunk/arch/unicore32/include/asm/bitops.h | 12 +- trunk/arch/unicore32/include/asm/processor.h | 1 - trunk/arch/unicore32/kernel/ksyms.c | 4 +- trunk/arch/unicore32/lib/findbit.S | 14 +- trunk/arch/unicore32/mm/init.c | 1 + trunk/arch/x86/Kconfig | 3 - trunk/arch/x86/crypto/aes_glue.c | 1 + trunk/arch/x86/crypto/aesni-intel_glue.c | 1 + trunk/arch/x86/include/asm/apic.h | 1 + trunk/arch/x86/include/asm/mach_traps.h | 2 +- trunk/arch/x86/include/asm/mce.h | 5 +- trunk/arch/x86/include/asm/mrst.h | 7 + trunk/arch/x86/include/asm/x86_init.h | 3 + trunk/arch/x86/include/asm/xen/grant_table.h | 7 - trunk/arch/x86/include/asm/xen/hypercall.h | 8 + trunk/arch/x86/include/asm/xen/interface.h | 1 + trunk/arch/x86/kernel/alternative.c | 2 +- trunk/arch/x86/kernel/apic/apic.c | 33 +- trunk/arch/x86/kernel/apic/io_apic.c | 9 +- trunk/arch/x86/kernel/cpu/amd.c | 1 + trunk/arch/x86/kernel/cpu/mcheck/mce-apei.c | 1 + trunk/arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce.c | 26 +- .../arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 + trunk/arch/x86/kernel/cpu/perf_event_intel.c | 1 + trunk/arch/x86/kernel/devicetree.c | 1 + trunk/arch/x86/kernel/e820.c | 1 + trunk/arch/x86/kernel/hpet.c | 1 + trunk/arch/x86/kernel/irq.c | 1 + trunk/arch/x86/kernel/jump_label.c | 20 +- trunk/arch/x86/kernel/kvmclock.c | 5 +- trunk/arch/x86/kernel/nmi.c | 4 +- trunk/arch/x86/kernel/pci-dma.c | 1 + trunk/arch/x86/kernel/probe_roms.c | 4 +- trunk/arch/x86/kernel/rtc.c | 1 + trunk/arch/x86/kernel/setup.c | 2 + trunk/arch/x86/kernel/smp.c | 1 + trunk/arch/x86/kernel/tboot.c | 1 + trunk/arch/x86/kernel/time.c | 1 + trunk/arch/x86/kernel/topology.c | 1 + trunk/arch/x86/kernel/vsyscall_64.c | 1 + trunk/arch/x86/kernel/x86_init.c | 4 + trunk/arch/x86/kvm/vmx.c | 131 +- trunk/arch/x86/lguest/boot.c | 1 + trunk/arch/x86/pci/i386.c | 1 + trunk/arch/x86/pci/legacy.c | 1 + trunk/arch/x86/platform/ce4100/ce4100.c | 2 +- trunk/arch/x86/platform/efi/efi.c | 1 + trunk/arch/x86/platform/efi/efi_32.c | 1 + trunk/arch/x86/platform/mrst/mrst.c | 47 +- trunk/arch/x86/platform/mrst/pmu.c | 2 +- trunk/arch/x86/platform/mrst/vrtc.c | 5 +- trunk/arch/x86/platform/olpc/olpc-xo1-pm.c | 1 + trunk/arch/x86/platform/uv/bios_uv.c | 1 + trunk/arch/x86/power/cpu.c | 1 + trunk/arch/x86/um/Kconfig | 3 - trunk/arch/x86/um/asm/processor.h | 2 +- trunk/arch/x86/video/fbdev.c | 1 + trunk/arch/x86/xen/enlighten.c | 3 +- trunk/arch/x86/xen/grant-table.c | 2 +- trunk/arch/x86/xen/time.c | 16 +- trunk/block/blk-core.c | 18 +- trunk/block/blk-integrity.c | 1 + trunk/block/blk-map.c | 7 +- trunk/block/bsg-lib.c | 2 +- trunk/block/genhd.c | 71 - trunk/block/ioctl.c | 1 + trunk/crypto/ablkcipher.c | 14 + trunk/crypto/aead.c | 14 + trunk/crypto/ahash.c | 7 + trunk/crypto/async_tx/async_memcpy.c | 1 + trunk/crypto/async_tx/async_pq.c | 1 + trunk/crypto/async_tx/async_raid6_recov.c | 1 + trunk/crypto/async_tx/async_tx.c | 1 + trunk/crypto/async_tx/async_xor.c | 1 + trunk/crypto/async_tx/raid6test.c | 1 + trunk/crypto/blkcipher.c | 7 + trunk/crypto/crypto_user.c | 3 - trunk/crypto/crypto_wq.c | 1 + trunk/crypto/md4.c | 1 + trunk/crypto/pcompress.c | 7 + trunk/crypto/proc.c | 1 + trunk/crypto/rng.c | 7 + trunk/crypto/shash.c | 7 + trunk/crypto/vmac.c | 1 + trunk/crypto/xcbc.c | 1 + trunk/drivers/acpi/acpica/evxface.c | 1 + trunk/drivers/acpi/acpica/evxfevnt.c | 1 + trunk/drivers/acpi/acpica/evxfgpe.c | 1 + trunk/drivers/acpi/acpica/evxfregn.c | 1 + trunk/drivers/acpi/acpica/hwregs.c | 11 +- trunk/drivers/acpi/acpica/hwsleep.c | 1 + trunk/drivers/acpi/acpica/hwtimer.c | 1 + trunk/drivers/acpi/acpica/hwxface.c | 1 + trunk/drivers/acpi/acpica/nsxfeval.c | 1 + trunk/drivers/acpi/acpica/nsxfname.c | 1 + trunk/drivers/acpi/acpica/nsxfobj.c | 1 + trunk/drivers/acpi/acpica/rsxface.c | 1 + trunk/drivers/acpi/acpica/tbxface.c | 1 + trunk/drivers/acpi/acpica/utdebug.c | 1 + trunk/drivers/acpi/acpica/utdecode.c | 1 + trunk/drivers/acpi/acpica/utglobal.c | 1 + trunk/drivers/acpi/acpica/utxface.c | 1 + trunk/drivers/acpi/acpica/utxferror.c | 1 + trunk/drivers/acpi/atomicio.c | 4 +- trunk/drivers/acpi/blacklist.c | 1 - trunk/drivers/acpi/bus.c | 8 +- trunk/drivers/acpi/debugfs.c | 1 + trunk/drivers/acpi/ec_sys.c | 1 + trunk/drivers/acpi/event.c | 1 + trunk/drivers/acpi/glue.c | 1 + trunk/drivers/acpi/proc.c | 1 + trunk/drivers/acpi/processor_core.c | 1 + trunk/drivers/acpi/processor_driver.c | 20 +- trunk/drivers/acpi/processor_idle.c | 254 +- trunk/drivers/acpi/sbshc.c | 1 + trunk/drivers/acpi/scan.c | 3 +- trunk/drivers/acpi/sleep.c | 8 + trunk/drivers/acpi/sysfs.c | 14 +- trunk/drivers/acpi/video_detect.c | 1 + trunk/drivers/ata/ahci.c | 3 + trunk/drivers/ata/ahci_platform.c | 4 +- trunk/drivers/ata/libata-eh.c | 13 +- trunk/drivers/ata/libata-pmp.c | 8 +- trunk/drivers/ata/libata-scsi.c | 5 + trunk/drivers/ata/libata-sff.c | 1 + trunk/drivers/ata/pata_of_platform.c | 2 +- trunk/drivers/ata/sata_sis.c | 2 +- trunk/drivers/base/base.h | 1 + trunk/drivers/base/core.c | 3 + trunk/drivers/base/dma-coherent.c | 1 + trunk/drivers/base/dma-mapping.c | 1 + trunk/drivers/base/hypervisor.c | 1 + trunk/drivers/base/power/clock_ops.c | 3 +- trunk/drivers/base/power/common.c | 2 +- trunk/drivers/base/power/generic_ops.c | 1 + trunk/drivers/base/power/main.c | 4 +- trunk/drivers/base/power/opp.c | 2 +- trunk/drivers/base/power/qos.c | 19 +- trunk/drivers/base/power/runtime.c | 24 +- trunk/drivers/base/power/sysfs.c | 1 + trunk/drivers/base/power/trace.c | 1 + trunk/drivers/base/power/wakeup.c | 1 + trunk/drivers/base/regmap/regcache.c | 1 + trunk/drivers/base/transport_class.c | 1 + trunk/drivers/bcma/core.c | 1 + trunk/drivers/bcma/driver_chipcommon.c | 1 + trunk/drivers/bcma/driver_chipcommon_pmu.c | 1 + trunk/drivers/bcma/driver_pci.c | 1 + trunk/drivers/bcma/host_pci.c | 1 + trunk/drivers/bcma/main.c | 1 + trunk/drivers/block/aoe/aoeblk.c | 1 + trunk/drivers/block/aoe/aoechr.c | 1 + trunk/drivers/block/cciss.c | 6 + trunk/drivers/block/cciss_scsi.c | 1 + trunk/drivers/block/loop.c | 47 +- trunk/drivers/block/paride/pg.c | 1 + trunk/drivers/block/ps3disk.c | 1 + trunk/drivers/block/ps3vram.c | 1 + trunk/drivers/block/virtio_blk.c | 1 + trunk/drivers/block/xen-blkback/common.h | 5 +- trunk/drivers/block/xen-blkback/xenbus.c | 54 +- trunk/drivers/bluetooth/ath3k.c | 4 +- trunk/drivers/bluetooth/bcm203x.c | 12 +- trunk/drivers/bluetooth/bfusb.c | 13 +- trunk/drivers/bluetooth/btmrvl_main.c | 2 + trunk/drivers/bluetooth/btmrvl_sdio.c | 1 + trunk/drivers/bluetooth/btusb.c | 3 + trunk/drivers/bluetooth/btwilink.c | 1 + trunk/drivers/char/agp/intel-gtt.c | 7 +- trunk/drivers/char/hw_random/virtio-rng.c | 1 + trunk/drivers/char/mem.c | 1 + trunk/drivers/char/ps3flash.c | 1 + trunk/drivers/char/ramoops.c | 1 + trunk/drivers/char/random.c | 2 +- trunk/drivers/char/ttyprintk.c | 1 + trunk/drivers/char/virtio_console.c | 1 + trunk/drivers/clocksource/sh_cmt.c | 1 + trunk/drivers/clocksource/sh_mtu2.c | 1 + trunk/drivers/clocksource/sh_tmu.c | 1 + trunk/drivers/cpufreq/cpufreq_stats.c | 1 + trunk/drivers/cpufreq/db8500-cpufreq.c | 6 +- trunk/drivers/cpufreq/s3c64xx-cpufreq.c | 1 + trunk/drivers/cpuidle/cpuidle.c | 87 +- trunk/drivers/cpuidle/driver.c | 25 + trunk/drivers/cpuidle/governors/ladder.c | 43 +- trunk/drivers/cpuidle/governors/menu.c | 30 +- trunk/drivers/cpuidle/sysfs.c | 22 +- trunk/drivers/crypto/mv_cesa.c | 1 + trunk/drivers/dca/dca-core.c | 1 + trunk/drivers/dca/dca-sysfs.c | 1 + trunk/drivers/devfreq/Kconfig | 41 +- trunk/drivers/devfreq/devfreq.c | 10 +- trunk/drivers/dma/imx-dma.c | 1 + trunk/drivers/dma/imx-sdma.c | 1 + trunk/drivers/dma/intel_mid_dma.c | 1 + trunk/drivers/dma/ipu/ipu_idmac.c | 1 + trunk/drivers/dma/ste_dma40.c | 1 + trunk/drivers/edac/cpc925_edac.c | 67 +- trunk/drivers/edac/mce_amd_inj.c | 1 + trunk/drivers/edac/ppc4xx_edac.c | 2 +- trunk/drivers/firewire/core-iso.c | 1 + trunk/drivers/firmware/dmi_scan.c | 6 +- trunk/drivers/firmware/edd.c | 6 +- trunk/drivers/firmware/google/gsmi.c | 1 + trunk/drivers/gpio/Kconfig | 24 +- trunk/drivers/gpio/Makefile | 7 +- trunk/drivers/gpio/gpio-74x164.c | 1 + trunk/drivers/gpio/gpio-ep93xx.c | 1 + trunk/drivers/gpio/gpio-exynos4.c | 385 --- trunk/drivers/gpio/gpio-mc33880.c | 1 + trunk/drivers/gpio/gpio-mcp23s08.c | 1 + trunk/drivers/gpio/gpio-ml-ioh.c | 1 + trunk/drivers/gpio/gpio-mpc5200.c | 1 + .../gpio/gpio-mpc8xxx.c} | 3 + trunk/drivers/gpio/gpio-mxc.c | 1 + trunk/drivers/gpio/gpio-mxs.c | 1 + trunk/drivers/gpio/gpio-omap.c | 59 +- trunk/drivers/gpio/gpio-pca953x.c | 11 +- trunk/drivers/gpio/gpio-pcf857x.c | 1 + trunk/drivers/gpio/gpio-pch.c | 1 + trunk/drivers/gpio/gpio-plat-samsung.c | 205 -- trunk/drivers/gpio/gpio-s5pc100.c | 354 --- trunk/drivers/gpio/gpio-s5pv210.c | 287 -- trunk/drivers/gpio/gpio-samsung.c | 2712 +++++++++++++++++ trunk/drivers/gpio/gpio-xilinx.c | 1 + trunk/drivers/gpu/drm/Kconfig | 2 +- trunk/drivers/gpu/drm/ati_pcigart.c | 1 + trunk/drivers/gpu/drm/drm_buffer.c | 1 + trunk/drivers/gpu/drm/drm_bufs.c | 1 + trunk/drivers/gpu/drm/drm_cache.c | 1 + trunk/drivers/gpu/drm/drm_crtc.c | 13 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 16 + trunk/drivers/gpu/drm/drm_debugfs.c | 13 +- trunk/drivers/gpu/drm/drm_dma.c | 1 + trunk/drivers/gpu/drm/drm_drv.c | 3 +- trunk/drivers/gpu/drm/drm_edid.c | 1 + trunk/drivers/gpu/drm/drm_encoder_slave.c | 2 + trunk/drivers/gpu/drm/drm_fb_helper.c | 1 + trunk/drivers/gpu/drm/drm_fops.c | 1 + trunk/drivers/gpu/drm/drm_hashtab.c | 1 + trunk/drivers/gpu/drm/drm_ioc32.c | 1 + trunk/drivers/gpu/drm/drm_irq.c | 32 +- trunk/drivers/gpu/drm/drm_memory.c | 1 + trunk/drivers/gpu/drm/drm_mm.c | 1 + trunk/drivers/gpu/drm/drm_modes.c | 1 + trunk/drivers/gpu/drm/drm_pci.c | 1 + trunk/drivers/gpu/drm/drm_platform.c | 1 + trunk/drivers/gpu/drm/drm_proc.c | 1 + trunk/drivers/gpu/drm/drm_sman.c | 1 + trunk/drivers/gpu/drm/drm_sysfs.c | 1 + trunk/drivers/gpu/drm/drm_usb.c | 1 + trunk/drivers/gpu/drm/drm_vm.c | 1 + trunk/drivers/gpu/drm/i2c/ch7006_drv.c | 2 + trunk/drivers/gpu/drm/i2c/sil164_drv.c | 2 + trunk/drivers/gpu/drm/i810/i810_drv.c | 2 + trunk/drivers/gpu/drm/i915/i915_debugfs.c | 6 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 1 + trunk/drivers/gpu/drm/i915/i915_drv.c | 5 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 2 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 1 + trunk/drivers/gpu/drm/i915/intel_i2c.c | 1 + trunk/drivers/gpu/drm/i915/intel_sdvo.c | 1 + trunk/drivers/gpu/drm/mga/mga_drv.c | 2 + trunk/drivers/gpu/drm/mga/mga_warp.c | 1 + trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 22 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- .../drivers/gpu/drm/nouveau/nouveau_channel.c | 1 + .../gpu/drm/nouveau/nouveau_connector.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_drv.c | 1 + trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c | 11 +- trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 2 - trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c | 4 +- trunk/drivers/gpu/drm/nouveau/nouveau_perf.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 13 +- trunk/drivers/gpu/drm/nouveau/nouveau_temp.c | 2 + trunk/drivers/gpu/drm/nouveau/nv40_pm.c | 20 +- trunk/drivers/gpu/drm/nouveau/nv50_graph.c | 4 +- trunk/drivers/gpu/drm/nouveau/nv50_grctx.c | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_vram.c | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_graph.c | 42 +- trunk/drivers/gpu/drm/nouveau/nvc0_grctx.c | 31 +- trunk/drivers/gpu/drm/nouveau/nvc0_vram.c | 16 +- trunk/drivers/gpu/drm/r128/r128_cce.c | 1 + trunk/drivers/gpu/drm/r128/r128_drv.c | 2 + trunk/drivers/gpu/drm/radeon/Makefile | 2 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 62 +- trunk/drivers/gpu/drm/radeon/atombios_dp.c | 22 +- .../gpu/drm/radeon/atombios_encoders.c | 2369 ++++++++++++++ trunk/drivers/gpu/drm/radeon/evergreen.c | 71 +- .../gpu/drm/radeon/evergreen_blit_kms.c | 20 +- trunk/drivers/gpu/drm/radeon/ni.c | 26 +- trunk/drivers/gpu/drm/radeon/r100.c | 8 +- trunk/drivers/gpu/drm/radeon/r300.c | 16 +- trunk/drivers/gpu/drm/radeon/r600.c | 225 +- trunk/drivers/gpu/drm/radeon/r600_blit_kms.c | 14 +- trunk/drivers/gpu/drm/radeon/r600_cp.c | 2 + trunk/drivers/gpu/drm/radeon/radeon.h | 107 +- trunk/drivers/gpu/drm/radeon/radeon_asic.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_asic.h | 1 + .../drivers/gpu/drm/radeon/radeon_atombios.c | 126 +- .../drivers/gpu/drm/radeon/radeon_benchmark.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 27 +- .../gpu/drm/radeon/radeon_connectors.c | 90 +- trunk/drivers/gpu/drm/radeon/radeon_cp.c | 2 + trunk/drivers/gpu/drm/radeon/radeon_cs.c | 14 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 16 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 36 +- trunk/drivers/gpu/drm/radeon/radeon_drv.c | 5 + .../drivers/gpu/drm/radeon/radeon_encoders.c | 2151 +------------ trunk/drivers/gpu/drm/radeon/radeon_gart.c | 71 +- trunk/drivers/gpu/drm/radeon/radeon_i2c.c | 30 +- trunk/drivers/gpu/drm/radeon/radeon_irq_kms.c | 60 +- .../gpu/drm/radeon/radeon_legacy_crtc.c | 6 - trunk/drivers/gpu/drm/radeon/radeon_mode.h | 14 +- trunk/drivers/gpu/drm/radeon/radeon_pm.c | 18 + trunk/drivers/gpu/drm/radeon/rs400.c | 5 +- trunk/drivers/gpu/drm/radeon/rs600.c | 17 +- trunk/drivers/gpu/drm/radeon/rv770.c | 73 +- trunk/drivers/gpu/drm/savage/savage_drv.c | 2 + trunk/drivers/gpu/drm/sis/sis_drv.c | 2 + trunk/drivers/gpu/drm/tdfx/tdfx_drv.c | 2 + trunk/drivers/gpu/drm/ttm/ttm_tt.c | 1 + trunk/drivers/gpu/drm/via/via_drv.c | 2 + trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 + trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 + trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 165 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 10 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 94 +- trunk/drivers/gpu/vga/vgaarb.c | 44 +- trunk/drivers/hid/hid-apple.c | 3 - trunk/drivers/hid/hid-axff.c | 1 + trunk/drivers/hid/hid-debug.c | 1 + trunk/drivers/hid/hid-dr.c | 1 + trunk/drivers/hid/hid-emsff.c | 1 + trunk/drivers/hid/hid-gaff.c | 1 + trunk/drivers/hid/hid-holtekff.c | 1 + trunk/drivers/hid/hid-picolcd.c | 1 + trunk/drivers/hid/hid-pl.c | 1 + trunk/drivers/hid/hid-roccat-common.c | 1 + trunk/drivers/hid/hid-roccat.c | 1 + trunk/drivers/hid/hid-sjoy.c | 1 + trunk/drivers/hid/hid-tmff.c | 1 + trunk/drivers/hid/hid-zpff.c | 1 + trunk/drivers/hid/usbhid/hid-quirks.c | 1 + trunk/drivers/hwmon/Kconfig | 2 +- trunk/drivers/hwmon/coretemp.c | 3 +- trunk/drivers/hwmon/ultra45_env.c | 1 + trunk/drivers/hwmon/w83627ehf.c | 9 +- trunk/drivers/hwspinlock/u8500_hsem.c | 7 +- trunk/drivers/i2c/busses/i2c-pxa-pci.c | 1 + trunk/drivers/i2c/busses/i2c-sh7760.c | 1 + trunk/drivers/i2c/busses/i2c-tegra.c | 1 + trunk/drivers/i2c/i2c-boardinfo.c | 1 + trunk/drivers/ide/buddha.c | 1 + trunk/drivers/ide/cmd640.c | 1 + trunk/drivers/ide/cy82c693.c | 6 +- trunk/drivers/ide/icside.c | 2 +- trunk/drivers/ide/ide-acpi.c | 1 + trunk/drivers/ide/ide-atapi.c | 1 + trunk/drivers/ide/ide-cd.c | 1 - trunk/drivers/ide/ide-disk_proc.c | 1 + trunk/drivers/ide/ide-dma-sff.c | 1 + trunk/drivers/ide/ide-dma.c | 1 + trunk/drivers/ide/ide-eh.c | 1 + trunk/drivers/ide/ide-floppy.c | 1 - trunk/drivers/ide/ide-floppy_proc.c | 1 + trunk/drivers/ide/ide-io-std.c | 1 + trunk/drivers/ide/ide-ioctls.c | 1 + trunk/drivers/ide/ide-legacy.c | 1 + trunk/drivers/ide/ide-lib.c | 1 + trunk/drivers/ide/ide-pnp.c | 1 + trunk/drivers/ide/ide-tape.c | 1 - trunk/drivers/ide/ide-taskfile.c | 1 + trunk/drivers/ide/ide-xfer-mode.c | 1 + trunk/drivers/ide/macide.c | 1 + trunk/drivers/ide/piix.c | 18 +- trunk/drivers/ide/pmac.c | 1 + trunk/drivers/ide/q40ide.c | 1 + trunk/drivers/ide/setup-pci.c | 1 + trunk/drivers/ide/tc86c001.c | 1 + trunk/drivers/ide/triflex.c | 16 +- trunk/drivers/idle/intel_idle.c | 131 +- trunk/drivers/infiniband/core/addr.c | 1 + trunk/drivers/infiniband/core/cm.c | 1 + trunk/drivers/infiniband/core/cma.c | 1 + trunk/drivers/infiniband/core/fmr_pool.c | 1 + trunk/drivers/infiniband/core/iwcm.c | 1 + trunk/drivers/infiniband/core/mad.c | 1 + trunk/drivers/infiniband/core/multicast.c | 1 + trunk/drivers/infiniband/core/netlink.c | 1 + trunk/drivers/infiniband/core/packer.c | 1 + trunk/drivers/infiniband/core/sysfs.c | 1 + trunk/drivers/infiniband/core/ucma.c | 1 + trunk/drivers/infiniband/core/ud_header.c | 1 + trunk/drivers/infiniband/core/umem.c | 1 + .../drivers/infiniband/core/uverbs_marshall.c | 1 + trunk/drivers/infiniband/core/verbs.c | 1 + trunk/drivers/infiniband/hw/cxgb4/qp.c | 3 + .../drivers/infiniband/hw/ipath/ipath_diag.c | 1 + .../infiniband/hw/ipath/ipath_driver.c | 1 + .../infiniband/hw/ipath/ipath_file_ops.c | 1 + .../infiniband/hw/ipath/ipath_init_chip.c | 1 + .../drivers/infiniband/hw/ipath/ipath_sysfs.c | 1 + .../drivers/infiniband/hw/ipath/ipath_verbs.c | 1 + .../drivers/infiniband/hw/mthca/mthca_catas.c | 1 + trunk/drivers/infiniband/hw/mthca/mthca_cmd.c | 1 + .../infiniband/hw/mthca/mthca_provider.c | 2 + trunk/drivers/infiniband/hw/qib/qib_diag.c | 1 + trunk/drivers/infiniband/hw/qib/qib_driver.c | 1 + .../drivers/infiniband/hw/qib/qib_file_ops.c | 1 + trunk/drivers/infiniband/hw/qib/qib_iba7220.c | 1 + trunk/drivers/infiniband/hw/qib/qib_iba7322.c | 1 + trunk/drivers/infiniband/hw/qib/qib_init.c | 1 + trunk/drivers/infiniband/hw/qib/qib_pcie.c | 1 + trunk/drivers/infiniband/hw/qib/qib_sd7220.c | 1 + trunk/drivers/infiniband/hw/qib/qib_sdma.c | 1 + trunk/drivers/infiniband/hw/qib/qib_tx.c | 1 + trunk/drivers/infiniband/hw/qib/qib_verbs.c | 1 + trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 + trunk/drivers/infiniband/ulp/ipoib/ipoib_fs.c | 1 + trunk/drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 + .../infiniband/ulp/ipoib/ipoib_multicast.c | 1 + .../drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + trunk/drivers/input/input-compat.c | 1 + trunk/drivers/input/input-mt.c | 1 + trunk/drivers/input/input-polldev.c | 1 + trunk/drivers/input/joystick/as5011.c | 1 + .../input/keyboard/nomadik-ske-keypad.c | 1 + .../drivers/input/keyboard/tnetv107x-keypad.c | 1 + trunk/drivers/input/misc/ad714x.c | 1 + trunk/drivers/input/misc/adxl34x.c | 1 + trunk/drivers/input/misc/ati_remote2.c | 1 + trunk/drivers/input/misc/cma3000_d0x.c | 1 + trunk/drivers/input/misc/dm355evm_keys.c | 1 + trunk/drivers/input/sparse-keymap.c | 1 + trunk/drivers/input/touchscreen/ad7877.c | 1 + trunk/drivers/input/touchscreen/ad7879-spi.c | 1 + trunk/drivers/input/touchscreen/ad7879.c | 1 + trunk/drivers/input/touchscreen/ads7846.c | 1 + trunk/drivers/input/touchscreen/bu21013_ts.c | 1 + trunk/drivers/iommu/intel-iommu.c | 1 + trunk/drivers/iommu/omap-iommu-debug.c | 1 + trunk/drivers/iommu/omap-iovmm.c | 1 + trunk/drivers/isdn/capi/kcapi_proc.c | 1 + trunk/drivers/isdn/gigaset/asyncdata.c | 1 + trunk/drivers/isdn/gigaset/capi.c | 1 + trunk/drivers/isdn/gigaset/dummyll.c | 1 + trunk/drivers/isdn/gigaset/ev-layer.c | 1 + trunk/drivers/isdn/gigaset/i4l.c | 1 + trunk/drivers/isdn/gigaset/interface.c | 1 + trunk/drivers/isdn/hardware/mISDN/mISDNisar.c | 1 + trunk/drivers/isdn/i4l/isdn_tty.c | 1 + trunk/drivers/isdn/mISDN/clock.c | 1 + trunk/drivers/isdn/mISDN/dsp_audio.c | 1 + trunk/drivers/isdn/mISDN/dsp_pipeline.c | 1 + trunk/drivers/isdn/mISDN/socket.c | 1 + trunk/drivers/leds/dell-led.c | 1 + trunk/drivers/leds/led-class.c | 5 +- trunk/drivers/leds/leds-88pm860x.c | 1 + trunk/drivers/leds/leds-asic3.c | 1 + trunk/drivers/leds/leds-atmel-pwm.c | 1 + trunk/drivers/leds/leds-cobalt-raq.c | 1 + trunk/drivers/leds/leds-fsg.c | 1 + trunk/drivers/leds/leds-gpio.c | 1 + trunk/drivers/leds/leds-lm3530.c | 1 + trunk/drivers/leds/leds-locomo.c | 1 + trunk/drivers/leds/leds-lt3593.c | 1 + trunk/drivers/leds/leds-net48xx.c | 1 + trunk/drivers/leds/leds-net5501.c | 1 + trunk/drivers/leds/leds-ns2.c | 1 + trunk/drivers/leds/leds-s3c24xx.c | 1 + trunk/drivers/leds/leds-wm831x-status.c | 1 + trunk/drivers/leds/leds-wm8350.c | 1 + trunk/drivers/leds/leds-wrap.c | 1 + trunk/drivers/lguest/lguest_device.c | 1 + trunk/drivers/lguest/lguest_user.c | 1 + trunk/drivers/macintosh/via-macii.c | 2 +- trunk/drivers/macintosh/via-maciisi.c | 4 +- trunk/drivers/md/dm-bufio.c | 1 + trunk/drivers/md/dm-exception-store.c | 1 + trunk/drivers/md/dm-log-userspace-base.c | 1 + trunk/drivers/md/dm-path-selector.c | 1 + trunk/drivers/md/dm-raid.c | 1 + trunk/drivers/md/dm-round-robin.c | 1 + trunk/drivers/md/dm-service-time.c | 1 + trunk/drivers/md/dm-snap-persistent.c | 1 + trunk/drivers/md/dm-snap-transient.c | 1 + trunk/drivers/md/dm-uevent.c | 1 + trunk/drivers/md/faulty.c | 1 + trunk/drivers/md/linear.c | 1 + trunk/drivers/md/md.c | 1 + trunk/drivers/md/multipath.c | 1 + .../md/persistent-data/dm-btree-remove.c | 2 +- trunk/drivers/md/persistent-data/dm-btree.c | 2 +- .../md/persistent-data/dm-space-map-checker.c | 1 + .../md/persistent-data/dm-space-map-disk.c | 2 +- .../persistent-data/dm-transaction-manager.c | 2 +- trunk/drivers/md/raid0.c | 1 + trunk/drivers/md/raid1.c | 1 + trunk/drivers/md/raid10.c | 1 + trunk/drivers/md/raid5.c | 17 +- trunk/drivers/media/common/saa7146_core.c | 1 + trunk/drivers/media/common/saa7146_fops.c | 1 + trunk/drivers/media/common/saa7146_hlp.c | 1 + trunk/drivers/media/common/saa7146_video.c | 1 + .../drivers/media/common/tuners/tuner-types.c | 1 + .../drivers/media/dvb/dvb-usb/mxl111sf-i2c.c | 3 +- .../drivers/media/dvb/dvb-usb/mxl111sf-phy.c | 7 +- .../media/dvb/frontends/dibx000_common.c | 1 + trunk/drivers/media/dvb/siano/sms-cards.c | 1 + trunk/drivers/media/dvb/siano/smsendian.c | 1 + trunk/drivers/media/dvb/siano/smssdio.c | 1 + trunk/drivers/media/dvb/siano/smsusb.c | 1 + trunk/drivers/media/media-device.c | 1 + trunk/drivers/media/radio/radio-timb.c | 1 + trunk/drivers/media/radio/radio-wl1273.c | 1 + trunk/drivers/media/radio/si4713-i2c.c | 1 + trunk/drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 + trunk/drivers/media/rc/ir-jvc-decoder.c | 1 + trunk/drivers/media/rc/ir-lirc-codec.c | 1 + trunk/drivers/media/rc/ir-nec-decoder.c | 1 + trunk/drivers/media/rc/ir-raw.c | 2 + trunk/drivers/media/rc/ir-rc5-decoder.c | 1 + trunk/drivers/media/rc/ir-rc5-sz-decoder.c | 1 + trunk/drivers/media/rc/ir-rc6-decoder.c | 1 + trunk/drivers/media/rc/ir-sony-decoder.c | 1 + .../media/rc/keymaps/rc-adstech-dvb-t-pci.c | 1 + .../drivers/media/rc/keymaps/rc-alink-dtu-m.c | 1 + trunk/drivers/media/rc/keymaps/rc-anysee.c | 1 + .../media/rc/keymaps/rc-apac-viewcomp.c | 1 + trunk/drivers/media/rc/keymaps/rc-asus-pc39.c | 1 + .../rc/keymaps/rc-ati-tv-wonder-hd-600.c | 1 + .../media/rc/keymaps/rc-avermedia-a16d.c | 1 + .../media/rc/keymaps/rc-avermedia-cardbus.c | 1 + .../media/rc/keymaps/rc-avermedia-dvbt.c | 1 + .../media/rc/keymaps/rc-avermedia-m135a.c | 1 + .../rc/keymaps/rc-avermedia-m733a-rm-k6.c | 1 + .../media/rc/keymaps/rc-avermedia-rm-ks.c | 1 + trunk/drivers/media/rc/keymaps/rc-avermedia.c | 1 + .../drivers/media/rc/keymaps/rc-avertv-303.c | 1 + .../media/rc/keymaps/rc-azurewave-ad-tu700.c | 1 + .../media/rc/keymaps/rc-behold-columbus.c | 1 + trunk/drivers/media/rc/keymaps/rc-behold.c | 1 + .../media/rc/keymaps/rc-budget-ci-old.c | 1 + .../media/rc/keymaps/rc-cinergy-1400.c | 1 + trunk/drivers/media/rc/keymaps/rc-cinergy.c | 1 + .../drivers/media/rc/keymaps/rc-dib0700-nec.c | 1 + .../drivers/media/rc/keymaps/rc-dib0700-rc5.c | 1 + .../media/rc/keymaps/rc-digitalnow-tinytwin.c | 1 + .../drivers/media/rc/keymaps/rc-digittrade.c | 1 + .../drivers/media/rc/keymaps/rc-dm1105-nec.c | 1 + .../media/rc/keymaps/rc-dntv-live-dvb-t.c | 1 + .../media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 1 + .../drivers/media/rc/keymaps/rc-em-terratec.c | 1 + .../media/rc/keymaps/rc-encore-enltv-fm53.c | 1 + .../media/rc/keymaps/rc-encore-enltv.c | 1 + .../media/rc/keymaps/rc-encore-enltv2.c | 1 + .../media/rc/keymaps/rc-evga-indtube.c | 1 + trunk/drivers/media/rc/keymaps/rc-eztv.c | 1 + trunk/drivers/media/rc/keymaps/rc-flydvb.c | 1 + trunk/drivers/media/rc/keymaps/rc-flyvideo.c | 1 + .../media/rc/keymaps/rc-fusionhdtv-mce.c | 1 + .../media/rc/keymaps/rc-gadmei-rm008z.c | 1 + .../media/rc/keymaps/rc-genius-tvgo-a11mce.c | 1 + .../drivers/media/rc/keymaps/rc-gotview7135.c | 1 + trunk/drivers/media/rc/keymaps/rc-hauppauge.c | 1 + trunk/drivers/media/rc/keymaps/rc-imon-mce.c | 1 + trunk/drivers/media/rc/keymaps/rc-imon-pad.c | 1 + .../media/rc/keymaps/rc-iodata-bctv7e.c | 1 + trunk/drivers/media/rc/keymaps/rc-kaiomy.c | 1 + .../drivers/media/rc/keymaps/rc-kworld-315u.c | 1 + .../rc/keymaps/rc-kworld-plus-tv-analog.c | 1 + .../media/rc/keymaps/rc-leadtek-y04g0051.c | 1 + trunk/drivers/media/rc/keymaps/rc-lirc.c | 1 + trunk/drivers/media/rc/keymaps/rc-lme2510.c | 1 + trunk/drivers/media/rc/keymaps/rc-manli.c | 1 + .../media/rc/keymaps/rc-msi-digivox-ii.c | 1 + .../media/rc/keymaps/rc-msi-digivox-iii.c | 1 + .../media/rc/keymaps/rc-msi-tvanywhere-plus.c | 1 + .../media/rc/keymaps/rc-msi-tvanywhere.c | 1 + trunk/drivers/media/rc/keymaps/rc-nebula.c | 1 + .../rc/keymaps/rc-nec-terratec-cinergy-xs.c | 1 + trunk/drivers/media/rc/keymaps/rc-norwood.c | 1 + trunk/drivers/media/rc/keymaps/rc-npgtech.c | 1 + .../drivers/media/rc/keymaps/rc-pctv-sedna.c | 1 + .../media/rc/keymaps/rc-pinnacle-color.c | 1 + .../media/rc/keymaps/rc-pinnacle-grey.c | 1 + .../media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 + .../media/rc/keymaps/rc-pixelview-002t.c | 1 + .../media/rc/keymaps/rc-pixelview-mk12.c | 1 + .../media/rc/keymaps/rc-pixelview-new.c | 1 + trunk/drivers/media/rc/keymaps/rc-pixelview.c | 1 + .../rc/keymaps/rc-powercolor-real-angel.c | 1 + .../media/rc/keymaps/rc-proteus-2309.c | 1 + trunk/drivers/media/rc/keymaps/rc-purpletv.c | 1 + trunk/drivers/media/rc/keymaps/rc-pv951.c | 1 + trunk/drivers/media/rc/keymaps/rc-rc6-mce.c | 1 + .../rc/keymaps/rc-real-audio-220-32-keys.c | 1 + trunk/drivers/media/rc/keymaps/rc-streamzap.c | 1 + trunk/drivers/media/rc/keymaps/rc-tbs-nec.c | 1 + .../media/rc/keymaps/rc-technisat-usb2.c | 1 + .../media/rc/keymaps/rc-terratec-cinergy-xs.c | 1 + .../media/rc/keymaps/rc-terratec-slim-2.c | 1 + .../media/rc/keymaps/rc-terratec-slim.c | 1 + trunk/drivers/media/rc/keymaps/rc-tevii-nec.c | 1 + trunk/drivers/media/rc/keymaps/rc-tivo.c | 1 + .../media/rc/keymaps/rc-total-media-in-hand.c | 1 + trunk/drivers/media/rc/keymaps/rc-trekstor.c | 1 + trunk/drivers/media/rc/keymaps/rc-tt-1500.c | 1 + .../drivers/media/rc/keymaps/rc-twinhan1027.c | 1 + .../media/rc/keymaps/rc-videomate-m1f.c | 1 + .../media/rc/keymaps/rc-videomate-s350.c | 1 + .../media/rc/keymaps/rc-videomate-tv-pvr.c | 1 + .../rc/keymaps/rc-winfast-usbii-deluxe.c | 1 + trunk/drivers/media/rc/keymaps/rc-winfast.c | 1 + trunk/drivers/media/rc/rc-main.c | 1 + trunk/drivers/media/video/adp1653.c | 1 + trunk/drivers/media/video/ak881x.c | 1 + trunk/drivers/media/video/cpia2/cpia2_usb.c | 1 + .../drivers/media/video/cx25840/cx25840-ir.c | 1 + .../drivers/media/video/davinci/dm355_ccdc.c | 1 + .../drivers/media/video/davinci/dm644x_ccdc.c | 1 + trunk/drivers/media/video/hdpvr/hdpvr-i2c.c | 1 + trunk/drivers/media/video/hexium_gemini.c | 1 + trunk/drivers/media/video/hexium_orion.c | 1 + trunk/drivers/media/video/imx074.c | 1 + .../drivers/media/video/m5mols/m5mols_core.c | 1 + trunk/drivers/media/video/mt9m001.c | 1 + trunk/drivers/media/video/mt9m111.c | 1 + trunk/drivers/media/video/mt9t031.c | 1 + trunk/drivers/media/video/mt9v011.c | 1 + trunk/drivers/media/video/mt9v022.c | 1 + trunk/drivers/media/video/mt9v032.c | 1 + trunk/drivers/media/video/mxb.c | 1 + trunk/drivers/media/video/noon010pc30.c | 1 + trunk/drivers/media/video/omap24xxcam.c | 1 + trunk/drivers/media/video/ov6650.c | 1 + .../media/video/pvrusb2/pvrusb2-devattr.c | 1 + .../drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 + .../media/video/pvrusb2/pvrusb2-i2c-core.c | 1 + .../media/video/pvrusb2/pvrusb2-v4l2.c | 1 + trunk/drivers/media/video/rj54n1cb0c.c | 1 + trunk/drivers/media/video/s5k6aa.c | 1 + .../drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 4 +- .../drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 4 +- trunk/drivers/media/video/sh_mobile_csi2.c | 1 + trunk/drivers/media/video/sh_vou.c | 1 + trunk/drivers/media/video/sr030pc30.c | 1 + trunk/drivers/media/video/tcm825x.c | 1 + trunk/drivers/media/video/timblogiw.c | 1 + trunk/drivers/media/video/tvp514x.c | 1 + trunk/drivers/media/video/tvp5150.c | 1 + trunk/drivers/media/video/tvp7002.c | 1 + .../media/video/usbvision/usbvision-cards.c | 1 + trunk/drivers/media/video/uvc/uvc_ctrl.c | 6 +- trunk/drivers/media/video/v4l2-ctrls.c | 6 +- trunk/drivers/media/video/v4l2-device.c | 1 + trunk/drivers/media/video/v4l2-event.c | 11 +- trunk/drivers/media/video/v4l2-fh.c | 1 + trunk/drivers/media/video/v4l2-int-device.c | 1 + trunk/drivers/media/video/v4l2-subdev.c | 1 + trunk/drivers/media/video/videobuf2-core.c | 6 +- trunk/drivers/memstick/core/memstick.c | 1 + trunk/drivers/memstick/core/mspro_block.c | 1 + trunk/drivers/memstick/host/jmb38x_ms.c | 1 + trunk/drivers/memstick/host/tifm_ms.c | 1 + trunk/drivers/message/i2o/pci.c | 1 + trunk/drivers/mfd/ab3100-core.c | 1 + trunk/drivers/mfd/ab5500-core.c | 1 + trunk/drivers/mfd/ab5500-debugfs.c | 1 + trunk/drivers/mfd/ab8500-debugfs.c | 1 + trunk/drivers/mfd/ab8500-sysctrl.c | 1 + trunk/drivers/mfd/abx500-core.c | 1 + trunk/drivers/mfd/asic3.c | 1 + trunk/drivers/mfd/dm355evm_msp.c | 1 + trunk/drivers/mfd/max8997.c | 1 + trunk/drivers/mfd/mfd-core.c | 1 + trunk/drivers/mfd/pcf50633-irq.c | 1 + trunk/drivers/mfd/tmio_core.c | 1 + trunk/drivers/mfd/twl-core.c | 1 + trunk/drivers/mfd/twl6030-irq.c | 1 + trunk/drivers/mfd/wl1273-core.c | 1 + trunk/drivers/mfd/wm8400-core.c | 1 + trunk/drivers/misc/ab8500-pwm.c | 1 + trunk/drivers/misc/atmel-ssc.c | 1 + trunk/drivers/misc/atmel_tclib.c | 1 + trunk/drivers/misc/bh1780gli.c | 1 + trunk/drivers/misc/carma/carma-fpga-program.c | 9 +- trunk/drivers/misc/carma/carma-fpga.c | 9 +- trunk/drivers/misc/eeprom/Kconfig | 2 +- trunk/drivers/misc/kgdbts.c | 1 + trunk/drivers/misc/sgi-gru/grukservices.c | 1 + trunk/drivers/misc/ti-st/st_kim.c | 1 + trunk/drivers/misc/tifm_7xx1.c | 1 + trunk/drivers/misc/tifm_core.c | 1 + trunk/drivers/mmc/core/bus.c | 2 + trunk/drivers/mmc/core/debugfs.c | 1 + trunk/drivers/mmc/core/host.c | 1 + trunk/drivers/mmc/core/mmc.c | 1 + trunk/drivers/mmc/core/mmc_ops.c | 1 + trunk/drivers/mmc/core/quirks.c | 1 + trunk/drivers/mmc/core/sd.c | 1 + trunk/drivers/mmc/core/sd_ops.c | 1 + trunk/drivers/mmc/core/sdio_bus.c | 1 + trunk/drivers/mmc/core/sdio_io.c | 1 + trunk/drivers/mmc/core/sdio_irq.c | 1 + trunk/drivers/mmc/host/sdhci-esdhc-imx.c | 8 + trunk/drivers/mmc/host/sdhci-tegra.c | 1 + trunk/drivers/mtd/Kconfig | 21 +- trunk/drivers/mtd/Makefile | 2 +- trunk/drivers/mtd/afs.c | 4 +- trunk/drivers/mtd/ar7part.c | 3 +- trunk/drivers/mtd/chips/cfi_cmdset_0002.c | 31 +- trunk/drivers/mtd/chips/fwh_lock.h | 3 +- trunk/drivers/mtd/chips/jedec_probe.c | 34 +- trunk/drivers/mtd/cmdlinepart.c | 8 +- trunk/drivers/mtd/devices/Kconfig | 13 +- trunk/drivers/mtd/devices/Makefile | 3 + trunk/drivers/mtd/devices/doc2000.c | 17 +- trunk/drivers/mtd/devices/doc2001.c | 11 +- trunk/drivers/mtd/devices/doc2001plus.c | 11 +- trunk/drivers/mtd/devices/docecc.c | 2 +- trunk/drivers/mtd/devices/docg3.c | 1114 +++++++ trunk/drivers/mtd/devices/docg3.h | 297 ++ trunk/drivers/mtd/devices/docprobe.c | 5 - trunk/drivers/mtd/devices/lart.c | 18 +- trunk/drivers/mtd/devices/m25p80.c | 92 +- trunk/drivers/mtd/devices/mtd_dataflash.c | 91 +- trunk/drivers/mtd/devices/sst25l.c | 42 +- trunk/drivers/mtd/ftl.c | 40 +- trunk/drivers/mtd/inftlcore.c | 69 +- trunk/drivers/mtd/inftlmount.c | 116 +- trunk/drivers/mtd/lpddr/lpddr_cmds.c | 1 + trunk/drivers/mtd/maps/Kconfig | 26 - trunk/drivers/mtd/maps/Makefile | 2 - trunk/drivers/mtd/maps/bcm963xx-flash.c | 1 + trunk/drivers/mtd/maps/bfin-async-flash.c | 16 +- trunk/drivers/mtd/maps/ceiva.c | 341 --- trunk/drivers/mtd/maps/dc21285.c | 9 +- trunk/drivers/mtd/maps/edb7312.c | 134 - trunk/drivers/mtd/maps/gpio-addr-flash.c | 16 +- trunk/drivers/mtd/maps/h720x-flash.c | 23 +- trunk/drivers/mtd/maps/impa7.c | 28 +- trunk/drivers/mtd/maps/intel_vr_nor.c | 7 +- trunk/drivers/mtd/maps/ixp2000.c | 11 +- trunk/drivers/mtd/maps/ixp4xx.c | 29 +- trunk/drivers/mtd/maps/lantiq-flash.c | 17 +- trunk/drivers/mtd/maps/latch-addr-flash.c | 24 +- trunk/drivers/mtd/maps/pcmciamtd.c | 124 +- trunk/drivers/mtd/maps/physmap.c | 38 +- trunk/drivers/mtd/maps/physmap_of.c | 80 +- trunk/drivers/mtd/maps/plat-ram.c | 23 +- trunk/drivers/mtd/maps/pxa2xx-flash.c | 20 +- trunk/drivers/mtd/maps/rbtx4939-flash.c | 24 +- trunk/drivers/mtd/maps/sa1100-flash.c | 30 +- trunk/drivers/mtd/maps/solutionengine.c | 30 +- trunk/drivers/mtd/maps/wr_sbc82xx_flash.c | 33 +- trunk/drivers/mtd/mtd_blkdevs.c | 2 + trunk/drivers/mtd/mtdblock.c | 18 +- trunk/drivers/mtd/mtdblock_ro.c | 1 + trunk/drivers/mtd/mtdchar.c | 162 +- trunk/drivers/mtd/mtdconcat.c | 10 +- trunk/drivers/mtd/mtdcore.c | 70 +- trunk/drivers/mtd/mtdcore.h | 3 + trunk/drivers/mtd/mtdoops.c | 2 +- trunk/drivers/mtd/mtdpart.c | 62 +- trunk/drivers/mtd/mtdsuper.c | 21 +- trunk/drivers/mtd/mtdswap.c | 31 +- trunk/drivers/mtd/nand/Kconfig | 29 +- trunk/drivers/mtd/nand/Makefile | 2 +- trunk/drivers/mtd/nand/atmel_nand.c | 74 +- trunk/drivers/mtd/nand/au1550nd.c | 29 +- trunk/drivers/mtd/nand/autcpu12.c | 4 +- trunk/drivers/mtd/nand/bcm_umi_nand.c | 57 +- trunk/drivers/mtd/nand/cafe_nand.c | 22 +- trunk/drivers/mtd/nand/cmx270_nand.c | 24 +- trunk/drivers/mtd/nand/cs553x_nand.c | 15 +- trunk/drivers/mtd/nand/davinci_nand.c | 39 +- trunk/drivers/mtd/nand/denali.c | 6 +- trunk/drivers/mtd/nand/diskonchip.c | 9 +- trunk/drivers/mtd/nand/edb7312.c | 203 -- trunk/drivers/mtd/nand/fsl_elbc_nand.c | 75 +- trunk/drivers/mtd/nand/fsl_upm.c | 16 +- trunk/drivers/mtd/nand/fsmc_nand.c | 77 +- trunk/drivers/mtd/nand/gpmi-nand/Makefile | 3 + trunk/drivers/mtd/nand/gpmi-nand/bch-regs.h | 84 + trunk/drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 1057 +++++++ trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 1619 ++++++++++ trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 273 ++ trunk/drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 172 ++ trunk/drivers/mtd/nand/h1910.c | 19 +- trunk/drivers/mtd/nand/jz4740_nand.c | 18 +- trunk/drivers/mtd/nand/mpc5121_nfc.c | 22 +- trunk/drivers/mtd/nand/mxc_nand.c | 37 +- trunk/drivers/mtd/nand/nand_base.c | 1109 +++---- trunk/drivers/mtd/nand/nand_bbt.c | 693 ++--- trunk/drivers/mtd/nand/nand_bch.c | 4 +- trunk/drivers/mtd/nand/nand_ecc.c | 10 +- trunk/drivers/mtd/nand/nandsim.c | 4 +- trunk/drivers/mtd/nand/ndfc.c | 22 +- trunk/drivers/mtd/nand/nomadik_nand.c | 1 + trunk/drivers/mtd/nand/nuc900_nand.c | 1 + trunk/drivers/mtd/nand/omap2.c | 23 +- trunk/drivers/mtd/nand/orion_nand.c | 16 +- trunk/drivers/mtd/nand/pasemi_nand.c | 3 +- trunk/drivers/mtd/nand/plat_nand.c | 25 +- trunk/drivers/mtd/nand/ppchameleonevb.c | 47 +- trunk/drivers/mtd/nand/pxa3xx_nand.c | 471 +-- trunk/drivers/mtd/nand/r852.c | 6 +- trunk/drivers/mtd/nand/rtc_from4.c | 5 +- trunk/drivers/mtd/nand/s3c2410.c | 27 +- trunk/drivers/mtd/nand/sharpsl.c | 13 +- trunk/drivers/mtd/nand/sm_common.c | 3 +- trunk/drivers/mtd/nand/socrates_nand.c | 28 +- trunk/drivers/mtd/nand/tmio_nand.c | 17 +- trunk/drivers/mtd/nand/txx9ndfmc.c | 8 +- trunk/drivers/mtd/nftlcore.c | 37 +- trunk/drivers/mtd/nftlmount.c | 26 +- trunk/drivers/mtd/ofpart.c | 112 +- trunk/drivers/mtd/onenand/generic.c | 14 +- trunk/drivers/mtd/onenand/omap2.c | 16 +- trunk/drivers/mtd/onenand/onenand_base.c | 114 +- trunk/drivers/mtd/onenand/onenand_bbt.c | 9 +- trunk/drivers/mtd/onenand/samsung.c | 13 +- trunk/drivers/mtd/redboot.c | 17 +- trunk/drivers/mtd/rfd_ftl.c | 1 + trunk/drivers/mtd/sm_ftl.c | 26 +- trunk/drivers/mtd/ssfdc.c | 46 +- trunk/drivers/mtd/tests/mtd_oobtest.c | 33 +- trunk/drivers/mtd/tests/mtd_pagetest.c | 37 +- trunk/drivers/mtd/tests/mtd_readtest.c | 13 +- trunk/drivers/mtd/tests/mtd_speedtest.c | 17 +- trunk/drivers/mtd/tests/mtd_stresstest.c | 11 +- trunk/drivers/mtd/tests/mtd_subpagetest.c | 17 +- trunk/drivers/mtd/tests/mtd_torturetest.c | 11 +- trunk/drivers/mtd/ubi/eba.c | 2 +- trunk/drivers/mtd/ubi/io.c | 24 +- trunk/drivers/mtd/ubi/kapi.c | 2 +- trunk/drivers/mtd/ubi/misc.c | 2 +- trunk/drivers/mtd/ubi/scan.c | 4 +- trunk/drivers/mtd/ubi/vmt.c | 1 + trunk/drivers/mtd/ubi/vtbl.c | 2 +- trunk/drivers/net/Kconfig | 2 + trunk/drivers/net/bonding/bond_main.c | 4 +- trunk/drivers/net/bonding/bond_procfs.c | 5 +- trunk/drivers/net/bonding/bond_sysfs.c | 7 + .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 50 +- .../net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 15 +- trunk/drivers/net/ethernet/broadcom/tg3.c | 195 +- trunk/drivers/net/ethernet/broadcom/tg3.h | 21 +- trunk/drivers/net/ethernet/brocade/bna/bnad.c | 1 + trunk/drivers/net/ethernet/cadence/Kconfig | 1 + .../ethernet/chelsio/cxgb3/cxgb3_offload.c | 1 + .../drivers/net/ethernet/chelsio/cxgb3/l2t.c | 1 + .../drivers/net/ethernet/chelsio/cxgb4/l2t.c | 7 +- .../drivers/net/ethernet/chelsio/cxgb4/sge.c | 1 + .../net/ethernet/emulex/benet/be_main.c | 1 + trunk/drivers/net/ethernet/ethoc.c | 1 + trunk/drivers/net/ethernet/freescale/Kconfig | 3 +- .../drivers/net/ethernet/freescale/ucc_geth.c | 1 + trunk/drivers/net/ethernet/intel/Kconfig | 6 +- .../drivers/net/ethernet/intel/e1000e/param.c | 1 + .../net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 + .../net/ethernet/intel/ixgbe/ixgbe_sriov.h | 4 +- trunk/drivers/net/ethernet/lantiq_etop.c | 2 + trunk/drivers/net/ethernet/marvell/sky2.c | 117 +- trunk/drivers/net/ethernet/marvell/sky2.h | 1 + .../net/ethernet/mellanox/mlx4/alloc.c | 1 + .../net/ethernet/mellanox/mlx4/catas.c | 1 + .../drivers/net/ethernet/mellanox/mlx4/cmd.c | 1 + trunk/drivers/net/ethernet/mellanox/mlx4/cq.c | 1 + .../net/ethernet/mellanox/mlx4/en_rx.c | 6 +- .../net/ethernet/mellanox/mlx4/en_tx.c | 1 + trunk/drivers/net/ethernet/mellanox/mlx4/eq.c | 1 + trunk/drivers/net/ethernet/mellanox/mlx4/fw.c | 1 + .../drivers/net/ethernet/mellanox/mlx4/intf.c | 1 + .../drivers/net/ethernet/mellanox/mlx4/mcg.c | 1 + .../net/ethernet/mellanox/mlx4/mlx4_en.h | 1 + trunk/drivers/net/ethernet/mellanox/mlx4/mr.c | 1 + trunk/drivers/net/ethernet/mellanox/mlx4/pd.c | 1 + .../drivers/net/ethernet/mellanox/mlx4/port.c | 1 + trunk/drivers/net/ethernet/mellanox/mlx4/qp.c | 1 + .../drivers/net/ethernet/mellanox/mlx4/srq.c | 1 + trunk/drivers/net/ethernet/natsemi/Kconfig | 5 +- .../net/ethernet/neterion/vxge/vxge-main.c | 1 + trunk/drivers/net/ethernet/nvidia/forcedeth.c | 104 +- .../drivers/net/ethernet/octeon/octeon_mgmt.c | 1 + .../ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 1 + .../ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 1 + trunk/drivers/net/ethernet/rdc/r6040.c | 2 +- trunk/drivers/net/ethernet/realtek/r8169.c | 2 +- trunk/drivers/net/ethernet/sfc/rx.c | 1 + trunk/drivers/net/ethernet/smsc/smsc911x.c | 12 + trunk/drivers/net/ethernet/smsc/smsc9420.c | 1 + .../net/ethernet/stmicro/stmmac/Kconfig | 9 - .../ethernet/stmicro/stmmac/dwmac1000_dma.c | 3 +- .../ethernet/stmicro/stmmac/dwmac100_dma.c | 3 +- .../net/ethernet/stmicro/stmmac/stmmac.h | 2 +- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 6 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 117 +- trunk/drivers/net/ethernet/sun/sunhme.c | 2 +- .../net/ethernet/toshiba/ps3_gelic_net.c | 3 + .../net/ethernet/toshiba/ps3_gelic_net.h | 6 + .../net/ethernet/xilinx/ll_temac_main.c | 7 +- .../drivers/net/ethernet/xscale/ixp4xx_eth.c | 1 + trunk/drivers/net/hippi/Kconfig | 2 +- trunk/drivers/net/macvlan.c | 7 + trunk/drivers/net/phy/realtek.c | 1 + trunk/drivers/net/usb/asix.c | 68 +- trunk/drivers/net/usb/cdc_ether.c | 2 +- trunk/drivers/net/usb/lg-vl600.c | 26 +- trunk/drivers/net/usb/smsc75xx.c | 7 +- trunk/drivers/net/usb/usbnet.c | 3 +- trunk/drivers/net/veth.c | 1 + trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 1 + trunk/drivers/net/wimax/i2400m/control.c | 2 + trunk/drivers/net/wimax/i2400m/debugfs.c | 1 + trunk/drivers/net/wimax/i2400m/fw.c | 1 + trunk/drivers/net/wimax/i2400m/netdev.c | 1 + trunk/drivers/net/wimax/i2400m/rx.c | 2 + trunk/drivers/net/wimax/i2400m/sdio.c | 1 + trunk/drivers/net/wimax/i2400m/tx.c | 1 + trunk/drivers/net/wimax/i2400m/usb.c | 1 + trunk/drivers/net/wireless/adm8211.c | 1 + trunk/drivers/net/wireless/ath/ath5k/debug.c | 3 +- trunk/drivers/net/wireless/ath/ath5k/pci.c | 1 + .../net/wireless/ath/ath6kl/cfg80211.c | 2 + trunk/drivers/net/wireless/ath/ath6kl/debug.c | 1 + trunk/drivers/net/wireless/ath/ath6kl/sdio.c | 1 + trunk/drivers/net/wireless/ath/ath9k/ahb.c | 1 + trunk/drivers/net/wireless/ath/ath9k/ani.c | 1 + .../net/wireless/ath/ath9k/ar9002_calib.c | 4 - .../net/wireless/ath/ath9k/ar9002_hw.c | 1 + .../net/wireless/ath/ath9k/ar9002_mac.c | 1 + .../net/wireless/ath/ath9k/ar9003_calib.c | 11 +- .../net/wireless/ath/ath9k/ar9003_mac.c | 1 + .../net/wireless/ath/ath9k/ar9003_paprd.c | 1 + .../net/wireless/ath/ath9k/ar9003_phy.c | 1 + .../net/wireless/ath/ath9k/ar9003_phy.h | 34 +- .../net/wireless/ath/ath9k/ar9485_initvals.h | 10 +- trunk/drivers/net/wireless/ath/ath9k/btcoex.c | 1 + trunk/drivers/net/wireless/ath/ath9k/calib.c | 1 + trunk/drivers/net/wireless/ath/ath9k/debug.c | 1 + trunk/drivers/net/wireless/ath/ath9k/hw.c | 4 + trunk/drivers/net/wireless/ath/ath9k/init.c | 1 + trunk/drivers/net/wireless/ath/ath9k/mac.c | 1 + trunk/drivers/net/wireless/ath/ath9k/pci.c | 1 + trunk/drivers/net/wireless/ath/ath9k/rc.c | 1 + trunk/drivers/net/wireless/ath/carl9170/fw.c | 1 + trunk/drivers/net/wireless/ath/carl9170/tx.c | 11 +- trunk/drivers/net/wireless/ath/debug.c | 1 + trunk/drivers/net/wireless/ath/hw.c | 1 + trunk/drivers/net/wireless/ath/key.c | 1 + trunk/drivers/net/wireless/ath/regd.c | 3 + trunk/drivers/net/wireless/b43/main.c | 2 +- trunk/drivers/net/wireless/b43/pcmcia.c | 1 + trunk/drivers/net/wireless/b43/xmit.c | 16 +- trunk/drivers/net/wireless/b43/xmit.h | 16 +- trunk/drivers/net/wireless/b43legacy/main.c | 2 +- .../net/wireless/brcm80211/brcmfmac/bcmsdh.c | 1 + .../net/wireless/brcm80211/brcmsmac/dma.c | 5 +- .../wireless/brcm80211/brcmsmac/mac80211_if.c | 1 + .../net/wireless/hostap/hostap_80211_rx.c | 1 + .../net/wireless/hostap/hostap_80211_tx.c | 1 + trunk/drivers/net/wireless/hostap/hostap_ap.c | 2 + .../drivers/net/wireless/hostap/hostap_info.c | 1 + .../net/wireless/hostap/hostap_ioctl.c | 1 + .../drivers/net/wireless/hostap/hostap_proc.c | 1 + .../net/wireless/iwlegacy/iwl-debugfs.c | 1 + trunk/drivers/net/wireless/iwlegacy/iwl-rx.c | 1 + .../drivers/net/wireless/iwlegacy/iwl-scan.c | 1 + trunk/drivers/net/wireless/iwlegacy/iwl-sta.c | 1 + trunk/drivers/net/wireless/iwlegacy/iwl-tx.c | 1 + trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 10 - trunk/drivers/net/wireless/iwlwifi/iwl-pci.c | 9 +- .../net/wireless/iwlwifi/iwl-trans-pcie.c | 45 +- .../net/wireless/iwmc3200wifi/commands.c | 1 + .../net/wireless/iwmc3200wifi/debugfs.c | 1 + .../drivers/net/wireless/iwmc3200wifi/main.c | 1 + .../drivers/net/wireless/iwmc3200wifi/sdio.c | 1 + trunk/drivers/net/wireless/libertas/cfg.c | 27 +- trunk/drivers/net/wireless/libertas/cfg.h | 1 + trunk/drivers/net/wireless/libertas/cmd.c | 1 + trunk/drivers/net/wireless/libertas/debugfs.c | 1 + trunk/drivers/net/wireless/libertas/if_sdio.c | 2 +- trunk/drivers/net/wireless/libertas/if_spi.c | 3 +- trunk/drivers/net/wireless/libertas/if_usb.c | 2 +- trunk/drivers/net/wireless/libertas/main.c | 8 +- trunk/drivers/net/wireless/libertas/rx.c | 1 + trunk/drivers/net/wireless/libertas/tx.c | 1 + trunk/drivers/net/wireless/libertas_tf/cmd.c | 1 + .../drivers/net/wireless/libertas_tf/if_usb.c | 2 +- trunk/drivers/net/wireless/libertas_tf/main.c | 1 + trunk/drivers/net/wireless/mac80211_hwsim.c | 1 + trunk/drivers/net/wireless/mwifiex/scan.c | 9 +- trunk/drivers/net/wireless/orinoco/fw.c | 1 + trunk/drivers/net/wireless/p54/eeprom.c | 1 + trunk/drivers/net/wireless/p54/fwio.c | 1 + trunk/drivers/net/wireless/p54/main.c | 1 + trunk/drivers/net/wireless/p54/p54pci.c | 1 + trunk/drivers/net/wireless/p54/p54usb.c | 1 + trunk/drivers/net/wireless/p54/txrx.c | 1 + trunk/drivers/net/wireless/rt2x00/rt2800usb.c | 1 + trunk/drivers/net/wireless/rt2x00/rt2x00.h | 1 + trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 22 +- .../net/wireless/rtl818x/rtl8180/dev.c | 1 + .../net/wireless/rtl818x/rtl8187/dev.c | 1 + trunk/drivers/net/wireless/rtlwifi/base.c | 1 + trunk/drivers/net/wireless/rtlwifi/cam.c | 1 + trunk/drivers/net/wireless/rtlwifi/efuse.c | 1 + trunk/drivers/net/wireless/rtlwifi/pci.c | 1 + trunk/drivers/net/wireless/rtlwifi/ps.c | 1 + .../net/wireless/rtlwifi/rtl8192c/dm_common.c | 1 + .../net/wireless/rtlwifi/rtl8192c/fw_common.c | 1 + .../net/wireless/rtlwifi/rtl8192c/main.c | 1 + .../wireless/rtlwifi/rtl8192c/phy_common.c | 1 + .../net/wireless/rtlwifi/rtl8192ce/sw.c | 1 + .../net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + .../net/wireless/rtlwifi/rtl8192de/sw.c | 1 + .../net/wireless/rtlwifi/rtl8192se/sw.c | 1 + trunk/drivers/net/wireless/rtlwifi/usb.c | 1 + trunk/drivers/net/wireless/wl12xx/boot.c | 1 + trunk/drivers/net/wireless/wl12xx/scan.c | 2 +- trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 1 + trunk/drivers/net/xen-netback/common.h | 11 +- trunk/drivers/net/xen-netback/netback.c | 80 +- trunk/drivers/nfc/nfcwilink.c | 1 + trunk/drivers/of/fdt.c | 7 +- trunk/drivers/of/of_net.c | 1 + trunk/drivers/of/of_pci.c | 1 + trunk/drivers/of/of_pci_irq.c | 1 + trunk/drivers/of/of_spi.c | 1 + trunk/drivers/parisc/ccio-dma.c | 1 + trunk/drivers/parisc/sba_iommu.c | 1 + trunk/drivers/pci/Kconfig | 11 - trunk/drivers/pci/ats.c | 1 + trunk/drivers/pci/hotplug-pci.c | 1 + trunk/drivers/pci/hotplug/pciehp_acpi.c | 1 + trunk/drivers/pci/hotplug/pcihp_slot.c | 1 + trunk/drivers/pci/hotplug/rpadlpar_core.c | 1 + trunk/drivers/pci/htirq.c | 1 + trunk/drivers/pci/ioapic.c | 1 + trunk/drivers/pci/iov.c | 1 + trunk/drivers/pci/irq.c | 1 + trunk/drivers/pci/msi.c | 1 + trunk/drivers/pci/pci-sysfs.c | 1 + trunk/drivers/pci/quirks.c | 1 + trunk/drivers/pci/rom.c | 1 + trunk/drivers/pci/setup-res.c | 1 + trunk/drivers/pci/slot.c | 1 + trunk/drivers/pci/vpd.c | 1 + trunk/drivers/pcmcia/db1xxx_ss.c | 1 + trunk/drivers/pcmcia/pxa2xx_base.c | 1 + trunk/drivers/pcmcia/pxa2xx_cm_x255.c | 1 + trunk/drivers/pcmcia/pxa2xx_cm_x270.c | 1 + trunk/drivers/pcmcia/pxa2xx_cm_x2xx.c | 3 +- trunk/drivers/pinctrl/Kconfig | 22 +- trunk/drivers/pinctrl/core.c | 1 + trunk/drivers/platform/x86/Kconfig | 4 +- trunk/drivers/platform/x86/dell-laptop.c | 4 +- trunk/drivers/platform/x86/intel_scu_ipc.c | 1 + trunk/drivers/platform/x86/msi-wmi.c | 1 + trunk/drivers/platform/x86/wmi.c | 1 + trunk/drivers/pnp/pnpacpi/core.c | 1 + trunk/drivers/pnp/pnpacpi/rsparser.c | 62 +- trunk/drivers/power/max17042_battery.c | 1 + trunk/drivers/power/max8903_charger.c | 1 + trunk/drivers/power/max8997_charger.c | 1 + trunk/drivers/power/max8998_charger.c | 1 + trunk/drivers/power/power_supply_sysfs.c | 1 + trunk/drivers/ps3/ps3-vuart.c | 2 +- trunk/drivers/ps3/ps3stor_lib.c | 3 +- trunk/drivers/ps3/sys-manager-core.c | 1 + trunk/drivers/rapidio/switches/idt_gen2.c | 1 + trunk/drivers/regulator/88pm8607.c | 1 + trunk/drivers/regulator/ab8500.c | 1 + trunk/drivers/regulator/bq24022.c | 1 + trunk/drivers/regulator/core.c | 1 + trunk/drivers/regulator/da903x.c | 1 + trunk/drivers/regulator/db8500-prcmu.c | 1 + trunk/drivers/regulator/dummy.c | 1 + trunk/drivers/regulator/fixed.c | 1 + trunk/drivers/regulator/lp3971.c | 1 + trunk/drivers/regulator/lp3972.c | 1 + trunk/drivers/regulator/max8925-regulator.c | 1 + trunk/drivers/regulator/max8997.c | 1 + trunk/drivers/regulator/mc13783-regulator.c | 1 + trunk/drivers/regulator/mc13892-regulator.c | 1 + .../regulator/mc13xxx-regulator-core.c | 1 + trunk/drivers/regulator/tps6586x-regulator.c | 1 + trunk/drivers/regulator/userspace-consumer.c | 1 + trunk/drivers/regulator/virtual.c | 1 + trunk/drivers/regulator/wm8400-regulator.c | 1 + trunk/drivers/rtc/interface.c | 1 + trunk/drivers/rtc/rtc-dm355evm.c | 1 + trunk/drivers/rtc/rtc-ds1305.c | 1 + trunk/drivers/rtc/rtc-ds1511.c | 1 + trunk/drivers/rtc/rtc-ds1553.c | 1 + trunk/drivers/rtc/rtc-ds1672.c | 1 + trunk/drivers/rtc/rtc-ds1742.c | 1 + trunk/drivers/rtc/rtc-em3027.c | 1 + trunk/drivers/rtc/rtc-isl12022.c | 1 + trunk/drivers/rtc/rtc-mrst.c | 19 +- trunk/drivers/rtc/rtc-mv.c | 1 + trunk/drivers/rtc/rtc-pcf2123.c | 1 + trunk/drivers/rtc/rtc-pcf8563.c | 1 + trunk/drivers/rtc/rtc-puv3.c | 4 +- trunk/drivers/rtc/rtc-rs5c348.c | 1 + trunk/drivers/rtc/rtc-rs5c372.c | 1 + trunk/drivers/rtc/rtc-stk17ta8.c | 1 + trunk/drivers/rtc/rtc-tx4939.c | 1 + trunk/drivers/rtc/rtc-x1205.c | 1 + trunk/drivers/s390/char/fs3270.c | 1 + trunk/drivers/s390/char/sclp_cpi_sys.c | 1 + trunk/drivers/s390/char/vmcp.c | 1 + trunk/drivers/s390/char/vmur.c | 1 + trunk/drivers/s390/char/zcore.c | 2 + trunk/drivers/s390/cio/chp.c | 2 + trunk/drivers/s390/cio/qdio_debug.c | 2 + trunk/drivers/s390/cio/qdio_setup.c | 1 + trunk/drivers/s390/crypto/ap_bus.c | 23 +- trunk/drivers/s390/kvm/kvm_virtio.c | 1 + trunk/drivers/s390/net/Kconfig | 2 +- trunk/drivers/s390/net/lcs.c | 6 +- trunk/drivers/s390/net/netiucv.c | 2 + trunk/drivers/s390/net/qeth_core.h | 3 +- trunk/drivers/s390/net/qeth_core_main.c | 1 - trunk/drivers/s390/net/qeth_l3_main.c | 7 + trunk/drivers/s390/net/qeth_l3_sys.c | 4 +- trunk/drivers/s390/scsi/zfcp_aux.c | 1 + trunk/drivers/s390/scsi/zfcp_ccw.c | 1 + trunk/drivers/s390/scsi/zfcp_dbf.c | 1 + trunk/drivers/s390/scsi/zfcp_qdio.c | 1 + trunk/drivers/s390/scsi/zfcp_scsi.c | 1 + trunk/drivers/scsi/Kconfig | 14 - trunk/drivers/scsi/a2091.c | 1 + trunk/drivers/scsi/a3000.c | 1 + trunk/drivers/scsi/aacraid/aachba.c | 1 + trunk/drivers/scsi/aacraid/linit.c | 4 + trunk/drivers/scsi/be2iscsi/be_main.c | 1 + trunk/drivers/scsi/bfa/bfad_debugfs.c | 1 + trunk/drivers/scsi/bfa/bfad_im.c | 2 + trunk/drivers/scsi/bnx2fc/bnx2fc.h | 5 +- trunk/drivers/scsi/bnx2fc/bnx2fc_els.c | 23 +- trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- trunk/drivers/scsi/bnx2fc/bnx2fc_io.c | 37 + trunk/drivers/scsi/cxgbi/libcxgbi.c | 1 + trunk/drivers/scsi/device_handler/scsi_dh.c | 11 +- .../scsi/device_handler/scsi_dh_alua.c | 4 +- .../drivers/scsi/device_handler/scsi_dh_emc.c | 1 + .../scsi/device_handler/scsi_dh_hp_sw.c | 1 + .../scsi/device_handler/scsi_dh_rdac.c | 1 + trunk/drivers/scsi/fcoe/fcoe.c | 13 +- trunk/drivers/scsi/gvp11.c | 1 + trunk/drivers/scsi/hosts.c | 9 +- trunk/drivers/scsi/hpsa.c | 226 +- trunk/drivers/scsi/hpsa.h | 10 +- trunk/drivers/scsi/hpsa_cmd.h | 5 +- trunk/drivers/scsi/ipr.c | 2 + trunk/drivers/scsi/ipr.h | 1 + trunk/drivers/scsi/isci/host.c | 23 +- trunk/drivers/scsi/isci/init.c | 2 +- trunk/drivers/scsi/isci/port.c | 146 +- trunk/drivers/scsi/isci/port.h | 6 +- trunk/drivers/scsi/isci/probe_roms.h | 4 +- trunk/drivers/scsi/isci/remote_device.c | 85 - trunk/drivers/scsi/isci/remote_device.h | 5 +- trunk/drivers/scsi/isci/request.c | 52 +- trunk/drivers/scsi/isci/request.h | 6 - trunk/drivers/scsi/isci/task.c | 698 ++--- trunk/drivers/scsi/isci/task.h | 35 +- trunk/drivers/scsi/iscsi_tcp.c | 1 + trunk/drivers/scsi/libfc/fc_disc.c | 1 + trunk/drivers/scsi/libfc/fc_elsct.c | 1 + trunk/drivers/scsi/libfc/fc_exch.c | 8 +- trunk/drivers/scsi/libfc/fc_libfc.c | 1 + trunk/drivers/scsi/libfc/fc_lport.c | 101 +- trunk/drivers/scsi/libfc/fc_npiv.c | 1 + trunk/drivers/scsi/libfc/fc_rport.c | 1 + trunk/drivers/scsi/libiscsi.c | 1 + trunk/drivers/scsi/libiscsi_tcp.c | 1 + trunk/drivers/scsi/libsas/sas_host_smp.c | 1 + trunk/drivers/scsi/libsas/sas_scsi_host.c | 1 + trunk/drivers/scsi/libsas/sas_task.c | 1 + trunk/drivers/scsi/libsrp.c | 1 + trunk/drivers/scsi/lpfc/lpfc_attr.c | 1 + trunk/drivers/scsi/lpfc/lpfc_debugfs.c | 1 + trunk/drivers/scsi/lpfc/lpfc_init.c | 1 + trunk/drivers/scsi/lpfc/lpfc_scsi.c | 1 + trunk/drivers/scsi/mac53c94.c | 1 + trunk/drivers/scsi/megaraid/megaraid_mbox.c | 1 + trunk/drivers/scsi/mpt2sas/mpi/mpi2.h | 11 +- trunk/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 153 +- trunk/drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 113 +- trunk/drivers/scsi/mpt2sas/mpt2sas_base.c | 247 +- trunk/drivers/scsi/mpt2sas/mpt2sas_base.h | 32 +- trunk/drivers/scsi/mpt2sas/mpt2sas_config.c | 67 +- trunk/drivers/scsi/mpt2sas/mpt2sas_ctl.c | 9 +- trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c | 639 +++- trunk/drivers/scsi/mvsas/mv_init.c | 10 + trunk/drivers/scsi/osd/osd_initiator.c | 1 + trunk/drivers/scsi/pmcraid.c | 2 +- trunk/drivers/scsi/ps3rom.c | 1 + trunk/drivers/scsi/qla2xxx/qla_isr.c | 2 +- trunk/drivers/scsi/scsi_lib.c | 13 +- trunk/drivers/scsi/scsi_lib_dma.c | 1 + trunk/drivers/scsi/scsi_netlink.c | 1 + trunk/drivers/scsi/scsi_pm.c | 1 + trunk/drivers/scsi/scsi_scan.c | 5 +- trunk/drivers/scsi/scsi_tgt_if.c | 1 + trunk/drivers/scsi/scsi_transport_iscsi.c | 2 +- trunk/drivers/scsi/sd.c | 12 +- trunk/drivers/scsi/sd.h | 6 - trunk/drivers/scsi/sr_ioctl.c | 1 + trunk/drivers/scsi/st.c | 4 +- trunk/drivers/sfi/sfi_core.h | 3 + trunk/drivers/sh/Makefile | 8 + trunk/drivers/sh/clk/core.c | 107 +- trunk/drivers/sh/intc/chip.c | 2 +- trunk/drivers/sh/intc/core.c | 2 + trunk/drivers/sh/intc/dynamic.c | 1 + trunk/drivers/sh/intc/virq.c | 1 + trunk/drivers/sh/maple/maple.c | 1 + .../mach-shmobile => drivers/sh}/pm_runtime.c | 4 +- trunk/drivers/spi/spi-altera.c | 1 + trunk/drivers/spi/spi-atmel.c | 5 +- trunk/drivers/spi/spi-au1550.c | 1 + trunk/drivers/spi/spi-bitbang.c | 1 + trunk/drivers/spi/spi-butterfly.c | 1 + trunk/drivers/spi/spi-dw-mmio.c | 1 + trunk/drivers/spi/spi-dw-pci.c | 1 + trunk/drivers/spi/spi-dw.c | 1 + trunk/drivers/spi/spi-gpio.c | 1 + trunk/drivers/spi/spi-oc-tiny.c | 1 + trunk/drivers/spi/spi-omap-uwire.c | 1 + trunk/drivers/spi/spi-orion.c | 1 + trunk/drivers/spi/spi-pl022.c | 8 + trunk/drivers/spi/spi-pxa2xx-pci.c | 1 + trunk/drivers/spi/spi-s3c24xx.c | 1 + trunk/drivers/spi/spi-sh-msiof.c | 1 + trunk/drivers/spi/spi-sh-sci.c | 1 + trunk/drivers/spi/spi-ti-ssp.c | 1 + trunk/drivers/spi/spi-tle62x0.c | 1 + trunk/drivers/spi/spi-txx9.c | 1 + trunk/drivers/spi/spi.c | 1 + trunk/drivers/ssb/b43_pci_bridge.c | 1 + trunk/drivers/ssb/driver_chipcommon.c | 1 + trunk/drivers/ssb/driver_chipcommon_pmu.c | 1 + trunk/drivers/ssb/driver_gige.c | 1 + trunk/drivers/ssb/driver_pcicore.c | 1 + trunk/drivers/ssb/embedded.c | 1 + trunk/drivers/ssb/main.c | 1 + trunk/drivers/ssb/pcihost_wrapper.c | 1 + trunk/drivers/staging/cxt1e1/linux.c | 1 + trunk/drivers/staging/gma500/intel_i2c.c | 1 + .../drivers/staging/gma500/mdfld_dsi_output.c | 1 + trunk/drivers/staging/gma500/mdfld_output.c | 3 +- trunk/drivers/staging/gma500/mid_bios.c | 1 + trunk/drivers/staging/gma500/mrst_hdmi_i2c.c | 1 + trunk/drivers/staging/gma500/psb_drv.c | 1 + .../staging/iio/accel/adis16201_ring.c | 1 + .../staging/iio/accel/adis16201_trigger.c | 1 + .../staging/iio/accel/adis16203_ring.c | 1 + .../staging/iio/accel/adis16203_trigger.c | 1 + .../staging/iio/accel/adis16204_ring.c | 1 + .../staging/iio/accel/adis16204_trigger.c | 1 + .../staging/iio/accel/adis16209_ring.c | 1 + .../staging/iio/accel/adis16209_trigger.c | 1 + .../staging/iio/accel/adis16240_ring.c | 1 + .../staging/iio/accel/adis16240_trigger.c | 1 + .../staging/iio/accel/lis3l02dq_ring.c | 1 + trunk/drivers/staging/iio/adc/ad7793.c | 1 + trunk/drivers/staging/iio/dac/ad5686.c | 1 + .../drivers/staging/iio/gyro/adis16060_core.c | 1 + .../drivers/staging/iio/gyro/adis16260_ring.c | 1 + .../staging/iio/gyro/adis16260_trigger.c | 1 + .../staging/iio/iio_simple_dummy_buffer.c | 1 + .../drivers/staging/iio/imu/adis16400_ring.c | 1 + .../staging/iio/imu/adis16400_trigger.c | 1 + .../drivers/staging/iio/industrialio-buffer.c | 1 + .../drivers/staging/iio/meter/ade7758_ring.c | 1 + .../staging/iio/meter/ade7758_trigger.c | 1 + trunk/drivers/staging/intel_sst/intel_sst.c | 1 + .../intel_sst/intel_sst_drv_interface.c | 1 + trunk/drivers/staging/line6/audio.c | 1 + trunk/drivers/staging/media/as102/as102_drv.c | 4 +- trunk/drivers/staging/media/as102/as102_drv.h | 3 +- trunk/drivers/staging/media/solo6x10/g723.c | 1 + trunk/drivers/staging/octeon/ethernet-tx.c | 2 +- trunk/drivers/staging/rts5139/rts51x_scsi.c | 1 + trunk/drivers/staging/spectra/lld_mtd.c | 6 +- trunk/drivers/staging/usbip/usbip_common.c | 1 + trunk/drivers/staging/usbip/usbip_event.c | 1 + trunk/drivers/staging/winbond/wbusb.c | 1 + trunk/drivers/staging/wlags49_h2/wl_cs.c | 1 + trunk/drivers/target/iscsi/iscsi_target.c | 12 +- .../target/iscsi/iscsi_target_configfs.c | 1 + .../drivers/target/iscsi/iscsi_target_stat.c | 1 + trunk/drivers/target/loopback/tcm_loop.c | 23 +- trunk/drivers/target/target_core_alua.c | 12 +- trunk/drivers/target/target_core_alua.h | 4 +- trunk/drivers/target/target_core_cdb.c | 216 +- trunk/drivers/target/target_core_cdb.h | 14 + trunk/drivers/target/target_core_device.c | 15 +- trunk/drivers/target/target_core_fabric_lib.c | 1 + trunk/drivers/target/target_core_file.c | 1 + trunk/drivers/target/target_core_hba.c | 1 + trunk/drivers/target/target_core_iblock.c | 1 + trunk/drivers/target/target_core_pr.c | 349 ++- trunk/drivers/target/target_core_pr.h | 7 +- trunk/drivers/target/target_core_pscsi.c | 3 +- trunk/drivers/target/target_core_tmr.c | 24 +- trunk/drivers/target/target_core_tpg.c | 1 + trunk/drivers/target/target_core_transport.c | 393 ++- trunk/drivers/target/tcm_fc/tcm_fc.h | 2 +- trunk/drivers/target/tcm_fc/tfc_cmd.c | 3 +- trunk/drivers/thermal/thermal_sys.c | 4 +- trunk/drivers/tty/hvc/Kconfig | 9 + trunk/drivers/tty/hvc/Makefile | 1 + trunk/drivers/tty/hvc/hvc_console.c | 7 +- trunk/drivers/tty/hvc/hvc_iseries.c | 1 + trunk/drivers/tty/hvc/hvc_opal.c | 425 +++ trunk/drivers/tty/hvc/hvc_vio.c | 1 + trunk/drivers/tty/hvc/hvcs.c | 6 +- trunk/drivers/tty/hvc/hvsi_lib.c | 4 +- trunk/drivers/tty/n_gsm.c | 12 +- trunk/drivers/tty/serial/8250.c | 23 - trunk/drivers/tty/serial/jsm/jsm_driver.c | 2 +- trunk/drivers/tty/serial/kgdboc.c | 1 + trunk/drivers/tty/serial/max3100.c | 1 + trunk/drivers/tty/serial/max3107-aava.c | 1 + trunk/drivers/tty/serial/max3107.c | 1 + trunk/drivers/tty/serial/nwpserial.c | 1 + trunk/drivers/tty/serial/sh-sci.c | 19 + trunk/drivers/tty/serial/timbuart.c | 1 + trunk/drivers/tty/serial/xilinx_uartps.c | 1 + trunk/drivers/tty/vt/vc_screen.c | 1 + trunk/drivers/uio/uio_pdrv.c | 1 + trunk/drivers/uio/uio_pdrv_genirq.c | 1 + trunk/drivers/usb/c67x00/c67x00-drv.c | 1 + trunk/drivers/usb/core/driver.c | 6 + trunk/drivers/usb/core/notify.c | 1 + trunk/drivers/usb/gadget/cdc2.c | 1 + trunk/drivers/usb/gadget/composite.c | 1 + trunk/drivers/usb/gadget/dbgp.c | 1 + trunk/drivers/usb/gadget/f_fs.c | 1 + trunk/drivers/usb/gadget/f_obex.c | 1 + trunk/drivers/usb/gadget/f_phonet.c | 2 +- trunk/drivers/usb/gadget/f_sourcesink.c | 1 + trunk/drivers/usb/gadget/file_storage.c | 1 + trunk/drivers/usb/gadget/fsl_udc_core.c | 2 +- trunk/drivers/usb/gadget/fusb300_udc.c | 1 + trunk/drivers/usb/gadget/gmidi.c | 1 + trunk/drivers/usb/gadget/u_serial.c | 1 + trunk/drivers/usb/host/fsl-mph-dr-of.c | 1 + trunk/drivers/usb/host/isp1760-if.c | 1 + trunk/drivers/usb/host/pci-quirks.c | 1 + trunk/drivers/usb/host/whci/debug.c | 1 + trunk/drivers/usb/host/whci/hcd.c | 1 + trunk/drivers/usb/host/xhci-hub.c | 1 + trunk/drivers/usb/host/xhci-pci.c | 1 + trunk/drivers/usb/mon/mon_bin.c | 1 + trunk/drivers/usb/mon/mon_stat.c | 1 + trunk/drivers/usb/mon/mon_text.c | 1 + trunk/drivers/usb/otg/gpio_vbus.c | 1 + trunk/drivers/usb/otg/otg.c | 1 + trunk/drivers/usb/otg/ulpi.c | 1 + trunk/drivers/usb/serial/aircable.c | 1 + trunk/drivers/usb/serial/qcserial.c | 1 + trunk/drivers/usb/storage/option_ms.c | 1 + trunk/drivers/usb/storage/protocol.c | 1 + trunk/drivers/usb/storage/sierra_ms.c | 1 + trunk/drivers/usb/storage/transport.c | 1 + trunk/drivers/usb/storage/uas.c | 1 + trunk/drivers/usb/wusbcore/devconnect.c | 1 + trunk/drivers/usb/wusbcore/mmc.c | 1 + trunk/drivers/usb/wusbcore/rh.c | 1 + trunk/drivers/usb/wusbcore/security.c | 1 + trunk/drivers/usb/wusbcore/wa-hc.c | 1 + trunk/drivers/usb/wusbcore/wa-rpipe.c | 1 + trunk/drivers/usb/wusbcore/wa-xfer.c | 1 + trunk/drivers/uwb/est.c | 1 + trunk/drivers/uwb/i1480/dfu/dfu.c | 1 + trunk/drivers/uwb/ie.c | 1 + trunk/drivers/uwb/lc-dev.c | 2 + trunk/drivers/uwb/lc-rc.c | 1 + trunk/drivers/uwb/neh.c | 1 + trunk/drivers/uwb/pal.c | 1 + trunk/drivers/uwb/radio.c | 1 + trunk/drivers/uwb/reset.c | 1 + trunk/drivers/uwb/rsv.c | 1 + trunk/drivers/uwb/scan.c | 1 + trunk/drivers/uwb/umc-bus.c | 1 + trunk/drivers/uwb/umc-dev.c | 1 + trunk/drivers/uwb/umc-drv.c | 1 + trunk/drivers/uwb/whci.c | 1 + trunk/drivers/video/atmel_lcdfb.c | 1 + trunk/drivers/video/backlight/88pm860x_bl.c | 1 + trunk/drivers/video/backlight/adp5520_bl.c | 1 + trunk/drivers/video/backlight/ams369fg06.c | 1 + trunk/drivers/video/backlight/da903x_bl.c | 1 + trunk/drivers/video/backlight/ep93xx_bl.c | 1 + trunk/drivers/video/backlight/l4f00242t03.c | 1 + trunk/drivers/video/backlight/ld9040.c | 1 + trunk/drivers/video/backlight/lms283gf05.c | 1 + trunk/drivers/video/backlight/max8925_bl.c | 1 + trunk/drivers/video/backlight/s6e63m0.c | 1 + trunk/drivers/video/backlight/wm831x_bl.c | 1 + trunk/drivers/video/carminefb.c | 1 + trunk/drivers/video/cobalt_lcdfb.c | 1 + trunk/drivers/video/ep93xx-fb.c | 1 + trunk/drivers/video/fb_ddc.c | 3 +- trunk/drivers/video/fb_notify.c | 1 + trunk/drivers/video/mb862xx/mb862xx-i2c.c | 1 + trunk/drivers/video/mb862xx/mb862xxfbdrv.c | 1 + trunk/drivers/video/msm/mdp.c | 1 + trunk/drivers/video/omap/lcd_mipid.c | 1 + trunk/drivers/video/omap/omapfb_main.c | 1 + trunk/drivers/video/omap2/dss/dispc.c | 1 + trunk/drivers/video/omap2/dss/dpi.c | 1 + trunk/drivers/video/omap2/dss/dsi.c | 1 + trunk/drivers/video/omap2/dss/dss.c | 1 + trunk/drivers/video/omap2/dss/rfbi.c | 1 + trunk/drivers/video/omap2/dss/sdi.c | 1 + .../drivers/video/omap2/omapfb/omapfb-ioctl.c | 1 + trunk/drivers/video/savage/savagefb_accel.c | 1 + trunk/drivers/video/sh_mipi_dsi.c | 1 + trunk/drivers/video/sh_mobile_lcdcfb.c | 1 + trunk/drivers/video/via/via-gpio.c | 1 + trunk/drivers/video/w100fb.c | 1 + trunk/drivers/virt/fsl_hypervisor.c | 1 + trunk/drivers/virtio/virtio.c | 1 + trunk/drivers/virtio/virtio_balloon.c | 1 + trunk/drivers/virtio/virtio_pci.c | 11 +- trunk/drivers/virtio/virtio_ring.c | 1 + trunk/drivers/w1/w1_family.c | 1 + trunk/drivers/w1/w1_int.c | 2 + trunk/drivers/watchdog/Kconfig | 2 + trunk/drivers/watchdog/coh901327_wdt.c | 2 +- trunk/drivers/watchdog/eurotechwdt.c | 2 +- trunk/drivers/watchdog/iTCO_wdt.c | 19 +- trunk/drivers/watchdog/mpcore_wdt.c | 3 +- trunk/drivers/watchdog/octeon-wdt-main.c | 2 +- trunk/drivers/watchdog/s3c2410_wdt.c | 176 +- trunk/drivers/watchdog/sb_wdog.c | 4 +- trunk/drivers/watchdog/sc520_wdt.c | 2 +- trunk/drivers/watchdog/stmp3xxx_wdt.c | 1 + trunk/drivers/watchdog/w83627hf_wdt.c | 33 +- trunk/drivers/watchdog/wdt.c | 2 +- trunk/drivers/watchdog/wdt_pci.c | 2 +- trunk/drivers/watchdog/wm831x_wdt.c | 318 +- trunk/drivers/xen/balloon.c | 18 +- trunk/drivers/xen/events.c | 9 +- trunk/drivers/xen/gntalloc.c | 4 +- trunk/drivers/xen/gntdev.c | 13 +- trunk/drivers/xen/grant-table.c | 2 +- trunk/drivers/xen/manage.c | 1 + trunk/drivers/xen/pci.c | 2 +- trunk/drivers/xen/swiotlb-xen.c | 1 + trunk/drivers/xen/xen-balloon.c | 17 +- trunk/drivers/xen/xen-pciback/conf_space.c | 1 + trunk/drivers/xen/xenbus/xenbus_client.c | 16 +- trunk/drivers/xen/xenbus/xenbus_probe.c | 8 +- trunk/drivers/xen/xenbus/xenbus_probe.h | 3 +- .../drivers/xen/xenbus/xenbus_probe_backend.c | 1 + .../xen/xenbus/xenbus_probe_frontend.c | 1 + trunk/drivers/zorro/proc.c | 1 + trunk/fs/bio-integrity.c | 1 + trunk/fs/bio.c | 7 +- trunk/fs/btrfs/Makefile | 3 +- trunk/fs/btrfs/acl.c | 17 +- trunk/fs/btrfs/backref.c | 776 +++++ trunk/fs/btrfs/backref.h | 62 + trunk/fs/btrfs/btrfs_inode.h | 21 +- trunk/fs/btrfs/compression.c | 3 +- trunk/fs/btrfs/ctree.c | 10 +- trunk/fs/btrfs/ctree.h | 198 +- trunk/fs/btrfs/delayed-inode.c | 108 +- trunk/fs/btrfs/disk-io.c | 485 ++- trunk/fs/btrfs/disk-io.h | 4 +- trunk/fs/btrfs/extent-tree.c | 873 ++++-- trunk/fs/btrfs/extent_io.c | 614 +++- trunk/fs/btrfs/extent_io.h | 23 +- trunk/fs/btrfs/file-item.c | 17 +- trunk/fs/btrfs/file.c | 25 +- trunk/fs/btrfs/free-space-cache.c | 929 +++--- trunk/fs/btrfs/inode-map.c | 34 +- trunk/fs/btrfs/inode.c | 539 ++-- trunk/fs/btrfs/ioctl.c | 227 +- trunk/fs/btrfs/ioctl.h | 29 + trunk/fs/btrfs/print-tree.c | 8 +- trunk/fs/btrfs/reada.c | 951 ++++++ trunk/fs/btrfs/relocation.c | 26 +- trunk/fs/btrfs/scrub.c | 655 +++- trunk/fs/btrfs/super.c | 309 +- trunk/fs/btrfs/transaction.c | 148 +- trunk/fs/btrfs/tree-log.c | 19 +- trunk/fs/btrfs/volumes.c | 212 +- trunk/fs/btrfs/volumes.h | 18 +- trunk/fs/btrfs/xattr.c | 11 + trunk/fs/buffer.c | 2 +- trunk/fs/ceph/caps.c | 8 +- trunk/fs/ceph/dir.c | 87 +- trunk/fs/ceph/inode.c | 17 +- trunk/fs/ceph/mds_client.c | 10 +- trunk/fs/ceph/super.c | 10 +- trunk/fs/ceph/super.h | 23 +- trunk/fs/cifs/connect.c | 1 + trunk/fs/cifs/file.c | 105 +- trunk/fs/dcache.c | 17 +- trunk/fs/exofs/ore.c | 1 + trunk/fs/exofs/super.c | 1 + trunk/fs/ext4/inode.c | 2 +- trunk/fs/fs-writeback.c | 84 +- trunk/fs/fuse/cuse.c | 1 + trunk/fs/gfs2/ops_fstype.c | 1 + trunk/fs/hfs/trans.c | 2 + trunk/fs/ioprio.c | 1 + trunk/fs/jffs2/compr.c | 128 +- trunk/fs/jffs2/compr.h | 2 + trunk/fs/jffs2/fs.c | 2 +- trunk/fs/jffs2/jffs2_fs_sb.h | 6 + trunk/fs/jffs2/os-linux.h | 2 +- trunk/fs/jffs2/scan.c | 4 +- trunk/fs/jffs2/super.c | 119 + trunk/fs/jffs2/wbuf.c | 9 +- trunk/fs/jfs/jfs_logmgr.c | 1 + trunk/fs/logfs/super.c | 1 + trunk/fs/minix/bitmap.c | 55 +- trunk/fs/minix/inode.c | 25 +- trunk/fs/minix/minix.h | 11 +- trunk/fs/namei.c | 16 +- trunk/fs/namespace.c | 30 + trunk/fs/nfs/nfs4filelayout.c | 1 + trunk/fs/nfs/pagelist.c | 1 + trunk/fs/nfs/pnfs.c | 1 + trunk/fs/nfs/pnfs_dev.c | 1 + trunk/fs/nfs/super.c | 37 +- trunk/fs/nfs/write.c | 1 + trunk/fs/nfsd/nfs4acl.c | 1 + trunk/fs/nfsd/nfsctl.c | 1 + trunk/fs/nfsd/nfssvc.c | 1 + trunk/fs/ocfs2/cluster/tcp.c | 1 + trunk/fs/ocfs2/dlm/dlmdebug.c | 1 + trunk/fs/proc/base.c | 146 +- trunk/fs/proc/vmcore.c | 1 + trunk/fs/quota/quota.c | 2 +- trunk/fs/sync.c | 4 +- trunk/fs/ubifs/budget.c | 2 +- trunk/fs/ubifs/debug.c | 16 + trunk/fs/ubifs/debug.h | 5 + trunk/fs/ubifs/recovery.c | 2 +- trunk/fs/ubifs/sb.c | 2 +- trunk/fs/xfs/xfs_aops.c | 2 +- trunk/fs/xfs/xfs_buf_item.c | 2 +- trunk/fs/xfs/xfs_dquot_item.c | 6 +- trunk/fs/xfs/xfs_extfree_item.c | 4 +- trunk/fs/xfs/xfs_inode_item.c | 2 +- trunk/fs/xfs/xfs_log.c | 2 +- trunk/fs/xfs/xfs_log.h | 2 +- trunk/fs/xfs/xfs_qm.c | 3 +- trunk/fs/xfs/xfs_trans.h | 6 +- trunk/fs/xfs/xfs_vnodeops.c | 14 +- trunk/include/acpi/acpi_drivers.h | 2 +- trunk/include/acpi/actypes.h | 1 - trunk/include/acpi/platform/aclinux.h | 1 - trunk/include/acpi/processor.h | 1 + trunk/include/drm/drmP.h | 7 +- trunk/include/drm/drm_dp_helper.h | 3 + trunk/include/drm/drm_mode.h | 12 +- trunk/include/drm/drm_pciids.h | 2 + trunk/include/drm/exynos_drm.h | 2 + trunk/include/drm/vmwgfx_drm.h | 51 +- trunk/include/linux/backing-dev.h | 14 +- trunk/include/linux/bcma/bcma.h | 7 +- trunk/include/linux/bio.h | 10 +- trunk/include/linux/blkdev.h | 2 +- trunk/include/linux/ceph/osd_client.h | 8 +- trunk/include/linux/cpu.h | 4 - trunk/include/linux/cpuidle.h | 55 +- trunk/include/linux/crypto.h | 6 - trunk/include/linux/devfreq.h | 2 +- trunk/include/linux/device.h | 20 +- trunk/include/linux/device_cgroup.h | 1 - trunk/include/linux/dma-mapping.h | 3 + trunk/include/linux/dmaengine.h | 2 + trunk/include/linux/ethtool.h | 2 + trunk/include/linux/export.h | 89 + trunk/include/linux/firmware.h | 2 +- trunk/include/linux/freezer.h | 11 +- trunk/include/linux/fs.h | 1 + trunk/include/linux/ftrace.h | 2 +- trunk/include/linux/gameport.h | 17 +- trunk/include/linux/genhd.h | 4 - trunk/include/linux/hid.h | 9 +- trunk/include/linux/hugetlb.h | 5 - trunk/include/linux/hwspinlock.h | 1 - trunk/include/linux/i2c.h | 10 +- trunk/include/linux/inet_diag.h | 3 +- trunk/include/linux/ipmi.h | 3 +- trunk/include/linux/ipmi_smi.h | 1 - trunk/include/linux/irq.h | 32 +- trunk/include/linux/irqdesc.h | 1 + trunk/include/linux/jump_label.h | 23 +- trunk/include/linux/kernel.h | 1 + trunk/include/linux/kvm.h | 1 - trunk/include/linux/mdio-bitbang.h | 3 +- trunk/include/linux/mfd/wm8994/registers.h | 15 + trunk/include/linux/miscdevice.h | 3 +- trunk/include/linux/module.h | 73 +- trunk/include/linux/moduleparam.h | 5 + trunk/include/linux/mtd/bbm.h | 39 +- trunk/include/linux/mtd/mtd.h | 85 +- trunk/include/linux/mtd/nand.h | 92 +- trunk/include/linux/mtd/onenand.h | 4 + trunk/include/linux/mtd/partitions.h | 46 +- trunk/include/linux/mtd/physmap.h | 17 - trunk/include/linux/of.h | 1 + trunk/include/linux/of_platform.h | 1 - trunk/include/linux/opp.h | 4 +- trunk/include/linux/pci_hotplug.h | 10 +- trunk/include/linux/pci_ids.h | 4 + trunk/include/linux/pinctrl/pinctrl.h | 1 + trunk/include/linux/pm.h | 2 +- trunk/include/linux/pm_runtime.h | 7 +- trunk/include/linux/regmap.h | 2 +- trunk/include/linux/regulator/driver.h | 1 + trunk/include/linux/sched.h | 7 + trunk/include/linux/serial_sci.h | 1 + trunk/include/linux/serio.h | 20 +- trunk/include/linux/sh_clk.h | 4 +- trunk/include/linux/sh_pfc.h | 76 + trunk/include/linux/ssb/ssb.h | 7 +- trunk/include/linux/stop_machine.h | 1 + trunk/include/linux/sunrpc/svc_xprt.h | 3 +- trunk/include/linux/sysdev.h | 1 - trunk/include/linux/textsearch.h | 3 +- trunk/include/linux/topology.h | 4 + trunk/include/linux/uio_driver.h | 12 +- trunk/include/linux/usb.h | 9 +- trunk/include/linux/uwb.h | 1 + trunk/include/linux/uwb/umc.h | 7 +- trunk/include/linux/vermagic.h | 1 - trunk/include/linux/vlynq.h | 3 +- trunk/include/linux/vmalloc.h | 2 +- trunk/include/linux/writeback.h | 33 +- trunk/include/media/saa7146.h | 3 +- trunk/include/media/v4l2-int-device.h | 3 +- trunk/include/mtd/mtd-abi.h | 122 +- trunk/include/net/bluetooth/hci_core.h | 24 +- trunk/include/net/bluetooth/l2cap.h | 7 +- trunk/include/net/bluetooth/rfcomm.h | 1 + trunk/include/net/cfg80211.h | 4 + trunk/include/net/inet_timewait_sock.h | 1 - trunk/include/net/ip_vs.h | 15 +- trunk/include/net/lib80211.h | 3 +- trunk/include/net/mac80211.h | 3 +- trunk/include/net/netfilter/nf_conntrack.h | 2 + trunk/include/net/netlink.h | 11 +- trunk/include/net/sch_generic.h | 1 - trunk/include/net/sock.h | 2 +- trunk/include/sound/core.h | 2 +- trunk/include/target/target_core_base.h | 13 +- trunk/include/target/target_core_device.h | 2 +- trunk/include/target/target_core_fabric_ops.h | 11 +- trunk/include/target/target_core_transport.h | 7 +- trunk/include/trace/define_trace.h | 10 - trunk/include/trace/events/module.h | 2 +- trunk/include/trace/events/writeback.h | 161 +- trunk/include/xen/grant_table.h | 1 - trunk/include/xen/interface/platform.h | 320 ++ trunk/include/xen/interface/xen.h | 1 + trunk/include/xen/platform_pci.h | 6 +- trunk/include/xen/xenbus.h | 1 + trunk/init/main.c | 3 + trunk/kernel/async.c | 2 +- trunk/kernel/audit.c | 2 +- trunk/kernel/auditsc.c | 2 +- trunk/kernel/capability.c | 2 +- trunk/kernel/cgroup_freezer.c | 2 +- trunk/kernel/compat.c | 1 + trunk/kernel/cpu.c | 76 +- trunk/kernel/cpuset.c | 2 +- trunk/kernel/crash_dump.c | 2 +- trunk/kernel/cred.c | 2 +- trunk/kernel/debug/kdb/kdb_debugger.c | 1 + trunk/kernel/dma.c | 2 +- trunk/kernel/events/core.c | 1 + trunk/kernel/fork.c | 3 + trunk/kernel/freezer.c | 4 +- trunk/kernel/futex.c | 2 +- trunk/kernel/groups.c | 2 +- trunk/kernel/hrtimer.c | 2 +- trunk/kernel/hung_task.c | 2 +- trunk/kernel/irq/generic-chip.c | 1 + trunk/kernel/irq/irqdesc.c | 2 +- trunk/kernel/irq/spurious.c | 2 +- trunk/kernel/irq_work.c | 4 +- trunk/kernel/jump_label.c | 37 +- trunk/kernel/kfifo.c | 2 +- trunk/kernel/kprobes.c | 2 +- trunk/kernel/ksysfs.c | 3 +- trunk/kernel/kthread.c | 2 +- trunk/kernel/latencytop.c | 2 +- trunk/kernel/lockdep_proc.c | 2 +- trunk/kernel/module.c | 13 +- trunk/kernel/mutex-debug.c | 2 +- trunk/kernel/mutex.c | 2 +- trunk/kernel/notifier.c | 2 +- trunk/kernel/nsproxy.c | 2 +- trunk/kernel/padata.c | 2 +- trunk/kernel/panic.c | 2 + trunk/kernel/params.c | 2 +- trunk/kernel/pid.c | 2 +- trunk/kernel/posix-timers.c | 2 +- trunk/kernel/power/hibernate.c | 24 +- trunk/kernel/power/main.c | 4 +- trunk/kernel/power/qos.c | 5 +- trunk/kernel/power/suspend.c | 2 + trunk/kernel/power/user.c | 1 + trunk/kernel/profile.c | 2 +- trunk/kernel/ptrace.c | 2 +- trunk/kernel/range.c | 2 +- trunk/kernel/rcupdate.c | 2 +- trunk/kernel/rcutiny.c | 3 +- trunk/kernel/rcutiny_plugin.h | 1 + trunk/kernel/rcutree.c | 2 +- trunk/kernel/relay.c | 2 +- trunk/kernel/resource.c | 2 +- trunk/kernel/rtmutex-debug.c | 2 +- trunk/kernel/rtmutex-tester.c | 2 +- trunk/kernel/rtmutex.c | 2 +- trunk/kernel/rwsem.c | 2 +- trunk/kernel/sched.c | 2 - trunk/kernel/sched_clock.c | 2 +- trunk/kernel/semaphore.c | 2 +- trunk/kernel/signal.c | 2 +- trunk/kernel/smp.c | 2 +- trunk/kernel/softirq.c | 2 +- trunk/kernel/spinlock.c | 2 +- trunk/kernel/srcu.c | 2 +- trunk/kernel/stacktrace.c | 2 +- trunk/kernel/stop_machine.c | 2 +- trunk/kernel/sys.c | 3 +- trunk/kernel/time.c | 2 +- trunk/kernel/time/posix-clock.c | 1 + trunk/kernel/timer.c | 2 +- trunk/kernel/trace/blktrace.c | 1 + trunk/kernel/trace/ftrace.c | 1 + trunk/kernel/trace/trace_syscalls.c | 1 + trunk/kernel/up.c | 2 +- trunk/kernel/user-return-notifier.c | 2 +- trunk/kernel/user.c | 2 +- trunk/kernel/user_namespace.c | 2 +- trunk/kernel/utsname.c | 2 +- trunk/kernel/utsname_sysctl.c | 2 +- trunk/kernel/wait.c | 2 +- trunk/kernel/workqueue.c | 2 +- trunk/lib/dma-debug.c | 1 + trunk/lib/nlattr.c | 1 + trunk/lib/raid6/algos.c | 1 + trunk/lib/raid6/mktables.c | 1 + trunk/lib/raid6/recov.c | 1 + trunk/mm/backing-dev.c | 15 +- trunk/mm/bootmem.c | 2 +- trunk/mm/bounce.c | 2 +- trunk/mm/dmapool.c | 3 +- trunk/mm/filemap.c | 2 +- trunk/mm/filemap_xip.c | 2 +- trunk/mm/fremap.c | 1 - trunk/mm/highmem.c | 2 +- trunk/mm/hugetlb.c | 2 + trunk/mm/kmemleak.c | 2 +- trunk/mm/maccess.c | 2 +- trunk/mm/memcontrol.c | 1 + trunk/mm/memory-failure.c | 1 + trunk/mm/memory.c | 2 +- trunk/mm/memory_hotplug.c | 2 +- trunk/mm/mempolicy.c | 2 +- trunk/mm/mempool.c | 2 +- trunk/mm/migrate.c | 2 +- trunk/mm/mlock.c | 2 +- trunk/mm/mm_init.c | 2 +- trunk/mm/mmap.c | 2 +- trunk/mm/mmu_context.c | 2 +- trunk/mm/mmu_notifier.c | 2 +- trunk/mm/mmzone.c | 1 - trunk/mm/nobootmem.c | 2 +- trunk/mm/nommu.c | 4 +- trunk/mm/oom_kill.c | 7 +- trunk/mm/page-writeback.c | 708 ++++- trunk/mm/quicklist.c | 1 - trunk/mm/readahead.c | 2 +- trunk/mm/rmap.c | 2 +- trunk/mm/shmem.c | 2 +- trunk/mm/slob.c | 2 +- trunk/mm/sparse-vmemmap.c | 1 - trunk/mm/sparse.c | 2 +- trunk/mm/swap.c | 2 +- trunk/mm/swap_state.c | 1 - trunk/mm/swapfile.c | 1 - trunk/mm/truncate.c | 2 +- trunk/mm/util.c | 2 +- trunk/mm/vmalloc.c | 27 +- trunk/mm/vmscan.c | 3 +- trunk/net/802/fc.c | 1 + trunk/net/802/garp.c | 1 + trunk/net/802/stp.c | 1 + trunk/net/8021q/vlan_core.c | 1 + trunk/net/8021q/vlan_netlink.c | 1 + trunk/net/appletalk/aarp.c | 1 + trunk/net/appletalk/atalk_proc.c | 1 + trunk/net/atm/pvc.c | 1 + trunk/net/atm/svc.c | 1 + trunk/net/ax25/ax25_route.c | 1 + trunk/net/ax25/ax25_uid.c | 1 + trunk/net/bluetooth/hci_conn.c | 2 +- trunk/net/bluetooth/hci_core.c | 2 +- trunk/net/bluetooth/hci_sysfs.c | 1 + trunk/net/bluetooth/l2cap_core.c | 16 +- trunk/net/bluetooth/l2cap_sock.c | 1 + trunk/net/bluetooth/mgmt.c | 3 +- trunk/net/bluetooth/rfcomm/core.c | 9 +- trunk/net/bridge/br_input.c | 1 + trunk/net/bridge/br_multicast.c | 6 +- trunk/net/bridge/br_stp_if.c | 1 + trunk/net/caif/caif_dev.c | 1 + trunk/net/caif/cfpkt_skbuff.c | 1 + trunk/net/ceph/messenger.c | 1 + trunk/net/ceph/osd_client.c | 2 +- trunk/net/compat.c | 1 + trunk/net/core/dev_addr_lists.c | 1 + trunk/net/core/fib_rules.c | 1 + trunk/net/core/net-sysfs.c | 1 + trunk/net/core/net-traces.c | 1 + trunk/net/core/net_namespace.c | 1 + trunk/net/core/netevent.c | 1 + trunk/net/core/netpoll.c | 1 + trunk/net/core/timestamping.c | 1 + trunk/net/core/user_dma.c | 1 + trunk/net/dcb/dcbevent.c | 1 + trunk/net/dcb/dcbnl.c | 1 + trunk/net/dccp/ackvec.c | 1 + trunk/net/dccp/ccids/lib/tfrc.c | 1 + trunk/net/dccp/timer.c | 1 + trunk/net/decnet/dn_route.c | 1 + trunk/net/decnet/dn_rules.c | 1 + trunk/net/dsa/dsa.c | 1 + trunk/net/ieee802154/nl-mac.c | 1 + trunk/net/ipv4/ah4.c | 8 +- trunk/net/ipv4/fib_rules.c | 1 + trunk/net/ipv4/fib_trie.c | 1 + trunk/net/ipv4/inet_diag.c | 4 +- trunk/net/ipv4/inet_timewait_sock.c | 1 + trunk/net/ipv4/ip_options.c | 1 + trunk/net/ipv4/ipconfig.c | 1 + trunk/net/ipv4/ipmr.c | 1 + trunk/net/ipv4/netfilter.c | 1 + .../nf_conntrack_l3proto_ipv4_compat.c | 1 + .../net/ipv4/netfilter/nf_nat_proto_common.c | 1 + trunk/net/ipv4/netfilter/nf_nat_proto_icmp.c | 1 + trunk/net/ipv4/netfilter/nf_nat_proto_sctp.c | 1 + trunk/net/ipv4/netfilter/nf_nat_proto_tcp.c | 1 + trunk/net/ipv4/netfilter/nf_nat_proto_udp.c | 1 + .../net/ipv4/netfilter/nf_nat_proto_udplite.c | 1 + trunk/net/ipv4/ping.c | 3 +- trunk/net/ipv4/proc.c | 1 + trunk/net/ipv4/raw.c | 1 + trunk/net/ipv4/route.c | 120 +- trunk/net/ipv4/syncookies.c | 1 + trunk/net/ipv4/tcp_ipv4.c | 1 + trunk/net/ipv4/tcp_output.c | 2 +- trunk/net/ipv4/udplite.c | 1 + trunk/net/ipv4/xfrm4_state.c | 1 + trunk/net/ipv6/addrconf.c | 1 + trunk/net/ipv6/addrconf_core.c | 1 + trunk/net/ipv6/ah6.c | 8 +- trunk/net/ipv6/exthdrs.c | 1 + trunk/net/ipv6/exthdrs_core.c | 1 + trunk/net/ipv6/fib6_rules.c | 1 + trunk/net/ipv6/ip6_flowlabel.c | 1 + trunk/net/ipv6/ip6_input.c | 8 + trunk/net/ipv6/ip6_tunnel.c | 8 +- trunk/net/ipv6/ip6mr.c | 1 + trunk/net/ipv6/netfilter.c | 1 + trunk/net/ipv6/proc.c | 1 + trunk/net/ipv6/raw.c | 1 + trunk/net/ipv6/reassembly.c | 1 + trunk/net/ipv6/route.c | 1 + trunk/net/ipv6/sysctl_net_ipv6.c | 1 + trunk/net/ipv6/udplite.c | 1 + trunk/net/ipv6/xfrm6_state.c | 1 + trunk/net/ipx/ipx_proc.c | 1 + trunk/net/irda/discovery.c | 1 + trunk/net/irda/irda_device.c | 1 + trunk/net/irda/irttp.c | 1 + trunk/net/irda/qos.c | 2 + trunk/net/l2tp/l2tp_core.c | 8 +- trunk/net/llc/llc_input.c | 1 + trunk/net/llc/llc_output.c | 1 + trunk/net/llc/llc_proc.c | 1 + trunk/net/mac80211/agg-rx.c | 1 + trunk/net/mac80211/agg-tx.c | 1 + trunk/net/mac80211/cfg.c | 12 +- trunk/net/mac80211/ht.c | 1 + trunk/net/mac80211/ieee80211_i.h | 1 + trunk/net/mac80211/key.c | 1 + trunk/net/mac80211/led.c | 1 + trunk/net/mac80211/mlme.c | 41 +- trunk/net/mac80211/offchannel.c | 1 + trunk/net/mac80211/rate.c | 1 + trunk/net/mac80211/rc80211_minstrel_debugfs.c | 1 + .../mac80211/rc80211_minstrel_ht_debugfs.c | 1 + trunk/net/mac80211/rc80211_pid_debugfs.c | 1 + trunk/net/mac80211/rx.c | 10 +- trunk/net/mac80211/scan.c | 1 + trunk/net/mac80211/sta_info.c | 8 +- trunk/net/mac80211/status.c | 1 + trunk/net/mac80211/tkip.c | 1 + trunk/net/mac80211/tx.c | 1 + trunk/net/mac80211/util.c | 5 + trunk/net/mac80211/work.c | 7 +- trunk/net/netfilter/ipset/ip_set_getport.c | 1 + trunk/net/netfilter/ipset/pfxlen.c | 1 + trunk/net/netfilter/nf_conntrack_acct.c | 1 + trunk/net/netfilter/nf_conntrack_ecache.c | 1 + trunk/net/netfilter/nf_conntrack_expect.c | 2 + trunk/net/netfilter/x_tables.c | 1 + trunk/net/netfilter/xt_quota.c | 1 + trunk/net/netfilter/xt_statistic.c | 1 + trunk/net/netrom/nr_route.c | 1 + trunk/net/nfc/af_nfc.c | 1 + trunk/net/nfc/nci/core.c | 1 + trunk/net/nfc/rawsock.c | 1 + trunk/net/phonet/datagram.c | 1 + trunk/net/phonet/pep.c | 1 + trunk/net/phonet/socket.c | 1 + trunk/net/rds/Kconfig | 1 - trunk/net/rds/cong.c | 1 + trunk/net/rds/connection.c | 1 + trunk/net/rds/ib.c | 1 + trunk/net/rds/info.c | 1 + trunk/net/rds/iw.c | 1 + trunk/net/rds/message.c | 1 + trunk/net/rds/page.c | 1 + trunk/net/rds/rdma_transport.c | 1 + trunk/net/rds/recv.c | 1 + trunk/net/rds/send.c | 2 + trunk/net/rds/stats.c | 1 + trunk/net/rds/tcp.c | 1 + trunk/net/rds/threads.c | 1 + trunk/net/rfkill/input.c | 1 + trunk/net/rose/rose_route.c | 1 + trunk/net/rxrpc/ar-output.c | 1 + trunk/net/rxrpc/ar-recvmsg.c | 1 + trunk/net/sched/act_api.c | 1 + trunk/net/sched/cls_flow.c | 1 + trunk/net/sched/sch_mq.c | 1 + trunk/net/sched/sch_mqprio.c | 1 + trunk/net/sctp/proc.c | 1 + trunk/net/sctp/socket.c | 1 + trunk/net/sunrpc/addr.c | 1 + trunk/net/sunrpc/backchannel_rqst.c | 1 + trunk/net/sunrpc/socklib.c | 1 + trunk/net/sunrpc/svc_xprt.c | 1 + trunk/net/sunrpc/svcsock.c | 1 + .../net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 + trunk/net/sysctl_net.c | 1 + trunk/net/tipc/core.c | 2 + trunk/net/tipc/socket.c | 1 + trunk/net/wanrouter/wanproc.c | 2 - trunk/net/wimax/op-msg.c | 1 + trunk/net/wimax/op-reset.c | 1 + trunk/net/wimax/op-rfkill.c | 1 + trunk/net/wimax/stack.c | 1 + trunk/net/wireless/ibss.c | 1 + trunk/net/wireless/mesh.c | 1 + trunk/net/wireless/nl80211.c | 9 +- trunk/net/wireless/radiotap.c | 1 + trunk/net/wireless/reg.c | 5 + trunk/net/wireless/scan.c | 13 +- trunk/net/wireless/sme.c | 1 + trunk/net/wireless/util.c | 1 + trunk/net/wireless/wext-compat.c | 1 + trunk/net/wireless/wext-core.c | 1 + trunk/net/wireless/wext-sme.c | 1 + trunk/net/wireless/wext-spy.c | 1 + trunk/net/x25/x25_proc.c | 1 + trunk/net/xfrm/xfrm_proc.c | 1 + trunk/net/xfrm/xfrm_replay.c | 1 + trunk/samples/Kconfig | 6 - trunk/scripts/Makefile.build | 2 +- trunk/scripts/Makefile.lib | 4 + trunk/scripts/basic/fixdep.c | 1 + trunk/scripts/checkpatch.pl | 14 + trunk/scripts/extract-vmlinux | 62 + trunk/scripts/genksyms/genksyms.c | 3 +- trunk/scripts/genksyms/genksyms.h | 4 +- trunk/scripts/genksyms/lex.l | 8 + trunk/scripts/genksyms/lex.lex.c_shipped | 12 +- trunk/scripts/genksyms/parse.tab.c_shipped | 645 ++-- trunk/scripts/genksyms/parse.tab.h_shipped | 7 +- trunk/scripts/genksyms/parse.y | 40 +- trunk/scripts/kconfig/Makefile | 28 +- trunk/scripts/kconfig/confdata.c | 49 +- trunk/scripts/kconfig/lxdialog/textbox.c | 3 +- trunk/scripts/kconfig/mconf.c | 86 +- trunk/scripts/kconfig/menu.c | 13 +- trunk/scripts/kconfig/nconf.c | 23 +- trunk/scripts/kconfig/nconf.gui.c | 59 +- trunk/scripts/kconfig/nconf.h | 2 +- trunk/scripts/kconfig/streamline_config.pl | 22 +- trunk/scripts/mod/modpost.c | 7 + trunk/scripts/tags.sh | 4 +- trunk/security/keys/encrypted-keys/Makefile | 8 +- .../security/keys/encrypted-keys/encrypted.c | 2 +- .../security/keys/encrypted-keys/encrypted.h | 3 +- trunk/security/keys/user_defined.c | 3 +- trunk/security/selinux/hooks.c | 1 + trunk/security/selinux/netlink.c | 1 + trunk/security/smack/smackfs.c | 115 +- trunk/sound/aoa/soundbus/i2sbus/pcm.c | 1 + trunk/sound/arm/pxa2xx-ac97-lib.c | 1 + trunk/sound/arm/pxa2xx-pcm.c | 1 + trunk/sound/core/control.c | 5 +- trunk/sound/core/device.c | 1 + trunk/sound/core/hwdep.c | 1 + trunk/sound/core/info.c | 1 + trunk/sound/core/info_oss.c | 1 + trunk/sound/core/init.c | 1 + trunk/sound/core/isadma.c | 1 + trunk/sound/core/jack.c | 1 + trunk/sound/core/memory.c | 1 + trunk/sound/core/misc.c | 2 + trunk/sound/core/oss/mixer_oss.c | 1 + trunk/sound/core/oss/pcm_oss.c | 2 +- trunk/sound/core/pcm.c | 1 + trunk/sound/core/pcm_lib.c | 1 + trunk/sound/core/pcm_memory.c | 1 + trunk/sound/core/pcm_misc.c | 1 + trunk/sound/core/pcm_native.c | 1 + trunk/sound/core/rawmidi.c | 2 +- trunk/sound/core/seq/oss/seq_oss.c | 2 +- trunk/sound/core/seq/oss/seq_oss_init.c | 1 + trunk/sound/core/seq/oss/seq_oss_synth.c | 1 + trunk/sound/core/seq/seq.c | 2 +- trunk/sound/core/seq/seq_clientmgr.c | 1 + trunk/sound/core/seq/seq_device.c | 1 + trunk/sound/core/seq/seq_dummy.c | 2 +- trunk/sound/core/seq/seq_info.c | 1 + trunk/sound/core/seq/seq_lock.c | 1 + trunk/sound/core/seq/seq_memory.c | 1 + trunk/sound/core/seq/seq_midi.c | 2 +- trunk/sound/core/seq/seq_midi_emul.c | 1 + trunk/sound/core/seq/seq_midi_event.c | 1 + trunk/sound/core/seq/seq_ports.c | 1 + trunk/sound/core/seq/seq_system.c | 1 + trunk/sound/core/seq/seq_virmidi.c | 1 + trunk/sound/core/sound.c | 2 +- trunk/sound/core/sound_oss.c | 1 + trunk/sound/core/timer.c | 2 +- trunk/sound/core/vmaster.c | 19 +- trunk/sound/drivers/aloop.c | 2 +- trunk/sound/drivers/dummy.c | 2 +- trunk/sound/drivers/ml403-ac97cr.c | 2 +- trunk/sound/drivers/mpu401/mpu401.c | 2 +- trunk/sound/drivers/mpu401/mpu401_uart.c | 1 + trunk/sound/drivers/mtpav.c | 1 + trunk/sound/drivers/mts64.c | 1 + trunk/sound/drivers/opl3/opl3_lib.c | 1 + trunk/sound/drivers/opl3/opl3_oss.c | 1 + trunk/sound/drivers/opl3/opl3_seq.c | 1 + trunk/sound/drivers/opl3/opl3_synth.c | 1 + trunk/sound/drivers/opl4/opl4_lib.c | 1 + trunk/sound/drivers/opl4/opl4_proc.c | 1 + trunk/sound/drivers/opl4/opl4_seq.c | 1 + trunk/sound/drivers/pcsp/pcsp.c | 2 +- trunk/sound/drivers/portman2x4.c | 1 + trunk/sound/drivers/serial-u16550.c | 2 +- trunk/sound/drivers/virmidi.c | 2 +- trunk/sound/drivers/vx/vx_core.c | 1 + trunk/sound/drivers/vx/vx_hwdep.c | 1 + trunk/sound/firewire/iso-resources.c | 1 + trunk/sound/firewire/packets-buffer.c | 1 + trunk/sound/i2c/cs8427.c | 1 + trunk/sound/i2c/i2c.c | 1 + trunk/sound/i2c/other/ak4113.c | 1 + trunk/sound/i2c/other/ak4114.c | 1 + trunk/sound/i2c/other/ak4117.c | 1 + trunk/sound/i2c/other/ak4xxx-adda.c | 1 + trunk/sound/i2c/other/pt2258.c | 1 + trunk/sound/i2c/other/tea575x-tuner.c | 1 + trunk/sound/i2c/tea6330t.c | 1 + trunk/sound/isa/ad1816a/ad1816a.c | 2 +- trunk/sound/isa/ad1848/ad1848.c | 2 +- trunk/sound/isa/als100.c | 2 +- trunk/sound/isa/azt2320.c | 2 +- trunk/sound/isa/cmi8330.c | 2 +- trunk/sound/isa/cs423x/cs4231.c | 2 +- trunk/sound/isa/cs423x/cs4236.c | 2 +- trunk/sound/isa/es1688/es1688.c | 2 +- trunk/sound/isa/es1688/es1688_lib.c | 1 + trunk/sound/isa/es18xx.c | 2 +- trunk/sound/isa/gus/gus_main.c | 1 + trunk/sound/isa/gus/gus_volume.c | 1 + trunk/sound/isa/gus/gusclassic.c | 2 +- trunk/sound/isa/gus/gusextreme.c | 2 +- trunk/sound/isa/gus/gusmax.c | 2 +- trunk/sound/isa/gus/interwave.c | 2 +- trunk/sound/isa/msnd/msnd.c | 1 + trunk/sound/isa/msnd/msnd_midi.c | 1 + trunk/sound/isa/msnd/msnd_pinnacle_mixer.c | 1 + trunk/sound/isa/opl3sa2.c | 2 +- trunk/sound/isa/opti9xx/miro.c | 2 +- trunk/sound/isa/opti9xx/opti92x-ad1848.c | 2 +- trunk/sound/isa/sb/emu8000.c | 1 + trunk/sound/isa/sb/emu8000_callback.c | 1 + trunk/sound/isa/sb/emu8000_patch.c | 1 + trunk/sound/isa/sb/emu8000_synth.c | 1 + trunk/sound/isa/sb/sb16.c | 2 +- trunk/sound/isa/sb/sb16_csp.c | 1 + trunk/sound/isa/sb/sb16_main.c | 1 + trunk/sound/isa/sb/sb8.c | 2 +- trunk/sound/isa/sb/sb8_main.c | 1 + trunk/sound/isa/sb/sb_common.c | 1 + trunk/sound/isa/sscape.c | 2 +- trunk/sound/isa/wavefront/wavefront.c | 2 +- trunk/sound/isa/wavefront/wavefront_fx.c | 1 + trunk/sound/isa/wavefront/wavefront_synth.c | 1 + trunk/sound/isa/wss/wss_lib.c | 1 + trunk/sound/mips/au1x00.c | 1 + trunk/sound/mips/hal2.c | 1 + trunk/sound/mips/sgio2audio.c | 1 + trunk/sound/pci/ac97/ac97_codec.c | 2 +- trunk/sound/pci/ac97/ac97_pcm.c | 1 + trunk/sound/pci/ad1889.c | 1 + trunk/sound/pci/ak4531_codec.c | 1 + trunk/sound/pci/ali5451/ali5451.c | 2 +- trunk/sound/pci/als300.c | 2 +- trunk/sound/pci/als4000.c | 2 +- trunk/sound/pci/asihpi/asihpi.c | 1 + trunk/sound/pci/asihpi/hpioctl.c | 1 + trunk/sound/pci/atiixp.c | 2 +- trunk/sound/pci/atiixp_modem.c | 2 +- trunk/sound/pci/au88x0/au88x0.c | 2 +- trunk/sound/pci/au88x0/au88x0_game.c | 1 + trunk/sound/pci/aw2/aw2-alsa.c | 1 + trunk/sound/pci/azt3328.c | 2 +- trunk/sound/pci/bt87x.c | 2 +- trunk/sound/pci/ca0106/ca0106_main.c | 2 +- trunk/sound/pci/cmipci.c | 2 +- trunk/sound/pci/cs4281.c | 2 +- trunk/sound/pci/cs46xx/cs46xx.c | 2 +- trunk/sound/pci/cs46xx/cs46xx_lib.c | 1 + trunk/sound/pci/cs5530.c | 2 +- trunk/sound/pci/cs5535audio/cs5535audio.c | 2 +- trunk/sound/pci/ctxfi/xfi.c | 1 + trunk/sound/pci/echoaudio/darla20.c | 2 +- trunk/sound/pci/echoaudio/darla24.c | 2 +- trunk/sound/pci/echoaudio/echo3g.c | 2 +- trunk/sound/pci/echoaudio/echoaudio.c | 2 + trunk/sound/pci/echoaudio/gina20.c | 2 +- trunk/sound/pci/echoaudio/gina24.c | 2 +- trunk/sound/pci/echoaudio/indigo.c | 2 +- trunk/sound/pci/echoaudio/indigodj.c | 2 +- trunk/sound/pci/echoaudio/indigodjx.c | 2 +- trunk/sound/pci/echoaudio/indigoio.c | 2 +- trunk/sound/pci/echoaudio/indigoiox.c | 2 +- trunk/sound/pci/echoaudio/layla20.c | 2 +- trunk/sound/pci/echoaudio/layla24.c | 2 +- trunk/sound/pci/echoaudio/mia.c | 2 +- trunk/sound/pci/echoaudio/mona.c | 2 +- trunk/sound/pci/emu10k1/emu10k1.c | 2 +- trunk/sound/pci/emu10k1/emu10k1_callback.c | 1 + trunk/sound/pci/emu10k1/emu10k1_main.c | 1 + trunk/sound/pci/emu10k1/emu10k1_synth.c | 1 + trunk/sound/pci/emu10k1/emu10k1x.c | 2 +- trunk/sound/pci/emu10k1/io.c | 1 + trunk/sound/pci/emu10k1/memory.c | 1 + trunk/sound/pci/emu10k1/voice.c | 1 + trunk/sound/pci/ens1370.c | 2 +- trunk/sound/pci/es1938.c | 2 +- trunk/sound/pci/es1968.c | 2 +- trunk/sound/pci/fm801.c | 2 +- trunk/sound/pci/hda/hda_beep.c | 1 + trunk/sound/pci/hda/hda_codec.c | 65 +- trunk/sound/pci/hda/hda_codec.h | 1 + trunk/sound/pci/hda/hda_eld.c | 13 +- trunk/sound/pci/hda/hda_generic.c | 1 + trunk/sound/pci/hda/hda_hwdep.c | 1 + trunk/sound/pci/hda/hda_intel.c | 4 +- trunk/sound/pci/hda/hda_local.h | 16 +- trunk/sound/pci/hda/patch_analog.c | 1 + trunk/sound/pci/hda/patch_ca0110.c | 1 + trunk/sound/pci/hda/patch_ca0132.c | 1 + trunk/sound/pci/hda/patch_cirrus.c | 24 +- trunk/sound/pci/hda/patch_cmedia.c | 1 + trunk/sound/pci/hda/patch_conexant.c | 2 +- trunk/sound/pci/hda/patch_hdmi.c | 57 +- trunk/sound/pci/hda/patch_realtek.c | 22 +- trunk/sound/pci/hda/patch_si3054.c | 1 + trunk/sound/pci/hda/patch_sigmatel.c | 45 +- trunk/sound/pci/hda/patch_via.c | 1 + trunk/sound/pci/ice1712/ak4xxx.c | 1 + trunk/sound/pci/ice1712/ice1712.c | 2 +- trunk/sound/pci/ice1712/ice1724.c | 2 +- trunk/sound/pci/intel8x0.c | 60 +- trunk/sound/pci/intel8x0m.c | 2 +- trunk/sound/pci/korg1212/korg1212.c | 2 +- trunk/sound/pci/lola/lola.c | 2 +- trunk/sound/pci/maestro3.c | 2 +- trunk/sound/pci/mixart/mixart.c | 2 +- trunk/sound/pci/mixart/mixart_hwdep.c | 1 + trunk/sound/pci/nm256/nm256.c | 2 +- trunk/sound/pci/oxygen/oxygen.c | 1 + trunk/sound/pci/oxygen/oxygen_io.c | 1 + trunk/sound/pci/oxygen/oxygen_lib.c | 1 + trunk/sound/pci/oxygen/virtuoso.c | 1 + trunk/sound/pci/pcxhr/pcxhr.c | 2 +- trunk/sound/pci/pcxhr/pcxhr_hwdep.c | 1 + trunk/sound/pci/riptide/riptide.c | 1 + trunk/sound/pci/rme32.c | 2 +- trunk/sound/pci/rme96.c | 2 +- trunk/sound/pci/rme9652/hdsp.c | 2 +- trunk/sound/pci/rme9652/hdspm.c | 2 +- trunk/sound/pci/rme9652/rme9652.c | 2 +- trunk/sound/pci/sis7019.c | 2 +- trunk/sound/pci/sonicvibes.c | 2 +- trunk/sound/pci/trident/trident.c | 2 +- trunk/sound/pci/trident/trident_main.c | 1 + trunk/sound/pci/via82xx.c | 2 +- trunk/sound/pci/via82xx_modem.c | 2 +- trunk/sound/pci/vx222/vx222.c | 2 +- trunk/sound/pci/ymfpci/ymfpci.c | 2 +- trunk/sound/pci/ymfpci/ymfpci_main.c | 1 + trunk/sound/pcmcia/pdaudiocf/pdaudiocf.c | 2 +- trunk/sound/pcmcia/vx/vxpocket.c | 2 +- trunk/sound/ppc/powermac.c | 2 +- trunk/sound/ppc/snd_ps3.c | 3 +- trunk/sound/sh/aica.c | 2 +- trunk/sound/sh/sh_dac_audio.c | 1 + trunk/sound/soc/blackfin/bf5xx-sport.c | 1 + trunk/sound/soc/blackfin/bfin-eval-adav80x.c | 1 + trunk/sound/soc/codecs/ac97.c | 1 + trunk/sound/soc/codecs/ads117x.c | 1 + trunk/sound/soc/codecs/ak4642.c | 1 + trunk/sound/soc/codecs/cx20442.c | 1 + trunk/sound/soc/codecs/da7210.c | 1 + trunk/sound/soc/codecs/dmic.c | 1 + trunk/sound/soc/codecs/pcm3008.c | 1 + trunk/sound/soc/codecs/sn95031.c | 1 + trunk/sound/soc/codecs/wl1273.c | 1 + trunk/sound/soc/codecs/wm8994.c | 43 +- trunk/sound/soc/ep93xx/edb93xx.c | 1 + trunk/sound/soc/ep93xx/snappercl15.c | 1 + trunk/sound/soc/imx/wm1133-ev1.c | 1 + trunk/sound/soc/mid-x86/mfld_machine.c | 1 + trunk/sound/soc/mid-x86/sst_platform.c | 1 + trunk/sound/soc/omap/am3517evm.c | 1 + trunk/sound/soc/omap/ams-delta.c | 1 + trunk/sound/soc/omap/igep0020.c | 1 + trunk/sound/soc/omap/n810.c | 1 + trunk/sound/soc/omap/omap-pcm.c | 1 + trunk/sound/soc/omap/omap3beagle.c | 1 + trunk/sound/soc/omap/omap3evm.c | 1 + trunk/sound/soc/omap/omap3pandora.c | 1 + trunk/sound/soc/omap/omap4-hdmi-card.c | 1 + trunk/sound/soc/omap/osk5912.c | 1 + trunk/sound/soc/omap/overo.c | 1 + trunk/sound/soc/omap/rx51.c | 1 + trunk/sound/soc/omap/sdp3430.c | 1 + trunk/sound/soc/omap/sdp4430.c | 1 + trunk/sound/soc/omap/zoom2.c | 1 + trunk/sound/soc/pxa/pxa2xx-pcm.c | 1 + trunk/sound/soc/samsung/ac97.c | 1 + trunk/sound/soc/samsung/dma.c | 3 +- trunk/sound/soc/samsung/goni_wm8994.c | 1 + trunk/sound/soc/samsung/h1940_uda1380.c | 1 + trunk/sound/soc/samsung/i2s.c | 1 + trunk/sound/soc/samsung/idma.c | 1 + trunk/sound/soc/samsung/jive_wm8750.c | 1 + trunk/sound/soc/samsung/ln2440sbc_alc650.c | 1 + trunk/sound/soc/samsung/pcm.c | 1 + trunk/sound/soc/samsung/rx1950_uda1380.c | 1 + trunk/sound/soc/samsung/s3c2412-i2s.c | 1 + trunk/sound/soc/samsung/s3c24xx-i2s.c | 1 + trunk/sound/soc/samsung/s3c24xx_simtec.c | 1 + .../sound/soc/samsung/s3c24xx_simtec_hermes.c | 1 + .../soc/samsung/s3c24xx_simtec_tlv320aic23.c | 1 + trunk/sound/soc/samsung/s3c24xx_uda134x.c | 1 + trunk/sound/soc/samsung/smartq_wm8987.c | 1 + trunk/sound/soc/samsung/smdk_spdif.c | 1 + trunk/sound/soc/samsung/smdk_wm8580.c | 1 + trunk/sound/soc/samsung/smdk_wm8580pcm.c | 1 + trunk/sound/soc/samsung/smdk_wm8994pcm.c | 1 + trunk/sound/soc/samsung/smdk_wm9713.c | 1 + trunk/sound/soc/samsung/spdif.c | 1 + trunk/sound/soc/samsung/speyside.c | 1 + trunk/sound/soc/samsung/speyside_wm8962.c | 1 + trunk/sound/soc/sh/fsi-ak4642.c | 1 + trunk/sound/soc/sh/fsi-da7210.c | 1 + trunk/sound/soc/sh/fsi-hdmi.c | 1 + trunk/sound/soc/sh/fsi.c | 1 + trunk/sound/soc/sh/siu_dai.c | 1 + trunk/sound/soc/soc-cache.c | 1 + trunk/sound/soc/soc-io.c | 1 + trunk/sound/soc/soc-jack.c | 1 + trunk/sound/soc/soc-utils.c | 1 + trunk/sound/soc/tegra/tegra_asoc_utils.c | 1 + trunk/sound/sparc/dbri.c | 1 + trunk/sound/synth/emux/emux.c | 1 + trunk/sound/synth/emux/emux_oss.c | 1 + trunk/sound/synth/emux/emux_seq.c | 2 +- trunk/sound/synth/emux/emux_synth.c | 1 + trunk/sound/synth/emux/soundfont.c | 1 + trunk/sound/synth/util_mem.c | 1 + trunk/sound/usb/6fire/firmware.c | 1 + trunk/sound/usb/card.c | 1 + trunk/sound/usb/midi.c | 1 + trunk/sound/usb/misc/ua101.c | 28 +- trunk/sound/usb/mixer.c | 110 +- trunk/sound/usb/quirks.c | 7 +- trunk/sound/usb/usx2y/us122l.c | 1 + trunk/sound/usb/usx2y/usbusx2yaudio.c | 1 + trunk/tools/perf/builtin-record.c | 13 +- trunk/tools/perf/builtin-stat.c | 20 +- trunk/tools/perf/builtin-test.c | 6 +- trunk/tools/perf/builtin-top.c | 54 +- trunk/tools/perf/util/annotate.c | 9 +- trunk/tools/perf/util/debug.c | 7 +- trunk/tools/perf/util/debug.h | 17 +- trunk/tools/perf/util/evlist.c | 30 + trunk/tools/perf/util/evlist.h | 2 + trunk/tools/perf/util/evsel.c | 43 +- trunk/tools/perf/util/evsel.h | 10 +- trunk/tools/perf/util/header.c | 2 +- trunk/tools/perf/util/hist.c | 3 +- trunk/tools/perf/util/hist.h | 1 + trunk/tools/perf/util/python.c | 31 +- trunk/tools/perf/util/session.c | 46 +- trunk/tools/perf/util/session.h | 1 + trunk/tools/perf/util/top.h | 1 - trunk/tools/perf/util/trace-event-info.c | 2 +- trunk/tools/perf/util/ui/browser.c | 151 +- trunk/tools/perf/util/ui/browser.h | 9 + trunk/tools/perf/util/ui/browsers/annotate.c | 14 +- trunk/tools/perf/util/ui/browsers/hists.c | 74 +- trunk/tools/perf/util/ui/helpline.c | 16 +- trunk/tools/perf/util/ui/helpline.h | 2 + trunk/tools/perf/util/ui/progress.c | 65 +- trunk/tools/perf/util/ui/progress.h | 7 +- trunk/tools/perf/util/ui/setup.c | 83 +- trunk/tools/perf/util/ui/ui.h | 3 + trunk/tools/perf/util/ui/util.c | 182 +- trunk/tools/perf/util/ui/util.h | 8 +- trunk/tools/power/x86/turbostat/turbostat.c | 28 +- trunk/tools/testing/ktest/ktest.pl | 515 +++- trunk/tools/testing/ktest/sample.conf | 146 +- trunk/virt/kvm/iommu.c | 2 + 3520 files changed, 50405 insertions(+), 26818 deletions(-) create mode 100644 trunk/Documentation/ABI/stable/sysfs-acpi-pmprofile create mode 100644 trunk/Documentation/devicetree/bindings/mtd/atmel-dataflash.txt create mode 100644 trunk/Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt create mode 100644 trunk/Documentation/watchdog/convert_drivers_to_kernel_api.txt rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/Kconfig (76%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/Makefile (88%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/Makefile.boot (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/clock-exynos4210.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/clock-exynos4212.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/clock.c (86%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/cpu.c (90%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/cpuidle.c (76%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/dev-ahci.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/dev-audio.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/dev-dwmci.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/dev-pd.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/dev-sysmmu.c (99%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/dma.c (98%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/headsmp.S (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/hotplug.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/debug-macro.S (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/dma.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/dwmci.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/entry-macro.S (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/exynos4-clock.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/gpio.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/hardware.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/io.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/irqs.h (97%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/map.h (87%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/memory.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/pm-core.h (89%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/pmu.h (84%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-audss.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-clock.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-gpio.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-irq.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-mct.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-mem.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-pmu.h (69%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-sysmmu.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/regs-usb-phy.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/sysmmu.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/system.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/timex.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/uncompress.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/include/mach/vmalloc.h (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/init.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/irq-combiner.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/irq-eint.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/mach-armlex4210.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/mach-nuri.c (85%) create mode 100644 trunk/arch/arm/mach-exynos/mach-origen.c rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/mach-smdk4x12.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/mach-smdkv310.c (88%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/mach-universal_c210.c (67%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/mct.c (91%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/platsmp.c (99%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/pm.c (98%) create mode 100644 trunk/arch/arm/mach-exynos/pmu.c rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-fimc.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-fimd0.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c0.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c1.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c2.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c3.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c4.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c5.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c6.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-i2c7.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-keypad.c (100%) rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-sdhci-gpio.c (100%) create mode 100644 trunk/arch/arm/mach-exynos/setup-sdhci.c rename trunk/arch/arm/{mach-exynos4 => mach-exynos}/setup-usb-phy.c (100%) delete mode 100644 trunk/arch/arm/mach-exynos4/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-exynos4/mach-origen.c delete mode 100644 trunk/arch/arm/mach-exynos4/pmu.c delete mode 100644 trunk/arch/arm/mach-exynos4/setup-sdhci.c create mode 100644 trunk/arch/arm/mach-mmp/include/mach/sram.h create mode 100644 trunk/arch/arm/mach-mmp/sram.c create mode 100644 trunk/arch/arm/mach-s3c2412/gpio.c delete mode 100644 trunk/arch/arm/mach-s3c64xx/dev-onenand1.c delete mode 100644 trunk/arch/arm/mach-s3c64xx/gpiolib.c delete mode 100644 trunk/arch/arm/mach-s3c64xx/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h delete mode 100644 trunk/arch/arm/mach-s3c64xx/include/mach/pll.h delete mode 100644 trunk/arch/arm/mach-s3c64xx/include/mach/pwm-clock.h create mode 100644 trunk/arch/arm/mach-s3c64xx/mach-crag6410-module.c delete mode 100644 trunk/arch/arm/mach-s5p64x0/include/mach/clkdev.h create mode 100644 trunk/arch/arm/mach-s5p64x0/include/mach/pm-core.h delete mode 100644 trunk/arch/arm/mach-s5p64x0/include/mach/pwm-clock.h create mode 100644 trunk/arch/arm/mach-s5p64x0/irq-pm.c create mode 100644 trunk/arch/arm/mach-s5p64x0/pm.c create mode 100644 trunk/arch/arm/mach-s5p64x0/setup-fb-24bpp.c delete mode 100644 trunk/arch/arm/mach-s5pc100/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-s5pc100/include/mach/pwm-clock.h delete mode 100644 trunk/arch/arm/mach-s5pv210/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/mach-s5pv210/include/mach/pwm-clock.h delete mode 100644 trunk/arch/arm/mach-s5pv210/sleep.S create mode 100644 trunk/arch/arm/mach-shmobile/board-kota2.c create mode 100644 trunk/arch/arm/mach-shmobile/include/mach/intc.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/omap-alsa.h create mode 100644 trunk/arch/arm/plat-s3c24xx/dev-uart.c delete mode 100644 trunk/arch/arm/plat-s3c24xx/devs.c delete mode 100644 trunk/arch/arm/plat-s3c24xx/gpio.c delete mode 100644 trunk/arch/arm/plat-s3c24xx/gpiolib.c delete mode 100644 trunk/arch/arm/plat-s3c24xx/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/plat-s3c24xx/include/mach/pwm-clock.h delete mode 100644 trunk/arch/arm/plat-s3c24xx/include/plat/pll.h delete mode 100644 trunk/arch/arm/plat-s3c24xx/include/plat/regs-iis.h delete mode 100644 trunk/arch/arm/plat-s3c24xx/include/plat/regs-spi.h delete mode 100644 trunk/arch/arm/plat-s5p/dev-csis0.c delete mode 100644 trunk/arch/arm/plat-s5p/dev-csis1.c delete mode 100644 trunk/arch/arm/plat-s5p/dev-ehci.c delete mode 100644 trunk/arch/arm/plat-s5p/dev-fimc0.c delete mode 100644 trunk/arch/arm/plat-s5p/dev-fimc1.c delete mode 100644 trunk/arch/arm/plat-s5p/dev-fimc2.c delete mode 100644 trunk/arch/arm/plat-s5p/dev-fimc3.c delete mode 100644 trunk/arch/arm/plat-s5p/dev-fimd0.c delete mode 100644 trunk/arch/arm/plat-s5p/dev-onenand.c delete mode 100644 trunk/arch/arm/plat-s5p/dev-pmu.c rename trunk/arch/arm/{mach-exynos4 => plat-s5p}/sleep.S (81%) delete mode 100644 trunk/arch/arm/plat-samsung/dev-adc.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-asocdma.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-fb.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-hsmmc.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-hsmmc1.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-hsmmc2.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-hsmmc3.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-hwmon.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-i2c0.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-i2c1.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-i2c2.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-i2c3.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-i2c4.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-i2c5.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-i2c6.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-i2c7.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-ide.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-keypad.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-nand.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-onenand.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-pwm.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-rtc.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-ts.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-usb-hsotg.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-usb.c delete mode 100644 trunk/arch/arm/plat-samsung/dev-wdt.c create mode 100644 trunk/arch/arm/plat-samsung/devs.c delete mode 100644 trunk/arch/arm/plat-samsung/gpio-config.c delete mode 100644 trunk/arch/arm/plat-samsung/gpio.c rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/audio-simtec.h (95%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/camport.h (86%) rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/common-smdk.h (87%) rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/cpu-freq-core.h (98%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/ehci.h (84%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/exynos4.h (87%) create mode 100644 trunk/arch/arm/plat-samsung/include/plat/fb-s3c2410.h rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/fiq.h (88%) create mode 100644 trunk/arch/arm/plat-samsung/include/plat/gpio-fns.h rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/irq.h (81%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/irqs.h (93%) rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/mci.h (90%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/mfc.h (90%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/mipi_csis.h (90%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/pll.h (57%) delete mode 100644 trunk/arch/arm/plat-samsung/include/plat/pll6553x.h rename trunk/arch/arm/{mach-exynos4/include/mach => plat-samsung/include/plat}/pwm-clock.h (68%) rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-dma.h (58%) create mode 100644 trunk/arch/arm/plat-samsung/include/plat/regs-iis.h create mode 100644 trunk/arch/arm/plat-samsung/include/plat/regs-spi.h rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/regs-srom.h (89%) rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/regs-udc.h (51%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/reset.h (66%) rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2410.h (93%) rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2412.h (92%) rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2416.h (92%) rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c2443.h (87%) rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/s3c244x.h (94%) rename trunk/arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6400.h (94%) rename trunk/arch/arm/{mach-s3c64xx/include/mach => plat-samsung/include/plat}/s3c6410.h (93%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-clock.h (96%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p-time.h (94%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6440.h (94%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/s5p6450.h (94%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pc100.h (94%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/s5pv210.h (94%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/sysmmu.h (96%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/system-reset.h (92%) create mode 100644 trunk/arch/arm/plat-samsung/include/plat/tv-core.h rename trunk/arch/arm/{plat-s3c24xx => plat-samsung}/include/plat/udc.h (95%) rename trunk/arch/arm/{plat-s5p => plat-samsung}/include/plat/usb-phy.h (83%) delete mode 100644 trunk/arch/ia64/include/asm/xen/grant_table.h delete mode 100644 trunk/arch/mips/nxp/pnx8550/common/pci.c delete mode 100644 trunk/arch/mips/nxp/pnx8550/common/setup.c delete mode 100644 trunk/arch/mips/powertv/asic/Kconfig create mode 100644 trunk/arch/powerpc/boot/dts/charon.dts delete mode 100644 trunk/arch/powerpc/boot/dts/hcu4.dts rename trunk/arch/powerpc/boot/dts/{p2040rdb.dts => p2041rdb.dts} (95%) rename trunk/arch/powerpc/boot/dts/{p2040si.dtsi => p2041si.dtsi} (80%) create mode 100644 trunk/arch/powerpc/boot/dts/p3060qds.dts create mode 100644 trunk/arch/powerpc/boot/dts/p3060si.dtsi delete mode 100644 trunk/arch/powerpc/configs/40x/hcu4_defconfig create mode 100644 trunk/arch/powerpc/include/asm/opal.h create mode 100644 trunk/arch/powerpc/mm/hugetlbpage-book3e.c delete mode 100644 trunk/arch/powerpc/platforms/40x/hcu4.c rename trunk/arch/powerpc/platforms/85xx/{p2040_rdb.c => p2041_rdb.c} (82%) create mode 100644 trunk/arch/powerpc/platforms/85xx/p3060_qds.c create mode 100644 trunk/arch/powerpc/platforms/powernv/Kconfig create mode 100644 trunk/arch/powerpc/platforms/powernv/Makefile create mode 100644 trunk/arch/powerpc/platforms/powernv/opal-nvram.c create mode 100644 trunk/arch/powerpc/platforms/powernv/opal-rtc.c create mode 100644 trunk/arch/powerpc/platforms/powernv/opal-takeover.S create mode 100644 trunk/arch/powerpc/platforms/powernv/opal-wrappers.S create mode 100644 trunk/arch/powerpc/platforms/powernv/opal.c create mode 100644 trunk/arch/powerpc/platforms/powernv/pci-p5ioc2.c create mode 100644 trunk/arch/powerpc/platforms/powernv/pci.c create mode 100644 trunk/arch/powerpc/platforms/powernv/pci.h create mode 100644 trunk/arch/powerpc/platforms/powernv/powernv.h create mode 100644 trunk/arch/powerpc/platforms/powernv/setup.c create mode 100644 trunk/arch/powerpc/platforms/powernv/smp.c create mode 100644 trunk/arch/powerpc/platforms/ps3/gelic_udbg.c create mode 100644 trunk/arch/powerpc/platforms/wsp/msi.c create mode 100644 trunk/arch/powerpc/platforms/wsp/msi.h create mode 100644 trunk/arch/powerpc/platforms/wsp/wsp_pci.c create mode 100644 trunk/arch/powerpc/platforms/wsp/wsp_pci.h create mode 100644 trunk/arch/powerpc/sysdev/xics/ics-opal.c delete mode 100644 trunk/arch/sparc/mm/generic_32.c delete mode 100644 trunk/arch/sparc/mm/generic_64.c delete mode 100644 trunk/arch/x86/include/asm/xen/grant_table.h delete mode 100644 trunk/drivers/gpio/gpio-exynos4.c rename trunk/{arch/powerpc/sysdev/mpc8xxx_gpio.c => drivers/gpio/gpio-mpc8xxx.c} (98%) delete mode 100644 trunk/drivers/gpio/gpio-plat-samsung.c delete mode 100644 trunk/drivers/gpio/gpio-s5pc100.c delete mode 100644 trunk/drivers/gpio/gpio-s5pv210.c create mode 100644 trunk/drivers/gpio/gpio-samsung.c create mode 100644 trunk/drivers/gpu/drm/radeon/atombios_encoders.c create mode 100644 trunk/drivers/mtd/devices/docg3.c create mode 100644 trunk/drivers/mtd/devices/docg3.h delete mode 100644 trunk/drivers/mtd/maps/ceiva.c delete mode 100644 trunk/drivers/mtd/maps/edb7312.c delete mode 100644 trunk/drivers/mtd/nand/edb7312.c create mode 100644 trunk/drivers/mtd/nand/gpmi-nand/Makefile create mode 100644 trunk/drivers/mtd/nand/gpmi-nand/bch-regs.h create mode 100644 trunk/drivers/mtd/nand/gpmi-nand/gpmi-lib.c create mode 100644 trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c create mode 100644 trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.h create mode 100644 trunk/drivers/mtd/nand/gpmi-nand/gpmi-regs.h rename trunk/{arch/arm/mach-shmobile => drivers/sh}/pm_runtime.c (94%) create mode 100644 trunk/drivers/target/target_core_cdb.h create mode 100644 trunk/drivers/tty/hvc/hvc_opal.c create mode 100644 trunk/fs/btrfs/backref.c create mode 100644 trunk/fs/btrfs/backref.h create mode 100644 trunk/fs/btrfs/reada.c create mode 100644 trunk/include/linux/export.h create mode 100644 trunk/include/xen/interface/platform.h create mode 100755 trunk/scripts/extract-vmlinux diff --git a/[refs] b/[refs] index 34ce7e3495d5..d53e5434877a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e58ad69efe9f4c91eb15f6bc365293414c397ce +refs/heads/master: f8f5ed7c996ad9426847ce09b828d415cb19bc06 diff --git a/trunk/.mailmap b/trunk/.mailmap index a4806f0de852..9b0d0267a3c3 100644 --- a/trunk/.mailmap +++ b/trunk/.mailmap @@ -68,6 +68,7 @@ Juha Yrjola Kay Sievers Kenneth W Chen Koushik +Kuninori Morimoto Leonid I Ananiev Linas Vepstas Mark Brown @@ -111,3 +112,4 @@ Uwe Kleine-König Uwe Kleine-König Valdis Kletnieks Takashi YOSHII +Yusuke Goda diff --git a/trunk/Documentation/ABI/stable/sysfs-acpi-pmprofile b/trunk/Documentation/ABI/stable/sysfs-acpi-pmprofile new file mode 100644 index 000000000000..964c7a8afb26 --- /dev/null +++ b/trunk/Documentation/ABI/stable/sysfs-acpi-pmprofile @@ -0,0 +1,22 @@ +What: /sys/firmware/acpi/pm_profile +Date: 03-Nov-2011 +KernelVersion: v3.2 +Contact: linux-acpi@vger.kernel.org +Description: The ACPI pm_profile sysfs interface exports the platform + power management (and performance) requirement expectations + as provided by BIOS. The integer value is directly passed as + retrieved from the FADT ACPI table. +Values: For possible values see ACPI specification: + 5.2.9 Fixed ACPI Description Table (FADT) + Field: Preferred_PM_Profile + + Currently these values are defined by spec: + 0 Unspecified + 1 Desktop + 2 Mobile + 3 Workstation + 4 Enterprise Server + 5 SOHO Server + 6 Appliance PC + 7 Performance Server + >7 Reserved diff --git a/trunk/Documentation/ABI/testing/sysfs-block b/trunk/Documentation/ABI/testing/sysfs-block index 2b5d56127fce..c1eb41cb9876 100644 --- a/trunk/Documentation/ABI/testing/sysfs-block +++ b/trunk/Documentation/ABI/testing/sysfs-block @@ -206,16 +206,3 @@ Description: when a discarded area is read the discard_zeroes_data parameter will be set to one. Otherwise it will be 0 and the result of reading a discarded area is undefined. -What: /sys/block//alias -Date: Aug 2011 -Contact: Nao Nishijima -Description: - A raw device name of a disk does not always point a same disk - each boot-up time. Therefore, users have to use persistent - device names, which udev creates when the kernel finds a disk, - instead of raw device name. However, kernel doesn't show those - persistent names on its messages (e.g. dmesg). - This file can store an alias of the disk and it would be - appeared in kernel messages if it is set. A disk can have an - alias which length is up to 255bytes. Users can use alphabets, - numbers, "-" and "_" in alias name. This file is writeonce. diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl index c27915893974..196b8b9dba11 100644 --- a/trunk/Documentation/DocBook/drm.tmpl +++ b/trunk/Documentation/DocBook/drm.tmpl @@ -32,7 +32,7 @@ The Linux DRM layer contains code intended to support the needs of complex graphics devices, usually containing programmable pipelines well suited to 3D graphics acceleration. Graphics - drivers in the kernel can make use of DRM functions to make + drivers in the kernel may make use of DRM functions to make tasks like memory management, interrupt handling and DMA easier, and provide a uniform interface to applications. @@ -57,10 +57,10 @@ existing drivers. - First, we'll go over some typical driver initialization + First, we go over some typical driver initialization requirements, like setting up command buffers, creating an initial output configuration, and initializing core services. - Subsequent sections will cover core internals in more detail, + Subsequent sections cover core internals in more detail, providing implementation notes and examples. @@ -74,7 +74,7 @@ The core of every DRM driver is struct drm_driver. Drivers - will typically statically initialize a drm_driver structure, + typically statically initialize a drm_driver structure, then pass it to drm_init() at load time. @@ -88,8 +88,8 @@ static struct drm_driver driver = { - /* don't use mtrr's here, the Xserver or user space app should - * deal with them for intel hardware. + /* Don't use MTRRs here; the Xserver or userspace app should + * deal with them for Intel hardware. */ .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | @@ -154,8 +154,8 @@ In the example above, taken from the i915 DRM driver, the driver - sets several flags indicating what core features it supports. - We'll go over the individual callbacks in later sections. Since + sets several flags indicating what core features it supports; + we go over the individual callbacks in later sections. Since flags indicate which features your driver supports to the DRM core, you need to set most of them prior to calling drm_init(). Some, like DRIVER_MODESET can be set later based on user supplied parameters, @@ -203,8 +203,8 @@ DRIVER_HAVE_IRQDRIVER_IRQ_SHARED - DRIVER_HAVE_IRQ indicates whether the driver has a IRQ - handler, DRIVER_IRQ_SHARED indicates whether the device & + DRIVER_HAVE_IRQ indicates whether the driver has an IRQ + handler. DRIVER_IRQ_SHARED indicates whether the device & handler support shared IRQs (note that this is required of PCI drivers). @@ -214,8 +214,8 @@ DRIVER_DMA_QUEUE - If the driver queues DMA requests and completes them - asynchronously, this flag should be set. Deprecated. + Should be set if the driver queues DMA requests and completes them + asynchronously. Deprecated. @@ -238,7 +238,7 @@ In this specific case, the driver requires AGP and supports - IRQs. DMA, as we'll see, is handled by device specific ioctls + IRQs. DMA, as discussed later, is handled by device-specific ioctls in this case. It also supports the kernel mode setting APIs, though unlike in the actual i915 driver source, this example unconditionally exports KMS capability. @@ -269,36 +269,34 @@ initial output configuration. - Note that the tasks performed at driver load time must not - conflict with DRM client requirements. For instance, if user + If compatibility is a concern (e.g. with drivers converted over + to the new interfaces from the old ones), care must be taken to + prevent device initialization and control that is incompatible with + currently active userspace drivers. For instance, if user level mode setting drivers are in use, it would be problematic to perform output discovery & configuration at load time. - Likewise, if pre-memory management aware user level drivers are + Likewise, if user-level drivers unaware of memory management are in use, memory management and command buffer setup may need to - be omitted. These requirements are driver specific, and care + be omitted. These requirements are driver-specific, and care needs to be taken to keep both old and new applications and libraries working. The i915 driver supports the "modeset" module parameter to control whether advanced features are - enabled at load time or in legacy fashion. If compatibility is - a concern (e.g. with drivers converted over to the new interfaces - from the old ones), care must be taken to prevent incompatible - device initialization and control with the currently active - userspace drivers. + enabled at load time or in legacy fashion. Driver private & performance counters The driver private hangs off the main drm_device structure and - can be used for tracking various device specific bits of + can be used for tracking various device-specific bits of information, like register offsets, command buffer status, register state for suspend/resume, etc. At load time, a - driver can simply allocate one and set drm_device.dev_priv - appropriately; at unload the driver can free it and set - drm_device.dev_priv to NULL. + driver may simply allocate one and set drm_device.dev_priv + appropriately; it should be freed and drm_device.dev_priv set + to NULL when the driver is unloaded. - The DRM supports several counters which can be used for rough + The DRM supports several counters which may be used for rough performance characterization. Note that the DRM stat counter system is not often used by applications, and supporting additional counters is completely optional. @@ -307,15 +305,15 @@ These interfaces are deprecated and should not be used. If performance monitoring is desired, the developer should investigate and potentially enhance the kernel perf and tracing infrastructure to export - GPU related performance information to performance monitoring - tools and applications. + GPU related performance information for consumption by performance + monitoring tools and applications. Configuring the device - Obviously, device configuration will be device specific. + Obviously, device configuration is device-specific. However, there are several common operations: finding a device's PCI resources, mapping them, and potentially setting up an IRQ handler. @@ -323,10 +321,10 @@ Finding & mapping resources is fairly straightforward. The DRM wrapper functions, drm_get_resource_start() and - drm_get_resource_len() can be used to find BARs on the given + drm_get_resource_len(), may be used to find BARs on the given drm_device struct. Once those values have been retrieved, the driver load function can call drm_addmap() to create a new - mapping for the BAR in question. Note you'll probably want a + mapping for the BAR in question. Note that you probably want a drm_local_map_t in your driver private structure to track any mappings you create. @@ -335,20 +333,20 @@ if compatibility with other operating systems isn't a concern (DRM drivers can run under various BSD variants and OpenSolaris), - native Linux calls can be used for the above, e.g. pci_resource_* + native Linux calls may be used for the above, e.g. pci_resource_* and iomap*/iounmap. See the Linux device driver book for more info. - Once you have a register map, you can use the DRM_READn() and + Once you have a register map, you may use the DRM_READn() and DRM_WRITEn() macros to access the registers on your device, or - use driver specific versions to offset into your MMIO space - relative to a driver specific base pointer (see I915_READ for - example). + use driver-specific versions to offset into your MMIO space + relative to a driver-specific base pointer (see I915_READ for + an example). If your device supports interrupt generation, you may want to - setup an interrupt handler at driver load time as well. This + set up an interrupt handler when the driver is loaded. This is done using the drm_irq_install() function. If your device supports vertical blank interrupts, it should call drm_vblank_init() to initialize the core vblank handling code before @@ -357,7 +355,7 @@ - Once your interrupt handler is registered (it'll use your + Once your interrupt handler is registered (it uses your drm_driver.irq_handler as the actual interrupt handling function), you can safely enable interrupts on your device, assuming any other state your interrupt handler uses is also @@ -371,10 +369,10 @@ using the pci_map_rom() call, a convenience function that takes care of mapping the actual ROM, whether it has been shadowed into memory (typically at address 0xc0000) or exists - on the PCI device in the ROM BAR. Note that once you've - mapped the ROM and extracted any necessary information, be - sure to unmap it; on many devices the ROM address decoder is - shared with other BARs, so leaving it mapped can cause + on the PCI device in the ROM BAR. Note that after the ROM + has been mapped and any necessary information has been extracted, + it should be unmapped; on many devices, the ROM address decoder is + shared with other BARs, so leaving it mapped could cause undesired behavior like hangs or memory corruption. @@ -389,9 +387,9 @@ should support a memory manager. - If your driver supports memory management (it should!), you'll + If your driver supports memory management (it should!), you need to set that up at load time as well. How you initialize - it depends on which memory manager you're using, TTM or GEM. + it depends on which memory manager you're using: TTM or GEM. TTM initialization @@ -401,7 +399,7 @@ and devices with dedicated video RAM (VRAM), i.e. most discrete graphics devices. If your device has dedicated RAM, supporting TTM is desirable. TTM also integrates tightly with your - driver specific buffer execution function. See the radeon + driver-specific buffer execution function. See the radeon driver for examples. @@ -429,21 +427,21 @@ created by the memory manager at runtime. Your global TTM should have a type of TTM_GLOBAL_TTM_MEM. The size field for the global object should be sizeof(struct ttm_mem_global), and the init and - release hooks should point at your driver specific init and - release routines, which will probably eventually call - ttm_mem_global_init and ttm_mem_global_release respectively. + release hooks should point at your driver-specific init and + release routines, which probably eventually call + ttm_mem_global_init and ttm_mem_global_release, respectively. Once your global TTM accounting structure is set up and initialized - (done by calling ttm_global_item_ref on the global object you - just created), you'll need to create a buffer object TTM to + by calling ttm_global_item_ref() on it, + you need to create a buffer object TTM to provide a pool for buffer object allocation by clients and the kernel itself. The type of this object should be TTM_GLOBAL_TTM_BO, and its size should be sizeof(struct ttm_bo_global). Again, - driver specific init and release functions can be provided, - likely eventually calling ttm_bo_global_init and - ttm_bo_global_release, respectively. Also like the previous - object, ttm_global_item_ref is used to create an initial reference + driver-specific init and release functions may be provided, + likely eventually calling ttm_bo_global_init() and + ttm_bo_global_release(), respectively. Also, like the previous + object, ttm_global_item_ref() is used to create an initial reference count for the TTM, which will call your initialization function. @@ -453,27 +451,26 @@ GEM is an alternative to TTM, designed specifically for UMA devices. It has simpler initialization and execution requirements than TTM, but has no VRAM management capability. Core GEM - initialization is comprised of a basic drm_mm_init call to create + is initialized by calling drm_mm_init() to create a GTT DRM MM object, which provides an address space pool for - object allocation. In a KMS configuration, the driver will - need to allocate and initialize a command ring buffer following - basic GEM initialization. Most UMA devices have a so-called + object allocation. In a KMS configuration, the driver + needs to allocate and initialize a command ring buffer following + core GEM initialization. A UMA device usually has what is called a "stolen" memory region, which provides space for the initial framebuffer and large, contiguous memory regions required by the - device. This space is not typically managed by GEM, and must + device. This space is not typically managed by GEM, and it must be initialized separately into its own DRM MM object. - Initialization will be driver specific, and will depend on - the architecture of the device. In the case of Intel + Initialization is driver-specific. In the case of Intel integrated graphics chips like 965GM, GEM initialization can be done by calling the internal GEM init function, i915_gem_do_init(). Since the 965GM is a UMA device - (i.e. it doesn't have dedicated VRAM), GEM will manage + (i.e. it doesn't have dedicated VRAM), GEM manages making regular RAM available for GPU operations. Memory set aside by the BIOS (called "stolen" memory by the i915 - driver) will be managed by the DRM memrange allocator; the - rest of the aperture will be managed by GEM. + driver) is managed by the DRM memrange allocator; the + rest of the aperture is managed by GEM. /* Basic memrange allocator for stolen space (aka vram) */ drm_memrange_init(&dev_priv->vram, 0, prealloc_size); @@ -483,7 +480,7 @@ - Once the memory manager has been set up, we can allocate the + Once the memory manager has been set up, we may allocate the command buffer. In the i915 case, this is also done with a GEM function, i915_gem_init_ringbuffer(). @@ -493,16 +490,25 @@ Output configuration - The final initialization task is output configuration. This involves - finding and initializing the CRTCs, encoders and connectors - for your device, creating an initial configuration and - registering a framebuffer console driver. + The final initialization task is output configuration. This involves: + + + Finding and initializing the CRTCs, encoders, and connectors + for the device. + + + Creating an initial configuration. + + + Registering a framebuffer console driver. + + Output discovery and initialization - Several core functions exist to create CRTCs, encoders and - connectors, namely drm_crtc_init(), drm_connector_init() and + Several core functions exist to create CRTCs, encoders, and + connectors, namely: drm_crtc_init(), drm_connector_init(), and drm_encoder_init(), along with several "helper" functions to perform common tasks. @@ -555,10 +561,10 @@ void intel_crt_init(struct drm_device *dev) In the example above (again, taken from the i915 driver), a - CRT connector and encoder combination is created. A device - specific i2c bus is also created, for fetching EDID data and + CRT connector and encoder combination is created. A device-specific + i2c bus is also created for fetching EDID data and performing monitor detection. Once the process is complete, - the new connector is registered with sysfs, to make its + the new connector is registered with sysfs to make its properties available to applications. @@ -567,12 +573,12 @@ void intel_crt_init(struct drm_device *dev) Since many PC-class graphics devices have similar display output designs, the DRM provides a set of helper functions to make output management easier. The core helper routines handle - encoder re-routing and disabling of unused functions following - mode set. Using the helpers is optional, but recommended for + encoder re-routing and the disabling of unused functions following + mode setting. Using the helpers is optional, but recommended for devices with PC-style architectures (i.e. a set of display planes for feeding pixels to encoders which are in turn routed to connectors). Devices with more complex requirements needing - finer grained management can opt to use the core callbacks + finer grained management may opt to use the core callbacks directly. @@ -580,17 +586,25 @@ void intel_crt_init(struct drm_device *dev) - For each encoder, CRTC and connector, several functions must - be provided, depending on the object type. Encoder objects - need to provide a DPMS (basically on/off) function, mode fixup - (for converting requested modes into native hardware timings), - and prepare, set and commit functions for use by the core DRM - helper functions. Connector helpers need to provide mode fetch and - validity functions as well as an encoder matching function for - returning an ideal encoder for a given connector. The core - connector functions include a DPMS callback, (deprecated) - save/restore routines, detection, mode probing, property handling, - and cleanup functions. + Each encoder object needs to provide: + + + A DPMS (basically on/off) function. + + + A mode-fixup function (for converting requested modes into + native hardware timings). + + + Functions (prepare, set, and commit) for use by the core DRM + helper functions. + + + Connector helpers need to provide functions (mode-fetch, validity, + and encoder-matching) for returning an ideal encoder for a given + connector. The core connector functions include a DPMS callback, + save/restore routines (deprecated), detection, mode probing, + property handling, and cleanup functions. @@ -605,22 +619,33 @@ void intel_crt_init(struct drm_device *dev) VBlank event handling The DRM core exposes two vertical blank related ioctls: - DRM_IOCTL_WAIT_VBLANK and DRM_IOCTL_MODESET_CTL. + + + DRM_IOCTL_WAIT_VBLANK + + + This takes a struct drm_wait_vblank structure as its argument, + and it is used to block or request a signal when a specified + vblank event occurs. + + + + + DRM_IOCTL_MODESET_CTL + + + This should be called by application level drivers before and + after mode setting, since on many devices the vertical blank + counter is reset at that time. Internally, the DRM snapshots + the last vblank count when the ioctl is called with the + _DRM_PRE_MODESET command, so that the counter won't go backwards + (which is dealt with when _DRM_POST_MODESET is used). + + + + - - DRM_IOCTL_WAIT_VBLANK takes a struct drm_wait_vblank structure - as its argument, and is used to block or request a signal when a - specified vblank event occurs. - - - DRM_IOCTL_MODESET_CTL should be called by application level - drivers before and after mode setting, since on many devices the - vertical blank counter will be reset at that time. Internally, - the DRM snapshots the last vblank count when the ioctl is called - with the _DRM_PRE_MODESET command so that the counter won't go - backwards (which is dealt with when _DRM_POST_MODESET is used). - To support the functions above, the DRM core provides several helper functions for tracking vertical blank counters, and @@ -632,24 +657,24 @@ void intel_crt_init(struct drm_device *dev) register. The enable and disable vblank callbacks should enable and disable vertical blank interrupts, respectively. In the absence of DRM clients waiting on vblank events, the core DRM - code will use the disable_vblank() function to disable - interrupts, which saves power. They'll be re-enabled again when + code uses the disable_vblank() function to disable + interrupts, which saves power. They are re-enabled again when a client calls the vblank wait ioctl above. - Devices that don't provide a count register can simply use an + A device that doesn't provide a count register may simply use an internal atomic counter incremented on every vertical blank - interrupt, and can make their enable and disable vblank - functions into no-ops. + interrupt (and then treat the enable_vblank() and disable_vblank() + callbacks as no-ops). Memory management - The memory manager lies at the heart of many DRM operations, and - is also required to support advanced client features like OpenGL - pbuffers. The DRM currently contains two memory managers, TTM + The memory manager lies at the heart of many DRM operations; it + is required to support advanced client features like OpenGL + pbuffers. The DRM currently contains two memory managers: TTM and GEM. @@ -679,41 +704,46 @@ void intel_crt_init(struct drm_device *dev) GEM-enabled drivers must provide gem_init_object() and gem_free_object() callbacks to support the core memory - allocation routines. They should also provide several driver - specific ioctls to support command execution, pinning, buffer + allocation routines. They should also provide several driver-specific + ioctls to support command execution, pinning, buffer read & write, mapping, and domain ownership transfers. - On a fundamental level, GEM involves several operations: memory - allocation and freeing, command execution, and aperture management - at command execution time. Buffer object allocation is relatively + On a fundamental level, GEM involves several operations: + + Memory allocation and freeing + Command execution + Aperture management at command execution time + + Buffer object allocation is relatively straightforward and largely provided by Linux's shmem layer, which provides memory to back each object. When mapped into the GTT or used in a command buffer, the backing pages for an object are flushed to memory and marked write combined so as to be coherent - with the GPU. Likewise, when the GPU finishes rendering to an object, - if the CPU accesses it, it must be made coherent with the CPU's view + with the GPU. Likewise, if the CPU accesses an object after the GPU + has finished rendering to the object, then the object must be made + coherent with the CPU's view of memory, usually involving GPU cache flushing of various kinds. - This core CPU<->GPU coherency management is provided by the GEM - set domain function, which evaluates an object's current domain and + This core CPU<->GPU coherency management is provided by a + device-specific ioctl, which evaluates an object's current domain and performs any necessary flushing or synchronization to put the object into the desired coherency domain (note that the object may be busy, - i.e. an active render target; in that case the set domain function - will block the client and wait for rendering to complete before + i.e. an active render target; in that case, setting the domain + blocks the client and waits for rendering to complete before performing any necessary flushing operations). Perhaps the most important GEM function is providing a command execution interface to clients. Client programs construct command - buffers containing references to previously allocated memory objects - and submit them to GEM. At that point, GEM will take care to bind + buffers containing references to previously allocated memory objects, + and then submit them to GEM. At that point, GEM takes care to bind all the objects into the GTT, execute the buffer, and provide necessary synchronization between clients accessing the same buffers. This often involves evicting some objects from the GTT and re-binding others (a fairly expensive operation), and providing relocation support which hides fixed GTT offsets from clients. Clients must take care not to submit command buffers that reference more objects - than can fit in the GTT or GEM will reject them and no rendering + than can fit in the GTT; otherwise, GEM will reject them and no rendering will occur. Similarly, if several objects in the buffer require fence registers to be allocated for correct rendering (e.g. 2D blits on pre-965 chips), care must be taken not to require more fence @@ -729,7 +759,7 @@ void intel_crt_init(struct drm_device *dev) Output management At the core of the DRM output management code is a set of - structures representing CRTCs, encoders and connectors. + structures representing CRTCs, encoders, and connectors. A CRTC is an abstraction representing a part of the chip that @@ -765,21 +795,19 @@ void intel_crt_init(struct drm_device *dev) Framebuffer management - In order to set a mode on a given CRTC, encoder and connector - configuration, clients need to provide a framebuffer object which - will provide a source of pixels for the CRTC to deliver to the encoder(s) - and ultimately the connector(s) in the configuration. A framebuffer - is fundamentally a driver specific memory object, made into an opaque - handle by the DRM addfb function. Once an fb has been created this - way it can be passed to the KMS mode setting routines for use in - a configuration. + Clients need to provide a framebuffer object which provides a source + of pixels for a CRTC to deliver to the encoder(s) and ultimately the + connector(s). A framebuffer is fundamentally a driver-specific memory + object, made into an opaque handle by the DRM's addfb() function. + Once a framebuffer has been created this way, it may be passed to the + KMS mode setting routines for use in a completed configuration. Command submission & fencing - This should cover a few device specific command submission + This should cover a few device-specific command submission implementations. @@ -789,7 +817,7 @@ void intel_crt_init(struct drm_device *dev) The DRM core provides some suspend/resume code, but drivers wanting full suspend/resume support should provide save() and - restore() functions. These will be called at suspend, + restore() functions. These are called at suspend, hibernate, or resume time, and should perform any state save or restore required by your device across suspend or hibernate states. @@ -812,8 +840,8 @@ void intel_crt_init(struct drm_device *dev) The DRM core exports several interfaces to applications, generally intended to be used through corresponding libdrm - wrapper functions. In addition, drivers export device specific - interfaces for use by userspace drivers & device aware + wrapper functions. In addition, drivers export device-specific + interfaces for use by userspace drivers & device-aware applications through ioctls and sysfs files. @@ -822,8 +850,8 @@ void intel_crt_init(struct drm_device *dev) management, memory management, and output management. - Cover generic ioctls and sysfs layout here. Only need high - level info, since man pages will cover the rest. + Cover generic ioctls and sysfs layout here. We only need high-level + info, since man pages should cover the rest. diff --git a/trunk/Documentation/DocBook/mtdnand.tmpl b/trunk/Documentation/DocBook/mtdnand.tmpl index 17910e2052ad..0c674be0d3c6 100644 --- a/trunk/Documentation/DocBook/mtdnand.tmpl +++ b/trunk/Documentation/DocBook/mtdnand.tmpl @@ -572,7 +572,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip) The simplest way to activate the FLASH based bad block table support - is to set the option NAND_USE_FLASH_BBT in the option field of + is to set the option NAND_BBT_USE_FLASH in the bbt_option field of the nand chip structure before calling nand_scan(). For AG-AND chips is this done by default. This activates the default FLASH based bad block table functionality @@ -773,20 +773,6 @@ struct nand_oobinfo { done according to the default builtin scheme. - - User space placement selection - - All non ecc functions like mtd->read and mtd->write use an internal - structure, which can be set by an ioctl. This structure is preset - to the autoplacement default. - - ioctl (fd, MEMSETOOBSEL, oobsel); - - oobsel is a pointer to a user supplied structure of type - nand_oobconfig. The contents of this structure must match the - criteria of the filesystem, which will be used. See an example in utils/nandwrite.c. - - Spare area autoplacement default schemes @@ -1158,9 +1144,6 @@ in this page These constants are defined in nand.h. They are ored together to describe the functionality. -/* Use a flash based bad block table. This option is parsed by the - * default bad block table function (nand_default_bbt). */ -#define NAND_USE_FLASH_BBT 0x00010000 /* The hw ecc generator provides a syndrome instead a ecc value on read * This can only work if we have the ecc bytes directly behind the * data bytes. Applies for DOC and AG-AND Renesas HW Reed Solomon generators */ diff --git a/trunk/Documentation/blockdev/cciss.txt b/trunk/Documentation/blockdev/cciss.txt index 71464e09ec18..b79d0a13e7cd 100644 --- a/trunk/Documentation/blockdev/cciss.txt +++ b/trunk/Documentation/blockdev/cciss.txt @@ -98,14 +98,12 @@ You must enable "SCSI tape drive support for Smart Array 5xxx" and "SCSI support" in your kernel configuration to be able to use SCSI tape drives with your Smart Array 5xxx controller. -Additionally, note that the driver will not engage the SCSI core at init -time. The driver must be directed to dynamically engage the SCSI core via -the /proc filesystem entry which the "block" side of the driver creates as -/proc/driver/cciss/cciss* at runtime. This is because at driver init time, -the SCSI core may not yet be initialized (because the driver is a block -driver) and attempting to register it with the SCSI core in such a case -would cause a hang. This is best done via an initialization script -(typically in /etc/init.d, but could vary depending on distribution). +Additionally, note that the driver will engage the SCSI core at init +time if any tape drives or medium changers are detected. The driver may +also be directed to dynamically engage the SCSI core via the /proc filesystem +entry which the "block" side of the driver creates as +/proc/driver/cciss/cciss* at runtime. This is best done via a script. + For example: for x in /proc/driver/cciss/cciss[0-9]* diff --git a/trunk/Documentation/cgroups/freezer-subsystem.txt b/trunk/Documentation/cgroups/freezer-subsystem.txt index c21d77742a07..7e62de1e59ff 100644 --- a/trunk/Documentation/cgroups/freezer-subsystem.txt +++ b/trunk/Documentation/cgroups/freezer-subsystem.txt @@ -33,9 +33,9 @@ demonstrate this problem using nested bash shells: From a second, unrelated bash shell: $ kill -SIGSTOP 16690 - $ kill -SIGCONT 16990 + $ kill -SIGCONT 16690 - + This happens because bash can observe both signals and choose how it responds to them. diff --git a/trunk/Documentation/devicetree/bindings/mtd/atmel-dataflash.txt b/trunk/Documentation/devicetree/bindings/mtd/atmel-dataflash.txt new file mode 100644 index 000000000000..ef66ddd01da0 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/mtd/atmel-dataflash.txt @@ -0,0 +1,14 @@ +* Atmel Data Flash + +Required properties: +- compatible : "atmel,", "atmel,", "atmel,dataflash". + +Example: + +flash@1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "atmel,at45db321d", "atmel,at45", "atmel,dataflash"; + spi-max-frequency = <25000000>; + reg = <1>; +}; diff --git a/trunk/Documentation/devicetree/bindings/powerpc/fsl/board.txt b/trunk/Documentation/devicetree/bindings/powerpc/fsl/board.txt index 39e941515a36..380914e965e0 100644 --- a/trunk/Documentation/devicetree/bindings/powerpc/fsl/board.txt +++ b/trunk/Documentation/devicetree/bindings/powerpc/fsl/board.txt @@ -1,3 +1,8 @@ +Freescale Reference Board Bindings + +This document describes device tree bindings for various devices that +exist on some Freescale reference boards. + * Board Control and Status (BCSR) Required properties: @@ -12,25 +17,26 @@ Example: reg = ; }; -* Freescale on board FPGA +* Freescale on-board FPGA This is the memory-mapped registers for on board FPGA. Required properities: -- compatible : should be "fsl,fpga-pixis". -- reg : should contain the address and the length of the FPPGA register - set. +- compatible: should be a board-specific string followed by a string + indicating the type of FPGA. Example: + "fsl,-fpga", "fsl,fpga-pixis" +- reg: should contain the address and the length of the FPGA register set. - interrupt-parent: should specify phandle for the interrupt controller. -- interrupts : should specify event (wakeup) IRQ. +- interrupts: should specify event (wakeup) IRQ. -Example (MPC8610HPCD): +Example (P1022DS): - board-control@e8000000 { - compatible = "fsl,fpga-pixis"; - reg = <0xe8000000 32>; - interrupt-parent = <&mpic>; - interrupts = <8 8>; - }; + board-control@3,0 { + compatible = "fsl,p1022ds-fpga", "fsl,fpga-ngpixis"; + reg = <3 0 0x30>; + interrupt-parent = <&mpic>; + interrupts = <8 8 0 0>; + }; * Freescale BCSR GPIO banks diff --git a/trunk/Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt b/trunk/Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt new file mode 100644 index 000000000000..9d54eb5a295f --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt @@ -0,0 +1,395 @@ +=================================================================== +Debug Control and Status Register (DCSR) Binding +Copyright 2011 Freescale Semiconductor Inc. + +NOTE: The bindings described in this document are preliminary and subject +to change. Some of the compatible strings that contain only generic names +may turn out to be inappropriate, or need additional properties to describe +the integration of the block with the rest of the chip. + +===================================================================== +Debug Control and Status Register Memory Map + +Description + +This node defines the base address and range for the +defined DCSR Memory Map. Child nodes will describe the individual +debug blocks defined within this memory space. + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include "fsl,dcsr" and "simple-bus". + The DCSR space exists in the memory-mapped bus. + + - #address-cells + Usage: required + Value type: + Definition: A standard property. Defines the number of cells + or representing physical addresses in child nodes. + + - #size-cells + Usage: required + Value type: + Definition: A standard property. Defines the number of cells + or representing the size of physical addresses in + child nodes. + + - ranges + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + range of the DCSR space. + +EXAMPLE + dcsr: dcsr@f00000000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,dcsr", "simple-bus"; + ranges = <0x00000000 0xf 0x00000000 0x01008000>; + }; + +===================================================================== +Event Processing Unit + +This node represents the region of DCSR space allocated to the EPU + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include "fsl,dcsr-epu" + + - interrupts + Usage: required + Value type: + Definition: Specifies the interrupts generated by the EPU. + The value of the interrupts property consists of three + interrupt specifiers. The format of the specifier is defined + by the binding document describing the node's interrupt parent. + + The EPU counters can be configured to assert the performance + monitor interrupt signal based on either counter overflow or value + match. Which counter asserted the interrupt is captured in an EPU + Counter Interrupt Status Register (EPCPUISR). + + The EPU unit can also be configured to assert either or both of + two interrupt signals based on debug event sources within the SoC. + The interrupt signals are epu_xt_int0 and epu_xt_int1. + Which event source asserted the interrupt is captured in an EPU + Interrupt Status Register (EPISR0,EPISR1). + + Interrupt numbers are lised in order (perfmon, event0, event1). + + - interrupt-parent + Usage: required + Value type: + Definition: A single value that points + to the interrupt parent to which the child domain + is being mapped. Value must be "&mpic" + + - reg + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + offset and length of the DCSR space registers of the device + configuration block. + +EXAMPLE + dcsr-epu@0 { + compatible = "fsl,dcsr-epu"; + interrupts = <52 2 0 0 + 84 2 0 0 + 85 2 0 0>; + interrupt-parent = <&mpic>; + reg = <0x0 0x1000>; + }; + +======================================================================= +Nexus Port Controller + +This node represents the region of DCSR space allocated to the NPC + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include "fsl,dcsr-npc" + + - reg + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + offset and length of the DCSR space registers of the device + configuration block. + The Nexus Port controller occupies two regions in the DCSR space + with distinct functionality. + + The first register range describes the Nexus Port Controller + control and status registers. + + The second register range describes the Nexus Port Controller + internal trace buffer. The NPC trace buffer is a small memory buffer + which stages the nexus trace data for transmission via the Aurora port + or to a DDR based trace buffer. In some configurations the NPC trace + buffer can be the only trace buffer used. + + +EXAMPLE + dcsr-npc { + compatible = "fsl,dcsr-npc"; + reg = <0x1000 0x1000 0x1000000 0x8000>; + }; + +======================================================================= +Nexus Concentrator + +This node represents the region of DCSR space allocated to the NXC + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include "fsl,dcsr-nxc" + + - reg + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + offset and length of the DCSR space registers of the device + configuration block. + +EXAMPLE + dcsr-nxc@2000 { + compatible = "fsl,dcsr-nxc"; + reg = <0x2000 0x1000>; + }; +======================================================================= +CoreNet Debug Controller + +This node represents the region of DCSR space allocated to +the CoreNet Debug controller. + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include "fsl,dcsr-corenet" + + - reg + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + offset and length of the DCSR space registers of the device + configuration block. + The CoreNet Debug controller occupies two regions in the DCSR space + with distinct functionality. + + The first register range describes the CoreNet Debug Controller + functionalty to perform transaction and transaction attribute matches. + + The second register range describes the CoreNet Debug Controller + functionalty to trigger event notifications and debug traces. + +EXAMPLE + dcsr-corenet { + compatible = "fsl,dcsr-corenet"; + reg = <0x8000 0x1000 0xB0000 0x1000>; + }; + +======================================================================= +Data Path Debug controller + +This node represents the region of DCSR space allocated to +the DPAA Debug Controller. This controller controls debug configuration +for the QMAN and FMAN blocks. + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include both an identifier specific to the SoC + or Debug IP of the form "fsl,-dcsr-dpaa" in addition to the + generic compatible string "fsl,dcsr-dpaa". + + - reg + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + offset and length of the DCSR space registers of the device + configuration block. + +EXAMPLE + dcsr-dpaa@9000 { + compatible = "fsl,p4080-dcsr-dpaa", "fsl,dcsr-dpaa"; + reg = <0x9000 0x1000>; + }; + +======================================================================= +OCeaN Debug controller + +This node represents the region of DCSR space allocated to +the OCN Debug Controller. + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include both an identifier specific to the SoC + or Debug IP of the form "fsl,-dcsr-ocn" in addition to the + generic compatible string "fsl,dcsr-ocn". + + - reg + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + offset and length of the DCSR space registers of the device + configuration block. + +EXAMPLE + dcsr-ocn@11000 { + compatible = "fsl,p4080-dcsr-ocn", "fsl,dcsr-ocn"; + reg = <0x11000 0x1000>; + }; + +======================================================================= +DDR Controller Debug controller + +This node represents the region of DCSR space allocated to +the OCN Debug Controller. + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include "fsl,dcsr-ddr" + + - dev-handle + Usage: required + Definition: A phandle to associate this debug node with its + component controller. + + - reg + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + offset and length of the DCSR space registers of the device + configuration block. + +EXAMPLE + dcsr-ddr@12000 { + compatible = "fsl,dcsr-ddr"; + dev-handle = <&ddr1>; + reg = <0x12000 0x1000>; + }; + +======================================================================= +Nexus Aurora Link Controller + +This node represents the region of DCSR space allocated to +the NAL Controller. + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include both an identifier specific to the SoC + or Debug IP of the form "fsl,-dcsr-nal" in addition to the + generic compatible string "fsl,dcsr-nal". + + - reg + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + offset and length of the DCSR space registers of the device + configuration block. + +EXAMPLE + dcsr-nal@18000 { + compatible = "fsl,p4080-dcsr-nal", "fsl,dcsr-nal"; + reg = <0x18000 0x1000>; + }; + + +======================================================================= +Run Control and Power Management + +This node represents the region of DCSR space allocated to +the RCPM Debug Controller. This functionlity is limited to the +control the debug operations of the SoC and cores. + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include both an identifier specific to the SoC + or Debug IP of the form "fsl,-dcsr-rcpm" in addition to the + generic compatible string "fsl,dcsr-rcpm". + + - reg + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + offset and length of the DCSR space registers of the device + configuration block. + +EXAMPLE + dcsr-rcpm@22000 { + compatible = "fsl,p4080-dcsr-rcpm", "fsl,dcsr-rcpm"; + reg = <0x22000 0x1000>; + }; + +======================================================================= +Core Service Bridge Proxy + +This node represents the region of DCSR space allocated to +the Core Service Bridge Proxies. +There is one Core Service Bridge Proxy device for each CPU in the system. +This functionlity provides access to the debug operations of the CPU. + +PROPERTIES + + - compatible + Usage: required + Value type: + Definition: Must include both an identifier specific to the cpu + of the form "fsl,dcsr--sb-proxy" in addition to the + generic compatible string "fsl,dcsr-cpu-sb-proxy". + + - cpu-handle + Usage: required + Definition: A phandle to associate this debug node with its cpu. + + - reg + Usage: required + Value type: + Definition: A standard property. Specifies the physical address + offset and length of the DCSR space registers of the device + configuration block. + +EXAMPLE + dcsr-cpu-sb-proxy@40000 { + compatible = "fsl,dcsr-e500mc-sb-proxy", + "fsl,dcsr-cpu-sb-proxy"; + cpu-handle = <&cpu0>; + reg = <0x40000 0x1000>; + }; + dcsr-cpu-sb-proxy@41000 { + compatible = "fsl,dcsr-e500mc-sb-proxy", + "fsl,dcsr-cpu-sb-proxy"; + cpu-handle = <&cpu1>; + reg = <0x41000 0x1000>; + }; + +======================================================================= diff --git a/trunk/Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt b/trunk/Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt index 70558c3f3682..5d586e1ccaf5 100644 --- a/trunk/Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt +++ b/trunk/Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt @@ -25,6 +25,16 @@ Required properties: are routed to IPIC, and for 85xx/86xx cpu the interrupts are routed to MPIC. +Optional properties: +- msi-address-64: 64-bit PCI address of the MSIIR register. The MSIIR register + is used for MSI messaging. The address of MSIIR in PCI address space is + the MSI message address. + + This property may be used in virtualized environments where the hypervisor + has created an alternate mapping for the MSIR block. See below for an + explanation. + + Example: msi@41600 { compatible = "fsl,mpc8610-msi", "fsl,mpic-msi"; @@ -41,3 +51,35 @@ Example: 0xe7 0>; interrupt-parent = <&mpic>; }; + +The Freescale hypervisor and msi-address-64 +------------------------------------------- +Normally, PCI devices have access to all of CCSR via an ATMU mapping. The +Freescale MSI driver calculates the address of MSIIR (in the MSI register +block) and sets that address as the MSI message address. + +In a virtualized environment, the hypervisor may need to create an IOMMU +mapping for MSIIR. The Freescale ePAPR hypervisor has this requirement +because of hardware limitations of the Peripheral Access Management Unit +(PAMU), which is currently the only IOMMU that the hypervisor supports. +The ATMU is programmed with the guest physical address, and the PAMU +intercepts transactions and reroutes them to the true physical address. + +In the PAMU, each PCI controller is given only one primary window. The +PAMU restricts DMA operations so that they can only occur within a window. +Because PCI devices must be able to DMA to memory, the primary window must +be used to cover all of the guest's memory space. + +PAMU primary windows can be divided into 256 subwindows, and each +subwindow can have its own address mapping ("guest physical" to "true +physical"). However, each subwindow has to have the same alignment, which +means they cannot be located at just any address. Because of these +restrictions, it is usually impossible to create a 4KB subwindow that +covers MSIIR where it's normally located. + +Therefore, the hypervisor has to create a subwindow inside the same +primary window used for memory, but mapped to the MSIR block (where MSIIR +lives). The first subwindow after the end of guest memory is used for +this. The address specified in the msi-address-64 property is the PCI +address of MSIIR. The hypervisor configures the PAMU to map that address to +the true physical address of MSIIR. diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt index cb7f3148035d..f049a1ca186f 100644 --- a/trunk/Documentation/networking/ip-sysctl.txt +++ b/trunk/Documentation/networking/ip-sysctl.txt @@ -20,7 +20,7 @@ ip_no_pmtu_disc - BOOLEAN default FALSE min_pmtu - INTEGER - default 562 - minimum discovered Path MTU + default 552 - minimum discovered Path MTU route/max_size - INTEGER Maximum number of routes allowed in the kernel. Increase diff --git a/trunk/Documentation/oops-tracing.txt b/trunk/Documentation/oops-tracing.txt index 6fe9001b9263..13032c0140d4 100644 --- a/trunk/Documentation/oops-tracing.txt +++ b/trunk/Documentation/oops-tracing.txt @@ -263,6 +263,8 @@ characters, each representing a particular tainted value. 12: 'I' if the kernel is working around a severe bug in the platform firmware (BIOS or similar). + 13: 'O' if an externally-built ("out-of-tree") module has been loaded. + The primary reason for the 'Tainted: ' string is to tell kernel debuggers if this is a clean kernel or if anything unusual has occurred. Tainting is permanent: even if an offending module is diff --git a/trunk/Documentation/power/freezing-of-tasks.txt b/trunk/Documentation/power/freezing-of-tasks.txt index 38b57248fd61..316c2ba187f4 100644 --- a/trunk/Documentation/power/freezing-of-tasks.txt +++ b/trunk/Documentation/power/freezing-of-tasks.txt @@ -22,12 +22,12 @@ try_to_freeze_tasks() that sets TIF_FREEZE for all of the freezable tasks and either wakes them up, if they are kernel threads, or sends fake signals to them, if they are user space processes. A task that has TIF_FREEZE set, should react to it by calling the function called refrigerator() (defined in -kernel/power/process.c), which sets the task's PF_FROZEN flag, changes its state +kernel/freezer.c), which sets the task's PF_FROZEN flag, changes its state to TASK_UNINTERRUPTIBLE and makes it loop until PF_FROZEN is cleared for it. Then, we say that the task is 'frozen' and therefore the set of functions handling this mechanism is referred to as 'the freezer' (these functions are -defined in kernel/power/process.c and include/linux/freezer.h). User space -processes are generally frozen before kernel threads. +defined in kernel/power/process.c, kernel/freezer.c & include/linux/freezer.h). +User space processes are generally frozen before kernel threads. It is not recommended to call refrigerator() directly. Instead, it is recommended to use the try_to_freeze() function (defined in @@ -95,7 +95,7 @@ after the memory for the image has been freed, we don't want tasks to allocate additional memory and we prevent them from doing that by freezing them earlier. [Of course, this also means that device drivers should not allocate substantial amounts of memory from their .suspend() callbacks before hibernation, but this -is e separate issue.] +is a separate issue.] 3. The third reason is to prevent user space processes and some kernel threads from interfering with the suspending and resuming of devices. A user space diff --git a/trunk/Documentation/power/runtime_pm.txt b/trunk/Documentation/power/runtime_pm.txt index 0e856088db7c..5336149f831b 100644 --- a/trunk/Documentation/power/runtime_pm.txt +++ b/trunk/Documentation/power/runtime_pm.txt @@ -789,6 +789,16 @@ will behave normally, not taking the autosuspend delay into account. Similarly, if the power.use_autosuspend field isn't set then the autosuspend helper functions will behave just like the non-autosuspend counterparts. +Under some circumstances a driver or subsystem may want to prevent a device +from autosuspending immediately, even though the usage counter is zero and the +autosuspend delay time has expired. If the ->runtime_suspend() callback +returns -EAGAIN or -EBUSY, and if the next autosuspend delay expiration time is +in the future (as it normally would be if the callback invoked +pm_runtime_mark_last_busy()), the PM core will automatically reschedule the +autosuspend. The ->runtime_suspend() callback can't do this rescheduling +itself because no suspend requests of any kind are accepted while the device is +suspending (i.e., while the callback is running). + The implementation is well suited for asynchronous use in interrupt contexts. However such use inevitably involves races, because the PM core can't synchronize ->runtime_suspend() callbacks with the arrival of I/O requests. diff --git a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt index 4f3443230d89..edad99abec21 100644 --- a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt @@ -349,6 +349,7 @@ STAC92HD83* ref Reference board mic-ref Reference board with power management for ports dell-s14 Dell laptop + dell-vostro-3500 Dell Vostro 3500 laptop hp HP laptops with (inverted) mute-LED hp-dv7-4000 HP dv-7 4000 auto BIOS setup (default) diff --git a/trunk/Documentation/sound/alsa/HD-Audio.txt b/trunk/Documentation/sound/alsa/HD-Audio.txt index 03e2771ddeef..91fee3b45fb8 100644 --- a/trunk/Documentation/sound/alsa/HD-Audio.txt +++ b/trunk/Documentation/sound/alsa/HD-Audio.txt @@ -579,7 +579,7 @@ Development Tree ~~~~~~~~~~~~~~~~ The latest development codes for HD-audio are found on sound git tree: -- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git +- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git The master branch or for-next branches can be used as the main development branches in general while the HD-audio specific patches @@ -594,7 +594,7 @@ is, installed via the usual spells: configure, make and make install(-modules). See INSTALL in the package. The snapshot tarballs are found at: -- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/ +- ftp://ftp.suse.com/pub/people/tiwai/snapshot/ Sending a Bug Report @@ -696,7 +696,7 @@ via hda-verb won't change the mixer value. The hda-verb program is found in the ftp directory: -- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/ +- ftp://ftp.suse.com/pub/people/tiwai/misc/ Also a git repository is available: @@ -764,7 +764,7 @@ operation, the jack plugging simulation, etc. The package is found in: -- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/ +- ftp://ftp.suse.com/pub/people/tiwai/misc/ A git repository is available: diff --git a/trunk/Documentation/watchdog/convert_drivers_to_kernel_api.txt b/trunk/Documentation/watchdog/convert_drivers_to_kernel_api.txt new file mode 100644 index 000000000000..ae1e90036d06 --- /dev/null +++ b/trunk/Documentation/watchdog/convert_drivers_to_kernel_api.txt @@ -0,0 +1,195 @@ +Converting old watchdog drivers to the watchdog framework +by Wolfram Sang +========================================================= + +Before the watchdog framework came into the kernel, every driver had to +implement the API on its own. Now, as the framework factored out the common +components, those drivers can be lightened making it a user of the framework. +This document shall guide you for this task. The necessary steps are described +as well as things to look out for. + + +Remove the file_operations struct +--------------------------------- + +Old drivers define their own file_operations for actions like open(), write(), +etc... These are now handled by the framework and just call the driver when +needed. So, in general, the 'file_operations' struct and assorted functions can +go. Only very few driver-specific details have to be moved to other functions. +Here is a overview of the functions and probably needed actions: + +- open: Everything dealing with resource management (file-open checks, magic + close preparations) can simply go. Device specific stuff needs to go to the + driver specific start-function. Note that for some drivers, the start-function + also serves as the ping-function. If that is the case and you need start/stop + to be balanced (clocks!), you are better off refactoring a separate start-function. + +- close: Same hints as for open apply. + +- write: Can simply go, all defined behaviour is taken care of by the framework, + i.e. ping on write and magic char ('V') handling. + +- ioctl: While the driver is allowed to have extensions to the IOCTL interface, + the most common ones are handled by the framework, supported by some assistance + from the driver: + + WDIOC_GETSUPPORT: + Returns the mandatory watchdog_info struct from the driver + + WDIOC_GETSTATUS: + Needs the status-callback defined, otherwise returns 0 + + WDIOC_GETBOOTSTATUS: + Needs the bootstatus member properly set. Make sure it is 0 if you + don't have further support! + + WDIOC_SETOPTIONS: + No preparations needed + + WDIOC_KEEPALIVE: + If wanted, options in watchdog_info need to have WDIOF_KEEPALIVEPING + set + + WDIOC_SETTIMEOUT: + Options in watchdog_info need to have WDIOF_SETTIMEOUT set + and a set_timeout-callback has to be defined. The core will also + do limit-checking, if min_timeout and max_timeout in the watchdog + device are set. All is optional. + + WDIOC_GETTIMEOUT: + No preparations needed + + Other IOCTLs can be served using the ioctl-callback. Note that this is mainly + intended for porting old drivers; new drivers should not invent private IOCTLs. + Private IOCTLs are processed first. When the callback returns with + -ENOIOCTLCMD, the IOCTLs of the framework will be tried, too. Any other error + is directly given to the user. + +Example conversion: + +-static const struct file_operations s3c2410wdt_fops = { +- .owner = THIS_MODULE, +- .llseek = no_llseek, +- .write = s3c2410wdt_write, +- .unlocked_ioctl = s3c2410wdt_ioctl, +- .open = s3c2410wdt_open, +- .release = s3c2410wdt_release, +-}; + +Check the functions for device-specific stuff and keep it for later +refactoring. The rest can go. + + +Remove the miscdevice +--------------------- + +Since the file_operations are gone now, you can also remove the 'struct +miscdevice'. The framework will create it on watchdog_dev_register() called by +watchdog_register_device(). + +-static struct miscdevice s3c2410wdt_miscdev = { +- .minor = WATCHDOG_MINOR, +- .name = "watchdog", +- .fops = &s3c2410wdt_fops, +-}; + + +Remove obsolete includes and defines +------------------------------------ + +Because of the simplifications, a few defines are probably unused now. Remove +them. Includes can be removed, too. For example: + +- #include +- #include (if MODULE_ALIAS_MISCDEV is not used) +- #include (if no custom IOCTLs are used) + + +Add the watchdog operations +--------------------------- + +All possible callbacks are defined in 'struct watchdog_ops'. You can find it +explained in 'watchdog-kernel-api.txt' in this directory. start(), stop() and +owner must be set, the rest are optional. You will easily find corresponding +functions in the old driver. Note that you will now get a pointer to the +watchdog_device as a parameter to these functions, so you probably have to +change the function header. Other changes are most likely not needed, because +here simply happens the direct hardware access. If you have device-specific +code left from the above steps, it should be refactored into these callbacks. + +Here is a simple example: + ++static struct watchdog_ops s3c2410wdt_ops = { ++ .owner = THIS_MODULE, ++ .start = s3c2410wdt_start, ++ .stop = s3c2410wdt_stop, ++ .ping = s3c2410wdt_keepalive, ++ .set_timeout = s3c2410wdt_set_heartbeat, ++}; + +A typical function-header change looks like: + +-static void s3c2410wdt_keepalive(void) ++static int s3c2410wdt_keepalive(struct watchdog_device *wdd) + { +... ++ ++ return 0; + } + +... + +- s3c2410wdt_keepalive(); ++ s3c2410wdt_keepalive(&s3c2410_wdd); + + +Add the watchdog device +----------------------- + +Now we need to create a 'struct watchdog_device' and populate it with the +necessary information for the framework. The struct is also explained in detail +in 'watchdog-kernel-api.txt' in this directory. We pass it the mandatory +watchdog_info struct and the newly created watchdog_ops. Often, old drivers +have their own record-keeping for things like bootstatus and timeout using +static variables. Those have to be converted to use the members in +watchdog_device. Note that the timeout values are unsigned int. Some drivers +use signed int, so this has to be converted, too. + +Here is a simple example for a watchdog device: + ++static struct watchdog_device s3c2410_wdd = { ++ .info = &s3c2410_wdt_ident, ++ .ops = &s3c2410wdt_ops, ++}; + + +Register the watchdog device +---------------------------- + +Replace misc_register(&miscdev) with watchdog_register_device(&watchdog_dev). +Make sure the return value gets checked and the error message, if present, +still fits. Also convert the unregister case. + +- ret = misc_register(&s3c2410wdt_miscdev); ++ ret = watchdog_register_device(&s3c2410_wdd); + +... + +- misc_deregister(&s3c2410wdt_miscdev); ++ watchdog_unregister_device(&s3c2410_wdd); + + +Update the Kconfig-entry +------------------------ + +The entry for the driver now needs to select WATCHDOG_CORE: + ++ select WATCHDOG_CORE + + +Create a patch and send it to upstream +-------------------------------------- + +Make sure you understood Documentation/SubmittingPatches and send your patch to +linux-watchdog@vger.kernel.org. We are looking forward to it :) + diff --git a/trunk/Kbuild b/trunk/Kbuild index 2114113ceca2..b8b708ad6dc3 100644 --- a/trunk/Kbuild +++ b/trunk/Kbuild @@ -88,11 +88,13 @@ $(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s Kbuild # 3) Check for missing system calls # +always += missing-syscalls +targets += missing-syscalls + quiet_cmd_syscalls = CALL $< - cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags) + cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags) $(missing_syscalls_flags) -PHONY += missing-syscalls -missing-syscalls: scripts/checksyscalls.sh FORCE +missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE $(call cmd,syscalls) # Keep these two files during make clean diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a6afe342f0fc..29f9948b2cc0 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1032,6 +1032,7 @@ F: arch/arm/include/asm/hardware/ioc.h F: arch/arm/include/asm/hardware/iomd.h F: arch/arm/include/asm/hardware/memc.h F: arch/arm/mach-rpc/ +F: drivers/net/ethernet/8390/etherh.c F: drivers/net/ethernet/i825xx/ether1* F: drivers/net/ethernet/seeq/ether3* F: drivers/scsi/arm/ @@ -1105,6 +1106,7 @@ F: drivers/media/video/s5p-fimc/ ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT M: Kyungmin Park M: Kamil Debski +M: Jeongtae Park L: linux-arm-kernel@lists.infradead.org L: linux-media@vger.kernel.org S: Maintained @@ -1925,9 +1927,11 @@ S: Maintained F: drivers/connector/ CONTROL GROUPS (CGROUPS) -M: Paul Menage +M: Tejun Heo M: Li Zefan L: containers@lists.linux-foundation.org +L: cgroups@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git S: Maintained F: include/linux/cgroup* F: kernel/cgroup* @@ -2341,6 +2345,13 @@ S: Supported F: drivers/gpu/drm/i915 F: include/drm/i915* +DRM DRIVERS FOR EXYNOS +M: Inki Dae +L: dri-devel@lists.freedesktop.org +S: Supported +F: drivers/gpu/drm/exynos +F: include/drm/exynos* + DSCC4 DRIVER M: Francois Romieu L: netdev@vger.kernel.org @@ -2387,7 +2398,7 @@ F: include/linux/netfilter_bridge/ebt_*.h F: net/bridge/netfilter/ebt*.c ECRYPT FILE SYSTEM -M: Tyler Hicks +M: Tyler Hicks M: Dustin Kirkland L: ecryptfs@vger.kernel.org W: https://launchpad.net/ecryptfs @@ -2575,7 +2586,7 @@ S: Maintained F: drivers/net/ethernet/i825xx/eexpress.* ETHERNET BRIDGE -M: Stephen Hemminger +M: Stephen Hemminger L: bridge@lists.linux-foundation.org L: netdev@vger.kernel.org W: http://www.linuxfoundation.org/en/Net:Bridge @@ -4295,6 +4306,7 @@ MEMORY RESOURCE CONTROLLER M: Balbir Singh M: Daisuke Nishimura M: KAMEZAWA Hiroyuki +L: cgroups@vger.kernel.org L: linux-mm@kvack.org S: Maintained F: mm/memcontrol.c @@ -4328,7 +4340,7 @@ MIPS M: Ralf Baechle L: linux-mips@linux-mips.org W: http://www.linux-mips.org/ -T: git git://git.linux-mips.org/pub/scm/linux.git +T: git git://git.linux-mips.org/pub/scm/ralf/linux.git Q: http://patchwork.linux-mips.org/project/linux-mips/list/ S: Supported F: Documentation/mips/ @@ -4461,7 +4473,7 @@ S: Supported F: drivers/infiniband/hw/nes/ NETEM NETWORK EMULATOR -M: Stephen Hemminger +M: Stephen Hemminger L: netem@lists.linux-foundation.org S: Maintained F: net/sched/sch_netem.c @@ -4672,7 +4684,7 @@ L: linux-omap@vger.kernel.org W: http://www.muru.com/linux/omap/ W: http://linux.omap.com/ Q: http://patchwork.kernel.org/project/linux-omap/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git S: Maintained F: arch/arm/*omap*/ @@ -4938,7 +4950,7 @@ F: drivers/char/ppdev.c F: include/linux/ppdev.h PARAVIRT_OPS INTERFACE -M: Jeremy Fitzhardinge +M: Jeremy Fitzhardinge M: Chris Wright M: Alok Kataria M: Rusty Russell @@ -5470,7 +5482,7 @@ S: Maintained F: drivers/net/ethernet/rdc/r6040.c RDS - RELIABLE DATAGRAM SOCKETS -M: Andy Grover +M: Venkat Venkatsubra L: rds-devel@oss.oracle.com (moderated for non-subscribers) S: Supported F: net/rds/ @@ -5976,7 +5988,7 @@ S: Maintained F: drivers/usb/misc/sisusbvga/ SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS -M: Stephen Hemminger +M: Stephen Hemminger L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/marvell/sk* @@ -6121,7 +6133,7 @@ F: sound/ SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) M: Liam Girdwood M: Mark Brown -T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git L: alsa-devel@alsa-project.org (moderated for non-subscribers) W: http://alsa-project.org/main/index.php/ASoC S: Supported @@ -7390,8 +7402,8 @@ S: Maintained F: arch/x86/kernel/cpu/mcheck/* XEN HYPERVISOR INTERFACE -M: Jeremy Fitzhardinge M: Konrad Rzeszutek Wilk +M: Jeremy Fitzhardinge L: xen-devel@lists.xensource.com (moderated for non-subscribers) L: virtualization@lists.linux-foundation.org S: Supported @@ -7424,7 +7436,8 @@ F: drivers/xen/*swiotlb* XFS FILESYSTEM P: Silicon Graphics Inc -M: Alex Elder +M: Ben Myers +M: Alex Elder M: xfs-masters@oss.sgi.com L: xfs@oss.sgi.com W: http://oss.sgi.com/projects/xfs diff --git a/trunk/Makefile b/trunk/Makefile index 07bc92544e9c..dab8610c4d6f 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,8 +1,8 @@ VERSION = 3 -PATCHLEVEL = 1 +PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -NAME = "Divemaster Edition" +EXTRAVERSION = -rc2 +NAME = Saber-toothed Squirrel # *DOCUMENTATION* # To see a list of typical targets execute "make help" @@ -983,7 +983,6 @@ archprepare: prepare1 scripts_basic prepare0: archprepare FORCE $(Q)$(MAKE) $(build)=. - $(Q)$(MAKE) $(build)=. missing-syscalls # All the preparing.. prepare: prepare0 @@ -1198,7 +1197,7 @@ distclean: mrproper @find $(srctree) $(RCS_FIND_IGNORE) \ \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ - -o -name '.*.rej' -o -size 0 \ + -o -name '.*.rej' \ -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ -type f -print | xargs rm -f @@ -1296,7 +1295,6 @@ help: @echo ' 2: warnings which occur quite often but may still be relevant' @echo ' 3: more obscure warnings, can most likely be ignored' @echo ' Multiple levels can be combined with W=12 or W=123' - @echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections' @echo '' @echo 'Execute "make" or "make all" to build all targets marked with [*] ' @echo 'For further info see the ./README file' diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig index 8bb936226dee..3d74801a4015 100644 --- a/trunk/arch/alpha/Kconfig +++ b/trunk/arch/alpha/Kconfig @@ -445,11 +445,6 @@ config ALPHA_EV67 Is this a machine based on the EV67 core? If in doubt, select N here and the machine will be treated as an EV6. -config ALPHA_EV7 - bool - depends on ALPHA_MARVEL - default y - config ALPHA_MCPCIA bool depends on ALPHA_RAWHIDE diff --git a/trunk/arch/alpha/kernel/core_irongate.c b/trunk/arch/alpha/kernel/core_irongate.c index a872078497be..00096df0f6ad 100644 --- a/trunk/arch/alpha/kernel/core_irongate.c +++ b/trunk/arch/alpha/kernel/core_irongate.c @@ -303,6 +303,7 @@ irongate_init_arch(void) #include #include #include +#include #include #define GET_PAGE_DIR_OFF(addr) (addr >> 22) diff --git a/trunk/arch/alpha/kernel/pci-sysfs.c b/trunk/arch/alpha/kernel/pci-sysfs.c index b899e95f79fd..53649c7d0068 100644 --- a/trunk/arch/alpha/kernel/pci-sysfs.c +++ b/trunk/arch/alpha/kernel/pci-sysfs.c @@ -10,6 +10,7 @@ */ #include +#include #include #include diff --git a/trunk/arch/alpha/kernel/pci_iommu.c b/trunk/arch/alpha/kernel/pci_iommu.c index 022c2748fa41..43610804987d 100644 --- a/trunk/arch/alpha/kernel/pci_iommu.c +++ b/trunk/arch/alpha/kernel/pci_iommu.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/trunk/arch/alpha/kernel/setup.c b/trunk/arch/alpha/kernel/setup.c index cc0fd862cf26..32de56067e63 100644 --- a/trunk/arch/alpha/kernel/setup.c +++ b/trunk/arch/alpha/kernel/setup.c @@ -43,6 +43,7 @@ #include #include #include +#include extern struct atomic_notifier_head panic_notifier_list; static int alpha_panic_event(struct notifier_block *, unsigned long, void *); diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index fe6b0526b3a6..44789eff983f 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -595,6 +595,7 @@ config ARCH_MMP select TICK_ONESHOT select PLAT_PXA select SPARSE_IRQ + select GENERIC_ALLOCATOR help Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. @@ -769,6 +770,7 @@ config ARCH_S3C64XX select CPU_V6 select ARM_VIC select HAVE_CLK + select HAVE_TCM select CLKDEV_LOOKUP select NO_IOPORT select ARCH_USES_GETTIMEOFFSET @@ -777,9 +779,6 @@ config ARCH_S3C64XX select SAMSUNG_CLKSRC select SAMSUNG_IRQ_VIC_TIMER select S3C_GPIO_TRACK - select S3C_GPIO_PULL_UPDOWN - select S3C_GPIO_CFG_S3C24XX - select S3C_GPIO_CFG_S3C64XX select S3C_DEV_NAND select USB_ARCH_HAS_OHCI select SAMSUNG_GPIOLIB_4BIT @@ -838,8 +837,8 @@ config ARCH_S5PV210 help Samsung S5PV210/S5PC110 series based systems -config ARCH_EXYNOS4 - bool "Samsung EXYNOS4" +config ARCH_EXYNOS + bool "SAMSUNG EXYNOS" select CPU_V7 select ARCH_SPARSEMEM_ENABLE select ARCH_HAS_HOLES_MEMORYMODEL @@ -853,7 +852,7 @@ config ARCH_EXYNOS4 select HAVE_S3C2410_WATCHDOG if WATCHDOG select NEED_MACH_MEMORY_H help - Samsung EXYNOS4 series based systems + Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5) config ARCH_SHARK bool "Shark" @@ -1080,7 +1079,7 @@ source "arch/arm/mach-s5pc100/Kconfig" source "arch/arm/mach-s5pv210/Kconfig" -source "arch/arm/mach-exynos4/Kconfig" +source "arch/arm/mach-exynos/Kconfig" source "arch/arm/mach-shmobile/Kconfig" @@ -2212,7 +2211,7 @@ menu "Power management options" source "kernel/power/Kconfig" config ARCH_SUSPEND_POSSIBLE - depends on !ARCH_S5P64X0 && !ARCH_S5PC100 + depends on !ARCH_S5PC100 depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \ CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE def_bool y diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index b7c2d377a6c2..dfcf3b033e10 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -180,7 +180,7 @@ machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 machine-$(CONFIG_ARCH_S5PC100) := s5pc100 machine-$(CONFIG_ARCH_S5PV210) := s5pv210 -machine-$(CONFIG_ARCH_EXYNOS4) := exynos4 +machine-$(CONFIG_ARCH_EXYNOS4) := exynos machine-$(CONFIG_ARCH_SA1100) := sa1100 machine-$(CONFIG_ARCH_SHARK) := shark machine-$(CONFIG_ARCH_SHMOBILE) := shmobile diff --git a/trunk/arch/arm/boot/Makefile b/trunk/arch/arm/boot/Makefile index 176062ac7f07..5df26a9976a2 100644 --- a/trunk/arch/arm/boot/Makefile +++ b/trunk/arch/arm/boot/Makefile @@ -65,6 +65,8 @@ $(obj)/%.dtb: $(src)/dts/%.dts $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y)) +clean-files := *.dtb + quiet_cmd_uimage = UIMAGE $@ cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \ -C none -a $(LOADADDR) -e $(STARTADDR) \ diff --git a/trunk/arch/arm/boot/dts/tegra-ventana.dts b/trunk/arch/arm/boot/dts/tegra-ventana.dts index 9b29a623aaf1..3f9abd6b6964 100644 --- a/trunk/arch/arm/boot/dts/tegra-ventana.dts +++ b/trunk/arch/arm/boot/dts/tegra-ventana.dts @@ -22,11 +22,10 @@ sdhci@c8000400 { cd-gpios = <&gpio 69 0>; /* gpio PI5 */ wp-gpios = <&gpio 57 0>; /* gpio PH1 */ - power-gpios = <&gpio 155 0>; /* gpio PT3 */ + power-gpios = <&gpio 70 0>; /* gpio PI6 */ }; sdhci@c8000600 { - power-gpios = <&gpio 70 0>; /* gpio PI6 */ support-8bit; }; }; diff --git a/trunk/arch/arm/common/it8152.c b/trunk/arch/arm/common/it8152.c index a7934ba9e1df..b539ec855e1a 100644 --- a/trunk/arch/arm/common/it8152.c +++ b/trunk/arch/arm/common/it8152.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include diff --git a/trunk/arch/arm/common/scoop.c b/trunk/arch/arm/common/scoop.c index 1cde34a080d7..0c616d5fcb0f 100644 --- a/trunk/arch/arm/common/scoop.c +++ b/trunk/arch/arm/common/scoop.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/trunk/arch/arm/configs/exynos4_defconfig b/trunk/arch/arm/configs/exynos4_defconfig index cd40bb56e568..bffe68e190a3 100644 --- a/trunk/arch/arm/configs/exynos4_defconfig +++ b/trunk/arch/arm/configs/exynos4_defconfig @@ -4,19 +4,18 @@ CONFIG_KALLSYMS_ALL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_EXYNOS4=y +CONFIG_ARCH_EXYNOS=y CONFIG_S3C_LOWLEVEL_UART_PORT=1 CONFIG_MACH_SMDKC210=y -CONFIG_MACH_SMDKV310=y CONFIG_MACH_ARMLEX4210=y CONFIG_MACH_UNIVERSAL_C210=y CONFIG_MACH_NURI=y CONFIG_MACH_ORIGEN=y +CONFIG_MACH_SMDK4412=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y CONFIG_NR_CPUS=2 -CONFIG_HOTPLUG_CPU=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M" @@ -61,13 +60,9 @@ CONFIG_DETECT_HUNG_TASK=y CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y CONFIG_DEBUG_INFO=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y CONFIG_DEBUG_LL=y CONFIG_EARLY_PRINTK=y -CONFIG_DEBUG_S3C_UART=1 CONFIG_CRC_CCITT=y diff --git a/trunk/arch/arm/include/asm/hardware/cache-l2x0.h b/trunk/arch/arm/include/asm/hardware/cache-l2x0.h index 1db1143a9483..7df239bcdf27 100644 --- a/trunk/arch/arm/include/asm/hardware/cache-l2x0.h +++ b/trunk/arch/arm/include/asm/hardware/cache-l2x0.h @@ -20,6 +20,8 @@ #ifndef __ASM_ARM_HARDWARE_L2X0_H #define __ASM_ARM_HARDWARE_L2X0_H +#include + #define L2X0_CACHE_ID 0x000 #define L2X0_CACHE_TYPE 0x004 #define L2X0_CTRL 0x100 diff --git a/trunk/arch/arm/include/asm/mach/arch.h b/trunk/arch/arm/include/asm/mach/arch.h index 7d19425dd496..2b0efc3104ac 100644 --- a/trunk/arch/arm/include/asm/mach/arch.h +++ b/trunk/arch/arm/include/asm/mach/arch.h @@ -13,6 +13,7 @@ struct tag; struct meminfo; struct sys_timer; +struct pt_regs; struct machine_desc { unsigned int nr; /* architecture number */ diff --git a/trunk/arch/arm/include/asm/unistd.h b/trunk/arch/arm/include/asm/unistd.h index c60a2944f95b..4a1123783806 100644 --- a/trunk/arch/arm/include/asm/unistd.h +++ b/trunk/arch/arm/include/asm/unistd.h @@ -402,6 +402,8 @@ #define __NR_syncfs (__NR_SYSCALL_BASE+373) #define __NR_sendmmsg (__NR_SYSCALL_BASE+374) #define __NR_setns (__NR_SYSCALL_BASE+375) +#define __NR_process_vm_readv (__NR_SYSCALL_BASE+376) +#define __NR_process_vm_writev (__NR_SYSCALL_BASE+377) /* * The following SWIs are ARM private. diff --git a/trunk/arch/arm/kernel/armksyms.c b/trunk/arch/arm/kernel/armksyms.c index 8e3c6f11b0a1..5b0bce61eb69 100644 --- a/trunk/arch/arm/kernel/armksyms.c +++ b/trunk/arch/arm/kernel/armksyms.c @@ -7,7 +7,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/bios32.c b/trunk/arch/arm/kernel/bios32.c index c0d9203fc75e..b530e9116a0c 100644 --- a/trunk/arch/arm/kernel/bios32.c +++ b/trunk/arch/arm/kernel/bios32.c @@ -5,7 +5,7 @@ * * Bits taken from various places. */ -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/calls.S b/trunk/arch/arm/kernel/calls.S index 9943e9e74a1b..463ff4a0ec8a 100644 --- a/trunk/arch/arm/kernel/calls.S +++ b/trunk/arch/arm/kernel/calls.S @@ -385,6 +385,8 @@ CALL(sys_syncfs) CALL(sys_sendmmsg) /* 375 */ CALL(sys_setns) + CALL(sys_process_vm_readv) + CALL(sys_process_vm_writev) #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls #define syscalls_counted diff --git a/trunk/arch/arm/kernel/devtree.c b/trunk/arch/arm/kernel/devtree.c index 1a33e9d6bb1f..bee7f9d47f02 100644 --- a/trunk/arch/arm/kernel/devtree.c +++ b/trunk/arch/arm/kernel/devtree.c @@ -9,7 +9,7 @@ */ #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/elf.c b/trunk/arch/arm/kernel/elf.c index 9b05c6a0dcea..ddba41d1fcf1 100644 --- a/trunk/arch/arm/kernel/elf.c +++ b/trunk/arch/arm/kernel/elf.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/etm.c b/trunk/arch/arm/kernel/etm.c index 1bec8b5f22f0..36d20bd50120 100644 --- a/trunk/arch/arm/kernel/etm.c +++ b/trunk/arch/arm/kernel/etm.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include diff --git a/trunk/arch/arm/kernel/head.S b/trunk/arch/arm/kernel/head.S index 566c54c2a1fe..08c82fd844a8 100644 --- a/trunk/arch/arm/kernel/head.S +++ b/trunk/arch/arm/kernel/head.S @@ -360,7 +360,7 @@ __secondary_data: * r13 = *virtual* address to jump to upon completion */ __enable_mmu: -#ifdef CONFIG_ALIGNMENT_TRAP +#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 6 orr r0, r0, #CR_A #else bic r0, r0, #CR_A diff --git a/trunk/arch/arm/kernel/io.c b/trunk/arch/arm/kernel/io.c index f4470307edb8..dcd5b4d86143 100644 --- a/trunk/arch/arm/kernel/io.c +++ b/trunk/arch/arm/kernel/io.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/trunk/arch/arm/kernel/irq.c b/trunk/arch/arm/kernel/irq.c index 7cb29261249a..3efd82cc95f0 100644 --- a/trunk/arch/arm/kernel/irq.c +++ b/trunk/arch/arm/kernel/irq.c @@ -22,7 +22,6 @@ * Naturally it's not a 1:1 relation, but there are similarities. */ #include -#include #include #include #include diff --git a/trunk/arch/arm/kernel/leds.c b/trunk/arch/arm/kernel/leds.c index 0f107dcb0347..0bcd38341573 100644 --- a/trunk/arch/arm/kernel/leds.c +++ b/trunk/arch/arm/kernel/leds.c @@ -7,10 +7,11 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include +#include #include #include #include +#include #include diff --git a/trunk/arch/arm/kernel/machine_kexec.c b/trunk/arch/arm/kernel/machine_kexec.c index c1b4463dcc83..e59bbd496c39 100644 --- a/trunk/arch/arm/kernel/machine_kexec.c +++ b/trunk/arch/arm/kernel/machine_kexec.c @@ -32,24 +32,6 @@ static atomic_t waiting_for_crash_ipi; int machine_kexec_prepare(struct kimage *image) { - unsigned long page_list; - void *reboot_code_buffer; - page_list = image->head & PAGE_MASK; - - reboot_code_buffer = page_address(image->control_code_page); - - /* Prepare parameters for reboot_code_buffer*/ - kexec_start_address = image->start; - kexec_indirection_page = page_list; - kexec_mach_type = machine_arch_type; - kexec_boot_atags = image->start - KEXEC_ARM_ZIMAGE_OFFSET + KEXEC_ARM_ATAGS_OFFSET; - - /* copy our kernel relocation code to the control code page */ - memcpy(reboot_code_buffer, - relocate_new_kernel, relocate_new_kernel_size); - - flush_icache_range((unsigned long) reboot_code_buffer, - (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE); return 0; } @@ -100,14 +82,31 @@ void (*kexec_reinit)(void); void machine_kexec(struct kimage *image) { + unsigned long page_list; unsigned long reboot_code_buffer_phys; void *reboot_code_buffer; + + page_list = image->head & PAGE_MASK; + /* we need both effective and real address here */ reboot_code_buffer_phys = page_to_pfn(image->control_code_page) << PAGE_SHIFT; reboot_code_buffer = page_address(image->control_code_page); + /* Prepare parameters for reboot_code_buffer*/ + kexec_start_address = image->start; + kexec_indirection_page = page_list; + kexec_mach_type = machine_arch_type; + kexec_boot_atags = image->start - KEXEC_ARM_ZIMAGE_OFFSET + KEXEC_ARM_ATAGS_OFFSET; + + /* copy our kernel relocation code to the control code page */ + memcpy(reboot_code_buffer, + relocate_new_kernel, relocate_new_kernel_size); + + + flush_icache_range((unsigned long) reboot_code_buffer, + (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE); printk(KERN_INFO "Bye!\n"); if (kexec_reinit) diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c index e6e5d7c84f1a..24e2347be6b1 100644 --- a/trunk/arch/arm/kernel/perf_event.c +++ b/trunk/arch/arm/kernel/perf_event.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/pj4-cp0.c b/trunk/arch/arm/kernel/pj4-cp0.c index a4b1b0748fd3..679cf4d18c08 100644 --- a/trunk/arch/arm/kernel/pj4-cp0.c +++ b/trunk/arch/arm/kernel/pj4-cp0.c @@ -10,7 +10,6 @@ * published by the Free Software Foundation. */ -#include #include #include #include diff --git a/trunk/arch/arm/kernel/process.c b/trunk/arch/arm/kernel/process.c index fd0814076ff6..75316f0dd02a 100644 --- a/trunk/arch/arm/kernel/process.c +++ b/trunk/arch/arm/kernel/process.c @@ -10,7 +10,7 @@ */ #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/ptrace.c b/trunk/arch/arm/kernel/ptrace.c index 2491f3b406bc..483727ad6892 100644 --- a/trunk/arch/arm/kernel/ptrace.c +++ b/trunk/arch/arm/kernel/ptrace.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/return_address.c b/trunk/arch/arm/kernel/return_address.c index 0b13a72f855d..8085417555dd 100644 --- a/trunk/arch/arm/kernel/return_address.c +++ b/trunk/arch/arm/kernel/return_address.c @@ -8,7 +8,7 @@ * under the terms of the GNU General Public License version 2 as published by * the Free Software Foundation. */ -#include +#include #include #if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c index bda0a218f4a5..3448a3f9cc8c 100644 --- a/trunk/arch/arm/kernel/setup.c +++ b/trunk/arch/arm/kernel/setup.c @@ -7,7 +7,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include +#include #include #include #include @@ -461,8 +461,10 @@ static void __init setup_processor(void) cpu_name, read_cpuid_id(), read_cpuid_id() & 15, proc_arch[cpu_architecture()], cr_alignment); - sprintf(init_utsname()->machine, "%s%c", list->arch_name, ENDIANNESS); - sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS); + snprintf(init_utsname()->machine, __NEW_UTS_LEN + 1, "%s%c", + list->arch_name, ENDIANNESS); + snprintf(elf_platform, ELF_PLATFORM_SIZE, "%s%c", + list->elf_name, ENDIANNESS); elf_hwcap = list->elf_hwcap; #ifndef CONFIG_ARM_THUMB elf_hwcap &= ~HWCAP_THUMB; diff --git a/trunk/arch/arm/kernel/stacktrace.c b/trunk/arch/arm/kernel/stacktrace.c index 381d23a497c1..00f79e59985b 100644 --- a/trunk/arch/arm/kernel/stacktrace.c +++ b/trunk/arch/arm/kernel/stacktrace.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/trunk/arch/arm/kernel/sys_arm.c b/trunk/arch/arm/kernel/sys_arm.c index 62e7c61d0342..d2b177905cdb 100644 --- a/trunk/arch/arm/kernel/sys_arm.c +++ b/trunk/arch/arm/kernel/sys_arm.c @@ -12,7 +12,7 @@ * have a non-standard calling sequence on the Linux/arm * platform. */ -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/time.c b/trunk/arch/arm/kernel/time.c index 5a54b95d6bd2..8c57dd3680e9 100644 --- a/trunk/arch/arm/kernel/time.c +++ b/trunk/arch/arm/kernel/time.c @@ -11,7 +11,7 @@ * This file contains the ARM-specific time handling details: * reading the RTC at bootup, etc... */ -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/unwind.c b/trunk/arch/arm/kernel/unwind.c index d2cb0b3c9872..e7e8365795c3 100644 --- a/trunk/arch/arm/kernel/unwind.c +++ b/trunk/arch/arm/kernel/unwind.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/xscale-cp0.c b/trunk/arch/arm/kernel/xscale-cp0.c index 1796157e3dd5..e42adc6bcdb1 100644 --- a/trunk/arch/arm/kernel/xscale-cp0.c +++ b/trunk/arch/arm/kernel/xscale-cp0.c @@ -8,7 +8,6 @@ * published by the Free Software Foundation. */ -#include #include #include #include diff --git a/trunk/arch/arm/mach-at91/Kconfig b/trunk/arch/arm/mach-at91/Kconfig index a6b7991d7fe8..d111c3e99249 100644 --- a/trunk/arch/arm/mach-at91/Kconfig +++ b/trunk/arch/arm/mach-at91/Kconfig @@ -195,12 +195,6 @@ if ARCH_AT91SAM9260 comment "AT91SAM9260 Variants" -config ARCH_AT91SAM9260_SAM9XE - bool "AT91SAM9XE" - help - Select this if you are using Atmel's AT91SAM9XE System-on-Chip. - They are basically AT91SAM9260s with various sizes of embedded Flash. - comment "AT91SAM9260 / AT91SAM9XE Board Type" config MACH_AT91SAM9260EK diff --git a/trunk/arch/arm/mach-at91/at91cap9_devices.c b/trunk/arch/arm/mach-at91/at91cap9_devices.c index a4401d6b5b07..adad70db70eb 100644 --- a/trunk/arch/arm/mach-at91/at91cap9_devices.c +++ b/trunk/arch/arm/mach-at91/at91cap9_devices.c @@ -98,7 +98,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} * USB HS Device (Gadget) * -------------------------------------------------------------------- */ -#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE) +#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE) static struct resource usba_udc_resources[] = { [0] = { @@ -1021,8 +1021,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -1035,7 +1035,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91rm9200_devices.c b/trunk/arch/arm/mach-at91/at91rm9200_devices.c index 01d8bbd1468b..66591fa53e05 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200_devices.c +++ b/trunk/arch/arm/mach-at91/at91rm9200_devices.c @@ -877,8 +877,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -891,7 +891,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91sam9260_devices.c b/trunk/arch/arm/mach-at91/at91sam9260_devices.c index 24b6f8c0440d..25e3464fb07f 100644 --- a/trunk/arch/arm/mach-at91/at91sam9260_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9260_devices.c @@ -837,8 +837,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -851,7 +851,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91sam9261_devices.c b/trunk/arch/arm/mach-at91/at91sam9261_devices.c index 3b70b3897d95..ae78f4d03b73 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9261_devices.c @@ -816,8 +816,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -830,7 +830,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91sam9263_devices.c b/trunk/arch/arm/mach-at91/at91sam9263_devices.c index 3faa1fde9ad9..ad017eb1f8df 100644 --- a/trunk/arch/arm/mach-at91/at91sam9263_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9263_devices.c @@ -1196,8 +1196,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -1210,7 +1210,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91sam9g45_devices.c b/trunk/arch/arm/mach-at91/at91sam9g45_devices.c index 000b5e1da965..09a16d6bd5cd 100644 --- a/trunk/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9g45_devices.c @@ -197,7 +197,7 @@ void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data) {} * USB HS Device (Gadget) * -------------------------------------------------------------------- */ -#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE) +#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE) static struct resource usba_udc_resources[] = { [0] = { .start = AT91SAM9G45_UDPHS_FIFO, @@ -1332,8 +1332,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -1346,7 +1346,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c index 305a851b5bff..628eb566d60c 100644 --- a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c @@ -75,7 +75,7 @@ void __init at91_add_device_hdmac(void) {} * USB HS Device (Gadget) * -------------------------------------------------------------------- */ -#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE) +#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE) static struct resource usba_udc_resources[] = { [0] = { @@ -908,8 +908,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -922,7 +922,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/trunk/arch/arm/mach-at91/board-afeb-9260v1.c b/trunk/arch/arm/mach-at91/board-afeb-9260v1.c index 0487ea10c2d6..4282d96dffa8 100644 --- a/trunk/arch/arm/mach-at91/board-afeb-9260v1.c +++ b/trunk/arch/arm/mach-at91/board-afeb-9260v1.c @@ -130,19 +130,14 @@ static struct mtd_partition __initdata afeb9260_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(afeb9260_nand_partition); - return afeb9260_nand_partition; -} - static struct atmel_nand_data __initdata afeb9260_nand_data = { .ale = 21, .cle = 22, .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, - .partition_info = nand_partitions, .bus_width_16 = 0, + .parts = afeb9260_nand_partition, + .num_parts = ARRAY_SIZE(afeb9260_nand_partition), }; diff --git a/trunk/arch/arm/mach-at91/board-cam60.c b/trunk/arch/arm/mach-at91/board-cam60.c index 747b2eaa9737..f90cfb32bad2 100644 --- a/trunk/arch/arm/mach-at91/board-cam60.c +++ b/trunk/arch/arm/mach-at91/board-cam60.c @@ -132,19 +132,14 @@ static struct mtd_partition __initdata cam60_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(cam60_nand_partition); - return cam60_nand_partition; -} - static struct atmel_nand_data __initdata cam60_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not there .rdy_pin = AT91_PIN_PA9, .enable_pin = AT91_PIN_PA7, - .partition_info = nand_partitions, + .parts = cam60_nand_partition, + .num_parts = ARRAY_SIZE(cam60_nand_partition), }; static struct sam9_smc_config __initdata cam60_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-cap9adk.c b/trunk/arch/arm/mach-at91/board-cap9adk.c index 062670351a6a..5dffd3be62d2 100644 --- a/trunk/arch/arm/mach-at91/board-cap9adk.c +++ b/trunk/arch/arm/mach-at91/board-cap9adk.c @@ -169,19 +169,14 @@ static struct mtd_partition __initdata cap9adk_nand_partitions[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(cap9adk_nand_partitions); - return cap9adk_nand_partitions; -} - static struct atmel_nand_data __initdata cap9adk_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not connected // .rdy_pin = ... not connected .enable_pin = AT91_PIN_PD15, - .partition_info = nand_partitions, + .parts = cap9adk_nand_partitions, + .num_parts = ARRAY_SIZE(cap9adk_nand_partitions), }; static struct sam9_smc_config __initdata cap9adk_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-kb9202.c b/trunk/arch/arm/mach-at91/board-kb9202.c index 15a3f1a87ab0..e61351ffad50 100644 --- a/trunk/arch/arm/mach-at91/board-kb9202.c +++ b/trunk/arch/arm/mach-at91/board-kb9202.c @@ -97,19 +97,14 @@ static struct mtd_partition __initdata kb9202_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(kb9202_nand_partition); - return kb9202_nand_partition; -} - static struct atmel_nand_data __initdata kb9202_nand_data = { .ale = 22, .cle = 21, // .det_pin = ... not there .rdy_pin = AT91_PIN_PC29, .enable_pin = AT91_PIN_PC28, - .partition_info = nand_partitions, + .parts = kb9202_nand_partition, + .num_parts = ARRAY_SIZE(kb9202_nand_partition), }; static void __init kb9202_board_init(void) diff --git a/trunk/arch/arm/mach-at91/board-neocore926.c b/trunk/arch/arm/mach-at91/board-neocore926.c index 6094496f7edb..ef816c17dc61 100644 --- a/trunk/arch/arm/mach-at91/board-neocore926.c +++ b/trunk/arch/arm/mach-at91/board-neocore926.c @@ -182,19 +182,14 @@ static struct mtd_partition __initdata neocore926_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(neocore926_nand_partition); - return neocore926_nand_partition; -} - static struct atmel_nand_data __initdata neocore926_nand_data = { .ale = 21, .cle = 22, .rdy_pin = AT91_PIN_PB19, .rdy_pin_active_low = 1, .enable_pin = AT91_PIN_PD15, - .partition_info = nand_partitions, + .parts = neocore926_nand_partition, + .num_parts = ARRAY_SIZE(neocore926_nand_partition), }; static struct sam9_smc_config __initdata neocore926_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-qil-a9260.c b/trunk/arch/arm/mach-at91/board-qil-a9260.c index 938cc390bea3..07421bdb88ea 100644 --- a/trunk/arch/arm/mach-at91/board-qil-a9260.c +++ b/trunk/arch/arm/mach-at91/board-qil-a9260.c @@ -130,19 +130,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(ek_nand_partition); - return ek_nand_partition; -} - static struct atmel_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not connected .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, - .partition_info = nand_partitions, + .parts = ek_nand_partition, + .num_parts = ARRAY_SIZE(ek_nand_partition), }; static struct sam9_smc_config __initdata ek_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-rm9200dk.c b/trunk/arch/arm/mach-at91/board-rm9200dk.c index b4ac30e38a9e..80a8c9c6e922 100644 --- a/trunk/arch/arm/mach-at91/board-rm9200dk.c +++ b/trunk/arch/arm/mach-at91/board-rm9200dk.c @@ -138,19 +138,14 @@ static struct mtd_partition __initdata dk_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(dk_nand_partition); - return dk_nand_partition; -} - static struct atmel_nand_data __initdata dk_nand_data = { .ale = 22, .cle = 21, .det_pin = AT91_PIN_PB1, .rdy_pin = AT91_PIN_PC2, // .enable_pin = ... not there - .partition_info = nand_partitions, + .parts = dk_nand_partition, + .num_parts = ARRAY_SIZE(dk_nand_partition), }; #define DK_FLASH_BASE AT91_CHIPSELECT_0 diff --git a/trunk/arch/arm/mach-at91/board-sam9-l9260.c b/trunk/arch/arm/mach-at91/board-sam9-l9260.c index 2a21e790250e..072d53af98d9 100644 --- a/trunk/arch/arm/mach-at91/board-sam9-l9260.c +++ b/trunk/arch/arm/mach-at91/board-sam9-l9260.c @@ -131,19 +131,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(ek_nand_partition); - return ek_nand_partition; -} - static struct atmel_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not connected .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, - .partition_info = nand_partitions, + .parts = ek_nand_partition, + .num_parts = ARRAY_SIZE(ek_nand_partition), }; static struct sam9_smc_config __initdata ek_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-sam9260ek.c b/trunk/arch/arm/mach-at91/board-sam9260ek.c index 89c8b579bfda..4f10181a0782 100644 --- a/trunk/arch/arm/mach-at91/board-sam9260ek.c +++ b/trunk/arch/arm/mach-at91/board-sam9260ek.c @@ -173,19 +173,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(ek_nand_partition); - return ek_nand_partition; -} - static struct atmel_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not connected .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, - .partition_info = nand_partitions, + .parts = ek_nand_partition, + .num_parts = ARRAY_SIZE(ek_nand_partition), }; static struct sam9_smc_config __initdata ek_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-sam9261ek.c b/trunk/arch/arm/mach-at91/board-sam9261ek.c index 3741f43cdae9..b005b738e8ff 100644 --- a/trunk/arch/arm/mach-at91/board-sam9261ek.c +++ b/trunk/arch/arm/mach-at91/board-sam9261ek.c @@ -179,19 +179,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(ek_nand_partition); - return ek_nand_partition; -} - static struct atmel_nand_data __initdata ek_nand_data = { .ale = 22, .cle = 21, // .det_pin = ... not connected .rdy_pin = AT91_PIN_PC15, .enable_pin = AT91_PIN_PC14, - .partition_info = nand_partitions, + .parts = ek_nand_partition, + .num_parts = ARRAY_SIZE(ek_nand_partition), }; static struct sam9_smc_config __initdata ek_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-sam9263ek.c b/trunk/arch/arm/mach-at91/board-sam9263ek.c index a580dd451a41..bccdcf23caa1 100644 --- a/trunk/arch/arm/mach-at91/board-sam9263ek.c +++ b/trunk/arch/arm/mach-at91/board-sam9263ek.c @@ -180,19 +180,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(ek_nand_partition); - return ek_nand_partition; -} - static struct atmel_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not connected .rdy_pin = AT91_PIN_PA22, .enable_pin = AT91_PIN_PD15, - .partition_info = nand_partitions, + .parts = ek_nand_partition, + .num_parts = ARRAY_SIZE(ek_nand_partition), }; static struct sam9_smc_config __initdata ek_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-sam9g20ek.c b/trunk/arch/arm/mach-at91/board-sam9g20ek.c index 8d77c2ff96b2..64fc75c9d0ac 100644 --- a/trunk/arch/arm/mach-at91/board-sam9g20ek.c +++ b/trunk/arch/arm/mach-at91/board-sam9g20ek.c @@ -157,19 +157,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(ek_nand_partition); - return ek_nand_partition; -} - /* det_pin is not connected */ static struct atmel_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, - .partition_info = nand_partitions, + .parts = ek_nand_partition, + .num_parts = ARRAY_SIZE(ek_nand_partition), }; static struct sam9_smc_config __initdata ek_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-sam9m10g45ek.c b/trunk/arch/arm/mach-at91/board-sam9m10g45ek.c index 2d6203ac1a42..92de9127923a 100644 --- a/trunk/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/trunk/arch/arm/mach-at91/board-sam9m10g45ek.c @@ -137,19 +137,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(ek_nand_partition); - return ek_nand_partition; -} - /* det_pin is not connected */ static struct atmel_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, .rdy_pin = AT91_PIN_PC8, .enable_pin = AT91_PIN_PC14, - .partition_info = nand_partitions, + .parts = ek_nand_partition, + .num_parts = ARRAY_SIZE(ek_nand_partition), }; static struct sam9_smc_config __initdata ek_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-sam9rlek.c b/trunk/arch/arm/mach-at91/board-sam9rlek.c index 39a28effc3df..b2b748239f36 100644 --- a/trunk/arch/arm/mach-at91/board-sam9rlek.c +++ b/trunk/arch/arm/mach-at91/board-sam9rlek.c @@ -88,19 +88,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = { }, }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(ek_nand_partition); - return ek_nand_partition; -} - static struct atmel_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not connected .rdy_pin = AT91_PIN_PD17, .enable_pin = AT91_PIN_PB6, - .partition_info = nand_partitions, + .parts = ek_nand_partition, + .num_parts = ARRAY_SIZE(ek_nand_partition), }; static struct sam9_smc_config __initdata ek_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-snapper9260.c b/trunk/arch/arm/mach-at91/board-snapper9260.c index c73d25e5faea..0df01c6e2d0c 100644 --- a/trunk/arch/arm/mach-at91/board-snapper9260.c +++ b/trunk/arch/arm/mach-at91/board-snapper9260.c @@ -97,18 +97,12 @@ static struct mtd_partition __initdata snapper9260_nand_partitions[] = { }, }; -static struct mtd_partition * __init -snapper9260_nand_partition_info(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(snapper9260_nand_partitions); - return snapper9260_nand_partitions; -} - static struct atmel_nand_data __initdata snapper9260_nand_data = { .ale = 21, .cle = 22, .rdy_pin = AT91_PIN_PC13, - .partition_info = snapper9260_nand_partition_info, + .parts = snapper9260_nand_partitions, + .num_parts = ARRAY_SIZE(snapper9260_nand_partitions), .bus_width_16 = 0, }; diff --git a/trunk/arch/arm/mach-at91/board-usb-a926x.c b/trunk/arch/arm/mach-at91/board-usb-a926x.c index 5852d3d9890c..0a20bab21f99 100644 --- a/trunk/arch/arm/mach-at91/board-usb-a926x.c +++ b/trunk/arch/arm/mach-at91/board-usb-a926x.c @@ -190,19 +190,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = { } }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(ek_nand_partition); - return ek_nand_partition; -} - static struct atmel_nand_data __initdata ek_nand_data = { .ale = 21, .cle = 22, // .det_pin = ... not connected .rdy_pin = AT91_PIN_PA22, .enable_pin = AT91_PIN_PD15, - .partition_info = nand_partitions, + .parts = ek_nand_partition, + .num_parts = ARRAY_SIZE(ek_nand_partition), }; static struct sam9_smc_config __initdata usb_a9260_nand_smc_config = { diff --git a/trunk/arch/arm/mach-at91/board-yl-9200.c b/trunk/arch/arm/mach-at91/board-yl-9200.c index 3c288b396fc4..12a3f955162b 100644 --- a/trunk/arch/arm/mach-at91/board-yl-9200.c +++ b/trunk/arch/arm/mach-at91/board-yl-9200.c @@ -172,19 +172,14 @@ static struct mtd_partition __initdata yl9200_nand_partition[] = { } }; -static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) -{ - *num_partitions = ARRAY_SIZE(yl9200_nand_partition); - return yl9200_nand_partition; -} - static struct atmel_nand_data __initdata yl9200_nand_data = { .ale = 6, .cle = 7, // .det_pin = ... not connected .rdy_pin = AT91_PIN_PC14, /* R/!B (Sheet10) */ .enable_pin = AT91_PIN_PC15, /* !CE (Sheet10) */ - .partition_info = nand_partitions, + .parts = yl9200_nand_partition, + .num_parts = ARRAY_SIZE(yl9200_nand_partition), }; /* @@ -389,7 +384,7 @@ static struct spi_board_info yl9200_spi_devices[] = { #include