From a971f19b44969b7945ef8dc1706715d632b59339 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 13 Oct 2012 11:27:59 +0900 Subject: [PATCH] --- yaml --- r: 334226 b: refs/heads/master c: a3920a6efa158b445b8a39080b463b9b29337425 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/00-INDEX | 2 - .../ABI/obsolete/proc-pid-oom_adj | 22 - trunk/Documentation/ABI/testing/sysfs-block | 14 + .../Documentation/ABI/testing/sysfs-bus-fcoe | 12 +- .../DocBook/media/v4l/compat.xml | 4 + .../DocBook/media/v4l/controls.xml | 278 +- trunk/Documentation/DocBook/media/v4l/io.xml | 6 +- .../DocBook/media/v4l/pixfmt-nv12m.xml | 17 +- .../DocBook/media/v4l/pixfmt.xml | 38 + .../DocBook/media/v4l/subdev-formats.xml | 44 + .../DocBook/media/v4l/vidioc-qbuf.xml | 3 +- .../DocBook/media/v4l/vidioc-querybuf.xml | 11 +- trunk/Documentation/DocBook/mtdnand.tmpl | 2 - trunk/Documentation/arm/Booting | 22 +- trunk/Documentation/block/biodoc.txt | 5 - trunk/Documentation/cgroups/memory.txt | 90 +- .../devicetree/bindings/arm/davinci/nand.txt | 51 + .../devicetree/bindings/i2c/atmel-i2c.txt | 30 + .../devicetree/bindings/i2c/davinci.txt | 28 + .../devicetree/bindings/i2c/i2c-mxs.txt | 2 + .../devicetree/bindings/i2c/nomadik.txt | 23 + .../brcm,bcm2835-armctrl-ic.txt | 2 +- .../devicetree/bindings/mmc/atmel-hsmci.txt | 68 + .../bindings/mmc/exynos-dw-mshc.txt | 87 + .../devicetree/bindings/mmc/mmc.txt | 9 +- .../devicetree/bindings/mmc/pxa-mmc.txt | 25 + .../devicetree/bindings/mmc/samsung-sdhci.txt | 53 + .../devicetree/bindings/mmc/sdhci-dove.txt | 14 + .../devicetree/bindings/mmc/sdhci-spear.txt | 18 + .../bindings/mmc/synposis-dw-mshc.txt | 79 + .../devicetree/bindings/mtd/atmel-nand.txt | 40 +- .../devicetree/bindings/mtd/gpmi-nand.txt | 4 + .../devicetree/bindings/mtd/lpc32xx-mlc.txt | 50 + .../devicetree/bindings/mtd/lpc32xx-slc.txt | 52 + .../devicetree/bindings/mtd/mtd-physmap.txt | 7 + .../bindings/pinctrl/lantiq,falcon-pinumx.txt | 83 + .../bindings/pinctrl/lantiq,xway-pinumx.txt | 97 + .../devicetree/bindings/pwm/imx-pwm.txt | 17 + .../devicetree/bindings/pwm/mxs-pwm.txt | 2 +- .../bindings/pwm/nvidia,tegra20-pwm.txt | 2 +- .../devicetree/bindings/spi/spi-octeon.txt | 33 + .../timer/brcm,bcm2835-system-timer.txt | 2 +- trunk/Documentation/driver-model/devres.txt | 4 + trunk/Documentation/filesystems/nfs/nfs.txt | 44 +- .../filesystems/nfs/nfsd-admin-interfaces.txt | 41 + trunk/Documentation/filesystems/proc.txt | 22 +- trunk/Documentation/hwmon/da9052 | 2 +- trunk/Documentation/hwmon/max1619 | 2 +- trunk/Documentation/hwmon/twl4030-madc-hwmon | 2 +- trunk/Documentation/kernel-parameters.txt | 5 + trunk/Documentation/leds/leds-lp5523.txt | 21 +- trunk/Documentation/memory.txt | 33 - trunk/Documentation/percpu-rw-semaphore.txt | 27 + trunk/Documentation/prio_tree.txt | 107 - trunk/Documentation/pwm.txt | 3 +- trunk/Documentation/rbtree.txt | 209 +- .../Documentation/scsi/ChangeLog.megaraid_sas | 13 + trunk/Documentation/target/tcm_mod_builder.py | 16 - .../video4linux/v4l2-controls.txt | 24 + .../virtual/uml/UserModeLinux-HOWTO.txt | 2 +- trunk/Documentation/vm/unevictable-lru.txt | 14 +- trunk/MAINTAINERS | 27 +- trunk/Makefile | 19 +- trunk/arch/Kconfig | 9 + trunk/arch/alpha/Kconfig | 2 + trunk/arch/alpha/include/asm/Kbuild | 3 + trunk/arch/alpha/include/asm/exec.h | 6 - trunk/arch/alpha/include/asm/processor.h | 3 - trunk/arch/alpha/include/asm/thread_info.h | 3 +- trunk/arch/alpha/include/asm/unistd.h | 1 + trunk/arch/alpha/kernel/alpha_ksyms.c | 3 - trunk/arch/alpha/kernel/entry.S | 155 +- trunk/arch/alpha/kernel/osf_sys.c | 16 +- trunk/arch/alpha/kernel/pci-sysfs.c | 2 +- trunk/arch/alpha/kernel/process.c | 79 +- trunk/arch/alpha/kernel/ptrace.c | 32 +- trunk/arch/alpha/kernel/signal.c | 48 +- trunk/arch/arm/Kconfig | 7 +- trunk/arch/arm/boot/compressed/.gitignore | 1 + trunk/arch/arm/boot/compressed/Makefile | 9 +- trunk/arch/arm/boot/compressed/head.S | 71 +- trunk/arch/arm/boot/dts/Makefile | 15 +- trunk/arch/arm/boot/dts/at91sam9260.dtsi | 10 + trunk/arch/arm/boot/dts/at91sam9263.dtsi | 10 + trunk/arch/arm/boot/dts/at91sam9g20.dtsi | 4 + trunk/arch/arm/boot/dts/at91sam9g25ek.dts | 12 + trunk/arch/arm/boot/dts/at91sam9g45.dtsi | 20 + trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts | 8 + trunk/arch/arm/boot/dts/at91sam9n12.dtsi | 20 + trunk/arch/arm/boot/dts/at91sam9n12ek.dts | 8 + trunk/arch/arm/boot/dts/at91sam9x5.dtsi | 30 + trunk/arch/arm/boot/dts/imx28.dtsi | 2 + trunk/arch/arm/boot/dts/imx51.dtsi | 7 + trunk/arch/arm/boot/dts/imx53.dtsi | 7 + trunk/arch/arm/boot/dts/omap4-panda.dts | 47 + trunk/arch/arm/boot/dts/omap4-sdp.dts | 57 + trunk/arch/arm/boot/dts/omap5-evm.dts | 58 + trunk/arch/arm/boot/dts/omap5.dtsi | 17 + trunk/arch/arm/boot/dts/spear300-evb.dts | 3 +- trunk/arch/arm/boot/dts/spear320-evb.dts | 2 - trunk/arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- trunk/arch/arm/boot/dts/tegra20.dtsi | 4 +- trunk/arch/arm/common/it8152.c | 12 +- trunk/arch/arm/configs/cam60_defconfig | 1 - trunk/arch/arm/configs/corgi_defconfig | 1 - trunk/arch/arm/configs/ep93xx_defconfig | 1 - trunk/arch/arm/configs/mini2440_defconfig | 1 - trunk/arch/arm/configs/mv78xx0_defconfig | 1 - trunk/arch/arm/configs/nhk8815_defconfig | 1 - trunk/arch/arm/configs/orion5x_defconfig | 1 - trunk/arch/arm/configs/pxa3xx_defconfig | 1 - trunk/arch/arm/configs/spitz_defconfig | 1 - trunk/arch/arm/include/asm/assembler.h | 29 + trunk/arch/arm/include/asm/cacheflush.h | 15 + trunk/arch/arm/include/asm/glue-cache.h | 1 + trunk/arch/arm/include/asm/opcodes-virt.h | 10 + trunk/arch/arm/include/asm/processor.h | 5 - trunk/arch/arm/include/asm/ptrace.h | 6 + trunk/arch/arm/include/asm/system.h | 1 - trunk/arch/arm/include/asm/thread_info.h | 2 - trunk/arch/arm/include/asm/unistd.h | 1 + trunk/arch/arm/include/asm/vfpmacros.h | 4 +- trunk/arch/arm/include/asm/virt.h | 69 + trunk/arch/arm/kernel/Makefile | 2 + trunk/arch/arm/kernel/calls.S | 2 +- trunk/arch/arm/kernel/entry-common.S | 10 +- trunk/arch/arm/kernel/head.S | 14 +- trunk/arch/arm/kernel/hyp-stub.S | 223 + trunk/arch/arm/kernel/process.c | 74 +- trunk/arch/arm/kernel/setup.c | 20 + trunk/arch/arm/kernel/signal.c | 1 - trunk/arch/arm/kernel/smp.c | 8 +- trunk/arch/arm/kernel/suspend.c | 17 +- trunk/arch/arm/kernel/sys_arm.c | 63 - trunk/arch/arm/mach-at91/at91rm9200.c | 1 + trunk/arch/arm/mach-at91/at91rm9200_devices.c | 2 +- trunk/arch/arm/mach-at91/at91sam9260.c | 3 + .../arch/arm/mach-at91/at91sam9260_devices.c | 8 +- trunk/arch/arm/mach-at91/at91sam9261.c | 2 + .../arch/arm/mach-at91/at91sam9261_devices.c | 14 +- trunk/arch/arm/mach-at91/at91sam9263.c | 2 + .../arch/arm/mach-at91/at91sam9263_devices.c | 2 +- trunk/arch/arm/mach-at91/at91sam9g45.c | 4 + .../arch/arm/mach-at91/at91sam9g45_devices.c | 10 +- trunk/arch/arm/mach-at91/at91sam9n12.c | 2 + trunk/arch/arm/mach-at91/at91sam9rl.c | 2 + trunk/arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- trunk/arch/arm/mach-at91/at91sam9x5.c | 3 + .../arm/mach-at91/include/mach/at91_twi.h | 68 - trunk/arch/arm/mach-at91/pm.c | 5 +- trunk/arch/arm/mach-at91/setup.c | 2 +- trunk/arch/arm/mach-clps711x/autcpu12.c | 19 + trunk/arch/arm/mach-davinci/Kconfig | 7 + trunk/arch/arm/mach-davinci/board-da850-evm.c | 179 + .../arch/arm/mach-davinci/board-dm644x-evm.c | 15 +- .../arch/arm/mach-davinci/board-dm646x-evm.c | 80 +- trunk/arch/arm/mach-davinci/da850.c | 154 +- trunk/arch/arm/mach-davinci/dm644x.c | 17 +- .../arm/mach-davinci/include/mach/da8xx.h | 11 + .../arch/arm/mach-davinci/include/mach/mux.h | 42 + .../arch/arm/mach-davinci/include/mach/psc.h | 1 + trunk/arch/arm/mach-exynos/dma.c | 2 + trunk/arch/arm/mach-exynos/mach-nuri.c | 9 +- trunk/arch/arm/mach-exynos/mach-origen.c | 6 +- trunk/arch/arm/mach-exynos/mach-smdk4x12.c | 2 +- trunk/arch/arm/mach-exynos/mach-smdkv310.c | 2 +- .../arm/mach-exynos/mach-universal_c210.c | 9 +- trunk/arch/arm/mach-exynos/setup-fimd0.c | 2 +- .../arm/mach-footbridge/include/mach/irqs.h | 2 - trunk/arch/arm/mach-imx/clk-imx51-imx53.c | 2 + .../arm/mach-integrator/include/mach/cm.h | 2 +- .../mach-integrator/include/mach/platform.h | 6 +- .../arch/arm/mach-integrator/integrator_ap.c | 2 +- .../arch/arm/mach-integrator/integrator_cp.c | 4 +- trunk/arch/arm/mach-iop13xx/iq81340sc.c | 2 +- trunk/arch/arm/mach-iop13xx/pci.c | 2 +- .../arm/mach-ks8695/include/mach/memory.h | 3 +- trunk/arch/arm/mach-mv78xx0/addr-map.c | 2 +- trunk/arch/arm/mach-mv78xx0/common.c | 2 +- trunk/arch/arm/mach-omap1/devices.c | 2 +- trunk/arch/arm/mach-omap2/board-4430sdp.c | 99 +- trunk/arch/arm/mach-omap2/board-flash.c | 2 +- trunk/arch/arm/mach-omap2/board-omap3beagle.c | 2 +- trunk/arch/arm/mach-omap2/board-omap3evm.c | 3 +- .../arch/arm/mach-omap2/board-omap3stalker.c | 5 - trunk/arch/arm/mach-omap2/board-omap4panda.c | 45 +- .../arm/mach-omap2/board-rx51-peripherals.c | 2 +- .../arm/mach-omap2/board-zoom-peripherals.c | 3 +- trunk/arch/arm/mach-omap2/clkt_clksel.c | 2 +- trunk/arch/arm/mach-omap2/clock33xx_data.c | 2 + .../arm/mach-omap2/clockdomain2xxx_3xxx.c | 44 +- trunk/arch/arm/mach-omap2/display.c | 3 +- trunk/arch/arm/mach-omap2/gpmc.c | 4 +- trunk/arch/arm/mach-omap2/hsmmc.c | 2 +- trunk/arch/arm/mach-omap2/mux.c | 2 +- trunk/arch/arm/mach-omap2/omap-secure.c | 4 +- trunk/arch/arm/mach-omap2/omap_hwmod.c | 31 +- .../mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +- .../arm/mach-omap2/omap_hwmod_3xxx_data.c | 9 +- trunk/arch/arm/mach-omap2/opp.c | 23 +- trunk/arch/arm/mach-omap2/pm-debug.c | 2 +- trunk/arch/arm/mach-omap2/pm.c | 13 +- trunk/arch/arm/mach-omap2/sr_device.c | 2 +- trunk/arch/arm/mach-omap2/timer.c | 2 +- trunk/arch/arm/mach-omap2/twl-common.c | 8 +- trunk/arch/arm/mach-pxa/cm-x2xx.c | 1 + trunk/arch/arm/mach-pxa/palmte2.c | 2 + trunk/arch/arm/mach-pxa/sharpsl_pm.c | 48 - trunk/arch/arm/mach-pxa/viper.c | 3 +- trunk/arch/arm/mach-rpc/ecard.c | 4 +- trunk/arch/arm/mach-s3c24xx/irq-s3c2416.c | 6 +- trunk/arch/arm/mach-s3c24xx/irq-s3c2443.c | 4 +- trunk/arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 +- trunk/arch/arm/mach-s3c24xx/simtec-usb.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- 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-smdk6410.c | 2 +- trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +- trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +- trunk/arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +- trunk/arch/arm/mach-s5pv210/mach-aquila.c | 2 +- trunk/arch/arm/mach-s5pv210/mach-goni.c | 2 +- trunk/arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +- trunk/arch/arm/mach-sa1100/assabet.c | 2 +- trunk/arch/arm/mach-shark/pci.c | 2 +- .../arm/mach-shmobile/include/mach/common.h | 2 +- trunk/arch/arm/mach-spear13xx/spear13xx.c | 3 + trunk/arch/arm/mach-tegra/Kconfig | 6 +- trunk/arch/arm/mach-ux500/Kconfig | 4 +- .../arm/mach-vt8500/include/mach/uncompress.h | 8 +- trunk/arch/arm/mach-vt8500/vt8500.c | 5 +- trunk/arch/arm/mm/Kconfig | 17 + trunk/arch/arm/mm/cache-fa.S | 3 + trunk/arch/arm/mm/cache-v3.S | 3 + trunk/arch/arm/mm/cache-v4.S | 3 + trunk/arch/arm/mm/cache-v4wb.S | 3 + trunk/arch/arm/mm/cache-v4wt.S | 3 + trunk/arch/arm/mm/cache-v6.S | 3 + trunk/arch/arm/mm/cache-v7.S | 48 +- trunk/arch/arm/mm/fault-armv.c | 3 +- trunk/arch/arm/mm/fault.c | 1 + trunk/arch/arm/mm/flush.c | 3 +- trunk/arch/arm/mm/proc-arm1020.S | 3 + trunk/arch/arm/mm/proc-arm1020e.S | 3 + trunk/arch/arm/mm/proc-arm1022.S | 3 + trunk/arch/arm/mm/proc-arm1026.S | 3 + trunk/arch/arm/mm/proc-arm920.S | 3 + trunk/arch/arm/mm/proc-arm922.S | 3 + trunk/arch/arm/mm/proc-arm925.S | 3 + trunk/arch/arm/mm/proc-arm926.S | 3 + trunk/arch/arm/mm/proc-arm940.S | 3 + trunk/arch/arm/mm/proc-arm946.S | 3 + trunk/arch/arm/mm/proc-feroceon.S | 4 + trunk/arch/arm/mm/proc-macros.S | 1 + trunk/arch/arm/mm/proc-mohawk.S | 3 + trunk/arch/arm/mm/proc-v7.S | 2 +- trunk/arch/arm/mm/proc-xsc3.S | 3 + trunk/arch/arm/mm/proc-xscale.S | 4 + .../arm/plat-mxc/devices/platform-mxc_nand.c | 11 +- .../plat-nomadik/include/plat/gpio-nomadik.h | 6 + .../arm/plat-nomadik/include/plat/pincfg.h | 2 + trunk/arch/arm/plat-omap/Kconfig | 2 + trunk/arch/arm/plat-omap/counter_32k.c | 21 +- trunk/arch/arm/plat-omap/i2c.c | 21 - trunk/arch/arm/plat-omap/omap-pm-noop.c | 8 +- trunk/arch/arm/plat-omap/omap_device.c | 2 +- .../plat-samsung/include/plat/regs-fb-v4.h | 159 - trunk/arch/arm/plat-samsung/setup-mipiphy.c | 20 +- trunk/arch/arm64/Kconfig | 4 + trunk/arch/arm64/include/asm/Kbuild | 2 - trunk/arch/arm64/include/asm/hwcap.h | 9 +- trunk/arch/arm64/include/asm/ptrace.h | 75 +- trunk/arch/arm64/include/asm/sigcontext.h | 40 +- trunk/arch/arm64/include/asm/stat.h | 5 +- trunk/arch/arm64/include/asm/unistd.h | 20 +- trunk/arch/arm64/include/asm/unistd32.h | 1105 +- trunk/arch/arm64/include/uapi/asm/Kbuild | 14 + .../arm64/include/{ => uapi}/asm/auxvec.h | 0 .../include/{ => uapi}/asm/bitsperlong.h | 0 .../arm64/include/{ => uapi}/asm/byteorder.h | 0 .../arch/arm64/include/{ => uapi}/asm/fcntl.h | 0 trunk/arch/arm64/include/uapi/asm/hwcap.h | 26 + .../arch/arm64/include/{ => uapi}/asm/param.h | 0 trunk/arch/arm64/include/uapi/asm/ptrace.h | 91 + .../arch/arm64/include/{ => uapi}/asm/setup.h | 0 .../arch/arm64/include/uapi/asm/sigcontext.h | 57 + .../arm64/include/{ => uapi}/asm/siginfo.h | 0 .../arm64/include/{ => uapi}/asm/signal.h | 0 trunk/arch/arm64/include/uapi/asm/stat.h | 16 + .../arm64/include/{ => uapi}/asm/statfs.h | 0 trunk/arch/arm64/include/uapi/asm/unistd.h | 16 + trunk/arch/arm64/kernel/entry.S | 1 + trunk/arch/arm64/kernel/ptrace.c | 6 +- trunk/arch/arm64/kernel/signal32.c | 22 +- trunk/arch/arm64/kernel/sys.c | 4 +- trunk/arch/arm64/kernel/sys32.S | 126 +- trunk/arch/arm64/kernel/sys_compat.c | 10 +- trunk/arch/avr32/include/asm/Kbuild | 4 +- trunk/arch/avr32/include/asm/param.h | 18 +- trunk/arch/avr32/include/asm/ptrace.h | 115 +- trunk/arch/avr32/include/asm/setup.h | 5 +- trunk/arch/avr32/include/asm/signal.h | 121 +- trunk/arch/avr32/include/asm/termios.h | 41 +- trunk/arch/avr32/include/asm/thread_info.h | 18 +- trunk/arch/avr32/include/asm/types.h | 6 +- trunk/arch/avr32/include/asm/unistd.h | 296 +- trunk/arch/avr32/include/uapi/asm/Kbuild | 32 + .../avr32/include/{ => uapi}/asm/auxvec.h | 0 .../include/{ => uapi}/asm/bitsperlong.h | 0 .../avr32/include/{ => uapi}/asm/byteorder.h | 0 .../avr32/include/{ => uapi}/asm/cachectl.h | 0 .../arch/avr32/include/{ => uapi}/asm/errno.h | 0 .../arch/avr32/include/{ => uapi}/asm/fcntl.h | 0 .../arch/avr32/include/{ => uapi}/asm/ioctl.h | 0 .../avr32/include/{ => uapi}/asm/ioctls.h | 0 .../avr32/include/{ => uapi}/asm/ipcbuf.h | 0 .../avr32/include/{ => uapi}/asm/kvm_para.h | 0 .../arch/avr32/include/{ => uapi}/asm/mman.h | 0 .../avr32/include/{ => uapi}/asm/msgbuf.h | 0 trunk/arch/avr32/include/uapi/asm/param.h | 18 + .../arch/avr32/include/{ => uapi}/asm/poll.h | 0 .../include/{ => uapi}/asm/posix_types.h | 0 trunk/arch/avr32/include/uapi/asm/ptrace.h | 126 + .../avr32/include/{ => uapi}/asm/resource.h | 0 .../avr32/include/{ => uapi}/asm/sembuf.h | 0 trunk/arch/avr32/include/uapi/asm/setup.h | 17 + .../avr32/include/{ => uapi}/asm/shmbuf.h | 0 .../avr32/include/{ => uapi}/asm/sigcontext.h | 0 .../avr32/include/{ => uapi}/asm/siginfo.h | 0 trunk/arch/avr32/include/uapi/asm/signal.h | 128 + .../avr32/include/{ => uapi}/asm/socket.h | 0 .../avr32/include/{ => uapi}/asm/sockios.h | 0 .../arch/avr32/include/{ => uapi}/asm/stat.h | 0 .../avr32/include/{ => uapi}/asm/statfs.h | 0 .../arch/avr32/include/{ => uapi}/asm/swab.h | 0 .../avr32/include/{ => uapi}/asm/termbits.h | 0 trunk/arch/avr32/include/uapi/asm/termios.h | 50 + .../include/{asm/exec.h => uapi/asm/types.h} | 7 +- trunk/arch/avr32/include/uapi/asm/unistd.h | 305 + trunk/arch/avr32/kernel/process.c | 4 +- trunk/arch/avr32/kernel/signal.c | 1 - trunk/arch/avr32/mach-at32ap/at32ap700x.c | 3 + trunk/arch/avr32/mm/fault.c | 1 + trunk/arch/blackfin/Kconfig | 3 +- .../blackfin/configs/BF533-EZKIT_defconfig | 7 +- .../blackfin/configs/BF561-ACVILON_defconfig | 1 - .../blackfin/configs/BF609-EZKIT_defconfig | 16 +- trunk/arch/blackfin/include/asm/thread_info.h | 4 - trunk/arch/blackfin/kernel/bfin_gpio.c | 4 +- trunk/arch/blackfin/kernel/process.c | 4 +- trunk/arch/blackfin/kernel/reboot.c | 1 - trunk/arch/blackfin/kernel/signal.c | 1 - .../blackfin/mach-bf537/boards/cm_bf537e.c | 130 +- trunk/arch/blackfin/mach-bf537/boards/stamp.c | 2 +- .../mach-bf609/include/mach/defBF609.h | 271 + trunk/arch/blackfin/mach-common/cpufreq.c | 9 +- .../arch/blackfin/mach-common/ints-priority.c | 1 - trunk/arch/blackfin/mach-common/smp.c | 4 +- trunk/arch/c6x/Kconfig | 1 + trunk/arch/c6x/include/asm/Kbuild | 2 +- trunk/arch/c6x/include/asm/exec.h | 6 - trunk/arch/c6x/include/asm/processor.h | 2 - trunk/arch/c6x/include/asm/ptrace.h | 146 +- trunk/arch/c6x/include/asm/syscalls.h | 5 - trunk/arch/c6x/include/asm/thread_info.h | 1 - trunk/arch/c6x/include/uapi/asm/Kbuild | 7 + .../c6x/include/{ => uapi}/asm/byteorder.h | 0 .../c6x/include/{ => uapi}/asm/kvm_para.h | 0 trunk/arch/c6x/include/uapi/asm/ptrace.h | 163 + trunk/arch/c6x/include/{ => uapi}/asm/setup.h | 0 .../c6x/include/{ => uapi}/asm/sigcontext.h | 0 trunk/arch/c6x/include/{ => uapi}/asm/swab.h | 0 .../arch/c6x/include/{ => uapi}/asm/unistd.h | 3 + trunk/arch/c6x/kernel/asm-offsets.c | 1 - trunk/arch/c6x/kernel/entry.S | 56 +- trunk/arch/c6x/kernel/process.c | 72 +- trunk/arch/cris/Kconfig | 1 + trunk/arch/cris/arch-v10/kernel/process.c | 4 +- trunk/arch/cris/arch-v32/kernel/process.c | 4 +- trunk/arch/cris/include/asm/Kbuild | 3 + trunk/arch/cris/include/asm/exec.h | 6 - trunk/arch/cris/include/asm/thread_info.h | 3 - trunk/arch/cris/mm/fault.c | 1 + trunk/arch/frv/Kconfig | 3 + trunk/arch/frv/include/asm/Kbuild | 5 +- trunk/arch/frv/include/asm/processor.h | 9 +- trunk/arch/frv/include/asm/ptrace.h | 52 +- trunk/arch/frv/include/asm/setup.h | 7 +- trunk/arch/frv/include/asm/signal.h | 33 +- trunk/arch/frv/include/asm/termios.h | 46 +- trunk/arch/frv/include/asm/thread_info.h | 3 - trunk/arch/frv/include/asm/types.h | 6 +- trunk/arch/frv/include/asm/unistd.h | 348 +- trunk/arch/frv/include/uapi/asm/Kbuild | 32 + .../arch/frv/include/{ => uapi}/asm/auxvec.h | 0 .../frv/include/{ => uapi}/asm/bitsperlong.h | 0 .../frv/include/{ => uapi}/asm/byteorder.h | 0 trunk/arch/frv/include/{ => uapi}/asm/errno.h | 0 trunk/arch/frv/include/{ => uapi}/asm/fcntl.h | 0 trunk/arch/frv/include/{ => uapi}/asm/ioctl.h | 0 .../arch/frv/include/{ => uapi}/asm/ioctls.h | 0 .../arch/frv/include/{ => uapi}/asm/ipcbuf.h | 0 .../frv/include/{ => uapi}/asm/kvm_para.h | 0 trunk/arch/frv/include/{ => uapi}/asm/mman.h | 0 .../arch/frv/include/{ => uapi}/asm/msgbuf.h | 0 trunk/arch/frv/include/{ => uapi}/asm/param.h | 0 trunk/arch/frv/include/{ => uapi}/asm/poll.h | 0 .../frv/include/{ => uapi}/asm/posix_types.h | 0 trunk/arch/frv/include/uapi/asm/ptrace.h | 60 + .../frv/include/{ => uapi}/asm/registers.h | 0 .../frv/include/{ => uapi}/asm/resource.h | 0 .../arch/frv/include/{ => uapi}/asm/sembuf.h | 0 trunk/arch/frv/include/uapi/asm/setup.h | 18 + .../arch/frv/include/{ => uapi}/asm/shmbuf.h | 0 .../frv/include/{ => uapi}/asm/sigcontext.h | 0 .../arch/frv/include/{ => uapi}/asm/siginfo.h | 0 trunk/arch/frv/include/uapi/asm/signal.h | 36 + .../arch/frv/include/{ => uapi}/asm/socket.h | 0 .../arch/frv/include/{ => uapi}/asm/sockios.h | 0 trunk/arch/frv/include/{ => uapi}/asm/stat.h | 0 .../arch/frv/include/{ => uapi}/asm/statfs.h | 0 trunk/arch/frv/include/{ => uapi}/asm/swab.h | 0 .../frv/include/{ => uapi}/asm/termbits.h | 0 trunk/arch/frv/include/uapi/asm/termios.h | 46 + .../include/{asm/exec.h => uapi/asm/types.h} | 12 +- trunk/arch/frv/include/uapi/asm/unistd.h | 348 + trunk/arch/frv/kernel/Makefile | 4 +- trunk/arch/frv/kernel/entry.S | 13 + trunk/arch/frv/kernel/frv_ksyms.c | 1 - trunk/arch/frv/kernel/kernel_execve.S | 33 - trunk/arch/frv/kernel/kernel_thread.S | 77 - trunk/arch/frv/kernel/process.c | 66 +- trunk/arch/frv/kernel/signal.c | 9 - trunk/arch/h8300/Kconfig | 1 + trunk/arch/h8300/include/asm/Kbuild | 3 + trunk/arch/h8300/include/asm/exec.h | 6 - trunk/arch/h8300/include/asm/thread_info.h | 7 +- trunk/arch/h8300/kernel/process.c | 4 +- trunk/arch/h8300/kernel/signal.c | 1 - trunk/arch/hexagon/include/asm/Kbuild | 1 + trunk/arch/hexagon/include/asm/thread_info.h | 5 - trunk/arch/hexagon/kernel/signal.c | 1 - trunk/arch/hexagon/kernel/syscall.c | 5 +- trunk/arch/hexagon/mm/vm_fault.c | 1 + trunk/arch/ia64/Kconfig | 2 +- trunk/arch/ia64/include/asm/Kbuild | 16 +- trunk/arch/ia64/include/asm/exec.h | 14 - trunk/arch/ia64/include/asm/gcc_intrin.h | 615 +- trunk/arch/ia64/include/asm/hugetlb.h | 4 + trunk/arch/ia64/include/asm/intrinsics.h | 120 +- trunk/arch/ia64/include/asm/kvm_para.h | 10 +- trunk/arch/ia64/include/asm/mman.h | 12 +- trunk/arch/ia64/include/asm/param.h | 22 +- trunk/arch/ia64/include/asm/perfmon.h | 171 +- trunk/arch/ia64/include/asm/ptrace.h | 236 +- trunk/arch/ia64/include/asm/siginfo.h | 118 +- trunk/arch/ia64/include/asm/signal.h | 122 +- trunk/arch/ia64/include/asm/termios.h | 46 +- trunk/arch/ia64/include/asm/thread_info.h | 2 - trunk/arch/ia64/include/asm/types.h | 19 +- trunk/arch/ia64/include/asm/unistd.h | 324 +- trunk/arch/ia64/include/asm/ustack.h | 11 +- trunk/arch/ia64/include/uapi/asm/Kbuild | 45 + .../arch/ia64/include/{ => uapi}/asm/auxvec.h | 0 .../ia64/include/{ => uapi}/asm/bitsperlong.h | 0 .../arch/ia64/include/{ => uapi}/asm/break.h | 0 .../ia64/include/{ => uapi}/asm/byteorder.h | 0 .../ia64/include/{ => uapi}/asm/cmpxchg.h | 0 .../arch/ia64/include/{ => uapi}/asm/errno.h | 0 .../arch/ia64/include/{ => uapi}/asm/fcntl.h | 0 trunk/arch/ia64/include/{ => uapi}/asm/fpu.h | 0 trunk/arch/ia64/include/uapi/asm/gcc_intrin.h | 618 + .../ia64/include/{ => uapi}/asm/ia64regs.h | 0 .../include/{ => uapi}/asm/intel_intrin.h | 0 trunk/arch/ia64/include/uapi/asm/intrinsics.h | 124 + .../arch/ia64/include/{ => uapi}/asm/ioctl.h | 0 .../arch/ia64/include/{ => uapi}/asm/ioctls.h | 0 .../arch/ia64/include/{ => uapi}/asm/ipcbuf.h | 0 trunk/arch/ia64/include/{ => uapi}/asm/kvm.h | 0 trunk/arch/ia64/include/uapi/asm/kvm_para.h | 0 trunk/arch/ia64/include/uapi/asm/mman.h | 16 + .../arch/ia64/include/{ => uapi}/asm/msgbuf.h | 0 trunk/arch/ia64/include/uapi/asm/param.h | 29 + trunk/arch/ia64/include/uapi/asm/perfmon.h | 177 + .../{ => uapi}/asm/perfmon_default_smpl.h | 0 trunk/arch/ia64/include/{ => uapi}/asm/poll.h | 0 .../ia64/include/{ => uapi}/asm/posix_types.h | 0 trunk/arch/ia64/include/uapi/asm/ptrace.h | 247 + .../include/{ => uapi}/asm/ptrace_offsets.h | 0 .../ia64/include/{ => uapi}/asm/resource.h | 0 trunk/arch/ia64/include/{ => uapi}/asm/rse.h | 0 .../arch/ia64/include/{ => uapi}/asm/sembuf.h | 0 .../arch/ia64/include/{ => uapi}/asm/setup.h | 0 .../arch/ia64/include/{ => uapi}/asm/shmbuf.h | 0 .../ia64/include/{ => uapi}/asm/sigcontext.h | 0 trunk/arch/ia64/include/uapi/asm/siginfo.h | 121 + trunk/arch/ia64/include/uapi/asm/signal.h | 127 + .../arch/ia64/include/{ => uapi}/asm/socket.h | 0 .../ia64/include/{ => uapi}/asm/sockios.h | 0 trunk/arch/ia64/include/{ => uapi}/asm/stat.h | 0 .../arch/ia64/include/{ => uapi}/asm/statfs.h | 0 trunk/arch/ia64/include/{ => uapi}/asm/swab.h | 0 .../ia64/include/{ => uapi}/asm/termbits.h | 0 trunk/arch/ia64/include/uapi/asm/termios.h | 50 + trunk/arch/ia64/include/uapi/asm/types.h | 31 + .../ia64/include/{ => uapi}/asm/ucontext.h | 0 trunk/arch/ia64/include/uapi/asm/unistd.h | 328 + trunk/arch/ia64/include/uapi/asm/ustack.h | 12 + trunk/arch/ia64/kernel/perfmon.c | 2 +- trunk/arch/ia64/kernel/process.c | 4 +- trunk/arch/ia64/kernel/signal.c | 8 - trunk/arch/ia64/kernel/time.c | 4 +- trunk/arch/ia64/mm/fault.c | 1 + trunk/arch/ia64/mm/init.c | 4 +- trunk/arch/m32r/Kconfig | 1 + trunk/arch/m32r/include/asm/Kbuild | 3 + trunk/arch/m32r/include/asm/exec.h | 14 - trunk/arch/m32r/include/asm/thread_info.h | 9 +- trunk/arch/m32r/kernel/process.c | 4 +- trunk/arch/m32r/kernel/signal.c | 3 - trunk/arch/m68k/Kconfig | 3 + trunk/arch/m68k/include/asm/Kbuild | 2 + trunk/arch/m68k/include/asm/exec.h | 6 - trunk/arch/m68k/include/asm/processor.h | 25 +- trunk/arch/m68k/include/asm/ptrace.h | 2 + trunk/arch/m68k/include/asm/unistd.h | 2 + trunk/arch/m68k/kernel/entry.S | 16 + trunk/arch/m68k/kernel/process.c | 104 +- trunk/arch/m68k/kernel/sys_m68k.c | 17 - trunk/arch/m68k/mm/fault.c | 1 + trunk/arch/microblaze/Kconfig | 1 + trunk/arch/microblaze/include/asm/Kbuild | 2 + trunk/arch/microblaze/include/asm/atomic.h | 1 + trunk/arch/microblaze/include/asm/exec.h | 14 - .../arch/microblaze/include/asm/thread_info.h | 3 +- trunk/arch/microblaze/kernel/signal.c | 7 +- trunk/arch/microblaze/kernel/sys_microblaze.c | 4 +- trunk/arch/microblaze/mm/fault.c | 1 + trunk/arch/mips/Kbuild.platforms | 2 +- trunk/arch/mips/Kconfig | 47 +- trunk/arch/mips/ath79/clock.c | 109 +- trunk/arch/mips/ath79/dev-usb.c | 92 +- trunk/arch/mips/ath79/mach-db120.c | 2 + trunk/arch/mips/bcm63xx/Makefile | 2 +- .../arch/mips/bcm63xx/boards/board_bcm963xx.c | 26 +- trunk/arch/mips/bcm63xx/clk.c | 21 +- trunk/arch/mips/bcm63xx/dev-usb-usbd.c | 65 + trunk/arch/mips/bcm63xx/irq.c | 22 +- trunk/arch/mips/bcm63xx/setup.c | 6 + trunk/arch/mips/cavium-octeon/csrc-octeon.c | 93 +- .../executive/cvmx-interrupt-rsl.c | 2 +- trunk/arch/mips/cavium-octeon/octeon-irq.c | 842 +- trunk/arch/mips/cavium-octeon/setup.c | 3 +- ...teon_defconfig => cavium_octeon_defconfig} | 0 trunk/arch/mips/configs/mipssim_defconfig | 64 - trunk/arch/mips/configs/nlm_xlp_defconfig | 133 +- ...225_defconfig => pnx8335_stb225_defconfig} | 0 ...50-jbs_defconfig => pnx8550_jbs_defconfig} | 0 ...810_defconfig => pnx8550_stb810_defconfig} | 0 trunk/arch/mips/configs/rb532_defconfig | 1 - ...swarm_defconfig => sb1250_swarm_defconfig} | 0 trunk/arch/mips/configs/sead3_defconfig | 124 + trunk/arch/mips/include/asm/cpu-features.h | 4 +- trunk/arch/mips/include/asm/cpu.h | 2 + trunk/arch/mips/include/asm/gic.h | 49 +- trunk/arch/mips/include/asm/hugetlb.h | 4 + .../mips/include/asm/mach-ath79/ar71xx_regs.h | 30 + .../include/asm/mach-bcm63xx/bcm63xx_cpu.h | 93 +- .../asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h | 17 + .../include/asm/mach-bcm63xx/bcm63xx_iudma.h | 38 + .../include/asm/mach-bcm63xx/bcm63xx_regs.h | 168 +- .../include/asm/mach-bcm63xx/board_bcm963xx.h | 5 + .../cpu-feature-overrides.h | 2 +- .../mips/include/asm/mach-cavium-octeon/irq.h | 7 +- .../mips/include/asm/mach-jz4740/platform.h | 1 + .../arch/mips/include/asm/mach-jz4740/timer.h | 113 + .../asm/mach-lantiq/falcon/falcon_irq.h | 2 + .../asm/mach-lantiq/falcon/lantiq_soc.h | 4 + .../arch/mips/include/asm/mach-lantiq/gpio.h | 5 +- .../include/asm/mach-lantiq/xway/lantiq_irq.h | 2 + .../cpu-feature-overrides.h | 15 +- trunk/arch/mips/include/asm/mach-sead3/irq.h | 9 + .../asm/mach-sead3/kernel-entry-init.h | 52 + .../asm/{mach-mipssim => mach-sead3}/war.h | 12 +- .../mips/include/asm/mips-boards/maltaint.h | 55 +- .../mips/include/asm/mips-boards/sead3int.h | 19 + .../mips/include/asm/mips-boards/simint.h | 31 - trunk/arch/mips/include/asm/mipsregs.h | 3 + .../mips/include/asm/octeon/cvmx-agl-defs.h | 1014 +- .../mips/include/asm/octeon/cvmx-asxx-defs.h | 300 +- .../mips/include/asm/octeon/cvmx-ciu-defs.h | 11333 +++++++++++++--- .../mips/include/asm/octeon/cvmx-ciu2-defs.h | 7108 ++++++++++ .../mips/include/asm/octeon/cvmx-dbg-defs.h | 39 +- .../mips/include/asm/octeon/cvmx-dpi-defs.h | 411 +- .../mips/include/asm/octeon/cvmx-fpa-defs.h | 1321 +- .../mips/include/asm/octeon/cvmx-gmxx-defs.h | 4966 ++++++- .../mips/include/asm/octeon/cvmx-gpio-defs.h | 282 +- .../mips/include/asm/octeon/cvmx-iob-defs.h | 722 +- .../mips/include/asm/octeon/cvmx-ipd-defs.h | 1111 +- .../mips/include/asm/octeon/cvmx-l2c-defs.h | 1726 ++- .../mips/include/asm/octeon/cvmx-l2d-defs.h | 171 +- .../mips/include/asm/octeon/cvmx-l2t-defs.h | 105 +- .../mips/include/asm/octeon/cvmx-led-defs.h | 67 +- .../mips/include/asm/octeon/cvmx-mio-defs.h | 1909 ++- .../mips/include/asm/octeon/cvmx-mixx-defs.h | 234 +- .../mips/include/asm/octeon/cvmx-mpi-defs.h | 328 + .../mips/include/asm/octeon/cvmx-npei-defs.h | 1743 ++- .../mips/include/asm/octeon/cvmx-npi-defs.h | 1260 +- .../mips/include/asm/octeon/cvmx-pci-defs.h | 909 +- .../include/asm/octeon/cvmx-pciercx-defs.h | 1292 +- .../mips/include/asm/octeon/cvmx-pcsx-defs.h | 729 +- .../mips/include/asm/octeon/cvmx-pcsxx-defs.h | 574 +- .../mips/include/asm/octeon/cvmx-pemx-defs.h | 288 +- .../mips/include/asm/octeon/cvmx-pescx-defs.h | 246 +- .../mips/include/asm/octeon/cvmx-pexp-defs.h | 2 +- .../mips/include/asm/octeon/cvmx-pip-defs.h | 2431 +++- .../mips/include/asm/octeon/cvmx-pko-defs.h | 1993 ++- .../mips/include/asm/octeon/cvmx-pow-defs.h | 530 +- .../mips/include/asm/octeon/cvmx-rnm-defs.h | 107 +- .../mips/include/asm/octeon/cvmx-sli-defs.h | 1351 +- .../mips/include/asm/octeon/cvmx-smix-defs.h | 202 +- .../mips/include/asm/octeon/cvmx-spxx-defs.h | 225 +- .../mips/include/asm/octeon/cvmx-sriox-defs.h | 703 +- .../mips/include/asm/octeon/cvmx-srxx-defs.h | 62 +- .../mips/include/asm/octeon/cvmx-stxx-defs.h | 166 +- .../mips/include/asm/octeon/cvmx-uctlx-defs.h | 268 +- .../mips/include/asm/octeon/octeon-model.h | 18 + trunk/arch/mips/include/asm/octeon/octeon.h | 4 + trunk/arch/mips/include/asm/pgtable-bits.h | 18 +- trunk/arch/mips/include/asm/pgtable.h | 12 +- trunk/arch/mips/include/asm/thread_info.h | 9 +- trunk/arch/mips/include/asm/uasm.h | 2 + trunk/arch/mips/include/asm/unistd.h | 15 +- trunk/arch/mips/jz4740/Kconfig | 3 - trunk/arch/mips/jz4740/Makefile | 2 +- trunk/arch/mips/jz4740/board-qi_lb60.c | 1 + trunk/arch/mips/jz4740/platform.c | 6 + trunk/arch/mips/jz4740/pwm.c | 177 - trunk/arch/mips/jz4740/time.c | 2 +- trunk/arch/mips/jz4740/timer.c | 4 +- trunk/arch/mips/jz4740/timer.h | 136 - trunk/arch/mips/kernel/Makefile | 19 +- trunk/arch/mips/kernel/cevt-r4k.c | 5 + trunk/arch/mips/kernel/cpu-probe.c | 10 +- trunk/arch/mips/kernel/entry.S | 15 +- trunk/arch/mips/kernel/irq-gic.c | 162 +- trunk/arch/mips/kernel/kgdb.c | 9 + trunk/arch/mips/kernel/linux32.c | 4 +- trunk/arch/mips/kernel/scall32-o32.S | 14 +- trunk/arch/mips/kernel/scall64-64.S | 14 +- trunk/arch/mips/kernel/scall64-n32.S | 14 +- trunk/arch/mips/kernel/scall64-o32.S | 14 +- trunk/arch/mips/kernel/signal.c | 8 - trunk/arch/mips/kernel/smp-mt.c | 2 + trunk/arch/mips/kernel/syscall.c | 4 +- trunk/arch/mips/lantiq/Kconfig | 2 + trunk/arch/mips/lantiq/falcon/prom.c | 5 + trunk/arch/mips/lantiq/falcon/sysctrl.c | 1 + trunk/arch/mips/lantiq/irq.c | 82 +- trunk/arch/mips/lantiq/xway/Makefile | 2 +- trunk/arch/mips/lantiq/xway/gpio.c | 183 - trunk/arch/mips/lantiq/xway/gptu.c | 214 + trunk/arch/mips/lantiq/xway/sysctrl.c | 5 +- trunk/arch/mips/lib/Makefile | 21 +- trunk/arch/mips/mipssim/Makefile | 23 - trunk/arch/mips/mipssim/Platform | 6 - trunk/arch/mips/mipssim/sim_console.c | 40 - trunk/arch/mips/mipssim/sim_int.c | 87 - trunk/arch/mips/mipssim/sim_mem.c | 115 - trunk/arch/mips/mipssim/sim_platform.c | 35 - trunk/arch/mips/mipssim/sim_setup.c | 99 - trunk/arch/mips/mipssim/sim_smtc.c | 116 - trunk/arch/mips/mipssim/sim_time.c | 117 - trunk/arch/mips/mm/Makefile | 17 +- trunk/arch/mips/mm/c-r4k.c | 21 + trunk/arch/mips/mm/cache.c | 2 +- trunk/arch/mips/mm/fault.c | 3 +- trunk/arch/mips/mm/tlb-r4k.c | 2 +- trunk/arch/mips/mm/tlbex.c | 44 +- trunk/arch/mips/mm/uasm.c | 23 +- trunk/arch/mips/mti-malta/malta-int.c | 34 + trunk/arch/mips/mti-sead3/Makefile | 19 + trunk/arch/mips/mti-sead3/Platform | 7 + trunk/arch/mips/mti-sead3/leds-sead3.c | 128 + trunk/arch/mips/mti-sead3/sead3-cmdline.c | 46 + trunk/arch/mips/mti-sead3/sead3-console.c | 46 + trunk/arch/mips/mti-sead3/sead3-display.c | 78 + trunk/arch/mips/mti-sead3/sead3-ehci.c | 47 + trunk/arch/mips/mti-sead3/sead3-i2c-dev.c | 33 + trunk/arch/mips/mti-sead3/sead3-i2c-drv.c | 405 + trunk/arch/mips/mti-sead3/sead3-i2c.c | 37 + trunk/arch/mips/mti-sead3/sead3-init.c | 91 + trunk/arch/mips/mti-sead3/sead3-int.c | 158 + trunk/arch/mips/mti-sead3/sead3-lcd.c | 43 + trunk/arch/mips/mti-sead3/sead3-leds.c | 83 + trunk/arch/mips/mti-sead3/sead3-memory.c | 138 + trunk/arch/mips/mti-sead3/sead3-mtd.c | 54 + trunk/arch/mips/mti-sead3/sead3-net.c | 51 + trunk/arch/mips/mti-sead3/sead3-pic32-bus.c | 103 + .../arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 435 + trunk/arch/mips/mti-sead3/sead3-platform.c | 45 + trunk/arch/mips/mti-sead3/sead3-reset.c | 39 + trunk/arch/mips/mti-sead3/sead3-serial.c | 45 + trunk/arch/mips/mti-sead3/sead3-setup.c | 20 + trunk/arch/mips/mti-sead3/sead3-time.c | 117 + trunk/arch/mips/netlogic/Kconfig | 15 + trunk/arch/mips/netlogic/Makefile | 1 + trunk/arch/mips/netlogic/dts/Makefile | 4 + trunk/arch/mips/netlogic/dts/xlp_evp.dts | 124 + trunk/arch/mips/netlogic/xlp/Makefile | 3 +- trunk/arch/mips/netlogic/xlp/of.c | 34 - trunk/arch/mips/netlogic/xlp/platform.c | 108 - trunk/arch/mips/netlogic/xlp/setup.c | 32 +- trunk/arch/mn10300/Kconfig | 1 + trunk/arch/mn10300/include/asm/Kbuild | 4 +- trunk/arch/mn10300/include/asm/frame.inc | 2 +- trunk/arch/mn10300/include/asm/processor.h | 18 +- trunk/arch/mn10300/include/asm/ptrace.h | 73 +- trunk/arch/mn10300/include/asm/setup.h | 4 +- trunk/arch/mn10300/include/asm/signal.h | 121 +- trunk/arch/mn10300/include/asm/termios.h | 81 +- trunk/arch/mn10300/include/asm/thread_info.h | 3 +- trunk/arch/mn10300/include/asm/types.h | 5 +- trunk/arch/mn10300/include/asm/unistd.h | 344 +- trunk/arch/mn10300/include/uapi/asm/Kbuild | 31 + .../mn10300/include/{ => uapi}/asm/auxvec.h | 0 .../include/{ => uapi}/asm/bitsperlong.h | 0 .../include/{ => uapi}/asm/byteorder.h | 0 .../mn10300/include/{ => uapi}/asm/errno.h | 0 .../mn10300/include/{ => uapi}/asm/fcntl.h | 0 .../mn10300/include/{ => uapi}/asm/ioctl.h | 0 .../mn10300/include/{ => uapi}/asm/ioctls.h | 0 .../mn10300/include/{ => uapi}/asm/ipcbuf.h | 0 .../mn10300/include/{ => uapi}/asm/kvm_para.h | 0 .../mn10300/include/{ => uapi}/asm/mman.h | 0 .../mn10300/include/{ => uapi}/asm/msgbuf.h | 0 .../mn10300/include/{ => uapi}/asm/param.h | 0 .../mn10300/include/{ => uapi}/asm/poll.h | 0 .../include/{ => uapi}/asm/posix_types.h | 0 trunk/arch/mn10300/include/uapi/asm/ptrace.h | 84 + .../mn10300/include/{ => uapi}/asm/resource.h | 0 .../mn10300/include/{ => uapi}/asm/sembuf.h | 0 trunk/arch/mn10300/include/uapi/asm/setup.h | 0 .../mn10300/include/{ => uapi}/asm/shmbuf.h | 0 .../include/{ => uapi}/asm/sigcontext.h | 0 .../mn10300/include/{ => uapi}/asm/siginfo.h | 0 trunk/arch/mn10300/include/uapi/asm/signal.h | 131 + .../mn10300/include/{ => uapi}/asm/socket.h | 0 .../mn10300/include/{ => uapi}/asm/sockios.h | 0 .../mn10300/include/{ => uapi}/asm/stat.h | 0 .../mn10300/include/{ => uapi}/asm/statfs.h | 0 .../mn10300/include/{ => uapi}/asm/swab.h | 0 .../mn10300/include/{ => uapi}/asm/termbits.h | 0 trunk/arch/mn10300/include/uapi/asm/termios.h | 83 + .../include/{asm/exec.h => uapi/asm/types.h} | 11 +- trunk/arch/mn10300/include/uapi/asm/unistd.h | 354 + trunk/arch/mn10300/kernel/Makefile | 4 +- trunk/arch/mn10300/kernel/entry.S | 18 + trunk/arch/mn10300/kernel/internal.h | 6 +- trunk/arch/mn10300/kernel/kernel_execve.S | 37 - trunk/arch/mn10300/kernel/kthread.S | 31 - trunk/arch/mn10300/kernel/process.c | 91 +- trunk/arch/mn10300/kernel/signal.c | 13 - trunk/arch/openrisc/include/asm/Kbuild | 1 + trunk/arch/openrisc/include/asm/processor.h | 2 +- trunk/arch/openrisc/include/asm/thread_info.h | 3 +- trunk/arch/openrisc/kernel/irq.c | 20 +- trunk/arch/openrisc/kernel/process.c | 4 +- trunk/arch/openrisc/kernel/ptrace.c | 2 +- trunk/arch/openrisc/lib/delay.c | 6 +- trunk/arch/openrisc/mm/fault.c | 1 + trunk/arch/parisc/hpux/fs.c | 4 +- trunk/arch/parisc/hpux/gate.S | 2 +- trunk/arch/parisc/include/asm/Kbuild | 2 + trunk/arch/parisc/include/asm/exec.h | 6 - trunk/arch/parisc/include/asm/thread_info.h | 5 +- trunk/arch/parisc/kernel/cache.c | 3 +- trunk/arch/parisc/kernel/process.c | 4 +- trunk/arch/parisc/kernel/signal.c | 45 +- trunk/arch/parisc/kernel/sys_parisc32.c | 4 +- trunk/arch/parisc/kernel/syscall.S | 9 +- trunk/arch/powerpc/Kconfig | 5 +- .../configs/83xx/mpc8313_rdb_defconfig | 1 - .../configs/83xx/mpc8315_rdb_defconfig | 1 - trunk/arch/powerpc/configs/mpc83xx_defconfig | 1 - trunk/arch/powerpc/include/asm/Kbuild | 36 +- trunk/arch/powerpc/include/asm/atomic.h | 1 + trunk/arch/powerpc/include/asm/bootx.h | 123 +- trunk/arch/powerpc/include/asm/cputable.h | 35 +- trunk/arch/powerpc/include/asm/elf.h | 311 +- trunk/arch/powerpc/include/asm/hugetlb.h | 4 + trunk/arch/powerpc/include/asm/kvm_para.h | 70 +- trunk/arch/powerpc/include/asm/mman.h | 27 +- trunk/arch/powerpc/include/asm/nvram.h | 55 +- trunk/arch/powerpc/include/asm/processor.h | 3 - trunk/arch/powerpc/include/asm/ptrace.h | 244 +- trunk/arch/powerpc/include/asm/signal.h | 143 +- trunk/arch/powerpc/include/asm/spu_info.h | 29 +- trunk/arch/powerpc/include/asm/swab.h | 15 +- trunk/arch/powerpc/include/asm/syscalls.h | 3 - trunk/arch/powerpc/include/asm/termios.h | 69 +- trunk/arch/powerpc/include/asm/thread_info.h | 2 + trunk/arch/powerpc/include/asm/types.h | 30 +- trunk/arch/powerpc/include/asm/unistd.h | 376 +- trunk/arch/powerpc/include/uapi/asm/Kbuild | 41 + .../powerpc/include/{ => uapi}/asm/auxvec.h | 0 .../include/{ => uapi}/asm/bitsperlong.h | 0 trunk/arch/powerpc/include/uapi/asm/bootx.h | 132 + .../include/{ => uapi}/asm/byteorder.h | 0 .../arch/powerpc/include/uapi/asm/cputable.h | 36 + trunk/arch/powerpc/include/uapi/asm/elf.h | 307 + .../powerpc/include/{ => uapi}/asm/errno.h | 0 .../powerpc/include/{ => uapi}/asm/fcntl.h | 0 .../powerpc/include/{ => uapi}/asm/ioctl.h | 0 .../powerpc/include/{ => uapi}/asm/ioctls.h | 0 .../powerpc/include/{ => uapi}/asm/ipcbuf.h | 0 .../arch/powerpc/include/{ => uapi}/asm/kvm.h | 0 .../arch/powerpc/include/uapi/asm/kvm_para.h | 90 + .../powerpc/include/{ => uapi}/asm/linkage.h | 0 trunk/arch/powerpc/include/uapi/asm/mman.h | 31 + .../powerpc/include/{ => uapi}/asm/msgbuf.h | 0 trunk/arch/powerpc/include/uapi/asm/nvram.h | 62 + .../powerpc/include/{ => uapi}/asm/param.h | 0 .../powerpc/include/{ => uapi}/asm/poll.h | 0 .../include/{ => uapi}/asm/posix_types.h | 0 .../powerpc/include/{ => uapi}/asm/ps3fb.h | 0 trunk/arch/powerpc/include/uapi/asm/ptrace.h | 259 + .../powerpc/include/{ => uapi}/asm/resource.h | 0 .../powerpc/include/{ => uapi}/asm/seccomp.h | 0 .../powerpc/include/{ => uapi}/asm/sembuf.h | 0 .../powerpc/include/{ => uapi}/asm/setup.h | 0 .../powerpc/include/{ => uapi}/asm/shmbuf.h | 0 .../include/{ => uapi}/asm/sigcontext.h | 0 .../powerpc/include/{ => uapi}/asm/siginfo.h | 0 trunk/arch/powerpc/include/uapi/asm/signal.h | 145 + .../powerpc/include/{ => uapi}/asm/socket.h | 0 .../powerpc/include/{ => uapi}/asm/sockios.h | 0 .../arch/powerpc/include/uapi/asm/spu_info.h | 53 + .../powerpc/include/{ => uapi}/asm/stat.h | 0 .../powerpc/include/{ => uapi}/asm/statfs.h | 0 trunk/arch/powerpc/include/uapi/asm/swab.h | 23 + .../powerpc/include/{ => uapi}/asm/termbits.h | 0 trunk/arch/powerpc/include/uapi/asm/termios.h | 76 + trunk/arch/powerpc/include/uapi/asm/types.h | 40 + .../powerpc/include/{ => uapi}/asm/ucontext.h | 0 trunk/arch/powerpc/include/uapi/asm/unistd.h | 380 + trunk/arch/powerpc/kernel/entry_32.S | 16 + trunk/arch/powerpc/kernel/entry_64.S | 16 + trunk/arch/powerpc/kernel/misc.S | 7 - trunk/arch/powerpc/kernel/misc_32.S | 33 - trunk/arch/powerpc/kernel/misc_64.S | 34 - trunk/arch/powerpc/kernel/ppc_ksyms.c | 1 - trunk/arch/powerpc/kernel/process.c | 59 +- trunk/arch/powerpc/kernel/signal_32.c | 1 - trunk/arch/powerpc/kernel/sys_ppc32.c | 22 - trunk/arch/powerpc/kernel/time.c | 4 +- trunk/arch/powerpc/kvm/book3s_hv.c | 2 +- trunk/arch/powerpc/mm/fault.c | 1 + .../powerpc/oprofile/cell/spu_task_sync.c | 15 +- .../powerpc/platforms/pseries/eeh_event.c | 5 +- .../platforms/pseries/hotplug-memory.c | 12 +- trunk/arch/s390/Kconfig | 6 +- trunk/arch/s390/Kconfig.debug | 12 + trunk/arch/s390/include/asm/Kbuild | 16 +- trunk/arch/s390/include/asm/chpid.h | 19 +- trunk/arch/s390/include/asm/cmb.h | 51 +- trunk/arch/s390/include/asm/css_chars.h | 3 - trunk/arch/s390/include/asm/debug.h | 28 +- trunk/arch/s390/include/asm/hugetlb.h | 19 +- trunk/arch/s390/include/asm/kvm_para.h | 14 +- trunk/arch/s390/include/asm/mman.h | 6 +- trunk/arch/s390/include/asm/page.h | 14 +- trunk/arch/s390/include/asm/pgtable.h | 240 +- trunk/arch/s390/include/asm/processor.h | 4 +- trunk/arch/s390/include/asm/ptrace.h | 462 +- trunk/arch/s390/include/asm/schid.h | 15 +- trunk/arch/s390/include/asm/setup.h | 26 +- trunk/arch/s390/include/asm/signal.h | 128 +- trunk/arch/s390/include/asm/termios.h | 42 +- trunk/arch/s390/include/asm/thread_info.h | 4 - trunk/arch/s390/include/asm/tlb.h | 1 + trunk/arch/s390/include/asm/types.h | 15 +- trunk/arch/s390/include/asm/unistd.h | 369 +- trunk/arch/s390/include/uapi/asm/Kbuild | 45 + .../arch/s390/include/{ => uapi}/asm/auxvec.h | 0 .../s390/include/{ => uapi}/asm/bitsperlong.h | 0 .../s390/include/{ => uapi}/asm/byteorder.h | 0 trunk/arch/s390/include/uapi/asm/chpid.h | 22 + trunk/arch/s390/include/{ => uapi}/asm/chsc.h | 10 +- trunk/arch/s390/include/uapi/asm/cmb.h | 53 + trunk/arch/s390/include/{ => uapi}/asm/dasd.h | 0 trunk/arch/s390/include/uapi/asm/debug.h | 34 + .../arch/s390/include/{ => uapi}/asm/errno.h | 0 .../arch/s390/include/{ => uapi}/asm/fcntl.h | 0 .../arch/s390/include/{ => uapi}/asm/ioctl.h | 0 .../arch/s390/include/{ => uapi}/asm/ioctls.h | 0 .../arch/s390/include/{ => uapi}/asm/ipcbuf.h | 0 trunk/arch/s390/include/{ => uapi}/asm/kvm.h | 0 trunk/arch/s390/include/uapi/asm/kvm_para.h | 0 .../s390/include/{ => uapi}/asm/kvm_virtio.h | 0 trunk/arch/s390/include/uapi/asm/mman.h | 6 + .../s390/include/{ => uapi}/asm/monwriter.h | 0 .../arch/s390/include/{ => uapi}/asm/msgbuf.h | 0 .../arch/s390/include/{ => uapi}/asm/param.h | 0 trunk/arch/s390/include/{ => uapi}/asm/poll.h | 0 .../s390/include/{ => uapi}/asm/posix_types.h | 0 trunk/arch/s390/include/uapi/asm/ptrace.h | 472 + trunk/arch/s390/include/{ => uapi}/asm/qeth.h | 0 .../s390/include/{ => uapi}/asm/resource.h | 0 trunk/arch/s390/include/uapi/asm/schid.h | 16 + .../arch/s390/include/{ => uapi}/asm/sembuf.h | 0 trunk/arch/s390/include/uapi/asm/setup.h | 13 + .../arch/s390/include/{ => uapi}/asm/shmbuf.h | 0 .../s390/include/{ => uapi}/asm/sigcontext.h | 0 .../s390/include/{ => uapi}/asm/siginfo.h | 0 trunk/arch/s390/include/uapi/asm/signal.h | 135 + .../arch/s390/include/{ => uapi}/asm/socket.h | 0 .../s390/include/{ => uapi}/asm/sockios.h | 0 trunk/arch/s390/include/{ => uapi}/asm/stat.h | 0 .../arch/s390/include/{ => uapi}/asm/statfs.h | 0 trunk/arch/s390/include/{ => uapi}/asm/swab.h | 0 .../s390/include/{ => uapi}/asm/tape390.h | 0 .../s390/include/{ => uapi}/asm/termbits.h | 0 trunk/arch/s390/include/uapi/asm/termios.h | 49 + trunk/arch/s390/include/uapi/asm/types.h | 22 + .../s390/include/{ => uapi}/asm/ucontext.h | 0 trunk/arch/s390/include/uapi/asm/unistd.h | 374 + trunk/arch/s390/include/{ => uapi}/asm/vtoc.h | 0 .../arch/s390/include/{ => uapi}/asm/zcrypt.h | 0 trunk/arch/s390/kernel/compat_linux.c | 26 - trunk/arch/s390/kernel/compat_linux.h | 2 - trunk/arch/s390/kernel/compat_wrapper.S | 2 +- trunk/arch/s390/kernel/early.c | 19 +- trunk/arch/s390/kernel/entry.S | 51 +- trunk/arch/s390/kernel/entry.h | 3 - trunk/arch/s390/kernel/entry64.S | 52 +- trunk/arch/s390/kernel/head.S | 101 +- trunk/arch/s390/kernel/head31.S | 3 - trunk/arch/s390/kernel/head64.S | 3 - trunk/arch/s390/kernel/module.c | 11 + trunk/arch/s390/kernel/process.c | 107 +- trunk/arch/s390/kernel/setup.c | 51 +- trunk/arch/s390/kernel/time.c | 4 +- trunk/arch/s390/mm/Makefile | 1 + trunk/arch/s390/mm/dump_pagetables.c | 226 + trunk/arch/s390/mm/fault.c | 1 + trunk/arch/s390/mm/gup.c | 11 +- trunk/arch/s390/mm/pageattr.c | 40 +- trunk/arch/s390/mm/pgtable.c | 108 + trunk/arch/s390/mm/vmem.c | 45 +- trunk/arch/score/include/asm/Kbuild | 2 + trunk/arch/score/include/asm/thread_info.h | 4 - trunk/arch/score/kernel/signal.c | 1 + trunk/arch/score/kernel/sys_score.c | 4 +- trunk/arch/sh/Kconfig | 3 + trunk/arch/sh/include/asm/Kbuild | 1 + trunk/arch/sh/include/asm/exec.h | 10 - trunk/arch/sh/include/asm/hugetlb.h | 6 + trunk/arch/sh/include/asm/thread_info.h | 3 + trunk/arch/sh/kernel/process_32.c | 4 +- trunk/arch/sh/kernel/process_64.c | 4 +- trunk/arch/sh/kernel/signal_32.c | 1 - trunk/arch/sh/kernel/signal_64.c | 1 - trunk/arch/sh/mm/fault.c | 1 + trunk/arch/sparc/Kconfig | 41 +- trunk/arch/sparc/include/asm/Kbuild | 18 +- trunk/arch/sparc/include/asm/exec.h | 6 - trunk/arch/sparc/include/asm/fbio.h | 260 +- trunk/arch/sparc/include/asm/hugetlb.h | 9 +- trunk/arch/sparc/include/asm/ioctls.h | 129 +- trunk/arch/sparc/include/asm/mman.h | 25 +- trunk/arch/sparc/include/asm/mmu_64.h | 19 +- trunk/arch/sparc/include/asm/mmu_context_64.h | 2 +- trunk/arch/sparc/include/asm/page_64.h | 21 +- trunk/arch/sparc/include/asm/pgalloc_64.h | 56 +- trunk/arch/sparc/include/asm/pgtable_64.h | 253 +- trunk/arch/sparc/include/asm/psr.h | 36 +- trunk/arch/sparc/include/asm/ptrace.h | 347 +- trunk/arch/sparc/include/asm/setup.h | 10 +- trunk/arch/sparc/include/asm/sigcontext.h | 4 +- trunk/arch/sparc/include/asm/siginfo.h | 23 +- trunk/arch/sparc/include/asm/signal.h | 185 +- trunk/arch/sparc/include/asm/termbits.h | 260 +- trunk/arch/sparc/include/asm/termios.h | 41 +- trunk/arch/sparc/include/asm/thread_info_32.h | 3 +- trunk/arch/sparc/include/asm/thread_info_64.h | 3 + trunk/arch/sparc/include/asm/traps.h | 111 +- trunk/arch/sparc/include/asm/tsb.h | 106 +- trunk/arch/sparc/include/asm/uaccess_64.h | 5 + trunk/arch/sparc/include/asm/unistd.h | 412 +- trunk/arch/sparc/include/uapi/asm/Kbuild | 46 + trunk/arch/sparc/include/{ => uapi}/asm/apc.h | 0 trunk/arch/sparc/include/{ => uapi}/asm/asi.h | 0 .../sparc/include/{ => uapi}/asm/auxvec.h | 0 .../include/{ => uapi}/asm/bitsperlong.h | 0 .../sparc/include/{ => uapi}/asm/byteorder.h | 0 .../include/{ => uapi}/asm/display7seg.h | 0 .../sparc/include/{ => uapi}/asm/envctrl.h | 0 .../arch/sparc/include/{ => uapi}/asm/errno.h | 0 trunk/arch/sparc/include/uapi/asm/fbio.h | 259 + .../arch/sparc/include/{ => uapi}/asm/fcntl.h | 0 .../arch/sparc/include/{ => uapi}/asm/ioctl.h | 0 trunk/arch/sparc/include/uapi/asm/ioctls.h | 131 + .../sparc/include/{ => uapi}/asm/ipcbuf.h | 0 .../sparc/include/{ => uapi}/asm/jsflash.h | 0 .../sparc/include/{ => uapi}/asm/kvm_para.h | 0 trunk/arch/sparc/include/uapi/asm/mman.h | 27 + .../sparc/include/{ => uapi}/asm/msgbuf.h | 0 .../sparc/include/{ => uapi}/asm/openpromio.h | 0 .../arch/sparc/include/{ => uapi}/asm/param.h | 0 .../sparc/include/{ => uapi}/asm/perfctr.h | 0 .../arch/sparc/include/{ => uapi}/asm/poll.h | 0 .../include/{ => uapi}/asm/posix_types.h | 0 trunk/arch/sparc/include/uapi/asm/psr.h | 47 + .../sparc/include/{ => uapi}/asm/psrcompat.h | 0 .../sparc/include/{ => uapi}/asm/pstate.h | 0 trunk/arch/sparc/include/uapi/asm/ptrace.h | 352 + .../sparc/include/{ => uapi}/asm/resource.h | 0 .../sparc/include/{ => uapi}/asm/sembuf.h | 0 trunk/arch/sparc/include/uapi/asm/setup.h | 15 + .../sparc/include/{ => uapi}/asm/shmbuf.h | 0 .../arch/sparc/include/uapi/asm/sigcontext.h | 0 trunk/arch/sparc/include/uapi/asm/siginfo.h | 25 + trunk/arch/sparc/include/uapi/asm/signal.h | 185 + .../sparc/include/{ => uapi}/asm/socket.h | 0 .../sparc/include/{ => uapi}/asm/sockios.h | 0 .../arch/sparc/include/{ => uapi}/asm/stat.h | 0 .../sparc/include/{ => uapi}/asm/statfs.h | 0 .../arch/sparc/include/{ => uapi}/asm/swab.h | 0 trunk/arch/sparc/include/uapi/asm/termbits.h | 263 + trunk/arch/sparc/include/uapi/asm/termios.h | 43 + trunk/arch/sparc/include/uapi/asm/traps.h | 120 + .../arch/sparc/include/{ => uapi}/asm/types.h | 0 .../arch/sparc/include/{ => uapi}/asm/uctx.h | 0 trunk/arch/sparc/include/uapi/asm/unistd.h | 422 + .../arch/sparc/include/{ => uapi}/asm/utrap.h | 0 .../sparc/include/{ => uapi}/asm/watchdog.h | 0 trunk/arch/sparc/kernel/pci.c | 2 +- trunk/arch/sparc/kernel/process_32.c | 4 +- trunk/arch/sparc/kernel/process_64.c | 4 +- trunk/arch/sparc/kernel/sun4v_tlb_miss.S | 2 +- trunk/arch/sparc/kernel/sys_sparc32.c | 4 +- trunk/arch/sparc/kernel/syscalls.S | 32 +- trunk/arch/sparc/kernel/traps_64.c | 263 +- trunk/arch/sparc/kernel/tsb.S | 9 +- trunk/arch/sparc/mm/fault_32.c | 1 + trunk/arch/sparc/mm/fault_64.c | 7 +- trunk/arch/sparc/mm/hugetlbpage.c | 50 - trunk/arch/sparc/mm/init_64.c | 314 +- trunk/arch/sparc/mm/tlb.c | 118 +- trunk/arch/sparc/mm/tsb.c | 40 +- trunk/arch/tile/Kconfig | 3 + trunk/arch/tile/include/arch/Kbuild | 17 - trunk/arch/tile/include/arch/spr_def.h | 12 +- trunk/arch/tile/include/asm/Kbuild | 5 +- trunk/arch/tile/include/asm/hardwall.h | 33 +- trunk/arch/tile/include/asm/hugetlb.h | 4 + trunk/arch/tile/include/asm/ptrace.h | 72 +- trunk/arch/tile/include/asm/setup.h | 7 +- trunk/arch/tile/include/asm/signal.h | 12 +- trunk/arch/tile/include/asm/unistd.h | 25 +- trunk/arch/tile/include/uapi/arch/Kbuild | 17 + trunk/arch/tile/include/{ => uapi}/arch/abi.h | 0 .../arch/tile/include/{ => uapi}/arch/chip.h | 0 .../include/{ => uapi}/arch/chip_tile64.h | 0 .../include/{ => uapi}/arch/chip_tilegx.h | 0 .../include/{ => uapi}/arch/chip_tilepro.h | 0 .../tile/include/{ => uapi}/arch/icache.h | 0 .../tile/include/{ => uapi}/arch/interrupts.h | 0 .../include/{ => uapi}/arch/interrupts_32.h | 0 .../include/{ => uapi}/arch/interrupts_64.h | 0 .../tile/include/{ => uapi}/arch/opcode.h | 0 .../include/{ => uapi}/arch/opcode_tilegx.h | 0 .../include/{ => uapi}/arch/opcode_tilepro.h | 0 trunk/arch/tile/include/{ => uapi}/arch/sim.h | 0 .../tile/include/{ => uapi}/arch/sim_def.h | 0 trunk/arch/tile/include/uapi/arch/spr_def.h | 26 + .../tile/include/{ => uapi}/arch/spr_def_32.h | 6 +- .../tile/include/{ => uapi}/arch/spr_def_64.h | 6 +- trunk/arch/tile/include/uapi/asm/Kbuild | 15 + .../arch/tile/include/{ => uapi}/asm/auxvec.h | 0 .../tile/include/{ => uapi}/asm/bitsperlong.h | 0 .../tile/include/{ => uapi}/asm/byteorder.h | 0 .../tile/include/{ => uapi}/asm/cachectl.h | 0 trunk/arch/tile/include/uapi/asm/hardwall.h | 51 + .../tile/include/{ => uapi}/asm/kvm_para.h | 0 trunk/arch/tile/include/{ => uapi}/asm/mman.h | 0 trunk/arch/tile/include/uapi/asm/ptrace.h | 88 + .../include/{asm/exec.h => uapi/asm/setup.h} | 9 +- .../tile/include/{ => uapi}/asm/sigcontext.h | 0 .../tile/include/{ => uapi}/asm/siginfo.h | 0 trunk/arch/tile/include/uapi/asm/signal.h | 27 + trunk/arch/tile/include/{ => uapi}/asm/stat.h | 0 trunk/arch/tile/include/{ => uapi}/asm/swab.h | 0 trunk/arch/tile/include/uapi/asm/unistd.h | 34 + trunk/arch/tile/kernel/compat_signal.c | 9 - trunk/arch/tile/kernel/process.c | 11 +- trunk/arch/tile/kernel/signal.c | 12 +- trunk/arch/tile/mm/elf.c | 19 +- trunk/arch/tile/mm/fault.c | 1 + trunk/arch/um/Kconfig.common | 1 + trunk/arch/um/drivers/chan_kern.c | 4 +- trunk/arch/um/drivers/chan_user.c | 4 +- trunk/arch/um/drivers/chan_user.h | 2 +- trunk/arch/um/drivers/cow_sys.h | 6 +- trunk/arch/um/drivers/daemon.h | 2 +- trunk/arch/um/drivers/daemon_kern.c | 4 +- trunk/arch/um/drivers/daemon_user.c | 6 +- trunk/arch/um/drivers/fd.c | 4 +- trunk/arch/um/drivers/harddog_user.c | 2 +- trunk/arch/um/drivers/hostaudio_kern.c | 18 +- trunk/arch/um/drivers/line.c | 16 +- trunk/arch/um/drivers/line.h | 12 +- trunk/arch/um/drivers/mconsole.h | 2 +- trunk/arch/um/drivers/mconsole_kern.c | 10 +- trunk/arch/um/drivers/mconsole_kern.h | 2 +- trunk/arch/um/drivers/mmapper_kern.c | 2 +- trunk/arch/um/drivers/net_kern.c | 10 +- trunk/arch/um/drivers/net_user.c | 6 +- trunk/arch/um/drivers/null.c | 2 +- trunk/arch/um/drivers/pcap_kern.c | 4 +- trunk/arch/um/drivers/pcap_user.c | 4 +- trunk/arch/um/drivers/pcap_user.h | 2 +- trunk/arch/um/drivers/port_kern.c | 20 +- trunk/arch/um/drivers/port_user.c | 4 +- trunk/arch/um/drivers/pty.c | 4 +- trunk/arch/um/drivers/random.c | 4 +- trunk/arch/um/drivers/slip_common.c | 2 +- trunk/arch/um/drivers/slip_kern.c | 2 +- trunk/arch/um/drivers/slip_user.c | 6 +- trunk/arch/um/drivers/slirp_kern.c | 6 +- trunk/arch/um/drivers/slirp_user.c | 4 +- trunk/arch/um/drivers/ssl.c | 22 +- trunk/arch/um/drivers/stdio_console.c | 36 +- trunk/arch/um/drivers/tty.c | 4 +- trunk/arch/um/drivers/ubd_kern.c | 8 +- trunk/arch/um/drivers/ubd_user.c | 2 +- trunk/arch/um/drivers/umcast.h | 2 +- trunk/arch/um/drivers/umcast_kern.c | 4 +- trunk/arch/um/drivers/umcast_user.c | 4 +- trunk/arch/um/drivers/vde_kern.c | 6 +- trunk/arch/um/drivers/vde_user.c | 4 +- trunk/arch/um/drivers/xterm.c | 4 +- trunk/arch/um/drivers/xterm_kern.c | 4 +- trunk/arch/um/include/asm/Kbuild | 2 +- trunk/arch/um/include/asm/dma.h | 2 +- trunk/arch/um/include/asm/mmu.h | 2 +- trunk/arch/um/include/asm/page.h | 2 +- trunk/arch/um/include/asm/pgtable.h | 4 +- trunk/arch/um/include/asm/processor-generic.h | 10 +- trunk/arch/um/include/asm/ptrace-generic.h | 2 +- trunk/arch/um/include/asm/smp.h | 6 +- trunk/arch/um/include/{shared => asm}/sysrq.h | 0 trunk/arch/um/include/asm/thread_info.h | 3 - trunk/arch/um/include/shared/arch.h | 2 +- trunk/arch/um/include/shared/as-layout.h | 2 +- trunk/arch/um/include/shared/irq_kern.h | 4 +- trunk/arch/um/include/shared/irq_user.h | 2 +- trunk/arch/um/include/shared/kern_util.h | 4 +- trunk/arch/um/include/shared/longjmp.h | 4 +- trunk/arch/um/include/shared/os.h | 7 +- trunk/arch/um/include/shared/registers.h | 4 +- trunk/arch/um/include/shared/skas/skas.h | 2 +- trunk/arch/um/include/shared/skas_ptrace.h | 2 +- trunk/arch/um/kernel/asm-offsets.c | 2 +- trunk/arch/um/kernel/config.c.in | 2 +- trunk/arch/um/kernel/dyn.lds.S | 2 +- trunk/arch/um/kernel/early_printk.c | 2 +- trunk/arch/um/kernel/exec.c | 34 +- trunk/arch/um/kernel/gmon_syms.c | 2 +- trunk/arch/um/kernel/gprof_syms.c | 2 +- trunk/arch/um/kernel/initrd.c | 12 +- trunk/arch/um/kernel/internal.h | 1 - trunk/arch/um/kernel/irq.c | 22 +- trunk/arch/um/kernel/ksyms.c | 2 +- trunk/arch/um/kernel/mem.c | 12 +- trunk/arch/um/kernel/process.c | 35 +- trunk/arch/um/kernel/reboot.c | 14 +- trunk/arch/um/kernel/sigio.c | 6 +- trunk/arch/um/kernel/signal.c | 4 +- trunk/arch/um/kernel/skas/clone.c | 8 +- trunk/arch/um/kernel/skas/mmu.c | 16 +- trunk/arch/um/kernel/skas/process.c | 12 +- trunk/arch/um/kernel/skas/syscall.c | 10 +- trunk/arch/um/kernel/skas/uaccess.c | 4 +- trunk/arch/um/kernel/smp.c | 30 +- trunk/arch/um/kernel/syscall.c | 37 +- trunk/arch/um/kernel/sysrq.c | 2 +- trunk/arch/um/kernel/time.c | 4 +- trunk/arch/um/kernel/tlb.c | 8 +- trunk/arch/um/kernel/trap.c | 11 +- trunk/arch/um/kernel/um_arch.c | 14 +- trunk/arch/um/kernel/umid.c | 6 +- trunk/arch/um/kernel/uml.lds.S | 2 +- trunk/arch/um/os-Linux/aio.c | 8 +- trunk/arch/um/os-Linux/drivers/etap.h | 2 +- .../arch/um/os-Linux/drivers/ethertap_kern.c | 2 +- .../arch/um/os-Linux/drivers/ethertap_user.c | 6 +- trunk/arch/um/os-Linux/drivers/tuntap.h | 2 +- trunk/arch/um/os-Linux/drivers/tuntap_kern.c | 2 +- trunk/arch/um/os-Linux/drivers/tuntap_user.c | 4 +- trunk/arch/um/os-Linux/elf_aux.c | 6 +- trunk/arch/um/os-Linux/execvp.c | 4 +- trunk/arch/um/os-Linux/file.c | 2 +- trunk/arch/um/os-Linux/helper.c | 6 +- trunk/arch/um/os-Linux/irq.c | 6 +- trunk/arch/um/os-Linux/main.c | 10 +- trunk/arch/um/os-Linux/mem.c | 4 +- trunk/arch/um/os-Linux/process.c | 21 +- trunk/arch/um/os-Linux/registers.c | 6 +- trunk/arch/um/os-Linux/sigio.c | 10 +- trunk/arch/um/os-Linux/signal.c | 8 +- trunk/arch/um/os-Linux/skas/mem.c | 20 +- trunk/arch/um/os-Linux/skas/process.c | 22 +- trunk/arch/um/os-Linux/start_up.c | 14 +- trunk/arch/um/os-Linux/time.c | 4 +- trunk/arch/um/os-Linux/tty.c | 4 +- trunk/arch/um/os-Linux/umid.c | 4 +- trunk/arch/um/os-Linux/user_syms.c | 4 +- trunk/arch/um/os-Linux/util.c | 2 +- trunk/arch/um/sys-ppc/miscthings.c | 6 +- trunk/arch/um/sys-ppc/ptrace.c | 2 +- trunk/arch/um/sys-ppc/ptrace_user.c | 2 +- trunk/arch/um/sys-ppc/shared/sysdep/ptrace.h | 2 +- trunk/arch/um/sys-ppc/sigcontext.c | 2 +- trunk/arch/um/sys-ppc/sysrq.c | 4 +- trunk/arch/unicore32/Kconfig | 12 +- trunk/arch/unicore32/include/asm/Kbuild | 2 + trunk/arch/unicore32/include/asm/exec.h | 15 - .../arch/unicore32/include/asm/thread_info.h | 4 +- trunk/arch/unicore32/include/mach/regs-ost.h | 18 +- trunk/arch/unicore32/kernel/Makefile | 1 - trunk/arch/unicore32/kernel/entry.S | 2 - trunk/arch/unicore32/kernel/process.c | 2 +- trunk/arch/unicore32/kernel/pwm.c | 263 - trunk/arch/unicore32/kernel/signal.c | 1 - trunk/arch/unicore32/kernel/sys.c | 5 +- trunk/arch/x86/Kconfig | 7 + trunk/arch/x86/ia32/ia32entry.S | 2 +- trunk/arch/x86/ia32/sys_ia32.c | 15 - trunk/arch/x86/include/asm/Kbuild | 6 + trunk/arch/x86/include/asm/atomic.h | 24 - trunk/arch/x86/include/asm/hugetlb.h | 4 + trunk/arch/x86/include/asm/msr-index.h | 5 + trunk/arch/x86/include/asm/pgtable.h | 11 +- trunk/arch/x86/include/asm/pgtable_32.h | 1 + trunk/arch/x86/include/asm/pgtable_64.h | 1 + trunk/arch/x86/include/asm/processor.h | 5 - trunk/arch/x86/include/asm/sys_ia32.h | 2 - trunk/arch/x86/include/asm/syscalls.h | 2 +- trunk/arch/x86/include/asm/thread_info.h | 2 - trunk/arch/x86/include/asm/unistd.h | 1 + trunk/arch/x86/include/asm/vgtod.h | 4 +- trunk/arch/x86/kernel/Makefile | 2 +- trunk/arch/x86/kernel/asm-offsets.c | 3 + trunk/arch/x86/kernel/cpu/Makefile | 2 +- trunk/arch/x86/kernel/cpu/perf_event.h | 2 + .../arch/x86/kernel/cpu/perf_event_amd_ibs.c | 61 +- trunk/arch/x86/kernel/cpu/perf_event_intel.c | 2 + trunk/arch/x86/kernel/cpu/perf_event_knc.c | 248 + trunk/arch/x86/kernel/cpu/perfctr-watchdog.c | 4 + trunk/arch/x86/kernel/entry_32.S | 46 +- trunk/arch/x86/kernel/entry_64.S | 60 +- trunk/arch/x86/kernel/kgdb.c | 2 + trunk/arch/x86/kernel/process.c | 65 - trunk/arch/x86/kernel/process_32.c | 37 +- trunk/arch/x86/kernel/process_64.c | 35 +- trunk/arch/x86/kernel/setup.c | 3 + trunk/arch/x86/kernel/signal.c | 4 - trunk/arch/x86/kernel/sys_i386_32.c | 40 - trunk/arch/x86/kernel/vm86_32.c | 6 +- trunk/arch/x86/kernel/vsyscall_64.c | 49 +- trunk/arch/x86/mm/fault.c | 1 + trunk/arch/x86/mm/hugetlbpage.c | 3 +- trunk/arch/x86/mm/pat.c | 87 +- trunk/arch/x86/mm/pat_rbtree.c | 34 +- trunk/arch/x86/syscalls/syscall_32.tbl | 2 +- trunk/arch/x86/um/Kconfig | 2 + trunk/arch/x86/um/asm/checksum.h | 144 + trunk/arch/x86/um/asm/checksum_32.h | 140 - trunk/arch/x86/um/asm/checksum_64.h | 125 - trunk/arch/x86/um/asm/elf.h | 2 +- trunk/arch/x86/um/asm/ptrace.h | 58 +- trunk/arch/x86/um/asm/ptrace_32.h | 28 - trunk/arch/x86/um/asm/ptrace_64.h | 46 - trunk/arch/x86/um/bugs_32.c | 6 +- trunk/arch/x86/um/bugs_64.c | 2 +- trunk/arch/x86/um/fault.c | 2 +- trunk/arch/x86/um/ldt.c | 10 +- trunk/arch/x86/um/mem_64.c | 6 +- trunk/arch/x86/um/os-Linux/registers.c | 4 +- trunk/arch/x86/um/os-Linux/task_size.c | 2 +- trunk/arch/x86/um/os-Linux/tls.c | 2 +- trunk/arch/x86/um/ptrace_32.c | 8 +- trunk/arch/x86/um/ptrace_user.c | 2 +- trunk/arch/x86/um/shared/sysdep/ptrace.h | 2 +- trunk/arch/x86/um/shared/sysdep/stub.h | 4 +- trunk/arch/x86/um/shared/sysdep/syscalls_32.h | 4 +- trunk/arch/x86/um/signal.c | 4 +- trunk/arch/x86/um/stub_32.S | 2 +- trunk/arch/x86/um/stub_64.S | 2 +- trunk/arch/x86/um/stub_segv.c | 6 +- trunk/arch/x86/um/sys_call_table_32.c | 1 - trunk/arch/x86/um/sysrq_32.c | 12 +- trunk/arch/x86/um/sysrq_64.c | 2 +- trunk/arch/x86/um/tls_32.c | 12 +- trunk/arch/x86/um/tls_64.c | 2 +- trunk/arch/x86/vdso/vclock_gettime.c | 22 +- trunk/arch/x86/xen/enlighten.c | 18 +- trunk/arch/x86/xen/mmu.c | 44 +- trunk/arch/xtensa/Kconfig | 23 +- trunk/arch/xtensa/Makefile | 34 +- trunk/arch/xtensa/boot/Makefile | 2 +- trunk/arch/xtensa/boot/boot-elf/Makefile | 24 +- trunk/arch/xtensa/boot/boot-elf/boot.lds.S | 7 - trunk/arch/xtensa/boot/boot-redboot/Makefile | 12 +- trunk/arch/xtensa/boot/boot-redboot/boot.ld | 7 - .../arch/xtensa/boot/boot-redboot/bootstrap.S | 10 - trunk/arch/xtensa/boot/ramdisk/Makefile | 23 - trunk/arch/xtensa/configs/s6105_defconfig | 5 - trunk/arch/xtensa/include/asm/Kbuild | 3 + trunk/arch/xtensa/include/asm/exec.h | 14 - trunk/arch/xtensa/include/asm/io.h | 172 +- trunk/arch/xtensa/include/asm/ioctls.h | 4 +- trunk/arch/xtensa/include/asm/regs.h | 2 +- trunk/arch/xtensa/include/asm/thread_info.h | 5 - trunk/arch/xtensa/kernel/Makefile | 3 +- trunk/arch/xtensa/kernel/io.c | 75 - trunk/arch/xtensa/kernel/irq.c | 4 +- trunk/arch/xtensa/kernel/pci-dma.c | 4 + trunk/arch/xtensa/kernel/pci.c | 2 +- trunk/arch/xtensa/kernel/platform.c | 4 +- trunk/arch/xtensa/kernel/process.c | 4 +- trunk/arch/xtensa/kernel/setup.c | 12 - trunk/arch/xtensa/kernel/signal.c | 4 - trunk/arch/xtensa/kernel/vmlinux.lds.S | 5 - trunk/arch/xtensa/kernel/xtensa_ksyms.c | 25 + trunk/arch/xtensa/mm/fault.c | 1 + trunk/arch/xtensa/platforms/iss/Makefile | 4 +- trunk/arch/xtensa/platforms/iss/console.c | 15 +- .../platforms/iss/include/platform/serial.h | 0 .../platforms/iss/include/platform/simcall.h | 53 + trunk/arch/xtensa/platforms/iss/io.c | 32 - trunk/arch/xtensa/platforms/iss/network.c | 49 - trunk/arch/xtensa/platforms/iss/setup.c | 14 +- trunk/block/blk-core.c | 51 +- trunk/block/blk-lib.c | 104 +- trunk/block/blk-merge.c | 53 +- trunk/block/blk-settings.c | 16 + trunk/block/blk-sysfs.c | 44 +- trunk/block/blk-tag.c | 6 +- trunk/block/blk.h | 5 +- trunk/block/elevator.c | 6 +- trunk/block/ioctl.c | 27 + trunk/drivers/base/memory.c | 40 +- trunk/drivers/block/drbd/drbd_main.c | 13 +- trunk/drivers/block/osdblk.c | 3 +- trunk/drivers/block/pktcdvd.c | 52 +- trunk/drivers/char/ds1620.c | 8 +- trunk/drivers/char/mbcs.c | 2 +- trunk/drivers/char/mem.c | 2 +- trunk/drivers/char/mspec.c | 2 +- trunk/drivers/char/nwflash.c | 4 +- trunk/drivers/char/raw.c | 2 +- trunk/drivers/cpufreq/omap-cpufreq.c | 36 +- trunk/drivers/dma/Kconfig | 17 + trunk/drivers/dma/Makefile | 2 + trunk/drivers/dma/amba-pl08x.c | 2 + trunk/drivers/dma/dw_dmac.c | 258 +- trunk/drivers/dma/dw_dmac_regs.h | 48 +- trunk/drivers/dma/edma.c | 671 + trunk/drivers/dma/ioat/dma_v2.c | 3 +- trunk/drivers/dma/ioat/pci.c | 22 + trunk/drivers/dma/mmp_pdma.c | 875 ++ trunk/drivers/dma/mmp_tdma.c | 51 +- trunk/drivers/dma/mxs-dma.c | 14 +- trunk/drivers/dma/pl330.c | 78 +- trunk/drivers/dma/sirf-dma.c | 23 +- trunk/drivers/dma/ste_dma40.c | 14 +- trunk/drivers/dma/tegra20-apb-dma.c | 12 +- trunk/drivers/firewire/core-cdev.c | 4 +- trunk/drivers/gpio/gpio-stp-xway.c | 2 +- trunk/drivers/gpu/drm/drm_gem.c | 2 +- trunk/drivers/gpu/drm/drm_vm.c | 10 +- .../drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +- trunk/drivers/gpu/drm/gma500/framebuffer.c | 3 +- .../gpu/drm/nouveau/core/core/parent.c | 17 - .../drm/nouveau/core/include/core/parent.h | 3 - .../drm/nouveau/core/include/subdev/timer.h | 2 +- .../gpu/drm/nouveau/core/subdev/bios/base.c | 21 +- .../gpu/drm/nouveau/core/subdev/clock/nv50.c | 1 + .../gpu/drm/nouveau/core/subdev/therm/nv50.c | 2 +- .../gpu/drm/nouveau/core/subdev/timer/nv04.c | 2 +- trunk/drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +- trunk/drivers/gpu/drm/udl/udl_fb.c | 2 +- trunk/drivers/hwmon/acpi_power_meter.c | 1 + trunk/drivers/hwmon/adm9240.c | 1 + trunk/drivers/hwmon/adt7411.c | 1 - trunk/drivers/hwmon/adt7462.c | 1 - trunk/drivers/hwmon/adt7475.c | 1 + trunk/drivers/hwmon/applesmc.c | 1 + trunk/drivers/hwmon/asus_atk0110.c | 2 + trunk/drivers/hwmon/da9052-hwmon.c | 1 - trunk/drivers/hwmon/emc1403.c | 1 + trunk/drivers/hwmon/emc6w201.c | 1 - trunk/drivers/hwmon/hih6130.c | 1 + trunk/drivers/hwmon/i5k_amb.c | 2 - trunk/drivers/hwmon/ibmaem.c | 1 + trunk/drivers/hwmon/ibmpex.c | 1 + trunk/drivers/hwmon/ina2xx.c | 1 + trunk/drivers/hwmon/k8temp.c | 1 - trunk/drivers/hwmon/lineage-pem.c | 1 + trunk/drivers/hwmon/lm92.c | 1 + trunk/drivers/hwmon/lm93.c | 1 + trunk/drivers/hwmon/ltc4151.c | 1 + trunk/drivers/hwmon/ltc4215.c | 1 + trunk/drivers/hwmon/ltc4245.c | 1 + trunk/drivers/hwmon/ltc4261.c | 1 + trunk/drivers/hwmon/max16065.c | 1 - trunk/drivers/hwmon/max1619.c | 4 +- trunk/drivers/hwmon/max6642.c | 2 +- trunk/drivers/hwmon/pmbus/pmbus_core.c | 2 +- trunk/drivers/hwmon/s3c-hwmon.c | 1 - trunk/drivers/hwmon/sht21.c | 1 + trunk/drivers/hwmon/smm665.c | 1 + trunk/drivers/hwmon/thmc50.c | 1 + trunk/drivers/hwmon/tmp102.c | 1 + trunk/drivers/hwmon/ultra45_env.c | 1 + trunk/drivers/hwmon/w83791d.c | 1 + trunk/drivers/hwmon/w83792d.c | 1 + trunk/drivers/hwmon/w83793.c | 1 + trunk/drivers/hwmon/w83795.c | 2 +- trunk/drivers/hwmon/w83l786ng.c | 1 + trunk/drivers/i2c/algos/i2c-algo-pca.c | 27 +- trunk/drivers/i2c/busses/Kconfig | 27 +- trunk/drivers/i2c/busses/Makefile | 1 + trunk/drivers/i2c/busses/i2c-at91.c | 667 +- trunk/drivers/i2c/busses/i2c-davinci.c | 58 +- trunk/drivers/i2c/busses/i2c-imx.c | 6 +- trunk/drivers/i2c/busses/i2c-mpc.c | 18 +- trunk/drivers/i2c/busses/i2c-mxs.c | 269 +- trunk/drivers/i2c/busses/i2c-nomadik.c | 52 +- trunk/drivers/i2c/busses/i2c-omap.c | 474 +- trunk/drivers/i2c/busses/i2c-rcar.c | 709 + trunk/drivers/i2c/busses/i2c-s3c2410.c | 18 +- trunk/drivers/infiniband/core/cma.c | 3 +- trunk/drivers/infiniband/core/netlink.c | 1 + .../drivers/infiniband/hw/ehca/ehca_uverbs.c | 4 +- .../infiniband/hw/ipath/ipath_file_ops.c | 2 +- .../drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- trunk/drivers/infiniband/ulp/srpt/ib_srpt.c | 12 - trunk/drivers/input/evdev.c | 99 +- trunk/drivers/input/input.c | 114 +- trunk/drivers/input/joydev.c | 88 +- trunk/drivers/input/keyboard/samsung-keypad.c | 11 +- trunk/drivers/input/mousedev.c | 224 +- trunk/drivers/input/tablet/wacom_sys.c | 145 +- trunk/drivers/input/tablet/wacom_wac.c | 30 +- .../drivers/input/touchscreen/atmel_mxt_ts.c | 6 +- trunk/drivers/isdn/hisax/Kconfig | 10 +- trunk/drivers/isdn/i4l/isdn_ppp.c | 2 +- trunk/drivers/leds/Kconfig | 26 +- trunk/drivers/leds/Makefile | 3 +- trunk/drivers/leds/led-class.c | 15 + trunk/drivers/leds/led-core.c | 16 +- trunk/drivers/leds/led-triggers.c | 17 +- trunk/drivers/leds/leds-clevo-mail.c | 10 +- trunk/drivers/leds/leds-gpio.c | 19 +- trunk/drivers/leds/leds-lm3530.c | 16 +- trunk/drivers/leds/leds-lm3556.c | 512 - trunk/drivers/leds/leds-lm355x.c | 572 + trunk/drivers/leds/leds-lm3642.c | 462 + trunk/drivers/leds/leds-lp5523.c | 75 +- trunk/drivers/leds/leds-pca9633.c | 19 +- trunk/drivers/leds/leds-wm8350.c | 29 +- trunk/drivers/leds/leds.h | 2 + trunk/drivers/md/Kconfig | 8 + trunk/drivers/md/Makefile | 1 + trunk/drivers/md/dm-bio-prison.c | 415 + trunk/drivers/md/dm-bio-prison.h | 72 + trunk/drivers/md/dm-bufio.c | 13 +- trunk/drivers/md/dm-crypt.c | 16 +- trunk/drivers/md/dm-io.c | 11 - trunk/drivers/md/dm-mpath.c | 3 +- trunk/drivers/md/dm-thin.c | 521 +- trunk/drivers/md/dm-verity.c | 2 +- trunk/drivers/md/dm.c | 178 +- trunk/drivers/md/md.c | 44 +- .../md/persistent-data/dm-space-map-common.c | 4 +- trunk/drivers/md/raid0.c | 1 + trunk/drivers/media/dvb-core/dvb_frontend.c | 20 +- trunk/drivers/media/dvb-core/dvb_frontend.h | 4 +- trunk/drivers/media/dvb-frontends/a8293.c | 2 +- trunk/drivers/media/dvb-frontends/af9013.c | 6 +- trunk/drivers/media/dvb-frontends/af9033.c | 16 +- trunk/drivers/media/dvb-frontends/bcm3510.c | 2 +- trunk/drivers/media/dvb-frontends/cx24110.c | 6 +- .../media/dvb-frontends/cxd2820r_core.c | 3 +- trunk/drivers/media/dvb-frontends/drxd_hard.c | 2 +- trunk/drivers/media/dvb-frontends/ds3000.c | 12 +- .../media/dvb-frontends/dvb_dummy_fe.c | 21 +- trunk/drivers/media/dvb-frontends/isl6405.c | 2 +- trunk/drivers/media/dvb-frontends/isl6421.c | 2 +- trunk/drivers/media/dvb-frontends/itd1000.c | 2 +- trunk/drivers/media/dvb-frontends/lg2160.c | 8 +- trunk/drivers/media/dvb-frontends/lnbp21.c | 4 +- trunk/drivers/media/dvb-frontends/lnbp22.c | 2 +- trunk/drivers/media/dvb-frontends/s5h1432.c | 8 +- trunk/drivers/media/dvb-frontends/s921.c | 9 +- trunk/drivers/media/dvb-frontends/si21xx.c | 4 +- trunk/drivers/media/dvb-frontends/sp8870.c | 6 +- trunk/drivers/media/dvb-frontends/sp887x.c | 6 +- trunk/drivers/media/dvb-frontends/stb6100.c | 8 +- trunk/drivers/media/dvb-frontends/stv0299.c | 6 +- .../media/dvb-frontends/stv0900_core.c | 4 +- trunk/drivers/media/dvb-frontends/tda665x.c | 8 +- trunk/drivers/media/dvb-frontends/tda8083.c | 4 +- .../drivers/media/i2c/cx25840/cx25840-core.c | 2 +- trunk/drivers/media/i2c/m5mols/m5mols.h | 10 + .../drivers/media/i2c/m5mols/m5mols_capture.c | 3 + trunk/drivers/media/i2c/m5mols/m5mols_core.c | 47 + trunk/drivers/media/i2c/m5mols/m5mols_reg.h | 1 + trunk/drivers/media/i2c/mt9p031.c | 19 +- trunk/drivers/media/i2c/mt9t001.c | 22 +- trunk/drivers/media/i2c/mt9v032.c | 54 +- trunk/drivers/media/i2c/soc_camera/ov2640.c | 5 + trunk/drivers/media/i2c/ths7303.c | 106 +- trunk/drivers/media/i2c/tvp514x.c | 77 +- trunk/drivers/media/pci/bt8xx/bttv-driver.c | 30 +- trunk/drivers/media/pci/bt8xx/bttvp.h | 1 + trunk/drivers/media/pci/bt8xx/dst_ca.c | 2 +- trunk/drivers/media/pci/cx23885/altera-ci.c | 4 +- trunk/drivers/media/pci/cx23885/cimax2.c | 2 +- .../drivers/media/pci/cx23885/cx23885-cards.c | 3 + .../drivers/media/pci/cx23885/cx23885-video.c | 3 +- .../pci/cx25821/cx25821-video-upstream-ch2.c | 2 +- .../pci/cx25821/cx25821-video-upstream.c | 2 +- trunk/drivers/media/pci/cx88/cx88-blackbird.c | 6 +- trunk/drivers/media/pci/cx88/cx88-dvb.c | 2 +- trunk/drivers/media/pci/cx88/cx88-mpeg.c | 2 +- trunk/drivers/media/pci/cx88/cx88-tvaudio.c | 4 +- trunk/drivers/media/pci/cx88/cx88-video.c | 2 +- trunk/drivers/media/pci/meye/meye.c | 2 +- .../drivers/media/pci/saa7134/saa7134-video.c | 2 +- trunk/drivers/media/platform/Kconfig | 4 +- trunk/drivers/media/platform/davinci/vpbe.c | 136 +- .../media/platform/davinci/vpbe_display.c | 80 +- .../media/platform/davinci/vpbe_venc.c | 25 +- .../media/platform/davinci/vpfe_capture.c | 17 +- .../media/platform/davinci/vpif_capture.c | 370 +- .../media/platform/davinci/vpif_capture.h | 16 +- .../media/platform/davinci/vpif_display.c | 275 +- .../media/platform/davinci/vpif_display.h | 18 +- .../media/platform/exynos-gsc/gsc-regs.c | 4 +- trunk/drivers/media/platform/fsl-viu.c | 2 +- .../drivers/media/platform/mem2mem_testdev.c | 14 +- trunk/drivers/media/platform/omap/omap_vout.c | 77 +- .../drivers/media/platform/omap3isp/ispreg.h | 6 +- .../media/platform/s5p-fimc/fimc-capture.c | 135 +- .../media/platform/s5p-fimc/fimc-core.c | 19 +- .../media/platform/s5p-fimc/fimc-core.h | 28 +- .../media/platform/s5p-fimc/fimc-m2m.c | 25 +- .../media/platform/s5p-fimc/fimc-reg.c | 23 +- .../media/platform/s5p-fimc/fimc-reg.h | 3 +- .../media/platform/s5p-fimc/mipi-csis.c | 75 +- trunk/drivers/media/platform/s5p-g2d/g2d.c | 2 +- .../media/platform/s5p-jpeg/jpeg-core.c | 6 +- trunk/drivers/media/platform/s5p-mfc/Makefile | 7 +- .../media/platform/s5p-mfc/regs-mfc-v6.h | 408 + .../drivers/media/platform/s5p-mfc/regs-mfc.h | 41 + .../drivers/media/platform/s5p-mfc/s5p_mfc.c | 294 +- .../media/platform/s5p-mfc/s5p_mfc_cmd.c | 111 +- .../media/platform/s5p-mfc/s5p_mfc_cmd.h | 17 +- .../media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 166 + .../media/platform/s5p-mfc/s5p_mfc_cmd_v5.h | 20 + .../media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 156 + .../media/platform/s5p-mfc/s5p_mfc_cmd_v6.h | 20 + .../media/platform/s5p-mfc/s5p_mfc_common.h | 191 +- .../media/platform/s5p-mfc/s5p_mfc_ctrl.c | 202 +- .../media/platform/s5p-mfc/s5p_mfc_ctrl.h | 1 + .../media/platform/s5p-mfc/s5p_mfc_dec.c | 258 +- .../media/platform/s5p-mfc/s5p_mfc_dec.h | 1 + .../media/platform/s5p-mfc/s5p_mfc_enc.c | 236 +- .../media/platform/s5p-mfc/s5p_mfc_enc.h | 1 + .../media/platform/s5p-mfc/s5p_mfc_intr.c | 11 +- .../media/platform/s5p-mfc/s5p_mfc_opr.c | 1418 +- .../media/platform/s5p-mfc/s5p_mfc_opr.h | 137 +- .../media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 1794 +++ .../{s5p_mfc_shm.h => s5p_mfc_opr_v5.h} | 41 +- .../media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 1956 +++ .../media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 50 + .../media/platform/s5p-mfc/s5p_mfc_pm.c | 3 +- .../media/platform/s5p-mfc/s5p_mfc_shm.c | 47 - .../media/platform/soc_camera/mx2_camera.c | 7 +- .../media/platform/soc_camera/soc_camera.c | 40 +- trunk/drivers/media/platform/vino.c | 2 +- .../media/radio/si470x/radio-si470x-i2c.c | 2 +- .../media/radio/si470x/radio-si470x-usb.c | 2 +- trunk/drivers/media/radio/si4713-i2c.c | 12 +- trunk/drivers/media/rc/ene_ir.c | 5 +- trunk/drivers/media/rc/iguanair.c | 147 +- trunk/drivers/media/rc/ir-lirc-codec.c | 4 +- .../media/rc/keymaps/rc-msi-digivox-ii.c | 36 +- trunk/drivers/media/rc/nuvoton-cir.c | 3 + trunk/drivers/media/rc/redrat3.c | 3 + trunk/drivers/media/rc/winbond-cir.c | 2 +- trunk/drivers/media/tuners/mt2063.c | 44 +- trunk/drivers/media/tuners/mt2063.h | 4 - trunk/drivers/media/tuners/tda18271-common.c | 104 +- trunk/drivers/media/usb/dvb-usb-v2/af9015.c | 4 +- trunk/drivers/media/usb/dvb-usb-v2/af9035.c | 2 +- trunk/drivers/media/usb/dvb-usb/a800.c | 2 +- .../media/usb/dvb-usb/cinergyT2-core.c | 3 +- .../drivers/media/usb/dvb-usb/dibusb-common.c | 2 +- trunk/drivers/media/usb/dvb-usb/digitv.c | 2 +- trunk/drivers/media/usb/dvb-usb/dtt200u.c | 2 +- trunk/drivers/media/usb/dvb-usb/m920x.c | 2 +- .../media/usb/dvb-usb/technisat-usb2.c | 1 + trunk/drivers/media/usb/em28xx/em28xx-cards.c | 2 +- trunk/drivers/media/usb/em28xx/em28xx-dvb.c | 13 +- .../drivers/media/usb/sn9c102/sn9c102_core.c | 3 +- .../drivers/media/usb/stk1160/stk1160-core.c | 15 +- trunk/drivers/media/usb/stk1160/stk1160-v4l.c | 7 +- trunk/drivers/media/usb/stk1160/stk1160.h | 3 +- .../media/usb/usbvision/usbvision-video.c | 3 +- trunk/drivers/media/usb/uvc/uvc_queue.c | 10 +- trunk/drivers/media/usb/uvc/uvc_video.c | 4 +- trunk/drivers/media/usb/uvc/uvcvideo.h | 2 +- trunk/drivers/media/v4l2-core/v4l2-ctrls.c | 74 + trunk/drivers/media/v4l2-core/v4l2-ioctl.c | 8 +- .../drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +- .../media/v4l2-core/videobuf-vmalloc.c | 2 +- .../drivers/media/v4l2-core/videobuf2-core.c | 79 +- .../media/v4l2-core/videobuf2-memops.c | 2 +- trunk/drivers/misc/Kconfig | 10 - trunk/drivers/misc/Makefile | 1 - trunk/drivers/misc/carma/carma-fpga.c | 2 - trunk/drivers/misc/sgi-gru/grufile.c | 5 +- trunk/drivers/mmc/core/core.c | 240 +- trunk/drivers/mmc/core/debugfs.c | 2 +- trunk/drivers/mmc/core/mmc.c | 57 +- trunk/drivers/mmc/core/mmc_ops.c | 84 +- trunk/drivers/mmc/core/sdio_bus.c | 7 - trunk/drivers/mmc/core/slot-gpio.c | 8 +- trunk/drivers/mmc/host/Kconfig | 9 + trunk/drivers/mmc/host/Makefile | 1 + trunk/drivers/mmc/host/atmel-mci-regs.h | 7 + trunk/drivers/mmc/host/atmel-mci.c | 113 +- trunk/drivers/mmc/host/bfin_sdh.c | 210 +- trunk/drivers/mmc/host/davinci_mmc.c | 271 +- trunk/drivers/mmc/host/dw_mmc-exynos.c | 253 + trunk/drivers/mmc/host/dw_mmc-pci.c | 15 +- trunk/drivers/mmc/host/dw_mmc-pltfm.c | 62 +- trunk/drivers/mmc/host/dw_mmc-pltfm.h | 20 + trunk/drivers/mmc/host/dw_mmc.c | 326 +- trunk/drivers/mmc/host/dw_mmc.h | 24 + trunk/drivers/mmc/host/mmc_spi.c | 15 +- trunk/drivers/mmc/host/mmci.c | 13 +- trunk/drivers/mmc/host/mxcmmc.c | 76 +- trunk/drivers/mmc/host/mxs-mmc.c | 2 +- trunk/drivers/mmc/host/omap.c | 37 +- trunk/drivers/mmc/host/omap_hsmmc.c | 125 +- trunk/drivers/mmc/host/pxamci.c | 52 + trunk/drivers/mmc/host/sdhci-dove.c | 8 + trunk/drivers/mmc/host/sdhci-of-esdhc.c | 36 +- trunk/drivers/mmc/host/sdhci-pci.c | 19 +- trunk/drivers/mmc/host/sdhci-pltfm.c | 3 + trunk/drivers/mmc/host/sdhci-pxav2.c | 6 +- trunk/drivers/mmc/host/sdhci-pxav3.c | 35 +- trunk/drivers/mmc/host/sdhci-s3c.c | 216 +- trunk/drivers/mmc/host/sdhci-spear.c | 67 +- trunk/drivers/mmc/host/sdhci-tegra.c | 8 +- trunk/drivers/mmc/host/sdhci.c | 205 +- trunk/drivers/mmc/host/sh_mmcif.c | 8 +- trunk/drivers/mmc/host/via-sdmmc.c | 16 +- trunk/drivers/mmc/host/vub300.c | 4 +- trunk/drivers/mtd/Kconfig | 7 + trunk/drivers/mtd/Makefile | 1 + trunk/drivers/mtd/bcm47xxpart.c | 202 + trunk/drivers/mtd/chips/Kconfig | 11 +- trunk/drivers/mtd/chips/cfi_cmdset_0001.c | 14 +- trunk/drivers/mtd/chips/cfi_cmdset_0002.c | 67 + trunk/drivers/mtd/cmdlinepart.c | 183 +- trunk/drivers/mtd/devices/Kconfig | 10 +- trunk/drivers/mtd/devices/Makefile | 1 + trunk/drivers/mtd/devices/bcm47xxsflash.c | 105 + trunk/drivers/mtd/devices/doc2001plus.c | 14 +- trunk/drivers/mtd/devices/docg3.c | 12 +- trunk/drivers/mtd/devices/m25p80.c | 24 +- trunk/drivers/mtd/devices/spear_smi.c | 141 +- trunk/drivers/mtd/maps/Kconfig | 16 +- trunk/drivers/mtd/maps/Makefile | 1 - trunk/drivers/mtd/maps/autcpu12-nvram.c | 153 +- trunk/drivers/mtd/maps/pci.c | 23 - trunk/drivers/mtd/maps/physmap_of.c | 14 + trunk/drivers/mtd/maps/rbtx4939-flash.c | 2 - trunk/drivers/mtd/maps/uclinux.c | 15 +- trunk/drivers/mtd/maps/wr_sbc82xx_flash.c | 174 - trunk/drivers/mtd/mtdchar.c | 8 +- trunk/drivers/mtd/mtdcore.c | 27 +- trunk/drivers/mtd/mtdoops.c | 14 +- trunk/drivers/mtd/mtdpart.c | 5 +- trunk/drivers/mtd/nand/Kconfig | 63 +- trunk/drivers/mtd/nand/Makefile | 4 +- trunk/drivers/mtd/nand/ams-delta.c | 13 - trunk/drivers/mtd/nand/atmel_nand.c | 987 +- trunk/drivers/mtd/nand/atmel_nand_ecc.h | 114 +- trunk/drivers/mtd/nand/au1550nd.c | 46 - trunk/drivers/mtd/nand/bcm_umi_bch.c | 217 - trunk/drivers/mtd/nand/bcm_umi_nand.c | 555 - trunk/drivers/mtd/nand/bf5xx_nand.c | 6 +- trunk/drivers/mtd/nand/cafe_nand.c | 20 +- trunk/drivers/mtd/nand/cmx270_nand.c | 13 - trunk/drivers/mtd/nand/davinci_nand.c | 78 +- trunk/drivers/mtd/nand/denali.c | 12 +- trunk/drivers/mtd/nand/diskonchip.c | 63 - trunk/drivers/mtd/nand/docg4.c | 43 +- trunk/drivers/mtd/nand/fsl_elbc_nand.c | 51 +- trunk/drivers/mtd/nand/fsl_ifc_nand.c | 52 +- trunk/drivers/mtd/nand/gpio.c | 54 +- trunk/drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 322 +- trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 152 +- trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 26 +- trunk/drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 12 + trunk/drivers/mtd/nand/lpc32xx_mlc.c | 924 ++ trunk/drivers/mtd/nand/lpc32xx_slc.c | 1039 ++ trunk/drivers/mtd/nand/mpc5121_nfc.c | 22 - trunk/drivers/mtd/nand/mxc_nand.c | 168 +- trunk/drivers/mtd/nand/nand_base.c | 529 +- trunk/drivers/mtd/nand/nand_bbt.c | 148 +- trunk/drivers/mtd/nand/nand_bcm_umi.c | 149 - trunk/drivers/mtd/nand/nand_bcm_umi.h | 336 - trunk/drivers/mtd/nand/nand_ids.c | 7 +- trunk/drivers/mtd/nand/nandsim.c | 17 +- trunk/drivers/mtd/nand/ndfc.c | 13 - trunk/drivers/mtd/nand/nuc900_nand.c | 17 - trunk/drivers/mtd/nand/omap2.c | 36 +- trunk/drivers/mtd/nand/orion_nand.c | 1 - trunk/drivers/mtd/nand/plat_nand.c | 5 + trunk/drivers/mtd/nand/pxa3xx_nand.c | 12 +- trunk/drivers/mtd/nand/r852.c | 22 - trunk/drivers/mtd/nand/s3c2410.c | 191 +- trunk/drivers/mtd/nand/sh_flctl.c | 327 +- trunk/drivers/mtd/nand/socrates_nand.c | 19 - trunk/drivers/mtd/nand/tmio_nand.c | 13 - trunk/drivers/mtd/nand/txx9ndfmc.c | 13 - trunk/drivers/mtd/nand/xway_nand.c | 201 + trunk/drivers/mtd/sm_ftl.c | 1 - trunk/drivers/mtd/tests/Makefile | 1 + trunk/drivers/mtd/tests/mtd_nandbiterrs.c | 460 + trunk/drivers/mtd/tests/mtd_nandecctest.c | 294 +- trunk/drivers/mtd/tests/mtd_speedtest.c | 16 +- trunk/drivers/mtd/tests/mtd_stresstest.c | 39 +- trunk/drivers/net/ethernet/amd/amd8111e.c | 2 + trunk/drivers/net/ethernet/amd/au1000_eth.c | 10 +- .../net/ethernet/broadcom/bcm63xx_enet.h | 30 +- trunk/drivers/net/ethernet/calxeda/xgmac.c | 19 +- .../net/ethernet/chelsio/cxgb4/cxgb4.h | 1 + .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 54 +- .../net/ethernet/chelsio/cxgb4/t4_hw.c | 15 +- trunk/drivers/net/ethernet/dec/tulip/dmfe.c | 12 +- .../net/ethernet/emulex/benet/be_main.c | 7 +- .../drivers/net/ethernet/freescale/gianfar.c | 27 +- .../drivers/net/ethernet/freescale/gianfar.h | 2 - .../drivers/net/ethernet/freescale/ucc_geth.c | 29 +- .../drivers/net/ethernet/freescale/ucc_geth.h | 2 - .../drivers/net/ethernet/intel/e1000e/e1000.h | 6 +- trunk/drivers/net/ethernet/intel/e1000e/hw.h | 2 + .../net/ethernet/intel/e1000e/netdev.c | 4 +- .../drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- .../net/ethernet/intel/ixgbevf/ixgbevf.h | 2 +- .../net/ethernet/intel/ixgbevf/ixgbevf_main.c | 7 + trunk/drivers/net/ethernet/jme.c | 4 + .../net/ethernet/marvell/mv643xx_eth.c | 18 +- trunk/drivers/net/ethernet/marvell/skge.c | 13 +- trunk/drivers/net/ethernet/marvell/sky2.c | 5 +- trunk/drivers/net/ethernet/natsemi/natsemi.c | 4 +- trunk/drivers/net/ethernet/natsemi/xtsonic.c | 1 + .../drivers/net/ethernet/octeon/octeon_mgmt.c | 550 +- .../net/ethernet/oki-semi/pch_gbe/Kconfig | 3 + .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 +- trunk/drivers/net/ethernet/realtek/8139cp.c | 2 +- trunk/drivers/net/ethernet/renesas/sh_eth.c | 1 + trunk/drivers/net/ethernet/sfc/ptp.c | 9 +- trunk/drivers/net/ethernet/sis/sis900.c | 4 +- .../net/ethernet/stmicro/stmmac/stmmac.h | 1 - .../net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +- trunk/drivers/net/ethernet/sun/niu.c | 1 + trunk/drivers/net/ethernet/sun/sungem.c | 3 +- trunk/drivers/net/irda/irtty-sir.c | 4 +- trunk/drivers/net/irda/mcs7780.c | 4 +- trunk/drivers/net/irda/pxaficp_ir.c | 4 +- trunk/drivers/net/irda/sa1100_ir.c | 4 +- trunk/drivers/net/irda/sh_irda.c | 4 +- trunk/drivers/net/irda/sh_sir.c | 5 +- trunk/drivers/net/phy/mdio_bus.c | 1 + trunk/drivers/net/usb/cdc_eem.c | 4 + trunk/drivers/net/usb/kaweth.c | 2 +- trunk/drivers/net/usb/mcs7830.c | 30 +- trunk/drivers/net/usb/usbnet.c | 17 + trunk/drivers/net/vxlan.c | 153 +- trunk/drivers/net/wan/farsync.c | 2 +- trunk/drivers/net/wireless/ath/ath5k/base.c | 3 +- trunk/drivers/net/wireless/ath/ath9k/beacon.c | 2 +- trunk/drivers/net/wireless/ath/ath9k/hw.c | 5 + trunk/drivers/net/wireless/ath/ath9k/hw.h | 1 + trunk/drivers/net/wireless/ath/ath9k/main.c | 15 +- trunk/drivers/net/wireless/ath/ath9k/pci.c | 7 + trunk/drivers/net/wireless/ath/ath9k/xmit.c | 53 +- .../net/wireless/ath/carl9170/carl9170.h | 1 + .../drivers/net/wireless/ath/carl9170/main.c | 29 +- trunk/drivers/net/wireless/mwifiex/cfg80211.c | 27 +- trunk/drivers/net/wireless/mwifiex/join.c | 6 +- trunk/drivers/net/wireless/mwifiex/main.h | 2 +- trunk/drivers/net/wireless/mwifiex/scan.c | 38 +- .../net/wireless/mwifiex/sta_cmdresp.c | 4 +- .../drivers/net/wireless/mwifiex/sta_event.c | 31 +- trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 4 +- trunk/drivers/net/xen-netback/netback.c | 40 +- trunk/drivers/oprofile/buffer_sync.c | 17 +- trunk/drivers/parport/Kconfig | 2 +- trunk/drivers/pinctrl/Kconfig | 16 + trunk/drivers/pinctrl/Makefile | 3 + trunk/drivers/pinctrl/pinctrl-falcon.c | 468 + trunk/drivers/pinctrl/pinctrl-lantiq.c | 342 + trunk/drivers/pinctrl/pinctrl-lantiq.h | 194 + .../drivers/pinctrl/pinctrl-nomadik-db8500.c | 289 +- .../drivers/pinctrl/pinctrl-nomadik-db8540.c | 344 +- trunk/drivers/pinctrl/pinctrl-nomadik.c | 117 +- trunk/drivers/pinctrl/pinctrl-nomadik.h | 78 + trunk/drivers/pinctrl/pinctrl-xway.c | 781 ++ trunk/drivers/power/avs/smartreflex.c | 8 +- trunk/drivers/pwm/Kconfig | 29 +- trunk/drivers/pwm/Makefile | 3 + trunk/drivers/pwm/core.c | 82 +- .../{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} | 116 +- trunk/drivers/pwm/pwm-bfin.c | 3 - trunk/drivers/pwm/pwm-imx.c | 278 +- trunk/drivers/pwm/pwm-jz4740.c | 221 + trunk/drivers/pwm/pwm-puv3.c | 161 + trunk/drivers/pwm/pwm-pxa.c | 3 - trunk/drivers/pwm/pwm-samsung.c | 3 - trunk/drivers/pwm/pwm-tiecap.c | 24 +- trunk/drivers/pwm/pwm-tiehrpwm.c | 75 +- trunk/drivers/rapidio/rio-scan.c | 40 +- trunk/drivers/rapidio/rio.c | 75 +- trunk/drivers/rtc/Kconfig | 3 + trunk/drivers/s390/block/dcssblk.c | 52 +- trunk/drivers/s390/crypto/zcrypt_pcixcc.c | 1 - trunk/drivers/scsi/bfa/bfa_core.c | 85 +- trunk/drivers/scsi/bfa/bfa_defs.h | 61 +- trunk/drivers/scsi/bfa/bfa_defs_svc.h | 119 +- trunk/drivers/scsi/bfa/bfa_fc.h | 5 + trunk/drivers/scsi/bfa/bfa_fcbuild.c | 4 + trunk/drivers/scsi/bfa/bfa_fcpim.c | 123 +- trunk/drivers/scsi/bfa/bfa_fcpim.h | 13 +- trunk/drivers/scsi/bfa/bfa_fcs.c | 64 +- trunk/drivers/scsi/bfa/bfa_fcs.h | 23 +- trunk/drivers/scsi/bfa/bfa_fcs_lport.c | 155 +- trunk/drivers/scsi/bfa/bfa_fcs_rport.c | 288 +- trunk/drivers/scsi/bfa/bfa_ioc.c | 494 +- trunk/drivers/scsi/bfa/bfa_ioc.h | 63 +- trunk/drivers/scsi/bfa/bfa_ioc_ct.c | 236 +- trunk/drivers/scsi/bfa/bfa_modules.h | 1 + trunk/drivers/scsi/bfa/bfa_port.c | 32 + trunk/drivers/scsi/bfa/bfa_port.h | 3 + trunk/drivers/scsi/bfa/bfa_svc.c | 732 +- trunk/drivers/scsi/bfa/bfa_svc.h | 30 +- trunk/drivers/scsi/bfa/bfad.c | 6 +- trunk/drivers/scsi/bfa/bfad_bsg.c | 375 +- trunk/drivers/scsi/bfa/bfad_bsg.h | 63 +- trunk/drivers/scsi/bfa/bfad_drv.h | 2 +- trunk/drivers/scsi/bfa/bfi.h | 72 +- trunk/drivers/scsi/bfa/bfi_ms.h | 14 + trunk/drivers/scsi/bfa/bfi_reg.h | 3 + trunk/drivers/scsi/fcoe/fcoe.c | 14 +- trunk/drivers/scsi/fcoe/fcoe.h | 2 + trunk/drivers/scsi/libfc/fc_fcp.c | 3 +- trunk/drivers/scsi/lpfc/lpfc.h | 2 + trunk/drivers/scsi/lpfc/lpfc_attr.c | 8 +- trunk/drivers/scsi/lpfc/lpfc_crtn.h | 1 + trunk/drivers/scsi/lpfc/lpfc_els.c | 7 +- trunk/drivers/scsi/lpfc/lpfc_hbadisc.c | 11 +- trunk/drivers/scsi/lpfc/lpfc_hw4.h | 20 +- trunk/drivers/scsi/lpfc/lpfc_init.c | 256 +- trunk/drivers/scsi/lpfc/lpfc_scsi.c | 39 +- trunk/drivers/scsi/lpfc/lpfc_sli.c | 96 +- trunk/drivers/scsi/lpfc/lpfc_sli4.h | 8 +- trunk/drivers/scsi/lpfc/lpfc_version.h | 2 +- trunk/drivers/scsi/megaraid/megaraid_sas.h | 8 +- .../drivers/scsi/megaraid/megaraid_sas_base.c | 13 +- trunk/drivers/scsi/megaraid/megaraid_sas_fp.c | 2 +- .../scsi/megaraid/megaraid_sas_fusion.c | 27 +- .../scsi/megaraid/megaraid_sas_fusion.h | 2 +- trunk/drivers/scsi/mvumi.c | 1093 +- trunk/drivers/scsi/mvumi.h | 235 +- trunk/drivers/scsi/qla2xxx/qla_init.c | 5 +- trunk/drivers/scsi/qla2xxx/qla_target.c | 2 +- trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c | 15 - trunk/drivers/scsi/scsi_debug.c | 2 +- trunk/drivers/scsi/scsi_error.c | 8 +- trunk/drivers/scsi/sg.c | 2 +- trunk/drivers/scsi/storvsc_drv.c | 5 + trunk/drivers/scsi/virtio_scsi.c | 39 +- trunk/drivers/spi/Kconfig | 8 + trunk/drivers/spi/Makefile | 1 + trunk/drivers/spi/spi-davinci.c | 292 +- trunk/drivers/spi/spi-octeon.c | 362 + trunk/drivers/staging/android/ashmem.c | 1 - trunk/drivers/staging/omapdrm/omap_drv.c | 5 +- .../drivers/staging/omapdrm/omap_gem_dmabuf.c | 2 +- .../staging/tidspbridge/rmgr/drv_interface.c | 2 +- trunk/drivers/target/iscsi/iscsi_target.c | 196 +- trunk/drivers/target/iscsi/iscsi_target.h | 5 + .../target/iscsi/iscsi_target_configfs.c | 42 +- .../drivers/target/iscsi/iscsi_target_core.h | 15 +- .../drivers/target/iscsi/iscsi_target_erl0.c | 94 +- .../drivers/target/iscsi/iscsi_target_erl1.c | 4 +- .../drivers/target/iscsi/iscsi_target_erl1.h | 4 +- .../drivers/target/iscsi/iscsi_target_erl2.c | 9 +- .../drivers/target/iscsi/iscsi_target_erl2.h | 2 +- .../drivers/target/iscsi/iscsi_target_login.c | 20 +- .../drivers/target/iscsi/iscsi_target_nego.c | 31 +- .../target/iscsi/iscsi_target_parameters.c | 71 +- .../target/iscsi/iscsi_target_parameters.h | 7 +- .../target/iscsi/iscsi_target_seq_pdu_list.c | 61 +- trunk/drivers/target/iscsi/iscsi_target_tmr.c | 31 +- trunk/drivers/target/iscsi/iscsi_target_tpg.c | 12 + trunk/drivers/target/iscsi/iscsi_target_tq.c | 6 +- trunk/drivers/target/iscsi/iscsi_target_tq.h | 1 - .../drivers/target/iscsi/iscsi_target_util.c | 16 +- .../drivers/target/iscsi/iscsi_target_util.h | 8 +- trunk/drivers/target/loopback/tcm_loop.c | 74 +- trunk/drivers/target/sbp/sbp_target.c | 27 +- trunk/drivers/target/target_core_alua.c | 2 +- trunk/drivers/target/target_core_configfs.c | 18 +- trunk/drivers/target/target_core_device.c | 16 +- .../target/target_core_fabric_configfs.c | 1 - trunk/drivers/target/target_core_fabric_lib.c | 8 +- trunk/drivers/target/target_core_file.c | 43 +- trunk/drivers/target/target_core_file.h | 1 + trunk/drivers/target/target_core_iblock.c | 26 +- trunk/drivers/target/target_core_pr.c | 14 +- trunk/drivers/target/target_core_pscsi.c | 2 +- trunk/drivers/target/target_core_sbc.c | 23 +- trunk/drivers/target/target_core_spc.c | 48 +- trunk/drivers/target/target_core_stat.c | 1 - trunk/drivers/target/target_core_tpg.c | 2 +- trunk/drivers/target/target_core_transport.c | 268 +- trunk/drivers/target/tcm_fc/tfc_cmd.c | 1 - trunk/drivers/target/tcm_fc/tfc_conf.c | 12 - trunk/drivers/target/tcm_fc/tfc_io.c | 4 +- trunk/drivers/target/tcm_fc/tfc_sess.c | 1 - trunk/drivers/tty/hvc/hvc_xen.c | 5 +- trunk/drivers/tty/serial/kgdboc.c | 3 +- trunk/drivers/tty/vt/vt.c | 13 + trunk/drivers/uio/uio.c | 4 +- trunk/drivers/usb/class/cdc-acm.c | 3 + trunk/drivers/usb/gadget/tcm_usb_gadget.c | 15 +- trunk/drivers/usb/mon/mon_bin.c | 2 +- trunk/drivers/usb/musb/musb_io.h | 3 +- trunk/drivers/vfio/pci/vfio_pci.c | 9 +- trunk/drivers/vfio/pci/vfio_pci_intrs.c | 18 +- trunk/drivers/vhost/tcm_vhost.c | 81 +- trunk/drivers/vhost/tcm_vhost.h | 8 + trunk/drivers/video/68328fb.c | 2 +- trunk/drivers/video/Kconfig | 15 - trunk/drivers/video/Makefile | 2 - trunk/drivers/video/amifb.c | 2 - trunk/drivers/video/arcfb.c | 1 + trunk/drivers/video/atmel_lcdfb.c | 5 +- trunk/drivers/video/aty/atyfb_base.c | 3 +- trunk/drivers/video/backlight/pwm_bl.c | 7 +- trunk/drivers/video/bf537-lq035.c | 12 +- trunk/drivers/video/bf54x-lq043fb.c | 9 +- trunk/drivers/video/bfin-lq035q1-fb.c | 13 +- trunk/drivers/video/bfin-t350mcqb-fb.c | 1 + trunk/drivers/video/bw2.c | 4 +- trunk/drivers/video/cg3.c | 3 +- trunk/drivers/video/cobalt_lcdfb.c | 5 +- trunk/drivers/video/console/font_mini_4x6.c | 2 +- trunk/drivers/video/console/font_sun8x16.c | 2 +- trunk/drivers/video/cyber2000fb.c | 4 +- trunk/drivers/video/da8xx-fb.c | 283 +- trunk/drivers/video/ep93xx-fb.c | 17 +- trunk/drivers/video/exynos/exynos_dp_core.c | 322 +- trunk/drivers/video/exynos/exynos_dp_core.h | 6 +- trunk/drivers/video/exynos/exynos_dp_reg.c | 58 +- trunk/drivers/video/exynos/exynos_dp_reg.h | 3 +- trunk/drivers/video/exynos/exynos_mipi_dsi.c | 9 +- .../video/exynos/exynos_mipi_dsi_common.c | 8 - trunk/drivers/video/fb-puv3.c | 3 +- trunk/drivers/video/fb_defio.c | 2 +- trunk/drivers/video/fbmem.c | 3 +- trunk/drivers/video/fsl-diu-fb.c | 10 +- trunk/drivers/video/gbefb.c | 19 +- trunk/drivers/video/hpfb.c | 28 +- trunk/drivers/video/imxfb.c | 1 + trunk/drivers/video/jz4740_fb.c | 44 +- trunk/drivers/video/mb862xx/mb862xxfbdrv.c | 10 +- trunk/drivers/video/mbx/mbxfb.c | 25 +- trunk/drivers/video/msm/mddi.c | 3 - trunk/drivers/video/msm/mddi_client_nt35399.c | 6 +- trunk/drivers/video/msm/mdp.c | 1 - trunk/drivers/video/msm/mdp_hw.h | 1 - trunk/drivers/video/mx3fb.c | 3 +- trunk/drivers/video/nuc900fb.c | 2 +- trunk/drivers/video/omap/hwa742.c | 1 - trunk/drivers/video/omap/lcd_palmte.c | 1 - trunk/drivers/video/omap/omapfb_main.c | 9 - .../video/omap2/displays/panel-acx565akm.c | 14 +- .../video/omap2/displays/panel-generic-dpi.c | 76 +- .../omap2/displays/panel-lgphilips-lb035q02.c | 3 + .../drivers/video/omap2/displays/panel-n8x0.c | 31 +- .../omap2/displays/panel-nec-nl8048hl11-01b.c | 3 + .../video/omap2/displays/panel-picodlp.c | 4 + .../omap2/displays/panel-sharp-ls037v7dw01.c | 3 + .../drivers/video/omap2/displays/panel-taal.c | 239 +- .../video/omap2/displays/panel-tfp410.c | 20 +- .../omap2/displays/panel-tpo-td043mtea1.c | 7 +- trunk/drivers/video/omap2/dss/Kconfig | 2 +- trunk/drivers/video/omap2/dss/Makefile | 4 +- trunk/drivers/video/omap2/dss/apply.c | 330 +- trunk/drivers/video/omap2/dss/core.c | 91 +- trunk/drivers/video/omap2/dss/dispc.c | 1018 +- trunk/drivers/video/omap2/dss/dispc.h | 37 + trunk/drivers/video/omap2/dss/display.c | 108 +- trunk/drivers/video/omap2/dss/dpi.c | 181 +- trunk/drivers/video/omap2/dss/dsi.c | 675 +- trunk/drivers/video/omap2/dss/dss.c | 257 +- trunk/drivers/video/omap2/dss/dss.h | 79 +- trunk/drivers/video/omap2/dss/dss_features.c | 278 +- trunk/drivers/video/omap2/dss/dss_features.h | 7 + trunk/drivers/video/omap2/dss/hdmi.c | 247 +- trunk/drivers/video/omap2/dss/hdmi_panel.c | 31 +- trunk/drivers/video/omap2/dss/manager-sysfs.c | 512 + trunk/drivers/video/omap2/dss/manager.c | 473 +- trunk/drivers/video/omap2/dss/output.c | 148 + trunk/drivers/video/omap2/dss/overlay-sysfs.c | 456 + trunk/drivers/video/omap2/dss/overlay.c | 492 +- trunk/drivers/video/omap2/dss/rfbi.c | 222 +- trunk/drivers/video/omap2/dss/sdi.c | 126 +- trunk/drivers/video/omap2/dss/venc.c | 337 +- trunk/drivers/video/omap2/dss/venc_panel.c | 251 + .../drivers/video/omap2/omapfb/omapfb-ioctl.c | 7 +- .../drivers/video/omap2/omapfb/omapfb-main.c | 34 +- trunk/drivers/video/omap2/omapfb/omapfb.h | 5 +- trunk/drivers/video/omap2/vram.c | 56 - trunk/drivers/video/pnx4008/Makefile | 7 - trunk/drivers/video/pnx4008/dum.h | 211 - trunk/drivers/video/pnx4008/fbcommon.h | 43 - trunk/drivers/video/pnx4008/pnxrgbfb.c | 198 - trunk/drivers/video/pnx4008/sdum.c | 861 -- trunk/drivers/video/pnx4008/sdum.h | 136 - trunk/drivers/video/ps3fb.c | 7 +- trunk/drivers/video/s3c-fb.c | 54 +- trunk/drivers/video/s3c2410fb.c | 34 +- trunk/drivers/video/savage/savagefb_driver.c | 4 +- trunk/drivers/video/sbuslib.c | 5 +- trunk/drivers/video/sis/initextlfb.c | 2 +- trunk/drivers/video/smscufx.c | 1 - trunk/drivers/video/sunxvr1000.c | 4 +- trunk/drivers/video/sunxvr2500.c | 4 +- trunk/drivers/video/sunxvr500.c | 8 +- trunk/drivers/video/udlfb.c | 3 +- trunk/drivers/video/uvesafb.c | 2 + trunk/drivers/video/vermilion/vermilion.c | 4 +- trunk/drivers/video/vfb.c | 1 - trunk/drivers/video/via/via_clock.c | 19 + trunk/drivers/xen/gntalloc.c | 2 +- trunk/drivers/xen/gntdev.c | 2 +- trunk/drivers/xen/privcmd.c | 3 +- trunk/drivers/xen/xenbus/xenbus_xs.c | 21 + trunk/fs/9p/v9fs.c | 30 +- trunk/fs/9p/vfs_file.c | 1 + trunk/fs/9p/vfs_inode.c | 8 +- trunk/fs/autofs4/root.c | 6 +- trunk/fs/binfmt_elf.c | 5 +- trunk/fs/binfmt_elf_fdpic.c | 3 +- trunk/fs/bio-integrity.c | 44 +- trunk/fs/bio.c | 231 +- trunk/fs/block_dev.c | 68 +- trunk/fs/btrfs/backref.c | 299 +- trunk/fs/btrfs/backref.h | 10 +- trunk/fs/btrfs/btrfs_inode.h | 15 +- trunk/fs/btrfs/check-integrity.c | 16 +- trunk/fs/btrfs/compression.c | 13 +- trunk/fs/btrfs/ctree.c | 148 +- trunk/fs/btrfs/ctree.h | 109 +- trunk/fs/btrfs/delayed-inode.c | 6 +- trunk/fs/btrfs/disk-io.c | 230 +- trunk/fs/btrfs/disk-io.h | 2 + trunk/fs/btrfs/extent-tree.c | 376 +- trunk/fs/btrfs/extent_io.c | 128 +- trunk/fs/btrfs/extent_io.h | 23 +- trunk/fs/btrfs/extent_map.c | 55 +- trunk/fs/btrfs/extent_map.h | 8 +- trunk/fs/btrfs/file-item.c | 5 +- trunk/fs/btrfs/file.c | 449 +- trunk/fs/btrfs/free-space-cache.c | 10 +- trunk/fs/btrfs/hash.h | 10 + trunk/fs/btrfs/inode-item.c | 285 +- trunk/fs/btrfs/inode.c | 386 +- trunk/fs/btrfs/ioctl.c | 102 +- trunk/fs/btrfs/ordered-data.c | 97 +- trunk/fs/btrfs/ordered-data.h | 12 +- trunk/fs/btrfs/qgroup.c | 40 +- trunk/fs/btrfs/relocation.c | 11 +- trunk/fs/btrfs/root-tree.c | 29 +- trunk/fs/btrfs/scrub.c | 30 +- trunk/fs/btrfs/send.c | 915 +- trunk/fs/btrfs/send.h | 1 + trunk/fs/btrfs/super.c | 74 +- trunk/fs/btrfs/transaction.c | 283 +- trunk/fs/btrfs/transaction.h | 20 +- trunk/fs/btrfs/tree-log.c | 889 +- trunk/fs/btrfs/ulist.c | 7 +- trunk/fs/btrfs/ulist.h | 9 +- trunk/fs/btrfs/volumes.c | 73 +- trunk/fs/btrfs/zlib.c | 8 +- trunk/fs/ceph/addr.c | 2 +- trunk/fs/ceph/export.c | 18 +- trunk/fs/cifs/cifs_unicode.c | 22 + trunk/fs/cifs/connect.c | 9 + trunk/fs/cifs/file.c | 1 + trunk/fs/cifs/transport.c | 6 + trunk/fs/compat.c | 12 +- trunk/fs/exec.c | 69 +- trunk/fs/exofs/ore.c | 5 +- trunk/fs/exofs/ore_raid.c | 2 +- trunk/fs/exofs/super.c | 4 - trunk/fs/exofs/sys.c | 7 +- trunk/fs/ext3/super.c | 6 - trunk/fs/ext4/file.c | 2 +- trunk/fs/fat/dir.c | 4 +- trunk/fs/fat/fat.h | 5 +- trunk/fs/fat/inode.c | 5 +- trunk/fs/fat/namei_msdos.c | 26 +- trunk/fs/fat/namei_vfat.c | 30 +- trunk/fs/fcntl.c | 2 +- trunk/fs/file.c | 3 + trunk/fs/file_table.c | 2 +- trunk/fs/filesystems.c | 4 +- trunk/fs/fs-writeback.c | 9 +- trunk/fs/fuse/file.c | 1 + trunk/fs/gfs2/export.c | 4 + trunk/fs/gfs2/file.c | 2 +- trunk/fs/hostfs/hostfs.h | 2 +- trunk/fs/hostfs/hostfs_kern.c | 12 +- trunk/fs/hostfs/hostfs_user.c | 1 - trunk/fs/hpfs/super.c | 3 - trunk/fs/hppfs/hppfs.c | 4 +- trunk/fs/hugetlbfs/inode.c | 11 +- trunk/fs/inode.c | 2 +- trunk/fs/internal.h | 4 +- trunk/fs/isofs/export.c | 2 +- trunk/fs/jffs2/readinode.c | 13 +- trunk/fs/jffs2/super.c | 4 + trunk/fs/jffs2/wbuf.c | 8 +- trunk/fs/lockd/mon.c | 86 +- trunk/fs/lockd/netns.h | 4 + trunk/fs/lockd/svc.c | 18 +- trunk/fs/locks.c | 6 +- trunk/fs/namei.c | 216 +- trunk/fs/namespace.c | 16 +- trunk/fs/nfs/Kconfig | 4 +- trunk/fs/nfs/blocklayout/blocklayout.c | 306 +- trunk/fs/nfs/blocklayout/blocklayout.h | 2 +- trunk/fs/nfs/blocklayout/blocklayoutdev.c | 25 +- trunk/fs/nfs/blocklayout/extents.c | 3 +- trunk/fs/nfs/callback.c | 337 +- trunk/fs/nfs/callback.h | 3 +- trunk/fs/nfs/callback_proc.c | 31 +- trunk/fs/nfs/client.c | 23 +- trunk/fs/nfs/dir.c | 16 +- trunk/fs/nfs/direct.c | 32 +- trunk/fs/nfs/file.c | 42 +- trunk/fs/nfs/getroot.c | 2 + trunk/fs/nfs/idmap.c | 114 +- trunk/fs/nfs/inode.c | 10 +- trunk/fs/nfs/internal.h | 15 +- trunk/fs/nfs/netns.h | 4 + trunk/fs/nfs/nfs4_fs.h | 19 +- trunk/fs/nfs/nfs4client.c | 256 +- trunk/fs/nfs/nfs4file.c | 29 +- trunk/fs/nfs/nfs4filelayout.c | 41 +- trunk/fs/nfs/nfs4filelayout.h | 16 +- trunk/fs/nfs/nfs4filelayoutdev.c | 17 +- trunk/fs/nfs/nfs4namespace.c | 16 +- trunk/fs/nfs/nfs4proc.c | 342 +- trunk/fs/nfs/nfs4state.c | 228 +- trunk/fs/nfs/nfs4sysctl.c | 1 + trunk/fs/nfs/nfs4xdr.c | 31 +- trunk/fs/nfs/objlayout/objio_osd.c | 9 +- trunk/fs/nfs/pagelist.c | 12 +- trunk/fs/nfs/pnfs.c | 417 +- trunk/fs/nfs/pnfs.h | 57 +- trunk/fs/nfs/pnfs_dev.c | 27 + trunk/fs/nfs/super.c | 31 +- trunk/fs/nfs/write.c | 11 +- trunk/fs/nfsd/nfs2acl.c | 3 +- trunk/fs/nfsd/nfs3proc.c | 2 +- trunk/fs/nfsd/nfs4callback.c | 1 - trunk/fs/nfsd/nfs4idmap.c | 4 +- trunk/fs/nfsd/nfs4proc.c | 6 +- trunk/fs/nfsd/nfs4state.c | 351 +- trunk/fs/nfsd/nfs4xdr.c | 2 +- trunk/fs/nfsd/nfsctl.c | 84 +- trunk/fs/nfsd/nfsd.h | 4 +- trunk/fs/nfsd/nfssvc.c | 26 +- trunk/fs/nfsd/state.h | 8 +- trunk/fs/nfsd/vfs.c | 2 +- trunk/fs/nilfs2/file.c | 2 +- trunk/fs/ocfs2/mmap.c | 2 +- trunk/fs/open.c | 29 +- trunk/fs/proc/base.c | 122 +- trunk/fs/proc/page.c | 8 +- trunk/fs/proc/proc_sysctl.c | 5 +- trunk/fs/proc/task_mmu.c | 2 +- trunk/fs/quota/quota.c | 4 +- trunk/fs/reiserfs/inode.c | 6 +- trunk/fs/super.c | 23 - trunk/fs/sysv/balloc.c | 18 +- trunk/fs/sysv/ialloc.c | 14 +- trunk/fs/sysv/inode.c | 4 +- trunk/fs/sysv/super.c | 1 + trunk/fs/sysv/sysv.h | 1 + trunk/fs/ubifs/file.c | 1 + trunk/fs/ufs/balloc.c | 30 +- trunk/fs/ufs/ialloc.c | 16 +- trunk/fs/ufs/super.c | 21 +- trunk/fs/ufs/ufs.h | 1 + trunk/fs/xattr.c | 8 +- trunk/fs/xfs/xfs_export.c | 3 + trunk/fs/xfs/xfs_file.c | 2 +- trunk/include/asm-generic/Kbuild | 35 - trunk/include/asm-generic/bitsperlong.h | 13 +- trunk/include/asm-generic/clkdev.h | 28 + trunk/include/asm-generic/int-l64.h | 26 +- trunk/include/asm-generic/int-ll64.h | 31 +- trunk/include/asm-generic/ioctl.h | 95 +- trunk/include/asm-generic/kvm_para.h | 5 +- trunk/include/asm-generic/param.h | 17 +- trunk/include/asm-generic/pgtable.h | 72 +- trunk/include/asm-generic/resource.h | 66 +- trunk/include/asm-generic/siginfo.h | 297 +- trunk/include/asm-generic/signal.h | 117 +- trunk/include/asm-generic/statfs.h | 81 +- trunk/include/asm-generic/termios.h | 49 +- trunk/include/asm-generic/unistd.h | 907 +- trunk/include/asm-generic/xor.h | 4 +- trunk/include/linux/alarmtimer.h | 31 +- trunk/include/linux/atomic.h | 25 + trunk/include/linux/audit.h | 70 +- .../linux/bcma/bcma_driver_chipcommon.h | 2 + trunk/include/linux/binfmts.h | 6 + trunk/include/linux/bio.h | 70 +- trunk/include/linux/blk_types.h | 36 +- trunk/include/linux/blkdev.h | 82 +- trunk/include/linux/caif/Kbuild | 2 - trunk/include/linux/can/Kbuild | 5 - trunk/include/linux/clocksource.h | 16 - trunk/include/linux/compaction.h | 19 +- trunk/include/linux/compat.h | 8 +- trunk/include/linux/compiler-gcc4.h | 2 +- trunk/include/linux/console.h | 10 +- trunk/include/linux/dvb/version.h | 2 +- trunk/include/linux/dw_dmac.h | 7 + trunk/include/linux/edma.h | 29 + trunk/include/linux/fs.h | 40 +- trunk/include/linux/fsnotify.h | 8 +- trunk/include/linux/gfp.h | 9 +- trunk/include/linux/huge_mm.h | 3 +- trunk/include/linux/i2c-algo-pca.h | 1 + trunk/include/linux/i2c-omap.h | 1 - trunk/include/linux/i2c/i2c-rcar.h | 10 + trunk/include/linux/if_link.h | 6 + trunk/include/linux/if_vlan.h | 8 +- trunk/include/linux/input.h | 10 +- trunk/include/linux/interval_tree.h | 27 + trunk/include/linux/interval_tree_generic.h | 191 + trunk/include/linux/isdn/Kbuild | 1 - trunk/include/linux/jiffies.h | 20 +- trunk/include/linux/leds-lp5523.h | 1 + trunk/include/linux/leds.h | 4 + trunk/include/linux/lglock.h | 19 +- trunk/include/linux/memblock.h | 3 +- trunk/include/linux/memcontrol.h | 18 +- trunk/include/linux/memory_hotplug.h | 3 + trunk/include/linux/mempolicy.h | 4 +- trunk/include/linux/mm.h | 140 +- trunk/include/linux/mm_types.h | 16 +- trunk/include/linux/mman.h | 1 - trunk/include/linux/mmc/Kbuild | 1 - trunk/include/linux/mmc/card.h | 18 +- trunk/include/linux/mmc/core.h | 4 + trunk/include/linux/mmc/dw_mmc.h | 15 +- trunk/include/linux/mmc/host.h | 5 +- trunk/include/linux/mmc/mmc.h | 19 + trunk/include/linux/mmc/sdhci.h | 3 +- trunk/include/linux/mmu_notifier.h | 60 +- trunk/include/linux/mmzone.h | 10 +- trunk/include/linux/mtd/bbm.h | 7 +- trunk/include/linux/mtd/lpc32xx_mlc.h | 20 + trunk/include/linux/mtd/lpc32xx_slc.h | 20 + trunk/include/linux/mtd/mtd.h | 9 +- trunk/include/linux/mtd/nand.h | 72 +- trunk/include/linux/mtd/sh_flctl.h | 23 +- trunk/include/linux/netdevice.h | 19 +- trunk/include/linux/netfilter/Kbuild | 77 - trunk/include/linux/netfilter/ipset/Kbuild | 4 - trunk/include/linux/netfilter/ipset/ip_set.h | 225 +- .../linux/netfilter/ipset/ip_set_bitmap.h | 11 +- .../linux/netfilter/ipset/ip_set_hash.h | 19 +- .../linux/netfilter/ipset/ip_set_list.h | 19 +- .../linux/netfilter/nf_conntrack_common.h | 115 +- .../linux/netfilter/nf_conntrack_ftp.h | 16 +- .../linux/netfilter/nf_conntrack_tcp.h | 49 +- trunk/include/linux/netfilter/nfnetlink.h | 55 +- .../include/linux/netfilter/nfnetlink_acct.h | 25 +- trunk/include/linux/netfilter/x_tables.h | 186 +- trunk/include/linux/netfilter/xt_hashlimit.h | 71 +- trunk/include/linux/netfilter/xt_physdev.h | 21 +- trunk/include/linux/netfilter_arp/Kbuild | 2 - .../include/linux/netfilter_arp/arp_tables.h | 200 +- trunk/include/linux/netfilter_bridge/Kbuild | 18 - .../linux/netfilter_bridge/ebt_802_3.h | 61 +- .../include/linux/netfilter_bridge/ebtables.h | 255 +- trunk/include/linux/netfilter_ipv4/Kbuild | 10 - .../include/linux/netfilter_ipv4/ip_tables.h | 218 +- trunk/include/linux/netfilter_ipv6/Kbuild | 12 - .../include/linux/netfilter_ipv6/ip6_tables.h | 256 +- trunk/include/linux/netlink.h | 20 +- trunk/include/linux/nfs_fs.h | 11 +- trunk/include/linux/nfs_fs_sb.h | 3 + trunk/include/linux/nfs_xdr.h | 5 +- trunk/include/linux/nfsd/Kbuild | 5 - trunk/include/linux/nfsd/debug.h | 31 +- trunk/include/linux/nfsd/export.h | 52 +- trunk/include/linux/nfsd/nfsfh.h | 111 +- trunk/include/linux/nfsd/stats.h | 8 +- trunk/include/linux/of_mdio.h | 20 +- trunk/include/linux/oom.h | 11 - trunk/include/linux/page-isolation.h | 7 +- trunk/include/linux/pageblock-flags.h | 19 +- trunk/include/linux/percpu-rwsem.h | 89 + trunk/include/linux/perf_event.h | 2 +- .../include/linux/platform_data/i2c-nomadik.h | 2 +- .../include/linux/platform_data/leds-lm3556.h | 50 - .../include/linux/platform_data/leds-lm355x.h | 66 + .../include/linux/platform_data/leds-lm3642.h | 38 + .../linux/platform_data/leds-pca9633.h | 35 + trunk/include/linux/platform_data/mipi-csis.h | 30 +- trunk/include/linux/platform_data/mmp_dma.h | 19 + trunk/include/linux/platform_data/pxa_sdhci.h | 1 + trunk/include/linux/pnfs_osd_xdr.h | 1 - trunk/include/linux/prio_tree.h | 120 - trunk/include/linux/ptrace.h | 4 + trunk/include/linux/pwm.h | 108 +- trunk/include/linux/rbtree.h | 119 +- trunk/include/linux/rbtree_augmented.h | 223 + trunk/include/linux/rio.h | 3 +- trunk/include/linux/rmap.h | 36 +- trunk/include/linux/scatterlist.h | 1 + trunk/include/linux/sched.h | 4 +- trunk/include/linux/security.h | 12 +- trunk/include/linux/skbuff.h | 24 - trunk/include/linux/sunrpc/Kbuild | 1 - trunk/include/linux/sunrpc/clnt.h | 2 + trunk/include/linux/sunrpc/debug.h | 39 +- trunk/include/linux/sunrpc/svc_xprt.h | 5 +- trunk/include/linux/sunrpc/svcsock.h | 3 - trunk/include/linux/sunrpc/xprt.h | 3 +- trunk/include/linux/swap.h | 2 +- trunk/include/linux/syscalls.h | 8 + trunk/include/linux/tc_act/Kbuild | 7 - trunk/include/linux/tc_ematch/Kbuild | 4 - trunk/include/linux/timekeeper_internal.h | 108 + trunk/include/linux/timerqueue.h | 2 +- trunk/include/linux/usb/usbnet.h | 2 + trunk/include/linux/v4l2-controls.h | 42 + trunk/include/linux/v4l2-mediabus.h | 5 + trunk/include/linux/videodev2.h | 5 + trunk/include/linux/virtio_scsi.h | 2 + trunk/include/linux/vm_event_item.h | 1 - trunk/include/linux/vmstat.h | 12 + trunk/include/linux/wimax/Kbuild | 1 - trunk/include/media/davinci/vpbe.h | 14 +- trunk/include/media/davinci/vpbe_types.h | 8 +- trunk/include/media/davinci/vpbe_venc.h | 2 +- trunk/include/media/davinci/vpif_types.h | 26 +- trunk/include/media/s5p_fimc.h | 2 - trunk/include/media/v4l2-ctrls.h | 23 + trunk/include/media/v4l2-subdev.h | 48 + trunk/include/mtd/Kbuild | 5 - trunk/include/net/flow.h | 1 + trunk/include/net/route.h | 3 +- trunk/include/rdma/rdma_netlink.h | 1 + trunk/include/scsi/fc/fc_fcp.h | 6 + trunk/include/scsi/libfcoe.h | 2 - trunk/include/scsi/scsi_cmnd.h | 12 +- trunk/include/target/target_core_backend.h | 3 - trunk/include/target/target_core_fabric.h | 5 +- trunk/include/trace/events/btrfs.h | 14 +- trunk/include/trace/events/gfpflags.h | 1 - trunk/include/uapi/asm-generic/Kbuild | 35 + trunk/include/{ => uapi}/asm-generic/auxvec.h | 0 trunk/include/uapi/asm-generic/bitsperlong.h | 15 + .../{ => uapi}/asm-generic/errno-base.h | 0 trunk/include/{ => uapi}/asm-generic/errno.h | 0 trunk/include/{ => uapi}/asm-generic/fcntl.h | 0 trunk/include/uapi/asm-generic/int-l64.h | 34 + trunk/include/uapi/asm-generic/int-ll64.h | 39 + trunk/include/uapi/asm-generic/ioctl.h | 98 + trunk/include/{ => uapi}/asm-generic/ioctls.h | 0 trunk/include/{ => uapi}/asm-generic/ipcbuf.h | 0 trunk/include/uapi/asm-generic/kvm_para.h | 0 .../{ => uapi}/asm-generic/mman-common.h | 0 trunk/include/{ => uapi}/asm-generic/mman.h | 0 trunk/include/{ => uapi}/asm-generic/msgbuf.h | 0 trunk/include/uapi/asm-generic/param.h | 19 + trunk/include/{ => uapi}/asm-generic/poll.h | 0 .../{ => uapi}/asm-generic/posix_types.h | 0 trunk/include/uapi/asm-generic/resource.h | 68 + trunk/include/{ => uapi}/asm-generic/sembuf.h | 0 trunk/include/{ => uapi}/asm-generic/setup.h | 0 trunk/include/{ => uapi}/asm-generic/shmbuf.h | 0 .../include/{ => uapi}/asm-generic/shmparam.h | 0 trunk/include/uapi/asm-generic/siginfo.h | 298 + .../{ => uapi}/asm-generic/signal-defs.h | 0 trunk/include/uapi/asm-generic/signal.h | 123 + trunk/include/{ => uapi}/asm-generic/socket.h | 0 .../include/{ => uapi}/asm-generic/sockios.h | 0 trunk/include/{ => uapi}/asm-generic/stat.h | 0 trunk/include/uapi/asm-generic/statfs.h | 83 + trunk/include/{ => uapi}/asm-generic/swab.h | 0 .../include/{ => uapi}/asm-generic/termbits.h | 0 trunk/include/uapi/asm-generic/termios.h | 50 + trunk/include/{ => uapi}/asm-generic/types.h | 0 .../include/{ => uapi}/asm-generic/ucontext.h | 0 trunk/include/uapi/asm-generic/unistd.h | 902 ++ trunk/include/uapi/linux/caif/Kbuild | 2 + .../{ => uapi}/linux/caif/caif_socket.h | 0 trunk/include/{ => uapi}/linux/caif/if_caif.h | 0 trunk/include/uapi/linux/can/Kbuild | 5 + trunk/include/{ => uapi}/linux/can/bcm.h | 0 trunk/include/{ => uapi}/linux/can/error.h | 0 trunk/include/{ => uapi}/linux/can/gw.h | 0 trunk/include/{ => uapi}/linux/can/netlink.h | 0 trunk/include/{ => uapi}/linux/can/raw.h | 0 trunk/include/uapi/linux/isdn/Kbuild | 1 + trunk/include/{ => uapi}/linux/isdn/capicmd.h | 0 trunk/include/uapi/linux/mmc/Kbuild | 1 + trunk/include/{ => uapi}/linux/mmc/ioctl.h | 0 trunk/include/uapi/linux/netfilter/Kbuild | 76 + .../include/uapi/linux/netfilter/ipset/Kbuild | 4 + .../uapi/linux/netfilter/ipset/ip_set.h | 231 + .../linux/netfilter/ipset/ip_set_bitmap.h | 13 + .../uapi/linux/netfilter/ipset/ip_set_hash.h | 21 + .../uapi/linux/netfilter/ipset/ip_set_list.h | 21 + .../linux/netfilter/nf_conntrack_common.h | 117 + .../uapi/linux/netfilter/nf_conntrack_ftp.h | 18 + .../linux/netfilter/nf_conntrack_sctp.h | 0 .../uapi/linux/netfilter/nf_conntrack_tcp.h | 51 + .../netfilter/nf_conntrack_tuple_common.h | 0 .../{ => uapi}/linux/netfilter/nf_nat.h | 0 .../include/uapi/linux/netfilter/nfnetlink.h | 56 + .../uapi/linux/netfilter/nfnetlink_acct.h | 27 + .../linux/netfilter/nfnetlink_compat.h | 0 .../linux/netfilter/nfnetlink_conntrack.h | 0 .../linux/netfilter/nfnetlink_cthelper.h | 0 .../linux/netfilter/nfnetlink_cttimeout.h | 0 .../linux/netfilter/nfnetlink_log.h | 0 .../linux/netfilter/nfnetlink_queue.h | 0 trunk/include/uapi/linux/netfilter/x_tables.h | 187 + .../{ => uapi}/linux/netfilter/xt_AUDIT.h | 0 .../{ => uapi}/linux/netfilter/xt_CHECKSUM.h | 0 .../{ => uapi}/linux/netfilter/xt_CLASSIFY.h | 0 .../{ => uapi}/linux/netfilter/xt_CONNMARK.h | 0 .../linux/netfilter/xt_CONNSECMARK.h | 0 .../{ => uapi}/linux/netfilter/xt_CT.h | 0 .../{ => uapi}/linux/netfilter/xt_DSCP.h | 0 .../{ => uapi}/linux/netfilter/xt_IDLETIMER.h | 0 .../{ => uapi}/linux/netfilter/xt_LED.h | 0 .../{ => uapi}/linux/netfilter/xt_LOG.h | 0 .../{ => uapi}/linux/netfilter/xt_MARK.h | 0 .../{ => uapi}/linux/netfilter/xt_NFLOG.h | 0 .../{ => uapi}/linux/netfilter/xt_NFQUEUE.h | 0 .../{ => uapi}/linux/netfilter/xt_RATEEST.h | 0 .../{ => uapi}/linux/netfilter/xt_SECMARK.h | 0 .../{ => uapi}/linux/netfilter/xt_TCPMSS.h | 0 .../linux/netfilter/xt_TCPOPTSTRIP.h | 0 .../{ => uapi}/linux/netfilter/xt_TEE.h | 0 .../{ => uapi}/linux/netfilter/xt_TPROXY.h | 0 .../{ => uapi}/linux/netfilter/xt_addrtype.h | 0 .../{ => uapi}/linux/netfilter/xt_cluster.h | 0 .../{ => uapi}/linux/netfilter/xt_comment.h | 0 .../{ => uapi}/linux/netfilter/xt_connbytes.h | 0 .../{ => uapi}/linux/netfilter/xt_connlimit.h | 0 .../{ => uapi}/linux/netfilter/xt_connmark.h | 0 .../{ => uapi}/linux/netfilter/xt_conntrack.h | 0 .../{ => uapi}/linux/netfilter/xt_cpu.h | 0 .../{ => uapi}/linux/netfilter/xt_dccp.h | 0 .../{ => uapi}/linux/netfilter/xt_devgroup.h | 0 .../{ => uapi}/linux/netfilter/xt_dscp.h | 0 .../{ => uapi}/linux/netfilter/xt_ecn.h | 0 .../{ => uapi}/linux/netfilter/xt_esp.h | 0 .../uapi/linux/netfilter/xt_hashlimit.h | 73 + .../{ => uapi}/linux/netfilter/xt_helper.h | 0 .../{ => uapi}/linux/netfilter/xt_iprange.h | 0 .../{ => uapi}/linux/netfilter/xt_ipvs.h | 0 .../{ => uapi}/linux/netfilter/xt_length.h | 0 .../{ => uapi}/linux/netfilter/xt_limit.h | 0 .../{ => uapi}/linux/netfilter/xt_mac.h | 0 .../{ => uapi}/linux/netfilter/xt_mark.h | 0 .../{ => uapi}/linux/netfilter/xt_multiport.h | 0 .../{ => uapi}/linux/netfilter/xt_nfacct.h | 0 .../{ => uapi}/linux/netfilter/xt_osf.h | 0 .../{ => uapi}/linux/netfilter/xt_owner.h | 0 .../include/uapi/linux/netfilter/xt_physdev.h | 23 + .../{ => uapi}/linux/netfilter/xt_pkttype.h | 0 .../{ => uapi}/linux/netfilter/xt_policy.h | 0 .../{ => uapi}/linux/netfilter/xt_quota.h | 0 .../{ => uapi}/linux/netfilter/xt_rateest.h | 0 .../{ => uapi}/linux/netfilter/xt_realm.h | 0 .../{ => uapi}/linux/netfilter/xt_recent.h | 0 .../{ => uapi}/linux/netfilter/xt_sctp.h | 0 .../{ => uapi}/linux/netfilter/xt_set.h | 0 .../{ => uapi}/linux/netfilter/xt_socket.h | 0 .../{ => uapi}/linux/netfilter/xt_state.h | 0 .../{ => uapi}/linux/netfilter/xt_statistic.h | 0 .../{ => uapi}/linux/netfilter/xt_string.h | 0 .../{ => uapi}/linux/netfilter/xt_tcpmss.h | 0 .../{ => uapi}/linux/netfilter/xt_tcpudp.h | 0 .../{ => uapi}/linux/netfilter/xt_time.h | 0 .../{ => uapi}/linux/netfilter/xt_u32.h | 0 trunk/include/uapi/linux/netfilter_arp/Kbuild | 2 + .../uapi/linux/netfilter_arp/arp_tables.h | 206 + .../linux/netfilter_arp/arpt_mangle.h | 0 .../uapi/linux/netfilter_bridge/Kbuild | 18 + .../uapi/linux/netfilter_bridge/ebt_802_3.h | 62 + .../linux/netfilter_bridge/ebt_among.h | 0 .../linux/netfilter_bridge/ebt_arp.h | 0 .../linux/netfilter_bridge/ebt_arpreply.h | 0 .../linux/netfilter_bridge/ebt_ip.h | 0 .../linux/netfilter_bridge/ebt_ip6.h | 0 .../linux/netfilter_bridge/ebt_limit.h | 0 .../linux/netfilter_bridge/ebt_log.h | 0 .../linux/netfilter_bridge/ebt_mark_m.h | 0 .../linux/netfilter_bridge/ebt_mark_t.h | 0 .../linux/netfilter_bridge/ebt_nat.h | 0 .../linux/netfilter_bridge/ebt_nflog.h | 0 .../linux/netfilter_bridge/ebt_pkttype.h | 0 .../linux/netfilter_bridge/ebt_redirect.h | 0 .../linux/netfilter_bridge/ebt_stp.h | 0 .../linux/netfilter_bridge/ebt_ulog.h | 0 .../linux/netfilter_bridge/ebt_vlan.h | 0 .../uapi/linux/netfilter_bridge/ebtables.h | 268 + .../include/uapi/linux/netfilter_ipv4/Kbuild | 10 + .../uapi/linux/netfilter_ipv4/ip_tables.h | 229 + .../linux/netfilter_ipv4/ipt_CLUSTERIP.h | 0 .../{ => uapi}/linux/netfilter_ipv4/ipt_ECN.h | 0 .../{ => uapi}/linux/netfilter_ipv4/ipt_LOG.h | 0 .../linux/netfilter_ipv4/ipt_REJECT.h | 0 .../{ => uapi}/linux/netfilter_ipv4/ipt_TTL.h | 0 .../linux/netfilter_ipv4/ipt_ULOG.h | 0 .../{ => uapi}/linux/netfilter_ipv4/ipt_ah.h | 0 .../{ => uapi}/linux/netfilter_ipv4/ipt_ecn.h | 0 .../{ => uapi}/linux/netfilter_ipv4/ipt_ttl.h | 0 .../include/uapi/linux/netfilter_ipv6/Kbuild | 12 + .../uapi/linux/netfilter_ipv6/ip6_tables.h | 267 + .../{ => uapi}/linux/netfilter_ipv6/ip6t_HL.h | 0 .../linux/netfilter_ipv6/ip6t_LOG.h | 0 .../linux/netfilter_ipv6/ip6t_NPT.h | 0 .../linux/netfilter_ipv6/ip6t_REJECT.h | 0 .../{ => uapi}/linux/netfilter_ipv6/ip6t_ah.h | 0 .../linux/netfilter_ipv6/ip6t_frag.h | 0 .../{ => uapi}/linux/netfilter_ipv6/ip6t_hl.h | 0 .../linux/netfilter_ipv6/ip6t_ipv6header.h | 0 .../{ => uapi}/linux/netfilter_ipv6/ip6t_mh.h | 0 .../linux/netfilter_ipv6/ip6t_opts.h | 0 .../{ => uapi}/linux/netfilter_ipv6/ip6t_rt.h | 0 trunk/include/uapi/linux/nfsd/Kbuild | 5 + trunk/include/{ => uapi}/linux/nfsd/cld.h | 0 trunk/include/uapi/linux/nfsd/debug.h | 40 + trunk/include/uapi/linux/nfsd/export.h | 58 + trunk/include/uapi/linux/nfsd/nfsfh.h | 122 + trunk/include/uapi/linux/nfsd/stats.h | 17 + trunk/include/uapi/linux/sunrpc/Kbuild | 1 + trunk/include/uapi/linux/sunrpc/debug.h | 48 + trunk/include/uapi/linux/tc_act/Kbuild | 7 + .../include/{ => uapi}/linux/tc_act/tc_csum.h | 0 .../include/{ => uapi}/linux/tc_act/tc_gact.h | 0 .../include/{ => uapi}/linux/tc_act/tc_ipt.h | 0 .../{ => uapi}/linux/tc_act/tc_mirred.h | 0 .../include/{ => uapi}/linux/tc_act/tc_nat.h | 0 .../{ => uapi}/linux/tc_act/tc_pedit.h | 0 .../{ => uapi}/linux/tc_act/tc_skbedit.h | 0 trunk/include/uapi/linux/tc_ematch/Kbuild | 4 + .../{ => uapi}/linux/tc_ematch/tc_em_cmp.h | 0 .../{ => uapi}/linux/tc_ematch/tc_em_meta.h | 0 .../{ => uapi}/linux/tc_ematch/tc_em_nbyte.h | 0 .../{ => uapi}/linux/tc_ematch/tc_em_text.h | 0 trunk/include/uapi/linux/wimax/Kbuild | 1 + trunk/include/{ => uapi}/linux/wimax/i2400m.h | 0 trunk/include/uapi/mtd/Kbuild | 5 + trunk/include/{ => uapi}/mtd/inftl-user.h | 0 trunk/include/{ => uapi}/mtd/mtd-abi.h | 0 trunk/include/{ => uapi}/mtd/mtd-user.h | 0 trunk/include/{ => uapi}/mtd/nftl-user.h | 0 trunk/include/{ => uapi}/mtd/ubi-user.h | 0 trunk/include/uapi/xen/Kbuild | 2 + trunk/include/{ => uapi}/xen/evtchn.h | 0 trunk/include/{ => uapi}/xen/privcmd.h | 0 trunk/include/video/omapdss.h | 112 +- .../video/samsung_fimd.h} | 152 +- trunk/include/xen/Kbuild | 2 - trunk/include/xen/interface/hvm/hvm_op.h | 19 + trunk/init/Kconfig | 23 +- trunk/init/do_mounts.c | 7 +- trunk/init/do_mounts_initrd.c | 41 +- trunk/init/main.c | 35 +- trunk/ipc/mqueue.c | 20 +- trunk/kernel/acct.c | 6 +- trunk/kernel/audit.c | 2 + trunk/kernel/audit.h | 7 +- trunk/kernel/audit_watch.c | 3 +- trunk/kernel/auditfilter.c | 65 +- trunk/kernel/auditsc.c | 230 +- trunk/kernel/cpu.c | 4 + trunk/kernel/debug/debug_core.c | 18 + trunk/kernel/debug/kdb/kdb_bt.c | 2 + trunk/kernel/debug/kdb/kdb_io.c | 33 +- trunk/kernel/debug/kdb/kdb_main.c | 2 + trunk/kernel/events/core.c | 23 +- trunk/kernel/events/uprobes.c | 8 +- trunk/kernel/fork.c | 45 +- trunk/kernel/irq/irqdomain.c | 33 +- trunk/kernel/kmod.c | 7 +- trunk/kernel/kthread.c | 1 + trunk/kernel/rcutree.c | 21 +- trunk/kernel/rcutree.h | 6 + trunk/kernel/sched/core.c | 71 +- trunk/kernel/sysctl.c | 3 +- trunk/kernel/time.c | 2 +- trunk/kernel/time/Kconfig | 4 + trunk/kernel/time/alarmtimer.c | 118 +- trunk/kernel/time/jiffies.c | 32 +- trunk/kernel/time/tick-sched.c | 2 +- trunk/kernel/time/timekeeping.c | 117 +- trunk/kernel/timer.c | 10 +- trunk/lib/Kconfig.debug | 38 +- trunk/lib/Makefile | 7 +- trunk/lib/interval_tree.c | 10 + trunk/lib/interval_tree_test_main.c | 105 + trunk/lib/kasprintf.c | 2 +- trunk/lib/prio_tree.c | 466 - trunk/lib/rbtree.c | 656 +- trunk/lib/rbtree_test.c | 234 + trunk/lib/scatterlist.c | 19 + trunk/mm/Kconfig | 3 +- trunk/mm/Makefile | 4 +- trunk/mm/backing-dev.c | 50 +- trunk/mm/bootmem.c | 10 +- trunk/mm/compaction.c | 562 +- trunk/mm/filemap.c | 6 +- trunk/mm/filemap_xip.c | 10 +- trunk/mm/fremap.c | 16 +- trunk/mm/huge_memory.c | 440 +- trunk/mm/hugetlb.c | 34 +- trunk/mm/internal.h | 52 +- trunk/mm/interval_tree.c | 112 + trunk/mm/kmemleak.c | 100 +- trunk/mm/ksm.c | 40 +- trunk/mm/madvise.c | 8 +- trunk/mm/memblock.c | 5 +- trunk/mm/memcontrol.c | 22 +- trunk/mm/memory-failure.c | 8 +- trunk/mm/memory.c | 115 +- trunk/mm/memory_hotplug.c | 77 +- trunk/mm/mempolicy.c | 148 +- trunk/mm/mlock.c | 27 +- trunk/mm/mmap.c | 207 +- trunk/mm/mmu_notifier.c | 103 +- trunk/mm/mremap.c | 73 +- trunk/mm/nobootmem.c | 5 +- trunk/mm/nommu.c | 33 +- trunk/mm/oom_kill.c | 4 +- trunk/mm/page-writeback.c | 14 +- trunk/mm/page_alloc.c | 317 +- trunk/mm/page_isolation.c | 43 +- trunk/mm/pgtable-generic.c | 50 + trunk/mm/prio_tree.c | 208 - trunk/mm/rmap.c | 159 +- trunk/mm/shmem.c | 9 +- trunk/mm/slab_common.c | 5 +- trunk/mm/swap.c | 13 +- trunk/mm/swapfile.c | 11 +- trunk/mm/truncate.c | 3 - trunk/mm/vmalloc.c | 5 +- trunk/mm/vmscan.c | 111 +- trunk/mm/vmstat.c | 14 +- trunk/net/8021q/vlan_core.c | 10 +- trunk/net/9p/client.c | 18 +- trunk/net/9p/trans_fd.c | 38 +- trunk/net/bridge/br_netfilter.c | 3 + trunk/net/ceph/osd_client.c | 1 - trunk/net/core/dev.c | 59 +- trunk/net/core/neighbour.c | 6 +- trunk/net/core/pktgen.c | 146 +- trunk/net/core/skbuff.c | 47 - trunk/net/core/utils.c | 24 + trunk/net/ipv4/fib_frontend.c | 3 +- trunk/net/ipv4/fib_semantics.c | 2 + trunk/net/ipv4/inet_connection_sock.c | 4 +- trunk/net/ipv4/ip_forward.c | 2 +- trunk/net/ipv4/ip_output.c | 4 +- trunk/net/ipv4/ip_vti.c | 4 +- trunk/net/ipv4/route.c | 148 +- trunk/net/ipv4/sysctl_net_ipv4.c | 2 + trunk/net/ipv4/tcp_ipv4.c | 7 +- trunk/net/ipv4/xfrm4_policy.c | 1 + trunk/net/ipv6/af_inet6.c | 22 +- trunk/net/ipv6/tcp_ipv6.c | 3 +- trunk/net/mac80211/mesh_sync.c | 3 +- trunk/net/mac80211/status.c | 4 +- trunk/net/mac80211/tx.c | 22 +- trunk/net/netfilter/ipvs/ip_vs_xmit.c | 6 +- trunk/net/netlink/af_netlink.c | 29 +- trunk/net/rds/send.c | 2 +- trunk/net/sunrpc/auth_gss/auth_gss.c | 58 +- trunk/net/sunrpc/clnt.c | 105 +- trunk/net/sunrpc/rpc_pipe.c | 8 +- trunk/net/sunrpc/sched.c | 2 +- trunk/net/sunrpc/svc_xprt.c | 233 +- trunk/net/sunrpc/svcsock.c | 157 +- trunk/net/sunrpc/xdr.c | 21 +- trunk/net/sunrpc/xprt.c | 8 +- .../net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 - trunk/net/sunrpc/xprtrdma/transport.c | 22 +- trunk/net/sunrpc/xprtsock.c | 40 +- trunk/scripts/Makefile.modinst | 2 +- trunk/scripts/Makefile.modpost | 2 +- trunk/scripts/coccicheck | 3 + trunk/scripts/coccinelle/api/ptr_ret.cocci | 26 + .../coccinelle/tests/odd_ptr_err.cocci | 65 + trunk/scripts/kconfig/Makefile | 12 +- trunk/scripts/kconfig/conf.c | 25 +- trunk/scripts/kconfig/expr.h | 11 + trunk/scripts/kconfig/lkc_proto.h | 6 +- trunk/scripts/kconfig/lxdialog/dialog.h | 9 +- trunk/scripts/kconfig/lxdialog/textbox.c | 171 +- trunk/scripts/kconfig/lxdialog/util.c | 7 + trunk/scripts/kconfig/mconf.c | 123 +- trunk/scripts/kconfig/menu.c | 53 +- trunk/scripts/kconfig/nconf.c | 2 +- trunk/scripts/kernel-doc | 273 +- trunk/scripts/mod/modpost.c | 3 + trunk/scripts/package/buildtar | 6 +- trunk/scripts/tags.sh | 8 +- trunk/security/apparmor/Makefile | 2 +- trunk/security/capability.c | 4 +- trunk/security/security.c | 4 +- trunk/security/selinux/hooks.c | 4 +- trunk/security/selinux/selinuxfs.c | 2 +- trunk/security/smack/smack_lsm.c | 4 +- trunk/security/tomoyo/common.h | 2 +- trunk/security/tomoyo/mount.c | 5 +- trunk/security/tomoyo/tomoyo.c | 4 +- trunk/security/tomoyo/util.c | 9 +- trunk/sound/core/pcm_native.c | 6 +- trunk/sound/oss/waveartist.c | 4 +- trunk/sound/pci/hda/hda_codec.c | 2 + trunk/sound/pci/hda/hda_intel.c | 5 - trunk/sound/pci/hda/patch_cirrus.c | 58 +- trunk/sound/pci/hda/patch_realtek.c | 3 + trunk/sound/pci/hda/patch_sigmatel.c | 27 + trunk/sound/pci/hda/patch_via.c | 98 +- trunk/sound/usb/quirks-table.h | 46 + trunk/sound/usb/usx2y/us122l.c | 2 +- trunk/sound/usb/usx2y/usX2Yhwdep.c | 2 +- trunk/sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- trunk/tools/perf/Makefile | 86 +- trunk/tools/perf/bash_completion | 50 +- trunk/tools/perf/builtin-buildid-cache.c | 58 +- trunk/tools/perf/builtin-buildid-list.c | 55 +- trunk/tools/perf/builtin-diff.c | 68 +- trunk/tools/perf/builtin-evlist.c | 21 +- trunk/tools/perf/builtin-help.c | 40 +- trunk/tools/perf/builtin-inject.c | 88 +- trunk/tools/perf/builtin-kmem.c | 66 +- trunk/tools/perf/builtin-kvm.c | 460 +- trunk/tools/perf/builtin-lock.c | 90 +- trunk/tools/perf/builtin-probe.c | 26 +- trunk/tools/perf/builtin-record.c | 27 +- trunk/tools/perf/builtin-report.c | 4 +- trunk/tools/perf/builtin-sched.c | 2 +- trunk/tools/perf/builtin-script.c | 90 +- trunk/tools/perf/builtin-stat.c | 328 +- trunk/tools/perf/builtin-timechart.c | 100 +- trunk/tools/perf/builtin-top.c | 11 +- trunk/tools/perf/builtin-trace.c | 134 +- trunk/tools/perf/perf.c | 4 +- trunk/tools/perf/ui/browsers/hists.c | 12 +- trunk/tools/perf/ui/gtk/browser.c | 6 +- trunk/tools/perf/ui/gtk/util.c | 2 +- trunk/tools/perf/ui/helpline.h | 18 +- trunk/tools/perf/ui/hist.c | 145 +- trunk/tools/perf/ui/setup.c | 2 +- trunk/tools/perf/ui/stdio/hist.c | 45 +- trunk/tools/perf/util/annotate.h | 8 +- trunk/tools/perf/util/cache.h | 38 +- trunk/tools/perf/util/debug.c | 2 +- trunk/tools/perf/util/debug.h | 17 +- trunk/tools/perf/util/evlist.c | 88 +- trunk/tools/perf/util/evlist.h | 18 +- trunk/tools/perf/util/generate-cmdlist.sh | 4 +- trunk/tools/perf/util/hist.c | 66 +- trunk/tools/perf/util/hist.h | 38 +- .../util/include/linux/rbtree_augmented.h | 2 + trunk/tools/perf/util/map.c | 2 +- trunk/tools/perf/util/parse-options.c | 8 + trunk/tools/perf/util/parse-options.h | 1 + trunk/tools/perf/util/path.c | 2 +- trunk/tools/perf/util/perf_regs.h | 4 +- trunk/tools/perf/util/sort.h | 19 +- trunk/tools/perf/util/symbol.h | 10 +- trunk/tools/perf/util/unwind.h | 4 +- trunk/tools/perf/util/util.c | 4 +- trunk/tools/testing/ktest/ktest.pl | 15 +- 2838 files changed, 122713 insertions(+), 48671 deletions(-) delete mode 100644 trunk/Documentation/ABI/obsolete/proc-pid-oom_adj create mode 100644 trunk/Documentation/devicetree/bindings/arm/davinci/nand.txt create mode 100644 trunk/Documentation/devicetree/bindings/i2c/atmel-i2c.txt create mode 100644 trunk/Documentation/devicetree/bindings/i2c/davinci.txt create mode 100644 trunk/Documentation/devicetree/bindings/i2c/nomadik.txt create mode 100644 trunk/Documentation/devicetree/bindings/mmc/atmel-hsmci.txt create mode 100644 trunk/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt create mode 100644 trunk/Documentation/devicetree/bindings/mmc/pxa-mmc.txt create mode 100644 trunk/Documentation/devicetree/bindings/mmc/samsung-sdhci.txt create mode 100644 trunk/Documentation/devicetree/bindings/mmc/sdhci-dove.txt create mode 100644 trunk/Documentation/devicetree/bindings/mmc/sdhci-spear.txt create mode 100644 trunk/Documentation/devicetree/bindings/mmc/synposis-dw-mshc.txt create mode 100644 trunk/Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt create mode 100644 trunk/Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt create mode 100644 trunk/Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt create mode 100644 trunk/Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt create mode 100644 trunk/Documentation/devicetree/bindings/pwm/imx-pwm.txt create mode 100644 trunk/Documentation/devicetree/bindings/spi/spi-octeon.txt create mode 100644 trunk/Documentation/filesystems/nfs/nfsd-admin-interfaces.txt delete mode 100644 trunk/Documentation/memory.txt create mode 100644 trunk/Documentation/percpu-rw-semaphore.txt delete mode 100644 trunk/Documentation/prio_tree.txt delete mode 100644 trunk/arch/alpha/include/asm/exec.h create mode 100644 trunk/arch/arm/include/asm/virt.h create mode 100644 trunk/arch/arm/kernel/hyp-stub.S delete mode 100644 trunk/arch/arm/mach-at91/include/mach/at91_twi.h delete mode 100644 trunk/arch/arm/plat-samsung/include/plat/regs-fb-v4.h rename trunk/arch/arm64/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/arm64/include/{ => uapi}/asm/bitsperlong.h (100%) rename trunk/arch/arm64/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/arm64/include/{ => uapi}/asm/fcntl.h (100%) create mode 100644 trunk/arch/arm64/include/uapi/asm/hwcap.h rename trunk/arch/arm64/include/{ => uapi}/asm/param.h (100%) create mode 100644 trunk/arch/arm64/include/uapi/asm/ptrace.h rename trunk/arch/arm64/include/{ => uapi}/asm/setup.h (100%) create mode 100644 trunk/arch/arm64/include/uapi/asm/sigcontext.h rename trunk/arch/arm64/include/{ => uapi}/asm/siginfo.h (100%) rename trunk/arch/arm64/include/{ => uapi}/asm/signal.h (100%) create mode 100644 trunk/arch/arm64/include/uapi/asm/stat.h rename trunk/arch/arm64/include/{ => uapi}/asm/statfs.h (100%) create mode 100644 trunk/arch/arm64/include/uapi/asm/unistd.h rename trunk/arch/avr32/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/bitsperlong.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/cachectl.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/errno.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/fcntl.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/ioctl.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/ioctls.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/ipcbuf.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/kvm_para.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/mman.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/msgbuf.h (100%) create mode 100644 trunk/arch/avr32/include/uapi/asm/param.h rename trunk/arch/avr32/include/{ => uapi}/asm/poll.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 trunk/arch/avr32/include/uapi/asm/ptrace.h rename trunk/arch/avr32/include/{ => uapi}/asm/resource.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/sembuf.h (100%) create mode 100644 trunk/arch/avr32/include/uapi/asm/setup.h rename trunk/arch/avr32/include/{ => uapi}/asm/shmbuf.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/sigcontext.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/siginfo.h (100%) create mode 100644 trunk/arch/avr32/include/uapi/asm/signal.h rename trunk/arch/avr32/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/sockios.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/statfs.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/swab.h (100%) rename trunk/arch/avr32/include/{ => uapi}/asm/termbits.h (100%) create mode 100644 trunk/arch/avr32/include/uapi/asm/termios.h rename trunk/arch/avr32/include/{asm/exec.h => uapi/asm/types.h} (66%) create mode 100644 trunk/arch/avr32/include/uapi/asm/unistd.h delete mode 100644 trunk/arch/c6x/include/asm/exec.h rename trunk/arch/c6x/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/c6x/include/{ => uapi}/asm/kvm_para.h (100%) create mode 100644 trunk/arch/c6x/include/uapi/asm/ptrace.h rename trunk/arch/c6x/include/{ => uapi}/asm/setup.h (100%) rename trunk/arch/c6x/include/{ => uapi}/asm/sigcontext.h (100%) rename trunk/arch/c6x/include/{ => uapi}/asm/swab.h (100%) rename trunk/arch/c6x/include/{ => uapi}/asm/unistd.h (92%) delete mode 100644 trunk/arch/cris/include/asm/exec.h rename trunk/arch/frv/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/bitsperlong.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/errno.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/fcntl.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/ioctl.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/ioctls.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/ipcbuf.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/kvm_para.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/mman.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/msgbuf.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/param.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/poll.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 trunk/arch/frv/include/uapi/asm/ptrace.h rename trunk/arch/frv/include/{ => uapi}/asm/registers.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/resource.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/sembuf.h (100%) create mode 100644 trunk/arch/frv/include/uapi/asm/setup.h rename trunk/arch/frv/include/{ => uapi}/asm/shmbuf.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/sigcontext.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/siginfo.h (100%) create mode 100644 trunk/arch/frv/include/uapi/asm/signal.h rename trunk/arch/frv/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/sockios.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/statfs.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/swab.h (100%) rename trunk/arch/frv/include/{ => uapi}/asm/termbits.h (100%) create mode 100644 trunk/arch/frv/include/uapi/asm/termios.h rename trunk/arch/frv/include/{asm/exec.h => uapi/asm/types.h} (62%) create mode 100644 trunk/arch/frv/include/uapi/asm/unistd.h delete mode 100644 trunk/arch/frv/kernel/kernel_execve.S delete mode 100644 trunk/arch/frv/kernel/kernel_thread.S delete mode 100644 trunk/arch/h8300/include/asm/exec.h delete mode 100644 trunk/arch/ia64/include/asm/exec.h rename trunk/arch/ia64/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/bitsperlong.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/break.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/cmpxchg.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/errno.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/fcntl.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/fpu.h (100%) create mode 100644 trunk/arch/ia64/include/uapi/asm/gcc_intrin.h rename trunk/arch/ia64/include/{ => uapi}/asm/ia64regs.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/intel_intrin.h (100%) create mode 100644 trunk/arch/ia64/include/uapi/asm/intrinsics.h rename trunk/arch/ia64/include/{ => uapi}/asm/ioctl.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/ioctls.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/ipcbuf.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/kvm.h (100%) create mode 100644 trunk/arch/ia64/include/uapi/asm/kvm_para.h create mode 100644 trunk/arch/ia64/include/uapi/asm/mman.h rename trunk/arch/ia64/include/{ => uapi}/asm/msgbuf.h (100%) create mode 100644 trunk/arch/ia64/include/uapi/asm/param.h create mode 100644 trunk/arch/ia64/include/uapi/asm/perfmon.h rename trunk/arch/ia64/include/{ => uapi}/asm/perfmon_default_smpl.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/poll.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 trunk/arch/ia64/include/uapi/asm/ptrace.h rename trunk/arch/ia64/include/{ => uapi}/asm/ptrace_offsets.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/resource.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/rse.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/sembuf.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/setup.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/shmbuf.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/sigcontext.h (100%) create mode 100644 trunk/arch/ia64/include/uapi/asm/siginfo.h create mode 100644 trunk/arch/ia64/include/uapi/asm/signal.h rename trunk/arch/ia64/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/sockios.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/statfs.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/swab.h (100%) rename trunk/arch/ia64/include/{ => uapi}/asm/termbits.h (100%) create mode 100644 trunk/arch/ia64/include/uapi/asm/termios.h create mode 100644 trunk/arch/ia64/include/uapi/asm/types.h rename trunk/arch/ia64/include/{ => uapi}/asm/ucontext.h (100%) create mode 100644 trunk/arch/ia64/include/uapi/asm/unistd.h create mode 100644 trunk/arch/ia64/include/uapi/asm/ustack.h delete mode 100644 trunk/arch/m32r/include/asm/exec.h delete mode 100644 trunk/arch/m68k/include/asm/exec.h delete mode 100644 trunk/arch/microblaze/include/asm/exec.h create mode 100644 trunk/arch/mips/bcm63xx/dev-usb-usbd.c rename trunk/arch/mips/configs/{cavium-octeon_defconfig => cavium_octeon_defconfig} (100%) delete mode 100644 trunk/arch/mips/configs/mipssim_defconfig rename trunk/arch/mips/configs/{pnx8335-stb225_defconfig => pnx8335_stb225_defconfig} (100%) rename trunk/arch/mips/configs/{pnx8550-jbs_defconfig => pnx8550_jbs_defconfig} (100%) rename trunk/arch/mips/configs/{pnx8550-stb810_defconfig => pnx8550_stb810_defconfig} (100%) rename trunk/arch/mips/configs/{sb1250-swarm_defconfig => sb1250_swarm_defconfig} (100%) create mode 100644 trunk/arch/mips/configs/sead3_defconfig create mode 100644 trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h create mode 100644 trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h rename trunk/arch/mips/include/asm/{mach-mipssim => mach-sead3}/cpu-feature-overrides.h (83%) create mode 100644 trunk/arch/mips/include/asm/mach-sead3/irq.h create mode 100644 trunk/arch/mips/include/asm/mach-sead3/kernel-entry-init.h rename trunk/arch/mips/include/asm/{mach-mipssim => mach-sead3}/war.h (72%) create mode 100644 trunk/arch/mips/include/asm/mips-boards/sead3int.h delete mode 100644 trunk/arch/mips/include/asm/mips-boards/simint.h create mode 100644 trunk/arch/mips/include/asm/octeon/cvmx-ciu2-defs.h create mode 100644 trunk/arch/mips/include/asm/octeon/cvmx-mpi-defs.h delete mode 100644 trunk/arch/mips/jz4740/pwm.c delete mode 100644 trunk/arch/mips/jz4740/timer.h delete mode 100644 trunk/arch/mips/lantiq/xway/gpio.c create mode 100644 trunk/arch/mips/lantiq/xway/gptu.c delete mode 100644 trunk/arch/mips/mipssim/Makefile delete mode 100644 trunk/arch/mips/mipssim/Platform delete mode 100644 trunk/arch/mips/mipssim/sim_console.c delete mode 100644 trunk/arch/mips/mipssim/sim_int.c delete mode 100644 trunk/arch/mips/mipssim/sim_mem.c delete mode 100644 trunk/arch/mips/mipssim/sim_platform.c delete mode 100644 trunk/arch/mips/mipssim/sim_setup.c delete mode 100644 trunk/arch/mips/mipssim/sim_smtc.c delete mode 100644 trunk/arch/mips/mipssim/sim_time.c create mode 100644 trunk/arch/mips/mti-sead3/Makefile create mode 100644 trunk/arch/mips/mti-sead3/Platform create mode 100644 trunk/arch/mips/mti-sead3/leds-sead3.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-cmdline.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-console.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-display.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-ehci.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-i2c-dev.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-i2c-drv.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-i2c.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-init.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-int.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-lcd.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-leds.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-memory.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-mtd.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-net.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-pic32-bus.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-pic32-i2c-drv.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-platform.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-reset.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-serial.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-setup.c create mode 100644 trunk/arch/mips/mti-sead3/sead3-time.c create mode 100644 trunk/arch/mips/netlogic/dts/Makefile create mode 100644 trunk/arch/mips/netlogic/dts/xlp_evp.dts delete mode 100644 trunk/arch/mips/netlogic/xlp/of.c delete mode 100644 trunk/arch/mips/netlogic/xlp/platform.c rename trunk/arch/mn10300/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/bitsperlong.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/errno.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/fcntl.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/ioctl.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/ioctls.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/ipcbuf.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/kvm_para.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/mman.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/msgbuf.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/param.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/poll.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 trunk/arch/mn10300/include/uapi/asm/ptrace.h rename trunk/arch/mn10300/include/{ => uapi}/asm/resource.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/sembuf.h (100%) create mode 100644 trunk/arch/mn10300/include/uapi/asm/setup.h rename trunk/arch/mn10300/include/{ => uapi}/asm/shmbuf.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/sigcontext.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/siginfo.h (100%) create mode 100644 trunk/arch/mn10300/include/uapi/asm/signal.h rename trunk/arch/mn10300/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/sockios.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/statfs.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/swab.h (100%) rename trunk/arch/mn10300/include/{ => uapi}/asm/termbits.h (100%) create mode 100644 trunk/arch/mn10300/include/uapi/asm/termios.h rename trunk/arch/mn10300/include/{asm/exec.h => uapi/asm/types.h} (62%) create mode 100644 trunk/arch/mn10300/include/uapi/asm/unistd.h delete mode 100644 trunk/arch/mn10300/kernel/kernel_execve.S delete mode 100644 trunk/arch/mn10300/kernel/kthread.S delete mode 100644 trunk/arch/parisc/include/asm/exec.h rename trunk/arch/powerpc/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/bitsperlong.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/bootx.h rename trunk/arch/powerpc/include/{ => uapi}/asm/byteorder.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/cputable.h create mode 100644 trunk/arch/powerpc/include/uapi/asm/elf.h rename trunk/arch/powerpc/include/{ => uapi}/asm/errno.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/fcntl.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/ioctl.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/ioctls.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/ipcbuf.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/kvm.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/kvm_para.h rename trunk/arch/powerpc/include/{ => uapi}/asm/linkage.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/mman.h rename trunk/arch/powerpc/include/{ => uapi}/asm/msgbuf.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/nvram.h rename trunk/arch/powerpc/include/{ => uapi}/asm/param.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/poll.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/posix_types.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/ps3fb.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/ptrace.h rename trunk/arch/powerpc/include/{ => uapi}/asm/resource.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/seccomp.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/sembuf.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/setup.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/shmbuf.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/sigcontext.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/siginfo.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/signal.h rename trunk/arch/powerpc/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/sockios.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/spu_info.h rename trunk/arch/powerpc/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/powerpc/include/{ => uapi}/asm/statfs.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/swab.h rename trunk/arch/powerpc/include/{ => uapi}/asm/termbits.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/termios.h create mode 100644 trunk/arch/powerpc/include/uapi/asm/types.h rename trunk/arch/powerpc/include/{ => uapi}/asm/ucontext.h (100%) create mode 100644 trunk/arch/powerpc/include/uapi/asm/unistd.h rename trunk/arch/s390/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/bitsperlong.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/byteorder.h (100%) create mode 100644 trunk/arch/s390/include/uapi/asm/chpid.h rename trunk/arch/s390/include/{ => uapi}/asm/chsc.h (92%) create mode 100644 trunk/arch/s390/include/uapi/asm/cmb.h rename trunk/arch/s390/include/{ => uapi}/asm/dasd.h (100%) create mode 100644 trunk/arch/s390/include/uapi/asm/debug.h rename trunk/arch/s390/include/{ => uapi}/asm/errno.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/fcntl.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/ioctl.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/ioctls.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/ipcbuf.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/kvm.h (100%) create mode 100644 trunk/arch/s390/include/uapi/asm/kvm_para.h rename trunk/arch/s390/include/{ => uapi}/asm/kvm_virtio.h (100%) create mode 100644 trunk/arch/s390/include/uapi/asm/mman.h rename trunk/arch/s390/include/{ => uapi}/asm/monwriter.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/msgbuf.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/param.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/poll.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 trunk/arch/s390/include/uapi/asm/ptrace.h rename trunk/arch/s390/include/{ => uapi}/asm/qeth.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/resource.h (100%) create mode 100644 trunk/arch/s390/include/uapi/asm/schid.h rename trunk/arch/s390/include/{ => uapi}/asm/sembuf.h (100%) create mode 100644 trunk/arch/s390/include/uapi/asm/setup.h rename trunk/arch/s390/include/{ => uapi}/asm/shmbuf.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/sigcontext.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/siginfo.h (100%) create mode 100644 trunk/arch/s390/include/uapi/asm/signal.h rename trunk/arch/s390/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/sockios.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/statfs.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/swab.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/tape390.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/termbits.h (100%) create mode 100644 trunk/arch/s390/include/uapi/asm/termios.h create mode 100644 trunk/arch/s390/include/uapi/asm/types.h rename trunk/arch/s390/include/{ => uapi}/asm/ucontext.h (100%) create mode 100644 trunk/arch/s390/include/uapi/asm/unistd.h rename trunk/arch/s390/include/{ => uapi}/asm/vtoc.h (100%) rename trunk/arch/s390/include/{ => uapi}/asm/zcrypt.h (100%) create mode 100644 trunk/arch/s390/mm/dump_pagetables.c delete mode 100644 trunk/arch/sh/include/asm/exec.h delete mode 100644 trunk/arch/sparc/include/asm/exec.h rename trunk/arch/sparc/include/{ => uapi}/asm/apc.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/asi.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/bitsperlong.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/display7seg.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/envctrl.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/errno.h (100%) create mode 100644 trunk/arch/sparc/include/uapi/asm/fbio.h rename trunk/arch/sparc/include/{ => uapi}/asm/fcntl.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/ioctl.h (100%) create mode 100644 trunk/arch/sparc/include/uapi/asm/ioctls.h rename trunk/arch/sparc/include/{ => uapi}/asm/ipcbuf.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/jsflash.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/kvm_para.h (100%) create mode 100644 trunk/arch/sparc/include/uapi/asm/mman.h rename trunk/arch/sparc/include/{ => uapi}/asm/msgbuf.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/openpromio.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/param.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/perfctr.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/poll.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 trunk/arch/sparc/include/uapi/asm/psr.h rename trunk/arch/sparc/include/{ => uapi}/asm/psrcompat.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/pstate.h (100%) create mode 100644 trunk/arch/sparc/include/uapi/asm/ptrace.h rename trunk/arch/sparc/include/{ => uapi}/asm/resource.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/sembuf.h (100%) create mode 100644 trunk/arch/sparc/include/uapi/asm/setup.h rename trunk/arch/sparc/include/{ => uapi}/asm/shmbuf.h (100%) create mode 100644 trunk/arch/sparc/include/uapi/asm/sigcontext.h create mode 100644 trunk/arch/sparc/include/uapi/asm/siginfo.h create mode 100644 trunk/arch/sparc/include/uapi/asm/signal.h rename trunk/arch/sparc/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/sockios.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/statfs.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/swab.h (100%) create mode 100644 trunk/arch/sparc/include/uapi/asm/termbits.h create mode 100644 trunk/arch/sparc/include/uapi/asm/termios.h create mode 100644 trunk/arch/sparc/include/uapi/asm/traps.h rename trunk/arch/sparc/include/{ => uapi}/asm/types.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/uctx.h (100%) create mode 100644 trunk/arch/sparc/include/uapi/asm/unistd.h rename trunk/arch/sparc/include/{ => uapi}/asm/utrap.h (100%) rename trunk/arch/sparc/include/{ => uapi}/asm/watchdog.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/abi.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/chip.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/chip_tile64.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/chip_tilegx.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/chip_tilepro.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/icache.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/interrupts.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/interrupts_32.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/interrupts_64.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/opcode.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/opcode_tilegx.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/opcode_tilepro.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/sim.h (100%) rename trunk/arch/tile/include/{ => uapi}/arch/sim_def.h (100%) create mode 100644 trunk/arch/tile/include/uapi/arch/spr_def.h rename trunk/arch/tile/include/{ => uapi}/arch/spr_def_32.h (98%) rename trunk/arch/tile/include/{ => uapi}/arch/spr_def_64.h (98%) rename trunk/arch/tile/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/tile/include/{ => uapi}/asm/bitsperlong.h (100%) rename trunk/arch/tile/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/tile/include/{ => uapi}/asm/cachectl.h (100%) create mode 100644 trunk/arch/tile/include/uapi/asm/hardwall.h rename trunk/arch/tile/include/{ => uapi}/asm/kvm_para.h (100%) rename trunk/arch/tile/include/{ => uapi}/asm/mman.h (100%) create mode 100644 trunk/arch/tile/include/uapi/asm/ptrace.h rename trunk/arch/tile/include/{asm/exec.h => uapi/asm/setup.h} (81%) rename trunk/arch/tile/include/{ => uapi}/asm/sigcontext.h (100%) rename trunk/arch/tile/include/{ => uapi}/asm/siginfo.h (100%) create mode 100644 trunk/arch/tile/include/uapi/asm/signal.h rename trunk/arch/tile/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/tile/include/{ => uapi}/asm/swab.h (100%) create mode 100644 trunk/arch/tile/include/uapi/asm/unistd.h rename trunk/arch/um/include/{shared => asm}/sysrq.h (100%) delete mode 100644 trunk/arch/um/kernel/internal.h delete mode 100644 trunk/arch/unicore32/include/asm/exec.h delete mode 100644 trunk/arch/unicore32/kernel/pwm.c create mode 100644 trunk/arch/x86/kernel/cpu/perf_event_knc.c delete mode 100644 trunk/arch/x86/kernel/sys_i386_32.c delete mode 100644 trunk/arch/x86/um/asm/ptrace_32.h delete mode 100644 trunk/arch/x86/um/asm/ptrace_64.h delete mode 100644 trunk/arch/xtensa/boot/ramdisk/Makefile delete mode 100644 trunk/arch/xtensa/include/asm/exec.h delete mode 100644 trunk/arch/xtensa/kernel/io.c create mode 100644 trunk/arch/xtensa/platforms/iss/include/platform/serial.h delete mode 100644 trunk/arch/xtensa/platforms/iss/io.c create mode 100644 trunk/drivers/dma/edma.c create mode 100644 trunk/drivers/dma/mmp_pdma.c create mode 100644 trunk/drivers/i2c/busses/i2c-rcar.c delete mode 100644 trunk/drivers/leds/leds-lm3556.c create mode 100644 trunk/drivers/leds/leds-lm355x.c create mode 100644 trunk/drivers/leds/leds-lm3642.c create mode 100644 trunk/drivers/md/dm-bio-prison.c create mode 100644 trunk/drivers/md/dm-bio-prison.h create mode 100644 trunk/drivers/media/platform/s5p-mfc/regs-mfc-v6.h create mode 100644 trunk/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c create mode 100644 trunk/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h create mode 100644 trunk/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c create mode 100644 trunk/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h create mode 100644 trunk/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c rename trunk/drivers/media/platform/s5p-mfc/{s5p_mfc_shm.h => s5p_mfc_opr_v5.h} (76%) create mode 100644 trunk/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c create mode 100644 trunk/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h delete mode 100644 trunk/drivers/media/platform/s5p-mfc/s5p_mfc_shm.c create mode 100644 trunk/drivers/mmc/host/dw_mmc-exynos.c create mode 100644 trunk/drivers/mmc/host/dw_mmc-pltfm.h create mode 100644 trunk/drivers/mtd/bcm47xxpart.c create mode 100644 trunk/drivers/mtd/devices/bcm47xxsflash.c delete mode 100644 trunk/drivers/mtd/maps/wr_sbc82xx_flash.c delete mode 100644 trunk/drivers/mtd/nand/bcm_umi_bch.c delete mode 100644 trunk/drivers/mtd/nand/bcm_umi_nand.c create mode 100644 trunk/drivers/mtd/nand/lpc32xx_mlc.c create mode 100644 trunk/drivers/mtd/nand/lpc32xx_slc.c delete mode 100644 trunk/drivers/mtd/nand/nand_bcm_umi.c delete mode 100644 trunk/drivers/mtd/nand/nand_bcm_umi.h create mode 100644 trunk/drivers/mtd/nand/xway_nand.c create mode 100644 trunk/drivers/mtd/tests/mtd_nandbiterrs.c create mode 100644 trunk/drivers/pinctrl/pinctrl-falcon.c create mode 100644 trunk/drivers/pinctrl/pinctrl-lantiq.c create mode 100644 trunk/drivers/pinctrl/pinctrl-lantiq.h create mode 100644 trunk/drivers/pinctrl/pinctrl-xway.c rename trunk/drivers/{misc/ab8500-pwm.c => pwm/pwm-ab8500.c} (52%) create mode 100644 trunk/drivers/pwm/pwm-jz4740.c create mode 100644 trunk/drivers/pwm/pwm-puv3.c create mode 100644 trunk/drivers/spi/spi-octeon.c create mode 100644 trunk/drivers/video/omap2/dss/manager-sysfs.c create mode 100644 trunk/drivers/video/omap2/dss/output.c create mode 100644 trunk/drivers/video/omap2/dss/overlay-sysfs.c create mode 100644 trunk/drivers/video/omap2/dss/venc_panel.c delete mode 100644 trunk/drivers/video/pnx4008/Makefile delete mode 100644 trunk/drivers/video/pnx4008/dum.h delete mode 100644 trunk/drivers/video/pnx4008/fbcommon.h delete mode 100644 trunk/drivers/video/pnx4008/pnxrgbfb.c delete mode 100644 trunk/drivers/video/pnx4008/sdum.c delete mode 100644 trunk/drivers/video/pnx4008/sdum.h create mode 100644 trunk/include/asm-generic/clkdev.h create mode 100644 trunk/include/linux/edma.h create mode 100644 trunk/include/linux/i2c/i2c-rcar.h create mode 100644 trunk/include/linux/interval_tree.h create mode 100644 trunk/include/linux/interval_tree_generic.h create mode 100644 trunk/include/linux/mtd/lpc32xx_mlc.h create mode 100644 trunk/include/linux/mtd/lpc32xx_slc.h create mode 100644 trunk/include/linux/percpu-rwsem.h delete mode 100644 trunk/include/linux/platform_data/leds-lm3556.h create mode 100644 trunk/include/linux/platform_data/leds-lm355x.h create mode 100644 trunk/include/linux/platform_data/leds-lm3642.h create mode 100644 trunk/include/linux/platform_data/leds-pca9633.h create mode 100644 trunk/include/linux/platform_data/mmp_dma.h delete mode 100644 trunk/include/linux/prio_tree.h create mode 100644 trunk/include/linux/rbtree_augmented.h create mode 100644 trunk/include/linux/timekeeper_internal.h rename trunk/include/{ => uapi}/asm-generic/auxvec.h (100%) create mode 100644 trunk/include/uapi/asm-generic/bitsperlong.h rename trunk/include/{ => uapi}/asm-generic/errno-base.h (100%) rename trunk/include/{ => uapi}/asm-generic/errno.h (100%) rename trunk/include/{ => uapi}/asm-generic/fcntl.h (100%) create mode 100644 trunk/include/uapi/asm-generic/int-l64.h create mode 100644 trunk/include/uapi/asm-generic/int-ll64.h create mode 100644 trunk/include/uapi/asm-generic/ioctl.h rename trunk/include/{ => uapi}/asm-generic/ioctls.h (100%) rename trunk/include/{ => uapi}/asm-generic/ipcbuf.h (100%) create mode 100644 trunk/include/uapi/asm-generic/kvm_para.h rename trunk/include/{ => uapi}/asm-generic/mman-common.h (100%) rename trunk/include/{ => uapi}/asm-generic/mman.h (100%) rename trunk/include/{ => uapi}/asm-generic/msgbuf.h (100%) create mode 100644 trunk/include/uapi/asm-generic/param.h rename trunk/include/{ => uapi}/asm-generic/poll.h (100%) rename trunk/include/{ => uapi}/asm-generic/posix_types.h (100%) create mode 100644 trunk/include/uapi/asm-generic/resource.h rename trunk/include/{ => uapi}/asm-generic/sembuf.h (100%) rename trunk/include/{ => uapi}/asm-generic/setup.h (100%) rename trunk/include/{ => uapi}/asm-generic/shmbuf.h (100%) rename trunk/include/{ => uapi}/asm-generic/shmparam.h (100%) create mode 100644 trunk/include/uapi/asm-generic/siginfo.h rename trunk/include/{ => uapi}/asm-generic/signal-defs.h (100%) create mode 100644 trunk/include/uapi/asm-generic/signal.h rename trunk/include/{ => uapi}/asm-generic/socket.h (100%) rename trunk/include/{ => uapi}/asm-generic/sockios.h (100%) rename trunk/include/{ => uapi}/asm-generic/stat.h (100%) create mode 100644 trunk/include/uapi/asm-generic/statfs.h rename trunk/include/{ => uapi}/asm-generic/swab.h (100%) rename trunk/include/{ => uapi}/asm-generic/termbits.h (100%) create mode 100644 trunk/include/uapi/asm-generic/termios.h rename trunk/include/{ => uapi}/asm-generic/types.h (100%) rename trunk/include/{ => uapi}/asm-generic/ucontext.h (100%) create mode 100644 trunk/include/uapi/asm-generic/unistd.h rename trunk/include/{ => uapi}/linux/caif/caif_socket.h (100%) rename trunk/include/{ => uapi}/linux/caif/if_caif.h (100%) rename trunk/include/{ => uapi}/linux/can/bcm.h (100%) rename trunk/include/{ => uapi}/linux/can/error.h (100%) rename trunk/include/{ => uapi}/linux/can/gw.h (100%) rename trunk/include/{ => uapi}/linux/can/netlink.h (100%) rename trunk/include/{ => uapi}/linux/can/raw.h (100%) rename trunk/include/{ => uapi}/linux/isdn/capicmd.h (100%) rename trunk/include/{ => uapi}/linux/mmc/ioctl.h (100%) create mode 100644 trunk/include/uapi/linux/netfilter/ipset/ip_set.h create mode 100644 trunk/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h create mode 100644 trunk/include/uapi/linux/netfilter/ipset/ip_set_hash.h create mode 100644 trunk/include/uapi/linux/netfilter/ipset/ip_set_list.h create mode 100644 trunk/include/uapi/linux/netfilter/nf_conntrack_common.h create mode 100644 trunk/include/uapi/linux/netfilter/nf_conntrack_ftp.h rename trunk/include/{ => uapi}/linux/netfilter/nf_conntrack_sctp.h (100%) create mode 100644 trunk/include/uapi/linux/netfilter/nf_conntrack_tcp.h rename trunk/include/{ => uapi}/linux/netfilter/nf_conntrack_tuple_common.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/nf_nat.h (100%) create mode 100644 trunk/include/uapi/linux/netfilter/nfnetlink.h create mode 100644 trunk/include/uapi/linux/netfilter/nfnetlink_acct.h rename trunk/include/{ => uapi}/linux/netfilter/nfnetlink_compat.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/nfnetlink_conntrack.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/nfnetlink_cthelper.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/nfnetlink_cttimeout.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/nfnetlink_log.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/nfnetlink_queue.h (100%) create mode 100644 trunk/include/uapi/linux/netfilter/x_tables.h rename trunk/include/{ => uapi}/linux/netfilter/xt_AUDIT.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_CHECKSUM.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_CLASSIFY.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_CONNMARK.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_CONNSECMARK.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_CT.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_DSCP.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_IDLETIMER.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_LED.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_LOG.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_MARK.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_NFLOG.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_NFQUEUE.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_RATEEST.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_SECMARK.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_TCPMSS.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_TCPOPTSTRIP.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_TEE.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_TPROXY.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_addrtype.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_cluster.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_comment.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_connbytes.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_connlimit.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_connmark.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_conntrack.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_cpu.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_dccp.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_devgroup.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_dscp.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_ecn.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_esp.h (100%) create mode 100644 trunk/include/uapi/linux/netfilter/xt_hashlimit.h rename trunk/include/{ => uapi}/linux/netfilter/xt_helper.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_iprange.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_ipvs.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_length.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_limit.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_mac.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_mark.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_multiport.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_nfacct.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_osf.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_owner.h (100%) create mode 100644 trunk/include/uapi/linux/netfilter/xt_physdev.h rename trunk/include/{ => uapi}/linux/netfilter/xt_pkttype.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_policy.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_quota.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_rateest.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_realm.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_recent.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_sctp.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_set.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_socket.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_state.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_statistic.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_string.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_tcpmss.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_tcpudp.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_time.h (100%) rename trunk/include/{ => uapi}/linux/netfilter/xt_u32.h (100%) create mode 100644 trunk/include/uapi/linux/netfilter_arp/arp_tables.h rename trunk/include/{ => uapi}/linux/netfilter_arp/arpt_mangle.h (100%) create mode 100644 trunk/include/uapi/linux/netfilter_bridge/ebt_802_3.h rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_among.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_arp.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_arpreply.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_ip.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_ip6.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_limit.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_log.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_mark_m.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_mark_t.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_nat.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_nflog.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_pkttype.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_redirect.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_stp.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_ulog.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_bridge/ebt_vlan.h (100%) create mode 100644 trunk/include/uapi/linux/netfilter_bridge/ebtables.h create mode 100644 trunk/include/uapi/linux/netfilter_ipv4/ip_tables.h rename trunk/include/{ => uapi}/linux/netfilter_ipv4/ipt_CLUSTERIP.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv4/ipt_ECN.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv4/ipt_LOG.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv4/ipt_REJECT.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv4/ipt_TTL.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv4/ipt_ULOG.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv4/ipt_ah.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv4/ipt_ecn.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv4/ipt_ttl.h (100%) create mode 100644 trunk/include/uapi/linux/netfilter_ipv6/ip6_tables.h rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_HL.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_LOG.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_NPT.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_REJECT.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_ah.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_frag.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_hl.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_ipv6header.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_mh.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_opts.h (100%) rename trunk/include/{ => uapi}/linux/netfilter_ipv6/ip6t_rt.h (100%) rename trunk/include/{ => uapi}/linux/nfsd/cld.h (100%) create mode 100644 trunk/include/uapi/linux/nfsd/debug.h create mode 100644 trunk/include/uapi/linux/nfsd/export.h create mode 100644 trunk/include/uapi/linux/nfsd/nfsfh.h create mode 100644 trunk/include/uapi/linux/nfsd/stats.h create mode 100644 trunk/include/uapi/linux/sunrpc/debug.h rename trunk/include/{ => uapi}/linux/tc_act/tc_csum.h (100%) rename trunk/include/{ => uapi}/linux/tc_act/tc_gact.h (100%) rename trunk/include/{ => uapi}/linux/tc_act/tc_ipt.h (100%) rename trunk/include/{ => uapi}/linux/tc_act/tc_mirred.h (100%) rename trunk/include/{ => uapi}/linux/tc_act/tc_nat.h (100%) rename trunk/include/{ => uapi}/linux/tc_act/tc_pedit.h (100%) rename trunk/include/{ => uapi}/linux/tc_act/tc_skbedit.h (100%) rename trunk/include/{ => uapi}/linux/tc_ematch/tc_em_cmp.h (100%) rename trunk/include/{ => uapi}/linux/tc_ematch/tc_em_meta.h (100%) rename trunk/include/{ => uapi}/linux/tc_ematch/tc_em_nbyte.h (100%) rename trunk/include/{ => uapi}/linux/tc_ematch/tc_em_text.h (100%) rename trunk/include/{ => uapi}/linux/wimax/i2400m.h (100%) rename trunk/include/{ => uapi}/mtd/inftl-user.h (100%) rename trunk/include/{ => uapi}/mtd/mtd-abi.h (100%) rename trunk/include/{ => uapi}/mtd/mtd-user.h (100%) rename trunk/include/{ => uapi}/mtd/nftl-user.h (100%) rename trunk/include/{ => uapi}/mtd/ubi-user.h (100%) rename trunk/include/{ => uapi}/xen/evtchn.h (100%) rename trunk/include/{ => uapi}/xen/privcmd.h (100%) rename trunk/{arch/arm/plat-samsung/include/plat/regs-fb.h => include/video/samsung_fimd.h} (73%) create mode 100644 trunk/lib/interval_tree.c create mode 100644 trunk/lib/interval_tree_test_main.c delete mode 100644 trunk/lib/prio_tree.c create mode 100644 trunk/lib/rbtree_test.c create mode 100644 trunk/mm/interval_tree.c delete mode 100644 trunk/mm/prio_tree.c create mode 100644 trunk/scripts/coccinelle/tests/odd_ptr_err.cocci create mode 100644 trunk/tools/perf/util/include/linux/rbtree_augmented.h diff --git a/[refs] b/[refs] index de8bb4109abd..b0ea719c6e14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1d4a81b842db21b144ffd2334ca5eee3eb740f3 +refs/heads/master: a3920a6efa158b445b8a39080b463b9b29337425 diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX index 49c051380daf..f54273e2ac97 100644 --- a/trunk/Documentation/00-INDEX +++ b/trunk/Documentation/00-INDEX @@ -270,8 +270,6 @@ preempt-locking.txt - info on locking under a preemptive kernel. printk-formats.txt - how to get printk format specifiers right -prio_tree.txt - - info on radix-priority-search-tree use for indexing vmas. ramoops.txt - documentation of the ramoops oops/panic logging module. rbtree.txt diff --git a/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj b/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj deleted file mode 100644 index 9a3cb88ade47..000000000000 --- a/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj +++ /dev/null @@ -1,22 +0,0 @@ -What: /proc//oom_adj -When: August 2012 -Why: /proc//oom_adj allows userspace to influence the oom killer's - badness heuristic used to determine which task to kill when the kernel - is out of memory. - - The badness heuristic has since been rewritten since the introduction of - this tunable such that its meaning is deprecated. The value was - implemented as a bitshift on a score generated by the badness() - function that did not have any precise units of measure. With the - rewrite, the score is given as a proportion of available memory to the - task allocating pages, so using a bitshift which grows the score - exponentially is, thus, impossible to tune with fine granularity. - - A much more powerful interface, /proc//oom_score_adj, was - introduced with the oom killer rewrite that allows users to increase or - decrease the badness score linearly. This interface will replace - /proc//oom_adj. - - A warning will be emitted to the kernel log if an application uses this - deprecated interface. After it is printed once, future warnings will be - suppressed until the kernel is rebooted. diff --git a/trunk/Documentation/ABI/testing/sysfs-block b/trunk/Documentation/ABI/testing/sysfs-block index c1eb41cb9876..279da08f7541 100644 --- a/trunk/Documentation/ABI/testing/sysfs-block +++ b/trunk/Documentation/ABI/testing/sysfs-block @@ -206,3 +206,17 @@ 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//queue/write_same_max_bytes +Date: January 2012 +Contact: Martin K. Petersen +Description: + Some devices support a write same operation in which a + single data block can be written to a range of several + contiguous blocks on storage. This can be used to wipe + areas on disk or to initialize drives in a RAID + configuration. write_same_max_bytes indicates how many + bytes can be written in a single write same command. If + write_same_max_bytes is 0, write same is not supported + by the device. + diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-fcoe b/trunk/Documentation/ABI/testing/sysfs-bus-fcoe index 469d09c02f6b..50e2a80ea28f 100644 --- a/trunk/Documentation/ABI/testing/sysfs-bus-fcoe +++ b/trunk/Documentation/ABI/testing/sysfs-bus-fcoe @@ -9,19 +9,19 @@ Attributes: this value will change the dev_loss_tmo for all FCFs discovered by this controller. - lesb_link_fail: Link Error Status Block (LESB) link failure count. + lesb/link_fail: Link Error Status Block (LESB) link failure count. - lesb_vlink_fail: Link Error Status Block (LESB) virtual link + lesb/vlink_fail: Link Error Status Block (LESB) virtual link failure count. - lesb_miss_fka: Link Error Status Block (LESB) missed FCoE + lesb/miss_fka: Link Error Status Block (LESB) missed FCoE Initialization Protocol (FIP) Keep-Alives (FKA). - lesb_symb_err: Link Error Status Block (LESB) symbolic error count. + lesb/symb_err: Link Error Status Block (LESB) symbolic error count. - lesb_err_block: Link Error Status Block (LESB) block error count. + lesb/err_block: Link Error Status Block (LESB) block error count. - lesb_fcs_error: Link Error Status Block (LESB) Fibre Channel + lesb/fcs_error: Link Error Status Block (LESB) Fibre Channel Serivces error count. Notes: ctlr_X (global increment starting at 0) diff --git a/trunk/Documentation/DocBook/media/v4l/compat.xml b/trunk/Documentation/DocBook/media/v4l/compat.xml index c6ae4c9d0e0c..4fdf6b562d1c 100644 --- a/trunk/Documentation/DocBook/media/v4l/compat.xml +++ b/trunk/Documentation/DocBook/media/v4l/compat.xml @@ -2582,6 +2582,10 @@ ioctls. Support for frequency band enumeration: &VIDIOC-ENUM-FREQ-BANDS; ioctl. + + Vendor and device specific media bus pixel formats. + . + diff --git a/trunk/Documentation/DocBook/media/v4l/controls.xml b/trunk/Documentation/DocBook/media/v4l/controls.xml index 272a5f718509..7fe5be1d3bbb 100644 --- a/trunk/Documentation/DocBook/media/v4l/controls.xml +++ b/trunk/Documentation/DocBook/media/v4l/controls.xml @@ -1586,7 +1586,6 @@ frame counter of the frame that is currently displayed (decoded). This value is the decoder is started. - V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE  @@ -2269,6 +2268,14 @@ encoder or editing process may produce.". Applicable to the MPEG1, MPEG2, MPEG4 encoders. + + + V4L2_CID_MPEG_VIDEO_VBV_DELAY  + integer + Sets the initial delay in milliseconds for +VBV buffer control. + + V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE  @@ -2334,6 +2341,265 @@ Applicable to the MPEG4 decoder. vop_time_increment value for MPEG4. Applicable to the MPEG4 encoder. + + + V4L2_CID_MPEG_VIDEO_H264_SEI_FRAME_PACKING  + boolean + + Enable generation of frame packing supplemental enhancement information in the encoded bitstream. +The frame packing SEI message contains the arrangement of L and R planes for 3D viewing. Applicable to the H264 encoder. + + + + + V4L2_CID_MPEG_VIDEO_H264_SEI_FP_CURRENT_FRAME_0  + boolean + + Sets current frame as frame0 in frame packing SEI. +Applicable to the H264 encoder. + + + + + V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE  + enum v4l2_mpeg_video_h264_sei_fp_arrangement_type + + Frame packing arrangement type for H264 SEI. +Applicable to the H264 encoder. +Possible values are: + + + + + + V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_CHEKERBOARD  + Pixels are alternatively from L and R. + + + V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_COLUMN  + L and R are interlaced by column. + + + V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_ROW  + L and R are interlaced by row. + + + V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_SIDE_BY_SIDE  + L is on the left, R on the right. + + + V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_TOP_BOTTOM  + L is on top, R on bottom. + + + V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_TEMPORAL  + One view per frame. + + + + + + + + V4L2_CID_MPEG_VIDEO_H264_FMO  + boolean + + Enables flexible macroblock ordering in the encoded bitstream. It is a technique +used for restructuring the ordering of macroblocks in pictures. Applicable to the H264 encoder. + + + + + V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE  + enum v4l2_mpeg_video_h264_fmo_map_type + + When using FMO, the map type divides the image in different scan patterns of macroblocks. +Applicable to the H264 encoder. +Possible values are: + + + + + + V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES  + Slices are interleaved one after other with macroblocks in run length order. + + + V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_SCATTERED_SLICES  + Scatters the macroblocks based on a mathematical function known to both encoder and decoder. + + + V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_FOREGROUND_WITH_LEFT_OVER  + Macroblocks arranged in rectangular areas or regions of interest. + + + V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_BOX_OUT  + Slice groups grow in a cyclic way from centre to outwards. + + + V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_RASTER_SCAN  + Slice groups grow in raster scan pattern from left to right. + + + V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_WIPE_SCAN  + Slice groups grow in wipe scan pattern from top to bottom. + + + V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_EXPLICIT  + User defined map type. + + + + + + + + V4L2_CID_MPEG_VIDEO_H264_FMO_SLICE_GROUP  + integer + + Number of slice groups in FMO. +Applicable to the H264 encoder. + + + + + V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_DIRECTION  + enum v4l2_mpeg_video_h264_fmo_change_dir + + Specifies a direction of the slice group change for raster and wipe maps. +Applicable to the H264 encoder. +Possible values are: + + + + + + V4L2_MPEG_VIDEO_H264_FMO_CHANGE_DIR_RIGHT  + Raster scan or wipe right. + + + V4L2_MPEG_VIDEO_H264_FMO_CHANGE_DIR_LEFT  + Reverse raster scan or wipe left. + + + + + + + + V4L2_CID_MPEG_VIDEO_H264_FMO_CHANGE_RATE  + integer + + Specifies the size of the first slice group for raster and wipe map. +Applicable to the H264 encoder. + + + + + V4L2_CID_MPEG_VIDEO_H264_FMO_RUN_LENGTH  + integer + + Specifies the number of consecutive macroblocks for the interleaved map. +Applicable to the H264 encoder. + + + + + V4L2_CID_MPEG_VIDEO_H264_ASO  + boolean + + Enables arbitrary slice ordering in encoded bitstream. +Applicable to the H264 encoder. + + + + + V4L2_CID_MPEG_VIDEO_H264_ASO_SLICE_ORDER  + integer + Specifies the slice order in ASO. Applicable to the H264 encoder. +The supplied 32-bit integer is interpreted as follows (bit +0 = least significant bit): + + + + + + Bit 0:15 + Slice ID + + + Bit 16:32 + Slice position or order + + + + + + + + V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING  + boolean + + Enables H264 hierarchical coding. +Applicable to the H264 encoder. + + + + + V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE  + enum v4l2_mpeg_video_h264_hierarchical_coding_type + + Specifies the hierarchical coding type. +Applicable to the H264 encoder. +Possible values are: + + + + + + V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_B  + Hierarchical B coding. + + + V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P  + Hierarchical P coding. + + + + + + + + V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER  + integer + + Specifies the number of hierarchical coding layers. +Applicable to the H264 encoder. + + + + + V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP  + integer + Specifies a user defined QP for each layer. Applicable to the H264 encoder. +The supplied 32-bit integer is interpreted as follows (bit +0 = least significant bit): + + + + + + Bit 0:15 + QP value + + + Bit 16:32 + Layer number + + + + + @@ -4267,6 +4533,16 @@ interface and may change in the future. pixels / second. + + V4L2_CID_TEST_PATTERN + menu + + + Some capture/display/sensor devices have + the capability to generate test pattern images. These hardware + specific test patterns can be used to test if a device is working + properly. + diff --git a/trunk/Documentation/DocBook/media/v4l/io.xml b/trunk/Documentation/DocBook/media/v4l/io.xml index 97f785add841..b5d1cbdc558b 100644 --- a/trunk/Documentation/DocBook/media/v4l/io.xml +++ b/trunk/Documentation/DocBook/media/v4l/io.xml @@ -677,8 +677,10 @@ memory, set by the application. See for details. length Size of the buffer (not the payload) in bytes for the - single-planar API. For the multi-planar API should contain the - number of elements in the planes array. + single-planar API. For the multi-planar API the application sets + this to the number of elements in the planes + array. The driver will fill in the actual number of valid elements in + that array. diff --git a/trunk/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml b/trunk/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml index 5274c24d11e0..a990b34d911a 100644 --- a/trunk/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml +++ b/trunk/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml @@ -1,11 +1,13 @@ - + - V4L2_PIX_FMT_NV12M ('NM12') + V4L2_PIX_FMT_NV12M ('NM12'), V4L2_PIX_FMT_NV21M ('NM21'), V4L2_PIX_FMT_NV12MT_16X16 &manvol; - V4L2_PIX_FMT_NV12M - Variation of V4L2_PIX_FMT_NV12 with planes + V4L2_PIX_FMT_NV12M + V4L2_PIX_FMT_NV21M + V4L2_PIX_FMT_NV12MT_16X16 + Variation of V4L2_PIX_FMT_NV12 and V4L2_PIX_FMT_NV21 with planes non contiguous in memory. @@ -22,7 +24,12 @@ The CbCr plane is the same width, in bytes, as the Y plane (and of the image), but is half as tall in pixels. Each CbCr pair belongs to four pixels. For example, Cb0/Cr0 belongs to Y'00, Y'01, -Y'10, Y'11. +Y'10, Y'11. +V4L2_PIX_FMT_NV12MT_16X16 is the tiled version of +V4L2_PIX_FMT_NV12M with 16x16 macroblock tiles. Here pixels +are arranged in 16x16 2D tiles and tiles are arranged in linear order in memory. +V4L2_PIX_FMT_NV21M is the same as V4L2_PIX_FMT_NV12M +except the Cb and Cr bytes are swapped, the CrCb plane starts with a Cr byte. V4L2_PIX_FMT_NV12M is intended to be used only in drivers and applications that support the multi-planar API, diff --git a/trunk/Documentation/DocBook/media/v4l/pixfmt.xml b/trunk/Documentation/DocBook/media/v4l/pixfmt.xml index 1ddbfabe3195..bf94f417592c 100644 --- a/trunk/Documentation/DocBook/media/v4l/pixfmt.xml +++ b/trunk/Documentation/DocBook/media/v4l/pixfmt.xml @@ -758,6 +758,11 @@ extended control V4L2_CID_MPEG_STREAM_TYPE, see 'AVC1' H264 video elementary stream without start codes. + + V4L2_PIX_FMT_H264_MVC + 'MVC' + H264 MVC video elementary stream. + V4L2_PIX_FMT_H263 'H263' @@ -793,6 +798,11 @@ extended control V4L2_CID_MPEG_STREAM_TYPE, see 'VC1L' VC1, SMPTE 421M Annex L compliant stream. + + V4L2_PIX_FMT_VP8 + 'VP8' + VP8 video elementary stream. + @@ -996,6 +1006,34 @@ the other bits are set to 0. Old 6-bit greyscale format. Only the most significant 6 bits of each byte are used, the other bits are set to 0. + + V4L2_PIX_FMT_S5C_UYVY_JPG + 'S5CI' + Two-planar format used by Samsung S5C73MX cameras. The +first plane contains interleaved JPEG and UYVY image data, followed by meta data +in form of an array of offsets to the UYVY data blocks. The actual pointer array +follows immediately the interleaved JPEG/UYVY data, the number of entries in +this array equals the height of the UYVY image. Each entry is a 4-byte unsigned +integer in big endian order and it's an offset to a single pixel line of the +UYVY image. The first plane can start either with JPEG or UYVY data chunk. The +size of a single UYVY block equals the UYVY image's width multiplied by 2. The +size of a JPEG chunk depends on the image and can vary with each line. +The second plane, at an offset of 4084 bytes, contains a 4-byte offset to +the pointer array in the first plane. This offset is followed by a 4-byte value +indicating size of the pointer array. All numbers in the second plane are also +in big endian order. Remaining data in the second plane is undefined. The +information in the second plane allows to easily find location of the pointer +array, which can be different for each frame. The size of the pointer array is +constant for given UYVY image height. +In order to extract UYVY and JPEG frames an application can initially set +a data pointer to the start of first plane and then add an offset from the first +entry of the pointers table. Such a pointer indicates start of an UYVY image +pixel line. Whole UYVY line can be copied to a separate buffer. These steps +should be repeated for each line, i.e. the number of entries in the pointer +array. Anything what's in between the UYVY lines is JPEG data and should be +concatenated to form the JPEG stream. + + diff --git a/trunk/Documentation/DocBook/media/v4l/subdev-formats.xml b/trunk/Documentation/DocBook/media/v4l/subdev-formats.xml index 49c532ebbbbe..a0a936455fae 100644 --- a/trunk/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/trunk/Documentation/DocBook/media/v4l/subdev-formats.xml @@ -2565,5 +2565,49 @@ + +
+ Vendor and Device Specific Formats + + + Experimental + This is an experimental +interface and may change in the future. + + + This section lists complex data formats that are either vendor or + device specific. + + + The following table lists the existing vendor and device specific + formats. + + + Vendor and device specific formats + + + + + + + Identifier + Code + Comments + + + + + V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8 + 0x5001 + + Interleaved raw UYVY and JPEG image format with embedded + meta-data used by Samsung S3C73MX camera sensors. + + + + +
+
+ diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml index 6a821a65a5ae..2d37abefce13 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml @@ -121,8 +121,7 @@ remaining fields or returns an error code. The driver may also set field. It indicates a non-critical (recoverable) streaming error. In such case the application may continue as normal, but should be aware that data in the dequeued buffer might be corrupted. When using the multi-planar API, the -planes array does not have to be passed; the m.planes -member must be set to NULL in that case. +planes array must be passed in as well. By default VIDIOC_DQBUF blocks when no buffer is in the outgoing queue. When the diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-querybuf.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-querybuf.xml index 6e414d7b6df7..a597155c052d 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-querybuf.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-querybuf.xml @@ -48,8 +48,8 @@ Description - This ioctl is part of the memory -mapping I/O method. It can be used to query the status of a + This ioctl is part of the streaming + I/O method. It can be used to query the status of a buffer at any time after buffers have been allocated with the &VIDIOC-REQBUFS; ioctl. @@ -71,6 +71,7 @@ the structure. In the flags field the V4L2_BUF_FLAG_MAPPED, +V4L2_BUF_FLAG_PREPARED, V4L2_BUF_FLAG_QUEUED and V4L2_BUF_FLAG_DONE flags will be valid. The memory field will be set to the current @@ -79,8 +80,10 @@ contains the offset of the buffer from the start of the device memory, the length field its size. For the multi-planar API, fields m.mem_offset and length in the m.planes -array elements will be used instead. The driver may or may not set the remaining -fields and flags, they are meaningless in this context. +array elements will be used instead and the length +field of &v4l2-buffer; is set to the number of filled-in array elements. +The driver may or may not set the remaining fields and flags, they are +meaningless in this context. The v4l2_buffer structure is specified in . diff --git a/trunk/Documentation/DocBook/mtdnand.tmpl b/trunk/Documentation/DocBook/mtdnand.tmpl index e0aedb7a7827..fe122d6e686f 100644 --- a/trunk/Documentation/DocBook/mtdnand.tmpl +++ b/trunk/Documentation/DocBook/mtdnand.tmpl @@ -1216,8 +1216,6 @@ in this page #define NAND_BBT_LASTBLOCK 0x00000010 /* The bbt is at the given page, else we must scan for the bbt */ #define NAND_BBT_ABSPAGE 0x00000020 -/* The bbt is at the given page, else we must scan for the bbt */ -#define NAND_BBT_SEARCH 0x00000040 /* bbt is stored per chip on multichip devices */ #define NAND_BBT_PERCHIP 0x00000080 /* bbt has a version counter at offset veroffs */ diff --git a/trunk/Documentation/arm/Booting b/trunk/Documentation/arm/Booting index a341d87d276e..0c1f475fdf36 100644 --- a/trunk/Documentation/arm/Booting +++ b/trunk/Documentation/arm/Booting @@ -154,13 +154,33 @@ In either case, the following conditions must be met: - CPU mode All forms of interrupts must be disabled (IRQs and FIQs) - The CPU must be in SVC mode. (A special exception exists for Angel) + + For CPUs which do not include the ARM virtualization extensions, the + CPU must be in SVC mode. (A special exception exists for Angel) + + CPUs which include support for the virtualization extensions can be + entered in HYP mode in order to enable the kernel to make full use of + these extensions. This is the recommended boot method for such CPUs, + unless the virtualisations are already in use by a pre-installed + hypervisor. + + If the kernel is not entered in HYP mode for any reason, it must be + entered in SVC mode. - Caches, MMUs The MMU must be off. Instruction cache may be on or off. Data cache must be off. + If the kernel is entered in HYP mode, the above requirements apply to + the HYP mode configuration in addition to the ordinary PL1 (privileged + kernel modes) configuration. In addition, all traps into the + hypervisor must be disabled, and PL1 access must be granted for all + peripherals and CPU resources for which this is architecturally + possible. Except for entering in HYP mode, the system configuration + should be such that a kernel which does not include support for the + virtualization extensions can boot correctly without extra help. + - The boot loader is expected to call the kernel image by jumping directly to the first instruction of the kernel image. diff --git a/trunk/Documentation/block/biodoc.txt b/trunk/Documentation/block/biodoc.txt index e418dc0a7086..8df5e8e6dceb 100644 --- a/trunk/Documentation/block/biodoc.txt +++ b/trunk/Documentation/block/biodoc.txt @@ -465,7 +465,6 @@ struct bio { bio_end_io_t *bi_end_io; /* bi_end_io (bio) */ atomic_t bi_cnt; /* pin count: free when it hits zero */ void *bi_private; - bio_destructor_t *bi_destructor; /* bi_destructor (bio) */ }; With this multipage bio design: @@ -647,10 +646,6 @@ for a non-clone bio. There are the 6 pools setup for different size biovecs, so bio_alloc(gfp_mask, nr_iovecs) will allocate a vec_list of the given size from these slabs. -The bi_destructor() routine takes into account the possibility of the bio -having originated from a different source (see later discussions on -n/w to block transfers and kvec_cb) - The bio_get() routine may be used to hold an extra reference on a bio prior to i/o submission, if the bio fields are likely to be accessed after the i/o is issued (since the bio may otherwise get freed in case i/o completion diff --git a/trunk/Documentation/cgroups/memory.txt b/trunk/Documentation/cgroups/memory.txt index 4372e6b8a353..c07f7b4fb88d 100644 --- a/trunk/Documentation/cgroups/memory.txt +++ b/trunk/Documentation/cgroups/memory.txt @@ -18,16 +18,16 @@ from the rest of the system. The article on LWN [12] mentions some probable uses of the memory controller. The memory controller can be used to a. Isolate an application or a group of applications - Memory hungry applications can be isolated and limited to a smaller + Memory-hungry applications can be isolated and limited to a smaller amount of memory. -b. Create a cgroup with limited amount of memory, this can be used +b. Create a cgroup with a limited amount of memory; this can be used as a good alternative to booting with mem=XXXX. c. Virtualization solutions can control the amount of memory they want to assign to a virtual machine instance. d. A CD/DVD burner could control the amount of memory used by the rest of the system to ensure that burning does not fail due to lack of available memory. -e. There are several other use cases, find one or use the controller just +e. There are several other use cases; find one or use the controller just for fun (to learn and hack on the VM subsystem). Current Status: linux-2.6.34-mmotm(development version of 2010/April) @@ -38,12 +38,12 @@ Features: - optionally, memory+swap usage can be accounted and limited. - hierarchical accounting - soft limit - - moving(recharging) account at moving a task is selectable. + - moving (recharging) account at moving a task is selectable. - usage threshold notifier - oom-killer disable knob and oom-notifier - Root cgroup has no limit controls. - Kernel memory support is work in progress, and the current version provides + Kernel memory support is a work in progress, and the current version provides basically functionality. (See Section 2.7) Brief summary of control files. @@ -144,9 +144,9 @@ Figure 1 shows the important aspects of the controller 3. Each page has a pointer to the page_cgroup, which in turn knows the cgroup it belongs to -The accounting is done as follows: mem_cgroup_charge() is invoked to setup +The accounting is done as follows: mem_cgroup_charge() is invoked to set up the necessary data structures and check if the cgroup that is being charged -is over its limit. If it is then reclaim is invoked on the cgroup. +is over its limit. If it is, then reclaim is invoked on the cgroup. More details can be found in the reclaim section of this document. If everything goes well, a page meta-data-structure called page_cgroup is updated. page_cgroup has its own LRU on cgroup. @@ -163,13 +163,13 @@ for earlier. A file page will be accounted for as Page Cache when it's inserted into inode (radix-tree). While it's mapped into the page tables of processes, duplicate accounting is carefully avoided. -A RSS page is unaccounted when it's fully unmapped. A PageCache page is +An RSS page is unaccounted when it's fully unmapped. A PageCache page is unaccounted when it's removed from radix-tree. Even if RSS pages are fully unmapped (by kswapd), they may exist as SwapCache in the system until they -are really freed. Such SwapCaches also also accounted. +are really freed. Such SwapCaches are also accounted. A swapped-in page is not accounted until it's mapped. -Note: The kernel does swapin-readahead and read multiple swaps at once. +Note: The kernel does swapin-readahead and reads multiple swaps at once. This means swapped-in pages may contain pages for other tasks than a task causing page fault. So, we avoid accounting at swap-in I/O. @@ -209,7 +209,7 @@ memsw.limit_in_bytes. Example: Assume a system with 4G of swap. A task which allocates 6G of memory (by mistake) under 2G memory limitation will use all swap. In this case, setting memsw.limit_in_bytes=3G will prevent bad use of swap. -By using memsw limit, you can avoid system OOM which can be caused by swap +By using the memsw limit, you can avoid system OOM which can be caused by swap shortage. * why 'memory+swap' rather than swap. @@ -217,7 +217,7 @@ The global LRU(kswapd) can swap out arbitrary pages. Swap-out means to move account from memory to swap...there is no change in usage of memory+swap. In other words, when we want to limit the usage of swap without affecting global LRU, memory+swap limit is better than just limiting swap from -OS point of view. +an OS point of view. * What happens when a cgroup hits memory.memsw.limit_in_bytes When a cgroup hits memory.memsw.limit_in_bytes, it's useless to do swap-out @@ -236,7 +236,7 @@ an OOM routine is invoked to select and kill the bulkiest task in the cgroup. (See 10. OOM Control below.) The reclaim algorithm has not been modified for cgroups, except that -pages that are selected for reclaiming come from the per cgroup LRU +pages that are selected for reclaiming come from the per-cgroup LRU list. NOTE: Reclaim does not work for the root cgroup, since we cannot set any @@ -316,7 +316,7 @@ We can check the usage: # cat /sys/fs/cgroup/memory/0/memory.usage_in_bytes 1216512 -A successful write to this file does not guarantee a successful set of +A successful write to this file does not guarantee a successful setting of this limit to the value written into the file. This can be due to a number of factors, such as rounding up to page boundaries or the total availability of memory on the system. The user is required to re-read @@ -350,7 +350,7 @@ Trying usual test under memory controller is always helpful. 4.1 Troubleshooting Sometimes a user might find that the application under a cgroup is -terminated by OOM killer. There are several causes for this: +terminated by the OOM killer. There are several causes for this: 1. The cgroup limit is too low (just too low to do anything useful) 2. The user is using anonymous memory and swap is turned off or too low @@ -358,7 +358,7 @@ terminated by OOM killer. There are several causes for this: A sync followed by echo 1 > /proc/sys/vm/drop_caches will help get rid of some of the pages cached in the cgroup (page cache pages). -To know what happens, disable OOM_Kill by 10. OOM Control(see below) and +To know what happens, disabling OOM_Kill as per "10. OOM Control" (below) and seeing what happens will be helpful. 4.2 Task migration @@ -399,10 +399,10 @@ About use_hierarchy, see Section 6. Almost all pages tracked by this memory cgroup will be unmapped and freed. Some pages cannot be freed because they are locked or in-use. Such pages are - moved to parent(if use_hierarchy==1) or root (if use_hierarchy==0) and this + moved to parent (if use_hierarchy==1) or root (if use_hierarchy==0) and this cgroup will be empty. - Typical use case of this interface is that calling this before rmdir(). + The typical use case for this interface is before calling rmdir(). Because rmdir() moves all pages to parent, some out-of-use page caches can be moved to the parent. If you want to avoid that, force_empty will be useful. @@ -486,7 +486,7 @@ You can reset failcnt by writing 0 to failcnt file. For efficiency, as other kernel components, memory cgroup uses some optimization to avoid unnecessary cacheline false sharing. usage_in_bytes is affected by the -method and doesn't show 'exact' value of memory(and swap) usage, it's an fuzz +method and doesn't show 'exact' value of memory (and swap) usage, it's a fuzz value for efficient access. (Of course, when necessary, it's synchronized.) If you want to know more exact memory usage, you should use RSS+CACHE(+SWAP) value in memory.stat(see 5.2). @@ -496,8 +496,8 @@ value in memory.stat(see 5.2). This is similar to numa_maps but operates on a per-memcg basis. This is useful for providing visibility into the numa locality information within an memcg since the pages are allowed to be allocated from any physical -node. One of the usecases is evaluating application performance by -combining this information with the application's cpu allocation. +node. One of the use cases is evaluating application performance by +combining this information with the application's CPU allocation. We export "total", "file", "anon" and "unevictable" pages per-node for each memcg. The ouput format of memory.numa_stat is: @@ -561,10 +561,10 @@ are pushed back to their soft limits. If the soft limit of each control group is very high, they are pushed back as much as possible to make sure that one control group does not starve the others of memory. -Please note that soft limits is a best effort feature, it comes with +Please note that soft limits is a best-effort feature; it comes with no guarantees, but it does its best to make sure that when memory is heavily contended for, memory is allocated based on the soft limit -hints/setup. Currently soft limit based reclaim is setup such that +hints/setup. Currently soft limit based reclaim is set up such that it gets invoked from balance_pgdat (kswapd). 7.1 Interface @@ -592,7 +592,7 @@ page tables. 8.1 Interface -This feature is disabled by default. It can be enabled(and disabled again) by +This feature is disabled by default. It can be enabledi (and disabled again) by writing to memory.move_charge_at_immigrate of the destination cgroup. If you want to enable it: @@ -601,8 +601,8 @@ If you want to enable it: Note: Each bits of move_charge_at_immigrate has its own meaning about what type of charges should be moved. See 8.2 for details. -Note: Charges are moved only when you move mm->owner, IOW, a leader of a thread - group. +Note: Charges are moved only when you move mm->owner, in other words, + a leader of a thread group. Note: If we cannot find enough space for the task in the destination cgroup, we try to make space by reclaiming memory. Task migration may fail if we cannot make enough space. @@ -612,25 +612,25 @@ And if you want disable it again: # echo 0 > memory.move_charge_at_immigrate -8.2 Type of charges which can be move +8.2 Type of charges which can be moved -Each bits of move_charge_at_immigrate has its own meaning about what type of -charges should be moved. But in any cases, it must be noted that an account of -a page or a swap can be moved only when it is charged to the task's current(old) -memory cgroup. +Each bit in move_charge_at_immigrate has its own meaning about what type of +charges should be moved. But in any case, it must be noted that an account of +a page or a swap can be moved only when it is charged to the task's current +(old) memory cgroup. bit | what type of charges would be moved ? -----+------------------------------------------------------------------------ - 0 | A charge of an anonymous page(or swap of it) used by the target task. - | You must enable Swap Extension(see 2.4) to enable move of swap charges. + 0 | A charge of an anonymous page (or swap of it) used by the target task. + | You must enable Swap Extension (see 2.4) to enable move of swap charges. -----+------------------------------------------------------------------------ - 1 | A charge of file pages(normal file, tmpfs file(e.g. ipc shared memory) + 1 | A charge of file pages (normal file, tmpfs file (e.g. ipc shared memory) | and swaps of tmpfs file) mmapped by the target task. Unlike the case of - | anonymous pages, file pages(and swaps) in the range mmapped by the task + | anonymous pages, file pages (and swaps) in the range mmapped by the task | will be moved even if the task hasn't done page fault, i.e. they might | not be the task's "RSS", but other task's "RSS" that maps the same file. - | And mapcount of the page is ignored(the page can be moved even if - | page_mapcount(page) > 1). You must enable Swap Extension(see 2.4) to + | And mapcount of the page is ignored (the page can be moved even if + | page_mapcount(page) > 1). You must enable Swap Extension (see 2.4) to | enable move of swap charges. 8.3 TODO @@ -640,11 +640,11 @@ memory cgroup. 9. Memory thresholds -Memory cgroup implements memory thresholds using cgroups notification +Memory cgroup implements memory thresholds using the cgroups notification API (see cgroups.txt). It allows to register multiple memory and memsw thresholds and gets notifications when it crosses. -To register a threshold application need: +To register a threshold, an application must: - create an eventfd using eventfd(2); - open memory.usage_in_bytes or memory.memsw.usage_in_bytes; - write string like " " to @@ -659,24 +659,24 @@ It's applicable for root and non-root cgroup. memory.oom_control file is for OOM notification and other controls. -Memory cgroup implements OOM notifier using cgroup notification +Memory cgroup implements OOM notifier using the cgroup notification API (See cgroups.txt). It allows to register multiple OOM notification delivery and gets notification when OOM happens. -To register a notifier, application need: +To register a notifier, an application must: - create an eventfd using eventfd(2) - open memory.oom_control file - write string like " " to cgroup.event_control -Application will be notified through eventfd when OOM happens. -OOM notification doesn't work for root cgroup. +The application will be notified through eventfd when OOM happens. +OOM notification doesn't work for the root cgroup. -You can disable OOM-killer by writing "1" to memory.oom_control file, as: +You can disable the OOM-killer by writing "1" to memory.oom_control file, as: #echo 1 > memory.oom_control -This operation is only allowed to the top cgroup of sub-hierarchy. +This operation is only allowed to the top cgroup of a sub-hierarchy. If OOM-killer is disabled, tasks under cgroup will hang/sleep in memory cgroup's OOM-waitqueue when they request accountable memory. diff --git a/trunk/Documentation/devicetree/bindings/arm/davinci/nand.txt b/trunk/Documentation/devicetree/bindings/arm/davinci/nand.txt new file mode 100644 index 000000000000..e37241f1fdd8 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/arm/davinci/nand.txt @@ -0,0 +1,51 @@ +* Texas Instruments Davinci NAND + +This file provides information, what the device node for the +davinci nand interface contain. + +Required properties: +- compatible: "ti,davinci-nand"; +- reg : contain 2 offset/length values: + - offset and length for the access window + - offset and length for accessing the aemif control registers +- ti,davinci-chipselect: Indicates on the davinci_nand driver which + chipselect is used for accessing the nand. + +Recommended properties : +- ti,davinci-mask-ale: mask for ale +- ti,davinci-mask-cle: mask for cle +- ti,davinci-mask-chipsel: mask for chipselect +- ti,davinci-ecc-mode: ECC mode valid values for davinci driver: + - "none" + - "soft" + - "hw" +- ti,davinci-ecc-bits: used ECC bits, currently supported 1 or 4. +- ti,davinci-nand-buswidth: buswidth 8 or 16 +- ti,davinci-nand-use-bbt: use flash based bad block table support. + +Example (enbw_cmc board): +aemif@60000000 { + compatible = "ti,davinci-aemif"; + #address-cells = <2>; + #size-cells = <1>; + reg = <0x68000000 0x80000>; + ranges = <2 0 0x60000000 0x02000000 + 3 0 0x62000000 0x02000000 + 4 0 0x64000000 0x02000000 + 5 0 0x66000000 0x02000000 + 6 0 0x68000000 0x02000000>; + nand@3,0 { + compatible = "ti,davinci-nand"; + reg = <3 0x0 0x807ff + 6 0x0 0x8000>; + #address-cells = <1>; + #size-cells = <1>; + ti,davinci-chipselect = <1>; + ti,davinci-mask-ale = <0>; + ti,davinci-mask-cle = <0>; + ti,davinci-mask-chipsel = <0>; + ti,davinci-ecc-mode = "hw"; + ti,davinci-ecc-bits = <4>; + ti,davinci-nand-use-bbt; + }; +}; diff --git a/trunk/Documentation/devicetree/bindings/i2c/atmel-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/atmel-i2c.txt new file mode 100644 index 000000000000..b689a0d9441c --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/i2c/atmel-i2c.txt @@ -0,0 +1,30 @@ +I2C for Atmel platforms + +Required properties : +- compatible : Must be "atmel,at91rm9200-i2c", "atmel,at91sam9261-i2c", + "atmel,at91sam9260-i2c", "atmel,at91sam9g20-i2c", "atmel,at91sam9g10-i2c" + or "atmel,at91sam9x5-i2c" +- reg: physical base address of the controller and length of memory mapped + region. +- interrupts: interrupt number to the cpu. +- #address-cells = <1>; +- #size-cells = <0>; + +Optional properties: +- Child nodes conforming to i2c bus binding + +Examples : + +i2c0: i2c@fff84000 { + compatible = "atmel,at91sam9g20-i2c"; + reg = <0xfff84000 0x100>; + interrupts = <12 4 6>; + #address-cells = <1>; + #size-cells = <0>; + + 24c512@50 { + compatible = "24c512"; + reg = <0x50>; + pagesize = <128>; + } +} diff --git a/trunk/Documentation/devicetree/bindings/i2c/davinci.txt b/trunk/Documentation/devicetree/bindings/i2c/davinci.txt new file mode 100644 index 000000000000..2dc935b4113d --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/i2c/davinci.txt @@ -0,0 +1,28 @@ +* Texas Instruments Davinci I2C + +This file provides information, what the device node for the +davinci i2c interface contain. + +Required properties: +- compatible: "ti,davinci-i2c"; +- reg : Offset and length of the register set for the device + +Recommended properties : +- interrupts : standard interrupt property. +- clock-frequency : desired I2C bus clock frequency in Hz. + +Example (enbw_cmc board): + i2c@1c22000 { + compatible = "ti,davinci-i2c"; + reg = <0x22000 0x1000>; + clock-frequency = <100000>; + interrupts = <15>; + interrupt-parent = <&intc>; + #address-cells = <1>; + #size-cells = <0>; + + dtt@48 { + compatible = "national,lm75"; + reg = <0x48>; + }; + }; diff --git a/trunk/Documentation/devicetree/bindings/i2c/i2c-mxs.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-mxs.txt index 30ac3a0557f7..7a3fe9e5f4cb 100644 --- a/trunk/Documentation/devicetree/bindings/i2c/i2c-mxs.txt +++ b/trunk/Documentation/devicetree/bindings/i2c/i2c-mxs.txt @@ -6,6 +6,7 @@ Required properties: - interrupts: Should contain ERROR and DMA interrupts - clock-frequency: Desired I2C bus clock frequency in Hz. Only 100000Hz and 400000Hz modes are supported. +- fsl,i2c-dma-channel: APBX DMA channel for the I2C Examples: @@ -16,4 +17,5 @@ i2c0: i2c@80058000 { reg = <0x80058000 2000>; interrupts = <111 68>; clock-frequency = <100000>; + fsl,i2c-dma-channel = <6>; }; diff --git a/trunk/Documentation/devicetree/bindings/i2c/nomadik.txt b/trunk/Documentation/devicetree/bindings/i2c/nomadik.txt new file mode 100644 index 000000000000..72065b0ff680 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/i2c/nomadik.txt @@ -0,0 +1,23 @@ +I2C for Nomadik based systems + +Required (non-standard) properties: + - Nil + +Recommended (non-standard) properties: + - clock-frequency : Maximum bus clock frequency for the device + +Optional (non-standard) properties: + - Nil + +Example : + +i2c@80004000 { + compatible = "stericsson,db8500-i2c", "st,nomadik-i2c"; + reg = <0x80004000 0x1000>; + interrupts = <0 21 0x4>; + #address-cells = <1>; + #size-cells = <0>; + v-i2c-supply = <&db8500_vape_reg>; + + clock-frequency = <400000>; +}; diff --git a/trunk/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt b/trunk/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt index 548892c08c59..7da578d72123 100644 --- a/trunk/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt +++ b/trunk/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt @@ -7,7 +7,7 @@ as "armctrl" in the SoC documentation, hence naming of this binding. Required properties: -- compatible : should be "brcm,bcm2835-armctrl-ic.txt" +- compatible : should be "brcm,bcm2835-armctrl-ic" - reg : Specifies base physical address and size of the registers. - interrupt-controller : Identifies the node as an interrupt controller - #interrupt-cells : Specifies the number of cells needed to encode an diff --git a/trunk/Documentation/devicetree/bindings/mmc/atmel-hsmci.txt b/trunk/Documentation/devicetree/bindings/mmc/atmel-hsmci.txt new file mode 100644 index 000000000000..0a85c70cd30a --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/mmc/atmel-hsmci.txt @@ -0,0 +1,68 @@ +* Atmel High Speed MultiMedia Card Interface + +This controller on atmel products provides an interface for MMC, SD and SDIO +types of memory cards. + +This file documents differences between the core properties described +by mmc.txt and the properties used by the atmel-mci driver. + +1) MCI node + +Required properties: +- compatible: should be "atmel,hsmci" +- #address-cells: should be one. The cell is the slot id. +- #size-cells: should be zero. +- at least one slot node + +The node contains child nodes for each slot that the platform uses + +Example MCI node: + +mmc0: mmc@f0008000 { + compatible = "atmel,hsmci"; + reg = <0xf0008000 0x600>; + interrupts = <12 4>; + #address-cells = <1>; + #size-cells = <0>; + + [ child node definitions...] +}; + +2) slot nodes + +Required properties: +- reg: should contain the slot id. +- bus-width: number of data lines connected to the controller + +Optional properties: +- cd-gpios: specify GPIOs for card detection +- cd-inverted: invert the value of external card detect gpio line +- wp-gpios: specify GPIOs for write protection + +Example slot node: + +slot@0 { + reg = <0>; + bus-width = <4>; + cd-gpios = <&pioD 15 0> + cd-inverted; +}; + +Example full MCI node: +mmc0: mmc@f0008000 { + compatible = "atmel,hsmci"; + reg = <0xf0008000 0x600>; + interrupts = <12 4>; + #address-cells = <1>; + #size-cells = <0>; + slot@0 { + reg = <0>; + bus-width = <4>; + cd-gpios = <&pioD 15 0> + cd-inverted; + }; + slot@1 { + reg = <1>; + bus-width = <4>; + }; +}; diff --git a/trunk/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt b/trunk/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt new file mode 100644 index 000000000000..792768953330 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt @@ -0,0 +1,87 @@ +* Samsung Exynos specific extensions to the Synopsis Designware Mobile + Storage Host Controller + +The Synopsis designware mobile storage host controller is used to interface +a SoC with storage medium such as eMMC or SD/MMC cards. This file documents +differences between the core Synopsis dw mshc controller properties described +by synposis-dw-mshc.txt and the properties used by the Samsung Exynos specific +extensions to the Synopsis Designware Mobile Storage Host Controller. + +Required Properties: + +* compatible: should be + - "samsung,exynos4210-dw-mshc": for controllers with Samsung Exynos4210 + specific extentions. + - "samsung,exynos4412-dw-mshc": for controllers with Samsung Exynos4412 + specific extentions. + - "samsung,exynos5250-dw-mshc": for controllers with Samsung Exynos5250 + specific extentions. + +* samsung,dw-mshc-ciu-div: Specifies the divider value for the card interface + unit (ciu) clock. This property is applicable only for Exynos5 SoC's and + ignored for Exynos4 SoC's. The valid range of divider value is 0 to 7. + +* samsung,dw-mshc-sdr-timing: Specifies the value of CIU clock phase shift value + in transmit mode and CIU clock phase shift value in receive mode for single + data rate mode operation. Refer notes below for the order of the cells and the + valid values. + +* samsung,dw-mshc-ddr-timing: Specifies the value of CUI clock phase shift value + in transmit mode and CIU clock phase shift value in receive mode for double + data rate mode operation. Refer notes below for the order of the cells and the + valid values. + + Notes for the sdr-timing and ddr-timing values: + + The order of the cells should be + - First Cell: CIU clock phase shift value for tx mode. + - Second Cell: CIU clock phase shift value for rx mode. + + Valid values for SDR and DDR CIU clock timing for Exynos5250: + - valid value for tx phase shift and rx phase shift is 0 to 7. + - when CIU clock divider value is set to 3, all possible 8 phase shift + values can be used. + - if CIU clock divider value is 0 (that is divide by 1), both tx and rx + phase shift clocks should be 0. + +Required properties for a slot: + +* gpios: specifies a list of gpios used for command, clock and data bus. The + first gpio is the command line and the second gpio is the clock line. The + rest of the gpios (depending on the bus-width property) are the data lines in + no particular order. The format of the gpio specifier depends on the gpio + controller. + +Example: + + The MSHC controller node can be split into two portions, SoC specific and + board specific portions as listed below. + + dwmmc0@12200000 { + compatible = "samsung,exynos5250-dw-mshc"; + reg = <0x12200000 0x1000>; + interrupts = <0 75 0>; + #address-cells = <1>; + #size-cells = <0>; + }; + + dwmmc0@12200000 { + num-slots = <1>; + supports-highspeed; + broken-cd; + fifo-depth = <0x80>; + card-detect-delay = <200>; + samsung,dw-mshc-ciu-div = <3>; + samsung,dw-mshc-sdr-timing = <2 3>; + samsung,dw-mshc-ddr-timing = <1 2>; + + slot@0 { + reg = <0>; + bus-width = <8>; + gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>, + <&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>, + <&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>, + <&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>, + <&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>; + }; + }; diff --git a/trunk/Documentation/devicetree/bindings/mmc/mmc.txt b/trunk/Documentation/devicetree/bindings/mmc/mmc.txt index 8a6811f4a02f..8e2e0ba2f486 100644 --- a/trunk/Documentation/devicetree/bindings/mmc/mmc.txt +++ b/trunk/Documentation/devicetree/bindings/mmc/mmc.txt @@ -9,12 +9,17 @@ Interpreted by the OF core: Required properties: - bus-width: Number of data lines, can be <1>, <4>, or <8> +Card detection: +If no property below is supplied, standard SDHCI card detect is used. +Only one of the properties in this section should be supplied: + - broken-cd: There is no card detection available; polling must be used. + - cd-gpios: Specify GPIOs for card detection, see gpio binding + - non-removable: non-removable slot (like eMMC); assume always present. + Optional properties: -- cd-gpios: Specify GPIOs for card detection, see gpio binding - wp-gpios: Specify GPIOs for write protection, see gpio binding - cd-inverted: when present, polarity on the cd gpio line is inverted - wp-inverted: when present, polarity on the wp gpio line is inverted -- non-removable: non-removable slot (like eMMC) - max-frequency: maximum operating clock frequency Example: diff --git a/trunk/Documentation/devicetree/bindings/mmc/pxa-mmc.txt b/trunk/Documentation/devicetree/bindings/mmc/pxa-mmc.txt new file mode 100644 index 000000000000..b7025de7dced --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/mmc/pxa-mmc.txt @@ -0,0 +1,25 @@ +* PXA MMC drivers + +Driver bindings for the PXA MCI (MMC/SDIO) interfaces + +Required properties: +- compatible: Should be "marvell,pxa-mmc". +- vmmc-supply: A regulator for VMMC + +Optional properties: +- marvell,detect-delay-ms: sets the detection delay timeout in ms. +- marvell,gpio-power: GPIO spec for the card power enable pin + +This file documents differences between the core properties in mmc.txt +and the properties used by the pxa-mmc driver. + +Examples: + +mmc0: mmc@41100000 { + compatible = "marvell,pxa-mmc"; + reg = <0x41100000 0x1000>; + interrupts = <23>; + cd-gpios = <&gpio 23 0>; + wp-gpios = <&gpio 24 0>; +}; + diff --git a/trunk/Documentation/devicetree/bindings/mmc/samsung-sdhci.txt b/trunk/Documentation/devicetree/bindings/mmc/samsung-sdhci.txt new file mode 100644 index 000000000000..630a7d7f4718 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/mmc/samsung-sdhci.txt @@ -0,0 +1,53 @@ +* Samsung's SDHCI Controller device tree bindings + +Samsung's SDHCI controller is used as a connectivity interface with external +MMC, SD and eMMC storage mediums. This file documents differences between the +core mmc properties described by mmc.txt and the properties used by the +Samsung implmentation of the SDHCI controller. + +Note: The mmc core bindings documentation states that if none of the core +card-detect bindings are used, then the standard sdhci card detect mechanism +is used. The Samsung's SDHCI controller bindings extends this as listed below. + +[A] The property "samsung,cd-pinmux-gpio" can be used as stated in the + "Optional Board Specific Properties" section below. + +[B] If core card-detect bindings and "samsung,cd-pinmux-gpio" property + is not specified, it is assumed that there is no card detection + mechanism used. + +Required SoC Specific Properties: +- compatible: should be one of the following + - "samsung,s3c6410-sdhci": For controllers compatible with s3c6410 sdhci + controller. + - "samsung,exynos4210-sdhci": For controllers compatible with Exynos4 sdhci + controller. + +Required Board Specific Properties: +- gpios: Should specify the gpios used for clock, command and data lines. The + gpio specifier format depends on the gpio controller. + +Optional Board Specific Properties: +- samsung,cd-pinmux-gpio: Specifies the card detect line that is routed + through a pinmux to the card-detect pin of the card slot. This property + should be used only if none of the mmc core card-detect properties are + used. + +Example: + sdhci@12530000 { + compatible = "samsung,exynos4210-sdhci"; + reg = <0x12530000 0x100>; + interrupts = <0 75 0>; + bus-width = <4>; + cd-gpios = <&gpk2 2 2 3 3>; + gpios = <&gpk2 0 2 0 3>, /* clock line */ + <&gpk2 1 2 0 3>, /* command line */ + <&gpk2 3 2 3 3>, /* data line 0 */ + <&gpk2 4 2 3 3>, /* data line 1 */ + <&gpk2 5 2 3 3>, /* data line 2 */ + <&gpk2 6 2 3 3>; /* data line 3 */ + }; + + Note: This example shows both SoC specific and board specific properties + in a single device node. The properties can be actually be seperated + into SoC specific node and board specific node. diff --git a/trunk/Documentation/devicetree/bindings/mmc/sdhci-dove.txt b/trunk/Documentation/devicetree/bindings/mmc/sdhci-dove.txt new file mode 100644 index 000000000000..ae9aab9abcd7 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/mmc/sdhci-dove.txt @@ -0,0 +1,14 @@ +* Marvell sdhci-dove controller + +This file documents differences between the core properties in mmc.txt +and the properties used by the sdhci-pxav2 and sdhci-pxav3 drivers. + +- compatible: Should be "marvell,dove-sdhci". + +Example: + +sdio0: sdio@92000 { + compatible = "marvell,dove-sdhci"; + reg = <0x92000 0x100>; + interrupts = <35>; +}; diff --git a/trunk/Documentation/devicetree/bindings/mmc/sdhci-spear.txt b/trunk/Documentation/devicetree/bindings/mmc/sdhci-spear.txt new file mode 100644 index 000000000000..fd3643e7e467 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/mmc/sdhci-spear.txt @@ -0,0 +1,18 @@ +* SPEAr SDHCI Controller + +This file documents differences between the core properties in mmc.txt +and the properties used by the sdhci-spear driver. + +Required properties: +- compatible: "st,spear300-sdhci" + +Optional properties: +- cd-gpios: card detect gpio, with zero flags. + +Example: + + sdhci@fc000000 { + compatible = "st,spear300-sdhci"; + reg = <0xfc000000 0x1000>; + cd-gpios = <&gpio0 6 0>; + }; diff --git a/trunk/Documentation/devicetree/bindings/mmc/synposis-dw-mshc.txt b/trunk/Documentation/devicetree/bindings/mmc/synposis-dw-mshc.txt new file mode 100644 index 000000000000..06cd32d08052 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/mmc/synposis-dw-mshc.txt @@ -0,0 +1,79 @@ +* Synopsis Designware Mobile Storage Host Controller + +The Synopsis designware mobile storage host controller is used to interface +a SoC with storage medium such as eMMC or SD/MMC cards. This file documents +differences between the core mmc properties described by mmc.txt and the +properties used by the Synopsis Designware Mobile Storage Host Controller. + +Required Properties: + +* compatible: should be + - snps,dw-mshc: for controllers compliant with synopsis dw-mshc. +* #address-cells: should be 1. +* #size-cells: should be 0. + +# Slots: The slot specific information are contained within child-nodes with + each child-node representing a supported slot. There should be atleast one + child node representing a card slot. The name of the child node representing + the slot is recommended to be slot@n where n is the unique number of the slot + connnected to the controller. The following are optional properties which + can be included in the slot child node. + + * reg: specifies the physical slot number. The valid values of this + property is 0 to (num-slots -1), where num-slots is the value + specified by the num-slots property. + + * bus-width: as documented in mmc core bindings. + + * wp-gpios: specifies the write protect gpio line. The format of the + gpio specifier depends on the gpio controller. If the write-protect + line is not available, this property is optional. + +Optional properties: + +* num-slots: specifies the number of slots supported by the controller. + The number of physical slots actually used could be equal or less than the + value specified by num-slots. If this property is not specified, the value + of num-slot property is assumed to be 1. + +* fifo-depth: The maximum size of the tx/rx fifo's. If this property is not + specified, the default value of the fifo size is determined from the + controller registers. + +* card-detect-delay: Delay in milli-seconds before detecting card after card + insert event. The default value is 0. + +* supports-highspeed: Enables support for high speed cards (upto 50MHz) + +* broken-cd: as documented in mmc core bindings. + +Aliases: + +- All the MSHC controller nodes should be represented in the aliases node using + the following format 'mshc{n}' where n is a unique number for the alias. + +Example: + +The MSHC controller node can be split into two portions, SoC specific and +board specific portions as listed below. + + dwmmc0@12200000 { + compatible = "snps,dw-mshc"; + reg = <0x12200000 0x1000>; + interrupts = <0 75 0>; + #address-cells = <1>; + #size-cells = <0>; + }; + + dwmmc0@12200000 { + num-slots = <1>; + supports-highspeed; + broken-cd; + fifo-depth = <0x80>; + card-detect-delay = <200>; + + slot@0 { + reg = <0>; + bus-width = <8>; + }; + }; diff --git a/trunk/Documentation/devicetree/bindings/mtd/atmel-nand.txt b/trunk/Documentation/devicetree/bindings/mtd/atmel-nand.txt index a20069502f5a..d555421ea49f 100644 --- a/trunk/Documentation/devicetree/bindings/mtd/atmel-nand.txt +++ b/trunk/Documentation/devicetree/bindings/mtd/atmel-nand.txt @@ -3,7 +3,9 @@ Atmel NAND flash Required properties: - compatible : "atmel,at91rm9200-nand". - reg : should specify localbus address and size used for the chip, - and if availlable the ECC. + and hardware ECC controller if available. + If the hardware ECC is PMECC, it should contain address and size for + PMECC, PMECC Error Location controller and ROM which has lookup tables. - atmel,nand-addr-offset : offset for the address latch. - atmel,nand-cmd-offset : offset for the command latch. - #address-cells, #size-cells : Must be present if the device has sub-nodes @@ -16,6 +18,15 @@ Optional properties: - nand-ecc-mode : String, operation mode of the NAND ecc mode, soft by default. Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first", "soft_bch". +- atmel,has-pmecc : boolean to enable Programmable Multibit ECC hardware. + Only supported by at91sam9x5 or later sam9 product. +- atmel,pmecc-cap : error correct capability for Programmable Multibit ECC + Controller. Supported values are: 2, 4, 8, 12, 24. +- atmel,pmecc-sector-size : sector size for ECC computation. Supported values + are: 512, 1024. +- atmel,pmecc-lookup-table-offset : includes two offsets of lookup table in ROM + for different sector size. First one is for sector size 512, the next is for + sector size 1024. - nand-bus-width : 8 or 16 bus width if not present 8 - nand-on-flash-bbt: boolean to enable on flash bbt option if not present false @@ -39,3 +50,30 @@ nand0: nand@40000000,0 { ... }; }; + +/* for PMECC supported chips */ +nand0: nand@40000000 { + compatible = "atmel,at91rm9200-nand"; + #address-cells = <1>; + #size-cells = <1>; + reg = < 0x40000000 0x10000000 /* bus addr & size */ + 0xffffe000 0x00000600 /* PMECC addr & size */ + 0xffffe600 0x00000200 /* PMECC ERRLOC addr & size */ + 0x00100000 0x00100000 /* ROM addr & size */ + >; + atmel,nand-addr-offset = <21>; /* ale */ + atmel,nand-cmd-offset = <22>; /* cle */ + nand-on-flash-bbt; + nand-ecc-mode = "hw"; + atmel,has-pmecc; /* enable PMECC */ + atmel,pmecc-cap = <2>; + atmel,pmecc-sector-size = <512>; + atmel,pmecc-lookup-table-offset = <0x8000 0x10000>; + gpios = <&pioD 5 0 /* rdy */ + &pioD 4 0 /* nce */ + 0 /* cd */ + >; + partition@0 { + ... + }; +}; diff --git a/trunk/Documentation/devicetree/bindings/mtd/gpmi-nand.txt b/trunk/Documentation/devicetree/bindings/mtd/gpmi-nand.txt index 1a5bbd346d22..3fb3f9015365 100644 --- a/trunk/Documentation/devicetree/bindings/mtd/gpmi-nand.txt +++ b/trunk/Documentation/devicetree/bindings/mtd/gpmi-nand.txt @@ -12,6 +12,10 @@ Required properties: - interrupt-names : The interrupt names "gpmi-dma", "bch"; - fsl,gpmi-dma-channel : Should contain the dma channel it uses. +Optional properties: + - nand-on-flash-bbt: boolean to enable on flash bbt option if not + present false + The device tree may optionally contain sub-nodes describing partitions of the address space. See partition.txt for more detail. diff --git a/trunk/Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt b/trunk/Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt new file mode 100644 index 000000000000..d0a37252eb22 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt @@ -0,0 +1,50 @@ +NXP LPC32xx SoC NAND MLC controller + +Required properties: +- compatible: "nxp,lpc3220-mlc" +- reg: Address and size of the controller +- interrupts: The NAND interrupt specification +- gpios: GPIO specification for NAND write protect + +The following required properties are very controller specific. See the LPC32xx +User Manual 7.5.14 MLC NAND Timing Register (the values here are specified in +Hz, to make them independent of actual clock speed and to provide for good +accuracy:) +- nxp,tcea_delay: TCEA_DELAY +- nxp,busy_delay: BUSY_DELAY +- nxp,nand_ta: NAND_TA +- nxp,rd_high: RD_HIGH +- nxp,rd_low: RD_LOW +- nxp,wr_high: WR_HIGH +- nxp,wr_low: WR_LOW + +Optional subnodes: +- Partitions, see Documentation/devicetree/bindings/mtd/partition.txt + +Example: + + mlc: flash@200A8000 { + compatible = "nxp,lpc3220-mlc"; + reg = <0x200A8000 0x11000>; + interrupts = <11 0>; + #address-cells = <1>; + #size-cells = <1>; + + nxp,tcea-delay = <333333333>; + nxp,busy-delay = <10000000>; + nxp,nand-ta = <18181818>; + nxp,rd-high = <31250000>; + nxp,rd-low = <45454545>; + nxp,wr-high = <40000000>; + nxp,wr-low = <83333333>; + gpios = <&gpio 5 19 1>; /* GPO_P3 19, active low */ + + mtd0@00000000 { + label = "boot"; + reg = <0x00000000 0x00064000>; + read-only; + }; + + ... + + }; diff --git a/trunk/Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt b/trunk/Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt new file mode 100644 index 000000000000..d94edc0fc554 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt @@ -0,0 +1,52 @@ +NXP LPC32xx SoC NAND SLC controller + +Required properties: +- compatible: "nxp,lpc3220-slc" +- reg: Address and size of the controller +- nand-on-flash-bbt: Use bad block table on flash +- gpios: GPIO specification for NAND write protect + +The following required properties are very controller specific. See the LPC32xx +User Manual: +- nxp,wdr-clks: Delay before Ready signal is tested on write (W_RDY) +- nxp,rdr-clks: Delay before Ready signal is tested on read (R_RDY) +(The following values are specified in Hz, to make them independent of actual +clock speed:) +- nxp,wwidth: Write pulse width (W_WIDTH) +- nxp,whold: Write hold time (W_HOLD) +- nxp,wsetup: Write setup time (W_SETUP) +- nxp,rwidth: Read pulse width (R_WIDTH) +- nxp,rhold: Read hold time (R_HOLD) +- nxp,rsetup: Read setup time (R_SETUP) + +Optional subnodes: +- Partitions, see Documentation/devicetree/bindings/mtd/partition.txt + +Example: + + slc: flash@20020000 { + compatible = "nxp,lpc3220-slc"; + reg = <0x20020000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + + nxp,wdr-clks = <14>; + nxp,wwidth = <40000000>; + nxp,whold = <100000000>; + nxp,wsetup = <100000000>; + nxp,rdr-clks = <14>; + nxp,rwidth = <40000000>; + nxp,rhold = <66666666>; + nxp,rsetup = <100000000>; + nand-on-flash-bbt; + gpios = <&gpio 5 19 1>; /* GPO_P3 19, active low */ + + mtd0@00000000 { + label = "phy3250-boot"; + reg = <0x00000000 0x00064000>; + read-only; + }; + + ... + + }; diff --git a/trunk/Documentation/devicetree/bindings/mtd/mtd-physmap.txt b/trunk/Documentation/devicetree/bindings/mtd/mtd-physmap.txt index a63c2bd7de2b..94de19b8f16b 100644 --- a/trunk/Documentation/devicetree/bindings/mtd/mtd-physmap.txt +++ b/trunk/Documentation/devicetree/bindings/mtd/mtd-physmap.txt @@ -16,6 +16,13 @@ file systems on embedded devices. - #address-cells, #size-cells : Must be present if the device has sub-nodes representing partitions (see below). In this case both #address-cells and #size-cells must be equal to 1. + - no-unaligned-direct-access: boolean to disable the default direct + mapping of the flash. + On some platforms (e.g. MPC5200) a direct 1:1 mapping may cause + problems with JFFS2 usage, as the local bus (LPB) doesn't support + unaligned accesses as implemented in the JFFS2 code via memcpy(). + By defining "no-unaligned-direct-access", the flash will not be + exposed directly to the MTD users (e.g. JFFS2) any more. For JEDEC compatible devices, the following additional properties are defined: diff --git a/trunk/Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt b/trunk/Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt new file mode 100644 index 000000000000..daa768956069 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt @@ -0,0 +1,83 @@ +Lantiq FALCON pinmux controller + +Required properties: +- compatible: "lantiq,pinctrl-falcon" +- reg: Should contain the physical address and length of the gpio/pinmux + register range + +Please refer to pinctrl-bindings.txt in this directory for details of the +common pinctrl bindings used by client devices, including the meaning of the +phrase "pin configuration node". + +Lantiq's pin configuration nodes act as a container for an abitrary number of +subnodes. Each of these subnodes represents some desired configuration for a +pin, a group, or a list of pins or groups. This configuration can include the +mux function to select on those group(s), and two pin configuration parameters: +pull-up and open-drain + +The name of each subnode is not important as long as it is unique; all subnodes +should be enumerated and processed purely based on their content. + +Each subnode only affects those parameters that are explicitly listed. In +other words, a subnode that lists a mux function but no pin configuration +parameters implies no information about any pin configuration parameters. +Similarly, a pin subnode that describes a pullup parameter implies no +information about e.g. the mux function. + +We support 2 types of nodes. + +Definition of mux function groups: + +Required subnode-properties: +- lantiq,groups : An array of strings. Each string contains the name of a group. + Valid values for these names are listed below. +- lantiq,function: A string containing the name of the function to mux to the + group. Valid values for function names are listed below. + +Valid values for group and function names: + + mux groups: + por, ntr, ntr8k, hrst, mdio, bootled, asc0, spi, spi cs0, spi cs1, i2c, + jtag, slic, pcm, asc1 + + functions: + rst, ntr, mdio, led, asc, spi, i2c, jtag, slic, pcm + + +Definition of pin configurations: + +Required subnode-properties: +- lantiq,pins : An array of strings. Each string contains the name of a pin. + Valid values for these names are listed below. + +Optional subnode-properties: +- lantiq,pull: Integer, representing the pull-down/up to apply to the pin. + 0: none, 1: down +- lantiq,drive-current: Boolean, enables drive-current +- lantiq,slew-rate: Boolean, enables slew-rate + +Example: + pinmux0 { + compatible = "lantiq,pinctrl-falcon"; + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + state_default: pinmux { + asc0 { + lantiq,groups = "asc0"; + lantiq,function = "asc"; + }; + ntr { + lantiq,groups = "ntr8k"; + lantiq,function = "ntr"; + }; + i2c { + lantiq,groups = "i2c"; + lantiq,function = "i2c"; + }; + hrst { + lantiq,groups = "hrst"; + lantiq,function = "rst"; + }; + }; + }; diff --git a/trunk/Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt b/trunk/Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt new file mode 100644 index 000000000000..b5469db1d7ad --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt @@ -0,0 +1,97 @@ +Lantiq XWAY pinmux controller + +Required properties: +- compatible: "lantiq,pinctrl-xway" or "lantiq,pinctrl-xr9" +- reg: Should contain the physical address and length of the gpio/pinmux + register range + +Please refer to pinctrl-bindings.txt in this directory for details of the +common pinctrl bindings used by client devices, including the meaning of the +phrase "pin configuration node". + +Lantiq's pin configuration nodes act as a container for an abitrary number of +subnodes. Each of these subnodes represents some desired configuration for a +pin, a group, or a list of pins or groups. This configuration can include the +mux function to select on those group(s), and two pin configuration parameters: +pull-up and open-drain + +The name of each subnode is not important as long as it is unique; all subnodes +should be enumerated and processed purely based on their content. + +Each subnode only affects those parameters that are explicitly listed. In +other words, a subnode that lists a mux function but no pin configuration +parameters implies no information about any pin configuration parameters. +Similarly, a pin subnode that describes a pullup parameter implies no +information about e.g. the mux function. + +We support 2 types of nodes. + +Definition of mux function groups: + +Required subnode-properties: +- lantiq,groups : An array of strings. Each string contains the name of a group. + Valid values for these names are listed below. +- lantiq,function: A string containing the name of the function to mux to the + group. Valid values for function names are listed below. + +Valid values for group and function names: + + mux groups: + exin0, exin1, exin2, jtag, ebu a23, ebu a24, ebu a25, ebu clk, ebu cs1, + ebu wait, nand ale, nand cs1, nand cle, spi, spi_cs1, spi_cs2, spi_cs3, + spi_cs4, spi_cs5, spi_cs6, asc0, asc0 cts rts, stp, nmi , gpt1, gpt2, + gpt3, clkout0, clkout1, clkout2, clkout3, gnt1, gnt2, gnt3, req1, req2, + req3 + + additional mux groups (XR9 only): + mdio, nand rdy, nand rd, exin3, exin4, gnt4, req4 + + functions: + spi, asc, cgu, jtag, exin, stp, gpt, nmi, pci, ebu, mdio + + + +Definition of pin configurations: + +Required subnode-properties: +- lantiq,pins : An array of strings. Each string contains the name of a pin. + Valid values for these names are listed below. + +Optional subnode-properties: +- lantiq,pull: Integer, representing the pull-down/up to apply to the pin. + 0: none, 1: down, 2: up. +- lantiq,open-drain: Boolean, enables open-drain on the defined pin. + +Valid values for XWAY pin names: + Pinconf pins can be referenced via the names io0-io31. + +Valid values for XR9 pin names: + Pinconf pins can be referenced via the names io0-io55. + +Example: + gpio: pinmux@E100B10 { + compatible = "lantiq,pinctrl-xway"; + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + #gpio-cells = <2>; + gpio-controller; + reg = <0xE100B10 0xA0>; + + state_default: pinmux { + stp { + lantiq,groups = "stp"; + lantiq,function = "stp"; + }; + pci { + lantiq,groups = "gnt1"; + lantiq,function = "pci"; + }; + conf_out { + lantiq,pins = "io4", "io5", "io6"; /* stp */ + lantiq,open-drain; + lantiq,pull = <0>; + }; + }; + }; + diff --git a/trunk/Documentation/devicetree/bindings/pwm/imx-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/imx-pwm.txt new file mode 100644 index 000000000000..8522bfbccfd7 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/pwm/imx-pwm.txt @@ -0,0 +1,17 @@ +Freescale i.MX PWM controller + +Required properties: +- compatible: should be "fsl,-pwm" +- reg: physical base address and length of the controller's registers +- #pwm-cells: should be 2. The first cell specifies the per-chip index + of the PWM to use and the second cell is the period in nanoseconds. +- interrupts: The interrupt for the pwm controller + +Example: + +pwm1: pwm@53fb4000 { + #pwm-cells = <2>; + compatible = "fsl,imx53-pwm", "fsl,imx27-pwm"; + reg = <0x53fb4000 0x4000>; + interrupts = <61>; +}; diff --git a/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt index 11963e4d6bc4..9e3f8f1d46a2 100644 --- a/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt +++ b/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt @@ -4,7 +4,7 @@ Required properties: - compatible: should be "fsl,imx23-pwm" - reg: physical base address and length of the controller's registers - #pwm-cells: should be 2. The first cell specifies the per-chip index - of the PWM to use and the second cell is the duty cycle in nanoseconds. + of the PWM to use and the second cell is the period in nanoseconds. - fsl,pwm-number: the number of PWM devices Example: diff --git a/trunk/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt index bbbeedb4ec05..01438ecd6628 100644 --- a/trunk/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt +++ b/trunk/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt @@ -7,7 +7,7 @@ Required properties: - reg: physical base address and length of the controller's registers - #pwm-cells: On Tegra the number of cells used to specify a PWM is 2. The first cell specifies the per-chip index of the PWM to use and the second - cell is the duty cycle in nanoseconds. + cell is the period in nanoseconds. Example: diff --git a/trunk/Documentation/devicetree/bindings/spi/spi-octeon.txt b/trunk/Documentation/devicetree/bindings/spi/spi-octeon.txt new file mode 100644 index 000000000000..431add192342 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/spi/spi-octeon.txt @@ -0,0 +1,33 @@ +Cavium, Inc. OCTEON SOC SPI master controller. + +Required properties: +- compatible : "cavium,octeon-3010-spi" +- reg : The register base for the controller. +- interrupts : One interrupt, used by the controller. +- #address-cells : <1>, as required by generic SPI binding. +- #size-cells : <0>, also as required by generic SPI binding. + +Child nodes as per the generic SPI binding. + +Example: + + spi@1070000001000 { + compatible = "cavium,octeon-3010-spi"; + reg = <0x10700 0x00001000 0x0 0x100>; + interrupts = <0 58>; + #address-cells = <1>; + #size-cells = <0>; + + eeprom@0 { + compatible = "st,m95256", "atmel,at25"; + reg = <0>; + spi-max-frequency = <5000000>; + spi-cpha; + spi-cpol; + + pagesize = <64>; + size = <32768>; + address-width = <16>; + }; + }; + diff --git a/trunk/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt b/trunk/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt index 2de21c2acf55..844bd5fbd04c 100644 --- a/trunk/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt +++ b/trunk/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt @@ -7,7 +7,7 @@ free running counter values, and generates an interrupt. Required properties: -- compatible : should be "brcm,bcm2835-system-timer.txt" +- compatible : should be "brcm,bcm2835-system-timer" - reg : Specifies base physical address and size of the registers. - interrupts : A list of 4 interrupt sinks; one per timer channel. - clock-frequency : The frequency of the clock that drives the counter, in Hz. diff --git a/trunk/Documentation/driver-model/devres.txt b/trunk/Documentation/driver-model/devres.txt index 950856bd2e39..43cff70465ab 100644 --- a/trunk/Documentation/driver-model/devres.txt +++ b/trunk/Documentation/driver-model/devres.txt @@ -284,3 +284,7 @@ CLOCK PINCTRL devm_pinctrl_get() devm_pinctrl_put() + +PWM + devm_pwm_get() + devm_pwm_put() diff --git a/trunk/Documentation/filesystems/nfs/nfs.txt b/trunk/Documentation/filesystems/nfs/nfs.txt index f50f26ce6cd0..f2571c8bef74 100644 --- a/trunk/Documentation/filesystems/nfs/nfs.txt +++ b/trunk/Documentation/filesystems/nfs/nfs.txt @@ -12,9 +12,47 @@ and work is in progress on adding support for minor version 1 of the NFSv4 protocol. The purpose of this document is to provide information on some of the -upcall interfaces that are used in order to provide the NFS client with -some of the information that it requires in order to fully comply with -the NFS spec. +special features of the NFS client that can be configured by system +administrators. + + +The nfs4_unique_id parameter +============================ + +NFSv4 requires clients to identify themselves to servers with a unique +string. File open and lock state shared between one client and one server +is associated with this identity. To support robust NFSv4 state recovery +and transparent state migration, this identity string must not change +across client reboots. + +Without any other intervention, the Linux client uses a string that contains +the local system's node name. System administrators, however, often do not +take care to ensure that node names are fully qualified and do not change +over the lifetime of a client system. Node names can have other +administrative requirements that require particular behavior that does not +work well as part of an nfs_client_id4 string. + +The nfs.nfs4_unique_id boot parameter specifies a unique string that can be +used instead of a system's node name when an NFS client identifies itself to +a server. Thus, if the system's node name is not unique, or it changes, its +nfs.nfs4_unique_id stays the same, preventing collision with other clients +or loss of state during NFS reboot recovery or transparent state migration. + +The nfs.nfs4_unique_id string is typically a UUID, though it can contain +anything that is believed to be unique across all NFS clients. An +nfs4_unique_id string should be chosen when a client system is installed, +just as a system's root file system gets a fresh UUID in its label at +install time. + +The string should remain fixed for the lifetime of the client. It can be +changed safely if care is taken that the client shuts down cleanly and all +outstanding NFSv4 state has expired, to prevent loss of NFSv4 state. + +This string can be stored in an NFS client's grub.conf, or it can be provided +via a net boot facility such as PXE. It may also be specified as an nfs.ko +module parameter. Specifying a uniquifier string is not support for NFS +clients running in containers. + The DNS resolver ================ diff --git a/trunk/Documentation/filesystems/nfs/nfsd-admin-interfaces.txt b/trunk/Documentation/filesystems/nfs/nfsd-admin-interfaces.txt new file mode 100644 index 000000000000..56a96fb08a73 --- /dev/null +++ b/trunk/Documentation/filesystems/nfs/nfsd-admin-interfaces.txt @@ -0,0 +1,41 @@ +Administrative interfaces for nfsd +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Note that normally these interfaces are used only by the utilities in +nfs-utils. + +nfsd is controlled mainly by pseudofiles under the "nfsd" filesystem, +which is normally mounted at /proc/fs/nfsd/. + +The server is always started by the first write of a nonzero value to +nfsd/threads. + +Before doing that, NFSD can be told which sockets to listen on by +writing to nfsd/portlist; that write may be: + + - an ascii-encoded file descriptor, which should refer to a + bound (and listening, for tcp) socket, or + - "transportname port", where transportname is currently either + "udp", "tcp", or "rdma". + +If nfsd is started without doing any of these, then it will create one +udp and one tcp listener at port 2049 (see nfsd_init_socks). + +On startup, nfsd and lockd grace periods start. + +nfsd is shut down by a write of 0 to nfsd/threads. All locks and state +are thrown away at that point. + +Between startup and shutdown, the number of threads may be adjusted up +or down by additional writes to nfsd/threads or by writes to +nfsd/pool_threads. + +For more detail about files under nfsd/ and what they control, see +fs/nfsd/nfsctl.c; most of them have detailed comments. + +Implementation notes +^^^^^^^^^^^^^^^^^^^^ + +Note that the rpc server requires the caller to serialize addition and +removal of listening sockets, and startup and shutdown of the server. +For nfsd this is done using nfsd_mutex. diff --git a/trunk/Documentation/filesystems/proc.txt b/trunk/Documentation/filesystems/proc.txt index fb0a6aeb936c..a1793d670cd0 100644 --- a/trunk/Documentation/filesystems/proc.txt +++ b/trunk/Documentation/filesystems/proc.txt @@ -33,7 +33,7 @@ Table of Contents 2 Modifying System Parameters 3 Per-Process Parameters - 3.1 /proc//oom_adj & /proc//oom_score_adj - Adjust the oom-killer + 3.1 /proc//oom_score_adj - Adjust the oom-killer score 3.2 /proc//oom_score - Display current oom-killer score 3.3 /proc//io - Display the IO accounting fields @@ -1320,10 +1320,10 @@ of the kernel. CHAPTER 3: PER-PROCESS PARAMETERS ------------------------------------------------------------------------------ -3.1 /proc//oom_adj & /proc//oom_score_adj- Adjust the oom-killer score +3.1 /proc//oom_score_adj- Adjust the oom-killer score -------------------------------------------------------------------------------- -These file can be used to adjust the badness heuristic used to select which +This file can be used to adjust the badness heuristic used to select which process gets killed in out of memory conditions. The badness heuristic assigns a value to each candidate task ranging from 0 @@ -1361,22 +1361,10 @@ same system, cpuset, mempolicy, or memory controller resources to use at least equivalent to discounting 50% of the task's allowed memory from being considered as scoring against the task. -For backwards compatibility with previous kernels, /proc//oom_adj may also -be used to tune the badness score. Its acceptable values range from -16 -(OOM_ADJUST_MIN) to +15 (OOM_ADJUST_MAX) and a special value of -17 -(OOM_DISABLE) to disable oom killing entirely for that task. Its value is -scaled linearly with /proc//oom_score_adj. - -Writing to /proc//oom_score_adj or /proc//oom_adj will change the -other with its scaled value. - The value of /proc//oom_score_adj may be reduced no lower than the last value set by a CAP_SYS_RESOURCE process. To reduce the value any lower requires CAP_SYS_RESOURCE. -NOTICE: /proc//oom_adj is deprecated and will be removed, please see -Documentation/feature-removal-schedule.txt. - Caveat: when a parent task is selected, the oom killer will sacrifice any first generation children with separate address spaces instead, if possible. This avoids servers and important system daemons from being killed and loses the @@ -1387,9 +1375,7 @@ minimal amount of work. ------------------------------------------------------------- This file can be used to check the current score used by the oom-killer is for -any given . Use it together with /proc//oom_adj to tune which -process should be killed in an out-of-memory situation. - +any given . 3.3 /proc//io - Display the IO accounting fields ------------------------------------------------------- diff --git a/trunk/Documentation/hwmon/da9052 b/trunk/Documentation/hwmon/da9052 index ef898553638e..5bc51346b689 100644 --- a/trunk/Documentation/hwmon/da9052 +++ b/trunk/Documentation/hwmon/da9052 @@ -56,6 +56,6 @@ The junction temperature is calculated: The junction temperature attribute is supported by the driver. The battery temperature is calculated: - Degree Celcius = 1 / (t1 + 1/298)- 273 + Degree Celsius = 1 / (t1 + 1/298)- 273 where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255)) Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively. diff --git a/trunk/Documentation/hwmon/max1619 b/trunk/Documentation/hwmon/max1619 index d6f8d9cd7d7f..e6d87398cc8f 100644 --- a/trunk/Documentation/hwmon/max1619 +++ b/trunk/Documentation/hwmon/max1619 @@ -9,7 +9,7 @@ Supported chips: http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf Authors: - Alexey Fisher , + Oleksij Rempel , Jean Delvare Description diff --git a/trunk/Documentation/hwmon/twl4030-madc-hwmon b/trunk/Documentation/hwmon/twl4030-madc-hwmon index ef7984317cec..c3a3a5be10ad 100644 --- a/trunk/Documentation/hwmon/twl4030-madc-hwmon +++ b/trunk/Documentation/hwmon/twl4030-madc-hwmon @@ -41,5 +41,5 @@ Channel Signal The Sysfs nodes will represent the voltage in the units of mV, the temperature channel shows the converted temperature in -degree celcius. The Battery charging current channel represents +degree Celsius. The Battery charging current channel represents battery charging current in mA. diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index f777fa96243d..e2ed3360b708 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1730,6 +1730,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. will be autodetected by the client, and it will fall back to using the idmapper. To turn off this behaviour, set the value to '0'. + nfs.nfs4_unique_id= + [NFS4] Specify an additional fixed unique ident- + ification string that NFSv4 clients can insert into + their nfs_client_id4 string. This is typically a + UUID that is generated at system install time. nfs.send_implementation_id = [NFSv4.1] Send client implementation identification diff --git a/trunk/Documentation/leds/leds-lp5523.txt b/trunk/Documentation/leds/leds-lp5523.txt index fad2feb8b7ce..c2743f59f9ac 100644 --- a/trunk/Documentation/leds/leds-lp5523.txt +++ b/trunk/Documentation/leds/leds-lp5523.txt @@ -10,8 +10,22 @@ Contact: Samu Onkalo (samu.p.onkalo-at-nokia.com) Description ----------- LP5523 can drive up to 9 channels. Leds can be controlled directly via -the led class control interface. Channels have generic names: -lp5523:channelx where x is 0...8 +the led class control interface. +The name of each channel is configurable in the platform data - name and label. +There are three options to make the channel name. + +a) Define the 'name' in the platform data +To make specific channel name, then use 'name' platform data. +/sys/class/leds/R1 (name: 'R1') +/sys/class/leds/B1 (name: 'B1') + +b) Use the 'label' with no 'name' field +For one device name with channel number, then use 'label'. +/sys/class/leds/RGB:channelN (label: 'RGB', N: 0 ~ 8) + +c) Default +If both fields are NULL, 'lp5523' is used by default. +/sys/class/leds/lp5523:channelN (N: 0 ~ 8) The chip provides 3 engines. Each engine can control channels without interaction from the main CPU. Details of the micro engine code can be found @@ -46,12 +60,13 @@ Note - chan_nr can have values between 0 and 8. static struct lp5523_led_config lp5523_led_config[] = { { + .name = "D1", .chan_nr = 0, .led_current = 50, .max_current = 130, }, ... - }, { + { .chan_nr = 8, .led_current = 50, .max_current = 130, diff --git a/trunk/Documentation/memory.txt b/trunk/Documentation/memory.txt deleted file mode 100644 index 802efe58647c..000000000000 --- a/trunk/Documentation/memory.txt +++ /dev/null @@ -1,33 +0,0 @@ -There are several classic problems related to memory on Linux -systems. - - 1) There are some motherboards that will not cache above - a certain quantity of memory. If you have one of these - motherboards, your system will be SLOWER, not faster - as you add more memory. Consider exchanging your - motherboard. - -All of these problems can be addressed with the "mem=XXXM" boot option -(where XXX is the size of RAM to use in megabytes). -It can also tell Linux to use less memory than is actually installed. -If you use "mem=" on a machine with PCI, consider using "memmap=" to avoid -physical address space collisions. - -See the documentation of your boot loader (LILO, grub, loadlin, etc.) about -how to pass options to the kernel. - -There are other memory problems which Linux cannot deal with. Random -corruption of memory is usually a sign of serious hardware trouble. -Try: - - * Reducing memory settings in the BIOS to the most conservative - timings. - - * Adding a cooling fan. - - * Not overclocking your CPU. - - * Having the memory tested in a memory tester or exchanged - with the vendor. Consider testing it with memtest86 yourself. - - * Exchanging your CPU, cache, or motherboard for one that works. diff --git a/trunk/Documentation/percpu-rw-semaphore.txt b/trunk/Documentation/percpu-rw-semaphore.txt new file mode 100644 index 000000000000..7d3c82431909 --- /dev/null +++ b/trunk/Documentation/percpu-rw-semaphore.txt @@ -0,0 +1,27 @@ +Percpu rw semaphores +-------------------- + +Percpu rw semaphores is a new read-write semaphore design that is +optimized for locking for reading. + +The problem with traditional read-write semaphores is that when multiple +cores take the lock for reading, the cache line containing the semaphore +is bouncing between L1 caches of the cores, causing performance +degradation. + +Locking for reading is very fast, it uses RCU and it avoids any atomic +instruction in the lock and unlock path. On the other hand, locking for +writing is very expensive, it calls synchronize_rcu() that can take +hundreds of milliseconds. + +The lock is declared with "struct percpu_rw_semaphore" type. +The lock is initialized percpu_init_rwsem, it returns 0 on success and +-ENOMEM on allocation failure. +The lock must be freed with percpu_free_rwsem to avoid memory leak. + +The lock is locked for read with percpu_down_read, percpu_up_read and +for write with percpu_down_write, percpu_up_write. + +The idea of using RCU for optimized rw-lock was introduced by +Eric Dumazet . +The code was written by Mikulas Patocka diff --git a/trunk/Documentation/prio_tree.txt b/trunk/Documentation/prio_tree.txt deleted file mode 100644 index 3aa68f9a117b..000000000000 --- a/trunk/Documentation/prio_tree.txt +++ /dev/null @@ -1,107 +0,0 @@ -The prio_tree.c code indexes vmas using 3 different indexes: - * heap_index = vm_pgoff + vm_size_in_pages : end_vm_pgoff - * radix_index = vm_pgoff : start_vm_pgoff - * size_index = vm_size_in_pages - -A regular radix-priority-search-tree indexes vmas using only heap_index and -radix_index. The conditions for indexing are: - * ->heap_index >= ->left->heap_index && - ->heap_index >= ->right->heap_index - * if (->heap_index == ->left->heap_index) - then ->radix_index < ->left->radix_index; - * if (->heap_index == ->right->heap_index) - then ->radix_index < ->right->radix_index; - * nodes are hashed to left or right subtree using radix_index - similar to a pure binary radix tree. - -A regular radix-priority-search-tree helps to store and query -intervals (vmas). However, a regular radix-priority-search-tree is only -suitable for storing vmas with different radix indices (vm_pgoff). - -Therefore, the prio_tree.c extends the regular radix-priority-search-tree -to handle many vmas with the same vm_pgoff. Such vmas are handled in -2 different ways: 1) All vmas with the same radix _and_ heap indices are -linked using vm_set.list, 2) if there are many vmas with the same radix -index, but different heap indices and if the regular radix-priority-search -tree cannot index them all, we build an overflow-sub-tree that indexes such -vmas using heap and size indices instead of heap and radix indices. For -example, in the figure below some vmas with vm_pgoff = 0 (zero) are -indexed by regular radix-priority-search-tree whereas others are pushed -into an overflow-subtree. Note that all vmas in an overflow-sub-tree have -the same vm_pgoff (radix_index) and if necessary we build different -overflow-sub-trees to handle each possible radix_index. For example, -in figure we have 3 overflow-sub-trees corresponding to radix indices -0, 2, and 4. - -In the final tree the first few (prio_tree_root->index_bits) levels -are indexed using heap and radix indices whereas the overflow-sub-trees below -those levels (i.e. levels prio_tree_root->index_bits + 1 and higher) are -indexed using heap and size indices. In overflow-sub-trees the size_index -is used for hashing the nodes to appropriate places. - -Now, an example prio_tree: - - vmas are represented [radix_index, size_index, heap_index] - i.e., [start_vm_pgoff, vm_size_in_pages, end_vm_pgoff] - -level prio_tree_root->index_bits = 3 ------ - _ - 0 [0,7,7] | - / \ | - ------------------ ------------ | Regular - / \ | radix priority - 1 [1,6,7] [4,3,7] | search tree - / \ / \ | - ------- ----- ------ ----- | heap-and-radix - / \ / \ | indexed - 2 [0,6,6] [2,5,7] [5,2,7] [6,1,7] | - / \ / \ / \ / \ | - 3 [0,5,5] [1,5,6] [2,4,6] [3,4,7] [4,2,6] [5,1,6] [6,0,6] [7,0,7] | - / / / _ - / / / _ - 4 [0,4,4] [2,3,5] [4,1,5] | - / / / | - 5 [0,3,3] [2,2,4] [4,0,4] | Overflow-sub-trees - / / | - 6 [0,2,2] [2,1,3] | heap-and-size - / / | indexed - 7 [0,1,1] [2,0,2] | - / | - 8 [0,0,0] | - _ - -Note that we use prio_tree_root->index_bits to optimize the height -of the heap-and-radix indexed tree. Since prio_tree_root->index_bits is -set according to the maximum end_vm_pgoff mapped, we are sure that all -bits (in vm_pgoff) above prio_tree_root->index_bits are 0 (zero). Therefore, -we only use the first prio_tree_root->index_bits as radix_index. -Whenever index_bits is increased in prio_tree_expand, we shuffle the tree -to make sure that the first prio_tree_root->index_bits levels of the tree -is indexed properly using heap and radix indices. - -We do not optimize the height of overflow-sub-trees using index_bits. -The reason is: there can be many such overflow-sub-trees and all of -them have to be suffled whenever the index_bits increases. This may involve -walking the whole prio_tree in prio_tree_insert->prio_tree_expand code -path which is not desirable. Hence, we do not optimize the height of the -heap-and-size indexed overflow-sub-trees using prio_tree->index_bits. -Instead the overflow sub-trees are indexed using full BITS_PER_LONG bits -of size_index. This may lead to skewed sub-trees because most of the -higher significant bits of the size_index are likely to be 0 (zero). In -the example above, all 3 overflow-sub-trees are skewed. This may marginally -affect the performance. However, processes rarely map many vmas with the -same start_vm_pgoff but different end_vm_pgoffs. Therefore, we normally -do not require overflow-sub-trees to index all vmas. - -From the above discussion it is clear that the maximum height of -a prio_tree can be prio_tree_root->index_bits + BITS_PER_LONG. -However, in most of the common cases we do not need overflow-sub-trees, -so the tree height in the common cases will be prio_tree_root->index_bits. - -It is fair to mention here that the prio_tree_root->index_bits -is increased on demand, however, the index_bits is not decreased when -vmas are removed from the prio_tree. That's tricky to do. Hence, it's -left as a home work problem. - - diff --git a/trunk/Documentation/pwm.txt b/trunk/Documentation/pwm.txt index 554290ebab94..7d2b4c9b544b 100644 --- a/trunk/Documentation/pwm.txt +++ b/trunk/Documentation/pwm.txt @@ -36,7 +36,8 @@ Legacy users can request a PWM device using pwm_request() and free it after usage with pwm_free(). New users should use the pwm_get() function and pass to it the consumer -device or a consumer name. pwm_put() is used to free the PWM device. +device or a consumer name. pwm_put() is used to free the PWM device. Managed +variants of these functions, devm_pwm_get() and devm_pwm_put(), also exist. After being requested a PWM has to be configured using: diff --git a/trunk/Documentation/rbtree.txt b/trunk/Documentation/rbtree.txt index 8d32d85a5234..61b6c48871a0 100644 --- a/trunk/Documentation/rbtree.txt +++ b/trunk/Documentation/rbtree.txt @@ -193,24 +193,55 @@ Example: Support for Augmented rbtrees ----------------------------- -Augmented rbtree is an rbtree with "some" additional data stored in each node. -This data can be used to augment some new functionality to rbtree. -Augmented rbtree is an optional feature built on top of basic rbtree -infrastructure. An rbtree user who wants this feature will have to call the -augmentation functions with the user provided augmentation callback -when inserting and erasing nodes. - -On insertion, the user must call rb_augment_insert() once the new node is in -place. This will cause the augmentation function callback to be called for -each node between the new node and the root which has been affected by the -insertion. - -When erasing a node, the user must call rb_augment_erase_begin() first to -retrieve the deepest node on the rebalance path. Then, after erasing the -original node, the user must call rb_augment_erase_end() with the deepest -node found earlier. This will cause the augmentation function to be called -for each affected node between the deepest node and the root. - +Augmented rbtree is an rbtree with "some" additional data stored in +each node, where the additional data for node N must be a function of +the contents of all nodes in the subtree rooted at N. This data can +be used to augment some new functionality to rbtree. Augmented rbtree +is an optional feature built on top of basic rbtree infrastructure. +An rbtree user who wants this feature will have to call the augmentation +functions with the user provided augmentation callback when inserting +and erasing nodes. + +C files implementing augmented rbtree manipulation must include + instead of . Note that +linux/rbtree_augmented.h exposes some rbtree implementations details +you are not expected to rely on; please stick to the documented APIs +there and do not include from header files +either so as to minimize chances of your users accidentally relying on +such implementation details. + +On insertion, the user must update the augmented information on the path +leading to the inserted node, then call rb_link_node() as usual and +rb_augment_inserted() instead of the usual rb_insert_color() call. +If rb_augment_inserted() rebalances the rbtree, it will callback into +a user provided function to update the augmented information on the +affected subtrees. + +When erasing a node, the user must call rb_erase_augmented() instead of +rb_erase(). rb_erase_augmented() calls back into user provided functions +to updated the augmented information on affected subtrees. + +In both cases, the callbacks are provided through struct rb_augment_callbacks. +3 callbacks must be defined: + +- A propagation callback, which updates the augmented value for a given + node and its ancestors, up to a given stop point (or NULL to update + all the way to the root). + +- A copy callback, which copies the augmented value for a given subtree + to a newly assigned subtree root. + +- A tree rotation callback, which copies the augmented value for a given + subtree to a newly assigned subtree root AND recomputes the augmented + information for the former subtree root. + +The compiled code for rb_erase_augmented() may inline the propagation and +copy callbacks, which results in a large function, so each augmented rbtree +user should have a single rb_erase_augmented() call site in order to limit +compiled code size. + + +Sample usage: Interval tree is an example of augmented rb tree. Reference - "Introduction to Algorithms" by Cormen, Leiserson, Rivest and Stein. @@ -230,26 +261,132 @@ and its immediate children. And this will be used in O(log n) lookup for lowest match (lowest start address among all possible matches) with something like: -find_lowest_match(lo, hi, node) +struct interval_tree_node * +interval_tree_first_match(struct rb_root *root, + unsigned long start, unsigned long last) { - lowest_match = NULL; - while (node) { - if (max_hi(node->left) > lo) { - // Lowest overlap if any must be on left side - node = node->left; - } else if (overlap(lo, hi, node)) { - lowest_match = node; - break; - } else if (lo > node->lo) { - // Lowest overlap if any must be on right side - node = node->right; - } else { - break; + struct interval_tree_node *node; + + if (!root->rb_node) + return NULL; + node = rb_entry(root->rb_node, struct interval_tree_node, rb); + + while (true) { + if (node->rb.rb_left) { + struct interval_tree_node *left = + rb_entry(node->rb.rb_left, + struct interval_tree_node, rb); + if (left->__subtree_last >= start) { + /* + * Some nodes in left subtree satisfy Cond2. + * Iterate to find the leftmost such node N. + * If it also satisfies Cond1, that's the match + * we are looking for. Otherwise, there is no + * matching interval as nodes to the right of N + * can't satisfy Cond1 either. + */ + node = left; + continue; + } } + if (node->start <= last) { /* Cond1 */ + if (node->last >= start) /* Cond2 */ + return node; /* node is leftmost match */ + if (node->rb.rb_right) { + node = rb_entry(node->rb.rb_right, + struct interval_tree_node, rb); + if (node->__subtree_last >= start) + continue; + } + } + return NULL; /* No match */ + } +} + +Insertion/removal are defined using the following augmented callbacks: + +static inline unsigned long +compute_subtree_last(struct interval_tree_node *node) +{ + unsigned long max = node->last, subtree_last; + if (node->rb.rb_left) { + subtree_last = rb_entry(node->rb.rb_left, + struct interval_tree_node, rb)->__subtree_last; + if (max < subtree_last) + max = subtree_last; + } + if (node->rb.rb_right) { + subtree_last = rb_entry(node->rb.rb_right, + struct interval_tree_node, rb)->__subtree_last; + if (max < subtree_last) + max = subtree_last; + } + return max; +} + +static void augment_propagate(struct rb_node *rb, struct rb_node *stop) +{ + while (rb != stop) { + struct interval_tree_node *node = + rb_entry(rb, struct interval_tree_node, rb); + unsigned long subtree_last = compute_subtree_last(node); + if (node->__subtree_last == subtree_last) + break; + node->__subtree_last = subtree_last; + rb = rb_parent(&node->rb); } - return lowest_match; } -Finding exact match will be to first find lowest match and then to follow -successor nodes looking for exact match, until the start of a node is beyond -the hi value we are looking for. +static void augment_copy(struct rb_node *rb_old, struct rb_node *rb_new) +{ + struct interval_tree_node *old = + rb_entry(rb_old, struct interval_tree_node, rb); + struct interval_tree_node *new = + rb_entry(rb_new, struct interval_tree_node, rb); + + new->__subtree_last = old->__subtree_last; +} + +static void augment_rotate(struct rb_node *rb_old, struct rb_node *rb_new) +{ + struct interval_tree_node *old = + rb_entry(rb_old, struct interval_tree_node, rb); + struct interval_tree_node *new = + rb_entry(rb_new, struct interval_tree_node, rb); + + new->__subtree_last = old->__subtree_last; + old->__subtree_last = compute_subtree_last(old); +} + +static const struct rb_augment_callbacks augment_callbacks = { + augment_propagate, augment_copy, augment_rotate +}; + +void interval_tree_insert(struct interval_tree_node *node, + struct rb_root *root) +{ + struct rb_node **link = &root->rb_node, *rb_parent = NULL; + unsigned long start = node->start, last = node->last; + struct interval_tree_node *parent; + + while (*link) { + rb_parent = *link; + parent = rb_entry(rb_parent, struct interval_tree_node, rb); + if (parent->__subtree_last < last) + parent->__subtree_last = last; + if (start < parent->start) + link = &parent->rb.rb_left; + else + link = &parent->rb.rb_right; + } + + node->__subtree_last = last; + rb_link_node(&node->rb, rb_parent, link); + rb_insert_augmented(&node->rb, root, &augment_callbacks); +} + +void interval_tree_remove(struct interval_tree_node *node, + struct rb_root *root) +{ + rb_erase_augmented(&node->rb, root, &augment_callbacks); +} diff --git a/trunk/Documentation/scsi/ChangeLog.megaraid_sas b/trunk/Documentation/scsi/ChangeLog.megaraid_sas index 3a3079411a3d..da03146c182a 100644 --- a/trunk/Documentation/scsi/ChangeLog.megaraid_sas +++ b/trunk/Documentation/scsi/ChangeLog.megaraid_sas @@ -1,3 +1,16 @@ +Release Date : Mon. Oct 1, 2012 17:00:00 PST 2012 - + (emaild-id:megaraidlinux@lsi.com) + Adam Radford +Current Version : 06.504.01.00-rc1 +Old Version : 00.00.06.18-rc1 + 1. Removed un-needed completion_lock spinlock calls. + 2. Add module param for configurable MSI-X vector count. + 3. Load io_request DataLength in bytes. + 4. Add array boundary check for SystemPD. + 5. Add SystemPD FastPath support. + 6. Remove duplicate code. + 7. Version, Changelog, Copyright update. +------------------------------------------------------------------------------- Release Date : Tue. Jun 17, 2012 17:00:00 PST 2012 - (emaild-id:megaraidlinux@lsi.com) Adam Radford/Kashyap Desai diff --git a/trunk/Documentation/target/tcm_mod_builder.py b/trunk/Documentation/target/tcm_mod_builder.py index a78879b01f09..3fe0d812dcec 100755 --- a/trunk/Documentation/target/tcm_mod_builder.py +++ b/trunk/Documentation/target/tcm_mod_builder.py @@ -402,8 +402,6 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): buf += " .queue_data_in = " + fabric_mod_name + "_queue_data_in,\n" buf += " .queue_status = " + fabric_mod_name + "_queue_status,\n" buf += " .queue_tm_rsp = " + fabric_mod_name + "_queue_tm_rsp,\n" - buf += " .get_fabric_sense_len = " + fabric_mod_name + "_get_fabric_sense_len,\n" - buf += " .set_fabric_sense_len = " + fabric_mod_name + "_set_fabric_sense_len,\n" buf += " .is_state_remove = " + fabric_mod_name + "_is_state_remove,\n" buf += " /*\n" buf += " * Setup function pointers for generic logic in target_core_fabric_configfs.c\n" @@ -906,20 +904,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): buf += "}\n\n" bufi += "int " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *);\n" - if re.search('get_fabric_sense_len\)\(', fo): - buf += "u16 " + fabric_mod_name + "_get_fabric_sense_len(void)\n" - buf += "{\n" - buf += " return 0;\n" - buf += "}\n\n" - bufi += "u16 " + fabric_mod_name + "_get_fabric_sense_len(void);\n" - - if re.search('set_fabric_sense_len\)\(', fo): - buf += "u16 " + fabric_mod_name + "_set_fabric_sense_len(struct se_cmd *se_cmd, u32 sense_length)\n" - buf += "{\n" - buf += " return 0;\n" - buf += "}\n\n" - bufi += "u16 " + fabric_mod_name + "_set_fabric_sense_len(struct se_cmd *, u32);\n" - if re.search('is_state_remove\)\(', fo): buf += "int " + fabric_mod_name + "_is_state_remove(struct se_cmd *se_cmd)\n" buf += "{\n" diff --git a/trunk/Documentation/video4linux/v4l2-controls.txt b/trunk/Documentation/video4linux/v4l2-controls.txt index 54270df99d5c..cfe52c798d74 100644 --- a/trunk/Documentation/video4linux/v4l2-controls.txt +++ b/trunk/Documentation/video4linux/v4l2-controls.txt @@ -136,11 +136,25 @@ Or alternatively for integer menu controls, by calling v4l2_ctrl_new_int_menu: const struct v4l2_ctrl_ops *ops, u32 id, s32 max, s32 def, const s64 *qmenu_int); +Standard menu controls with a driver specific menu are added by calling +v4l2_ctrl_new_std_menu_items: + + struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items( + struct v4l2_ctrl_handler *hdl, + const struct v4l2_ctrl_ops *ops, u32 id, s32 max, + s32 skip_mask, s32 def, const char * const *qmenu); + These functions are typically called right after the v4l2_ctrl_handler_init: static const s64 exp_bias_qmenu[] = { -2, -1, 0, 1, 2 }; + static const char * const test_pattern[] = { + "Disabled", + "Vertical Bars", + "Solid Black", + "Solid White", + }; v4l2_ctrl_handler_init(&foo->ctrl_handler, nr_of_controls); v4l2_ctrl_new_std(&foo->ctrl_handler, &foo_ctrl_ops, @@ -156,6 +170,9 @@ These functions are typically called right after the v4l2_ctrl_handler_init: ARRAY_SIZE(exp_bias_qmenu) - 1, ARRAY_SIZE(exp_bias_qmenu) / 2 - 1, exp_bias_qmenu); + v4l2_ctrl_new_std_menu_items(&foo->ctrl_handler, &foo_ctrl_ops, + V4L2_CID_TEST_PATTERN, ARRAY_SIZE(test_pattern) - 1, 0, + 0, test_pattern); ... if (foo->ctrl_handler.error) { int err = foo->ctrl_handler.error; @@ -185,6 +202,13 @@ v4l2_ctrl_new_std_menu in that it doesn't have the mask argument and takes as the last argument an array of signed 64-bit integers that form an exact menu item list. +The v4l2_ctrl_new_std_menu_items function is very similar to +v4l2_ctrl_new_std_menu but takes an extra parameter qmenu, which is the driver +specific menu for an otherwise standard menu control. A good example for this +control is the test pattern control for capture/display/sensors devices that +have the capability to generate test patterns. These test patterns are hardware +specific, so the contents of the menu will vary from device to device. + Note that if something fails, the function will return NULL or an error and set ctrl_handler->error to the error code. If ctrl_handler->error was already set, then it will just return and do nothing. This is also true for diff --git a/trunk/Documentation/virtual/uml/UserModeLinux-HOWTO.txt b/trunk/Documentation/virtual/uml/UserModeLinux-HOWTO.txt index 77dfecf4e2d6..a5f8436753e7 100644 --- a/trunk/Documentation/virtual/uml/UserModeLinux-HOWTO.txt +++ b/trunk/Documentation/virtual/uml/UserModeLinux-HOWTO.txt @@ -3591,7 +3591,7 @@ Looking at the source shows that the fault happened during a call to - copy_to_user to copy the data into the kernel: + copy_from_user to copy the data into the kernel: 107 count -= chars; diff --git a/trunk/Documentation/vm/unevictable-lru.txt b/trunk/Documentation/vm/unevictable-lru.txt index fa206cccf89f..a68db7692ee8 100644 --- a/trunk/Documentation/vm/unevictable-lru.txt +++ b/trunk/Documentation/vm/unevictable-lru.txt @@ -197,12 +197,8 @@ the pages are also "rescued" from the unevictable list in the process of freeing them. page_evictable() also checks for mlocked pages by testing an additional page -flag, PG_mlocked (as wrapped by PageMlocked()). If the page is NOT mlocked, -and a non-NULL VMA is supplied, page_evictable() will check whether the VMA is -VM_LOCKED via is_mlocked_vma(). is_mlocked_vma() will SetPageMlocked() and -update the appropriate statistics if the vma is VM_LOCKED. This method allows -efficient "culling" of pages in the fault path that are being faulted in to -VM_LOCKED VMAs. +flag, PG_mlocked (as wrapped by PageMlocked()), which is set when a page is +faulted into a VM_LOCKED vma, or found in a vma being VM_LOCKED. VMSCAN'S HANDLING OF UNEVICTABLE PAGES @@ -371,8 +367,8 @@ mlock_fixup() filters several classes of "special" VMAs: mlock_fixup() will call make_pages_present() in the hugetlbfs VMA range to allocate the huge pages and populate the ptes. -3) VMAs with VM_DONTEXPAND or VM_RESERVED are generally userspace mappings of - kernel pages, such as the VDSO page, relay channel pages, etc. These pages +3) VMAs with VM_DONTEXPAND are generally userspace mappings of kernel pages, + such as the VDSO page, relay channel pages, etc. These pages are inherently unevictable and are not managed on the LRU lists. mlock_fixup() treats these VMAs the same as hugetlbfs VMAs. It calls make_pages_present() to populate the ptes. @@ -651,7 +647,7 @@ PAGE RECLAIM IN shrink_*_list() ------------------------------- shrink_active_list() culls any obviously unevictable pages - i.e. -!page_evictable(page, NULL) - diverting these to the unevictable list. +!page_evictable(page) - diverting these to the unevictable list. However, shrink_active_list() only sees unevictable pages that made it onto the active/inactive lru lists. Note that these pages do not have PageUnevictable set - otherwise they would be on the unevictable list and shrink_active_list diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index b4e5ecf8d3d2..e73060fe0788 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1544,7 +1544,7 @@ S: Supported F: drivers/rtc/rtc-bfin.c BLACKFIN SDH DRIVER -M: Cliff Cai +M: Sonic Zhang L: uclinux-dist-devel@blackfin.uclinux.org W: http://blackfin.uclinux.org S: Supported @@ -1958,10 +1958,10 @@ S: Supported F: drivers/platform/x86/classmate-laptop.c COCCINELLE/Semantic Patches (SmPL) -M: Julia Lawall +M: Julia Lawall M: Gilles Muller -M: Nicolas Palix -L: cocci@diku.dk (moderated for non-subscribers) +M: Nicolas Palix +L: cocci@systeme.lip6.fr (moderated for non-subscribers) W: http://coccinelle.lip6.fr/ S: Supported F: scripts/coccinelle/ @@ -2423,11 +2423,6 @@ S: Maintained F: Documentation/hwmon/dme1737 F: drivers/hwmon/dme1737.c -DOCBOOK FOR DOCUMENTATION -M: Randy Dunlap -S: Maintained -F: scripts/kernel-doc - DOCKING STATION DRIVER M: Shaohua Li L: linux-acpi@vger.kernel.org @@ -5207,8 +5202,10 @@ S: Maintained F: drivers/mmc/host/omap.c OMAP HS MMC SUPPORT +M: Venkatraman S +L: linux-mmc@vger.kernel.org L: linux-omap@vger.kernel.org -S: Orphan +S: Maintained F: drivers/mmc/host/omap_hsmmc.c OMAP RANDOM NUMBER GENERATOR SUPPORT @@ -7039,6 +7036,14 @@ S: Maintained F: Documentation/svga.txt F: arch/x86/boot/video* +SWIOTLB SUBSYSTEM +M: Konrad Rzeszutek Wilk +L: linux-kernel@vger.kernel.org +S: Supported +F: lib/swiotlb.c +F: arch/*/kernel/pci-swiotlb.c +F: include/linux/swiotlb.h + SYSV FILESYSTEM M: Christoph Hellwig S: Maintained @@ -7170,6 +7175,8 @@ F: drivers/char/tlclk.c TENSILICA XTENSA PORT (xtensa) M: Chris Zankel +M: Max Filippov +L: linux-xtensa@linux-xtensa.org S: Maintained F: arch/xtensa/ diff --git a/trunk/Makefile b/trunk/Makefile index 86eb6acb3978..5d8e7f258388 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -664,22 +664,9 @@ ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) endif # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments -# But warn user when we do so -warn-assign = \ -$(warning "WARNING: Appending $$K$(1) ($(K$(1))) from $(origin K$(1)) to kernel $$$(1)") - -ifneq ($(KCPPFLAGS),) - $(call warn-assign,CPPFLAGS) - KBUILD_CPPFLAGS += $(KCPPFLAGS) -endif -ifneq ($(KAFLAGS),) - $(call warn-assign,AFLAGS) - KBUILD_AFLAGS += $(KAFLAGS) -endif -ifneq ($(KCFLAGS),) - $(call warn-assign,CFLAGS) - KBUILD_CFLAGS += $(KCFLAGS) -endif +KBUILD_CPPFLAGS += $(KCPPFLAGS) +KBUILD_AFLAGS += $(KAFLAGS) +KBUILD_CFLAGS += $(KCFLAGS) # Use --build-id when available. LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\ diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig index a62965d057f6..a79a1ad8bb96 100644 --- a/trunk/arch/Kconfig +++ b/trunk/arch/Kconfig @@ -271,6 +271,12 @@ config ARCH_WANT_OLD_COMPAT_IPC select ARCH_WANT_COMPAT_IPC_PARSE_VERSION bool +config GENERIC_KERNEL_THREAD + bool + +config GENERIC_KERNEL_EXECVE + bool + config HAVE_ARCH_SECCOMP_FILTER bool help @@ -313,4 +319,7 @@ config HAVE_IRQ_TIME_ACCOUNTING Archs need to ensure they use a high enough resolution clock to support irq time accounting and then call enable_sched_clock_irqtime(). +config HAVE_ARCH_TRANSPARENT_HUGEPAGE + bool + source "kernel/gcov/Kconfig" diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig index 9944dedee5b1..7a08cfb80ee8 100644 --- a/trunk/arch/alpha/Kconfig +++ b/trunk/arch/alpha/Kconfig @@ -20,6 +20,8 @@ config ALPHA select GENERIC_CMOS_UPDATE select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER + select GENERIC_KERNEL_THREAD + select GENERIC_KERNEL_EXECVE help The Alpha is a 64-bit general-purpose processor designed and marketed by the Digital Equipment Corporation of blessed memory, diff --git a/trunk/arch/alpha/include/asm/Kbuild b/trunk/arch/alpha/include/asm/Kbuild index e423defed91e..64ffc9e9e548 100644 --- a/trunk/arch/alpha/include/asm/Kbuild +++ b/trunk/arch/alpha/include/asm/Kbuild @@ -1,5 +1,7 @@ include include/asm-generic/Kbuild.asm +generic-y += clkdev.h + header-y += compiler.h header-y += console.h header-y += fpu.h @@ -8,3 +10,4 @@ header-y += pal.h header-y += reg.h header-y += regdef.h header-y += sysinfo.h +generic-y += exec.h diff --git a/trunk/arch/alpha/include/asm/exec.h b/trunk/arch/alpha/include/asm/exec.h deleted file mode 100644 index 4a5a41f30779..000000000000 --- a/trunk/arch/alpha/include/asm/exec.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ALPHA_EXEC_H -#define __ALPHA_EXEC_H - -#define arch_align_stack(x) (x) - -#endif /* __ALPHA_EXEC_H */ diff --git a/trunk/arch/alpha/include/asm/processor.h b/trunk/arch/alpha/include/asm/processor.h index e37b887b3d9f..6cb7fe85c4b5 100644 --- a/trunk/arch/alpha/include/asm/processor.h +++ b/trunk/arch/alpha/include/asm/processor.h @@ -49,9 +49,6 @@ extern void start_thread(struct pt_regs *, unsigned long, unsigned long); /* Free all resources held by a thread. */ extern void release_thread(struct task_struct *); -/* Create a kernel thread without removing it from tasklists. */ -extern long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); - unsigned long get_wchan(struct task_struct *p); #define KSTK_EIP(tsk) (task_pt_regs(tsk)->pc) diff --git a/trunk/arch/alpha/include/asm/thread_info.h b/trunk/arch/alpha/include/asm/thread_info.h index 28335bd40e40..4554ecbff7c6 100644 --- a/trunk/arch/alpha/include/asm/thread_info.h +++ b/trunk/arch/alpha/include/asm/thread_info.h @@ -84,7 +84,6 @@ register struct thread_info *__current_thread_info __asm__("$8"); #define _TIF_SIGPENDING (1< non-restartable */ + cmovne $26, 0, $18 /* $18 = 0 => non-restartable */ ldq $0, SP_OFF($sp) and $0, 8, $0 beq $0, ret_to_kernel @@ -320,8 +320,8 @@ ret_to_user: sampling and the rti. */ lda $16, 7 call_pal PAL_swpipl - ldl $5, TI_FLAGS($8) - and $5, _TIF_WORK_MASK, $2 + ldl $17, TI_FLAGS($8) + and $17, _TIF_WORK_MASK, $2 bne $2, work_pending restore_all: RESTORE_ALL @@ -341,10 +341,10 @@ $syscall_error: * frame to indicate that a negative return value wasn't an * error number.. */ - ldq $19, 0($sp) /* old syscall nr (zero if success) */ - beq $19, $ret_success + ldq $18, 0($sp) /* old syscall nr (zero if success) */ + beq $18, $ret_success - ldq $20, 72($sp) /* .. and this a3 */ + ldq $19, 72($sp) /* .. and this a3 */ subq $31, $0, $0 /* with error in v0 */ addq $31, 1, $1 /* set a3 for errno return */ stq $0, 0($sp) @@ -362,51 +362,35 @@ $ret_success: * Do all cleanup when returning from all interrupts and system calls. * * Arguments: - * $5: TI_FLAGS. * $8: current. - * $19: The old syscall number, or zero if this is not a return + * $17: TI_FLAGS. + * $18: The old syscall number, or zero if this is not a return * from a syscall that errored and is possibly restartable. - * $20: The old a3 value + * $19: The old a3 value */ .align 4 .ent work_pending work_pending: - and $5, _TIF_NEED_RESCHED, $2 - beq $2, $work_notifysig + and $17, _TIF_NOTIFY_RESUME | _TIF_SIGPENDING, $2 + bne $2, $work_notifysig $work_resched: - subq $sp, 16, $sp - stq $19, 0($sp) /* save syscall nr */ - stq $20, 8($sp) /* and error indication (a3) */ + /* + * We can get here only if we returned from syscall without SIGPENDING + * or got through work_notifysig already. Either case means no syscall + * restarts for us, so let $18 and $19 burn. + */ jsr $26, schedule - ldq $19, 0($sp) - ldq $20, 8($sp) - addq $sp, 16, $sp - /* Make sure need_resched and sigpending don't change between - sampling and the rti. */ - lda $16, 7 - call_pal PAL_swpipl - ldl $5, TI_FLAGS($8) - and $5, _TIF_WORK_MASK, $2 - beq $2, restore_all - and $5, _TIF_NEED_RESCHED, $2 - bne $2, $work_resched + mov 0, $18 + br ret_to_user $work_notifysig: mov $sp, $16 bsr $1, do_switch_stack - mov $sp, $17 - mov $5, $18 - mov $19, $9 /* save old syscall number */ - mov $20, $10 /* save old a3 */ - and $5, _TIF_SIGPENDING, $2 - cmovne $2, 0, $9 /* we don't want double syscall restarts */ - jsr $26, do_notify_resume - mov $9, $19 - mov $10, $20 + jsr $26, do_work_pending bsr $1, undo_switch_stack - br ret_to_user + br restore_all .end work_pending /* @@ -418,11 +402,10 @@ $work_notifysig: strace: /* set up signal stack, call syscall_trace */ bsr $1, do_switch_stack - jsr $26, syscall_trace + jsr $26, syscall_trace_enter /* returns the syscall number */ bsr $1, undo_switch_stack - /* get the system call number and the arguments back.. */ - ldq $0, 0($sp) + /* get the arguments back.. */ ldq $16, SP_OFF+24($sp) ldq $17, SP_OFF+32($sp) ldq $18, SP_OFF+40($sp) @@ -449,15 +432,15 @@ $strace_success: stq $0, 0($sp) /* save return value */ bsr $1, do_switch_stack - jsr $26, syscall_trace + jsr $26, syscall_trace_leave bsr $1, undo_switch_stack br $31, ret_from_sys_call .align 3 $strace_error: - ldq $19, 0($sp) /* old syscall nr (zero if success) */ - beq $19, $strace_success - ldq $20, 72($sp) /* .. and this a3 */ + ldq $18, 0($sp) /* old syscall nr (zero if success) */ + beq $18, $strace_success + ldq $19, 72($sp) /* .. and this a3 */ subq $31, $0, $0 /* with error in v0 */ addq $31, 1, $1 /* set a3 for errno return */ @@ -465,11 +448,11 @@ $strace_error: stq $1, 72($sp) /* a3 for return */ bsr $1, do_switch_stack - mov $19, $9 /* save old syscall number */ - mov $20, $10 /* save old a3 */ - jsr $26, syscall_trace - mov $9, $19 - mov $10, $20 + mov $18, $9 /* save old syscall number */ + mov $19, $10 /* save old a3 */ + jsr $26, syscall_trace_leave + mov $9, $18 + mov $10, $19 bsr $1, undo_switch_stack mov $31, $26 /* tell "ret_from_sys_call" we can restart */ @@ -609,59 +592,20 @@ ret_from_fork: .end ret_from_fork /* - * kernel_thread(fn, arg, clone_flags) + * ... and new kernel threads - here */ .align 4 - .globl kernel_thread - .ent kernel_thread -kernel_thread: - /* We can be called from a module. */ - ldgp $gp, 0($27) - .prologue 1 - subq $sp, SP_OFF+6*8, $sp - br $1, 2f /* load start address */ - - /* We've now "returned" from a fake system call. */ - unop - blt $0, 1f /* error? */ - ldi $1, 0x3fff - beq $20, 1f /* parent or child? */ - - bic $sp, $1, $8 /* in child. */ - jsr $26, ($27) - ldgp $gp, 0($26) - mov $0, $16 - mov $31, $26 - jmp $31, sys_exit - -1: ret /* in parent. */ - - .align 4 -2: /* Fake a system call stack frame, as we can't do system calls - from kernel space. Note that we store FN and ARG as they - need to be set up in the child for the call. Also store $8 - and $26 for use in the parent. */ - stq $31, SP_OFF($sp) /* ps */ - stq $1, SP_OFF+8($sp) /* pc */ - stq $gp, SP_OFF+16($sp) /* gp */ - stq $16, 136($sp) /* $27; FN for child */ - stq $17, SP_OFF+24($sp) /* $16; ARG for child */ - stq $8, 64($sp) /* $8 */ - stq $26, 128($sp) /* $26 */ - /* Avoid the HAE being gratuitously wrong, to avoid restoring it. */ - ldq $2, alpha_mv+HAE_CACHE - stq $2, 152($sp) /* HAE */ - - /* Shuffle FLAGS to the front; add CLONE_VM. */ - ldi $1, CLONE_VM|CLONE_UNTRACED - or $18, $1, $16 - bsr $26, sys_clone - - /* We don't actually care for a3 success widgetry in the kernel. - Not for positive errno values. */ - stq $0, 0($sp) /* $0 */ - br ret_to_kernel -.end kernel_thread + .globl ret_from_kernel_thread + .ent ret_from_kernel_thread +ret_from_kernel_thread: + mov $17, $16 + jsr $26, schedule_tail + mov $9, $27 + mov $10, $16 + jsr $26, ($9) + mov $31, $19 /* to disable syscall restarts */ + br $31, ret_to_user +.end ret_from_kernel_thread /* @@ -722,7 +666,7 @@ sys_sigreturn: lda $sp, -SWITCH_STACK_SIZE($sp) jsr $26, do_sigreturn bne $9, 1f - jsr $26, syscall_trace + jsr $26, syscall_trace_leave 1: br $1, undo_switch_stack br ret_from_sys_call .end sys_sigreturn @@ -739,20 +683,11 @@ sys_rt_sigreturn: lda $sp, -SWITCH_STACK_SIZE($sp) jsr $26, do_rt_sigreturn bne $9, 1f - jsr $26, syscall_trace + jsr $26, syscall_trace_leave 1: br $1, undo_switch_stack br ret_from_sys_call .end sys_rt_sigreturn - .align 4 - .globl sys_execve - .ent sys_execve -sys_execve: - .prologue 0 - mov $sp, $19 - jmp $31, do_sys_execve -.end sys_execve - .align 4 .globl alpha_ni_syscall .ent alpha_ni_syscall diff --git a/trunk/arch/alpha/kernel/osf_sys.c b/trunk/arch/alpha/kernel/osf_sys.c index 63e77e3944ce..9eb090582cf1 100644 --- a/trunk/arch/alpha/kernel/osf_sys.c +++ b/trunk/arch/alpha/kernel/osf_sys.c @@ -449,7 +449,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags) { int retval; struct cdfs_args tmp; - char *devname; + struct filename *devname; retval = -EFAULT; if (copy_from_user(&tmp, args, sizeof(tmp))) @@ -458,7 +458,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags) retval = PTR_ERR(devname); if (IS_ERR(devname)) goto out; - retval = do_mount(devname, dirname, "ext2", flags, NULL); + retval = do_mount(devname->name, dirname, "ext2", flags, NULL); putname(devname); out: return retval; @@ -469,7 +469,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags) { int retval; struct cdfs_args tmp; - char *devname; + struct filename *devname; retval = -EFAULT; if (copy_from_user(&tmp, args, sizeof(tmp))) @@ -478,7 +478,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags) retval = PTR_ERR(devname); if (IS_ERR(devname)) goto out; - retval = do_mount(devname, dirname, "iso9660", flags, NULL); + retval = do_mount(devname->name, dirname, "iso9660", flags, NULL); putname(devname); out: return retval; @@ -499,7 +499,7 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path, int, flag, void __user *, data) { int retval; - char *name; + struct filename *name; name = getname(path); retval = PTR_ERR(name); @@ -507,13 +507,13 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path, goto out; switch (typenr) { case 1: - retval = osf_ufs_mount(name, data, flag); + retval = osf_ufs_mount(name->name, data, flag); break; case 6: - retval = osf_cdfs_mount(name, data, flag); + retval = osf_cdfs_mount(name->name, data, flag); break; case 9: - retval = osf_procfs_mount(name, data, flag); + retval = osf_procfs_mount(name->name, data, flag); break; default: retval = -EINVAL; diff --git a/trunk/arch/alpha/kernel/pci-sysfs.c b/trunk/arch/alpha/kernel/pci-sysfs.c index 53649c7d0068..b51f7b4818cd 100644 --- a/trunk/arch/alpha/kernel/pci-sysfs.c +++ b/trunk/arch/alpha/kernel/pci-sysfs.c @@ -26,7 +26,7 @@ static int hose_mmap_page_range(struct pci_controller *hose, base = sparse ? hose->sparse_io_base : hose->dense_io_base; vma->vm_pgoff += base >> PAGE_SHIFT; - vma->vm_flags |= (VM_IO | VM_RESERVED); + vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; return io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, vma->vm_end - vma->vm_start, diff --git a/trunk/arch/alpha/kernel/process.c b/trunk/arch/alpha/kernel/process.c index 83638aa096d5..4054e0ffe2b2 100644 --- a/trunk/arch/alpha/kernel/process.c +++ b/trunk/arch/alpha/kernel/process.c @@ -263,33 +263,35 @@ alpha_vfork(struct pt_regs *regs) /* * Copy an alpha thread.. - * - * Note the "stack_offset" stuff: when returning to kernel mode, we need - * to have some extra stack-space for the kernel stack that still exists - * after the "ret_from_fork". When returning to user mode, we only want - * the space needed by the syscall stack frame (ie "struct pt_regs"). - * Use the passed "regs" pointer to determine how much space we need - * for a kernel fork(). */ int copy_thread(unsigned long clone_flags, unsigned long usp, - unsigned long unused, + unsigned long arg, struct task_struct * p, struct pt_regs * regs) { extern void ret_from_fork(void); + extern void ret_from_kernel_thread(void); struct thread_info *childti = task_thread_info(p); - struct pt_regs * childregs; - struct switch_stack * childstack, *stack; - unsigned long stack_offset, settls; - - stack_offset = PAGE_SIZE - sizeof(struct pt_regs); - if (!(regs->ps & 8)) - stack_offset = (PAGE_SIZE-1) & (unsigned long) regs; - childregs = (struct pt_regs *) - (stack_offset + PAGE_SIZE + task_stack_page(p)); - + struct pt_regs *childregs = task_pt_regs(p); + struct switch_stack *childstack, *stack; + unsigned long settls; + + childstack = ((struct switch_stack *) childregs) - 1; + if (unlikely(!regs)) { + /* kernel thread */ + memset(childstack, 0, + sizeof(struct switch_stack) + sizeof(struct pt_regs)); + childstack->r26 = (unsigned long) ret_from_kernel_thread; + childstack->r9 = usp; /* function */ + childstack->r10 = arg; + childregs->hae = alpha_mv.hae_cache, + childti->pcb.usp = 0; + childti->pcb.ksp = (unsigned long) childstack; + childti->pcb.flags = 1; /* set FEN, clear everything else */ + return 0; + } *childregs = *regs; settls = regs->r20; childregs->r0 = 0; @@ -297,7 +299,6 @@ copy_thread(unsigned long clone_flags, unsigned long usp, childregs->r20 = 1; /* OSF/1 has some strange fork() semantics. */ regs->r20 = 0; stack = ((struct switch_stack *) regs) - 1; - childstack = ((struct switch_stack *) childregs) - 1; *childstack = *stack; childstack->r26 = (unsigned long) ret_from_fork; childti->pcb.usp = usp; @@ -385,27 +386,6 @@ dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task) } EXPORT_SYMBOL(dump_elf_task_fp); -/* - * sys_execve() executes a new program. - */ -asmlinkage int -do_sys_execve(const char __user *ufilename, - const char __user *const __user *argv, - const char __user *const __user *envp, struct pt_regs *regs) -{ - int error; - char *filename; - - filename = getname(ufilename); - error = PTR_ERR(filename); - if (IS_ERR(filename)) - goto out; - error = do_execve(filename, argv, envp, regs); - putname(filename); -out: - return error; -} - /* * Return saved PC of a blocked thread. This assumes the frame * pointer is the 6th saved long on the kernel stack and that the @@ -459,22 +439,3 @@ get_wchan(struct task_struct *p) } return pc; } - -int kernel_execve(const char *path, const char *const argv[], const char *const envp[]) -{ - /* Avoid the HAE being gratuitously wrong, which would cause us - to do the whole turn off interrupts thing and restore it. */ - struct pt_regs regs = {.hae = alpha_mv.hae_cache}; - int err = do_execve(path, argv, envp, ®s); - if (!err) { - struct pt_regs *p = current_pt_regs(); - /* copy regs to normal position and off to userland we go... */ - *p = regs; - __asm__ __volatile__ ( - "mov %0, $sp;" - "br $31, ret_from_sys_call" - : : "r"(p)); - } - return err; -} -EXPORT_SYMBOL(kernel_execve); diff --git a/trunk/arch/alpha/kernel/ptrace.c b/trunk/arch/alpha/kernel/ptrace.c index 54616f496aed..2a4a80ff4a20 100644 --- a/trunk/arch/alpha/kernel/ptrace.c +++ b/trunk/arch/alpha/kernel/ptrace.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -312,25 +313,18 @@ long arch_ptrace(struct task_struct *child, long request, return ret; } +asmlinkage unsigned long syscall_trace_enter(void) +{ + unsigned long ret = 0; + if (test_thread_flag(TIF_SYSCALL_TRACE) && + tracehook_report_syscall_entry(current_pt_regs())) + ret = -1UL; + return ret ?: current_pt_regs()->r0; +} + asmlinkage void -syscall_trace(void) +syscall_trace_leave(void) { - if (!test_thread_flag(TIF_SYSCALL_TRACE)) - return; - if (!(current->ptrace & PT_PTRACED)) - return; - /* The 0x80 provides a way for the tracing parent to distinguish - between a syscall stop and SIGTRAP delivery */ - ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) - ? 0x80 : 0)); - - /* - * This isn't the same as continuing with a signal, but it will do - * for normal use. strace only continues with a signal if the - * stopping signal is not SIGTRAP. -brl - */ - if (current->exit_code) { - send_sig(current->exit_code, current, 1); - current->exit_code = 0; - } + if (test_thread_flag(TIF_SYSCALL_TRACE)) + tracehook_report_syscall_exit(current_pt_regs(), 0); } diff --git a/trunk/arch/alpha/kernel/signal.c b/trunk/arch/alpha/kernel/signal.c index a8c97d42ec8e..32575f85507d 100644 --- a/trunk/arch/alpha/kernel/signal.c +++ b/trunk/arch/alpha/kernel/signal.c @@ -298,8 +298,9 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size) static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, - struct switch_stack *sw, unsigned long mask, unsigned long sp) + unsigned long mask, unsigned long sp) { + struct switch_stack *sw = (struct switch_stack *)regs - 1; long i, err = 0; err |= __put_user(on_sig_stack((unsigned long)sc), &sc->sc_onstack); @@ -354,7 +355,7 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set, - struct pt_regs *regs, struct switch_stack * sw) + struct pt_regs *regs) { unsigned long oldsp, r26, err = 0; struct sigframe __user *frame; @@ -364,7 +365,7 @@ setup_frame(int sig, struct k_sigaction *ka, sigset_t *set, if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) return -EFAULT; - err |= setup_sigcontext(&frame->sc, regs, sw, set->sig[0], oldsp); + err |= setup_sigcontext(&frame->sc, regs, set->sig[0], oldsp); if (err) return -EFAULT; @@ -401,7 +402,7 @@ setup_frame(int sig, struct k_sigaction *ka, sigset_t *set, static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, - sigset_t *set, struct pt_regs *regs, struct switch_stack * sw) + sigset_t *set, struct pt_regs *regs) { unsigned long oldsp, r26, err = 0; struct rt_sigframe __user *frame; @@ -420,7 +421,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp); err |= __put_user(sas_ss_flags(oldsp), &frame->uc.uc_stack.ss_flags); err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size); - err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, sw, + err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0], oldsp); err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); if (err) @@ -464,15 +465,15 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, */ static inline void handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info, - struct pt_regs * regs, struct switch_stack *sw) + struct pt_regs * regs) { sigset_t *oldset = sigmask_to_save(); int ret; if (ka->sa.sa_flags & SA_SIGINFO) - ret = setup_rt_frame(sig, ka, info, oldset, regs, sw); + ret = setup_rt_frame(sig, ka, info, oldset, regs); else - ret = setup_frame(sig, ka, oldset, regs, sw); + ret = setup_frame(sig, ka, oldset, regs); if (ret) { force_sigsegv(sig, current); @@ -519,8 +520,7 @@ syscall_restart(unsigned long r0, unsigned long r19, * all (if we get here from anything but a syscall return, it will be 0) */ static void -do_signal(struct pt_regs * regs, struct switch_stack * sw, - unsigned long r0, unsigned long r19) +do_signal(struct pt_regs *regs, unsigned long r0, unsigned long r19) { siginfo_t info; int signr; @@ -537,7 +537,7 @@ do_signal(struct pt_regs * regs, struct switch_stack * sw, /* Whee! Actually deliver the signal. */ if (r0) syscall_restart(r0, r19, regs, &ka); - handle_signal(signr, &ka, &info, regs, sw); + handle_signal(signr, &ka, &info, regs); if (single_stepping) ptrace_set_bpt(current); /* re-set bpt */ return; @@ -568,15 +568,23 @@ do_signal(struct pt_regs * regs, struct switch_stack * sw, } void -do_notify_resume(struct pt_regs *regs, struct switch_stack *sw, - unsigned long thread_info_flags, +do_work_pending(struct pt_regs *regs, unsigned long thread_flags, unsigned long r0, unsigned long r19) { - if (thread_info_flags & _TIF_SIGPENDING) - do_signal(regs, sw, r0, r19); - - if (thread_info_flags & _TIF_NOTIFY_RESUME) { - clear_thread_flag(TIF_NOTIFY_RESUME); - tracehook_notify_resume(regs); - } + do { + if (thread_flags & _TIF_NEED_RESCHED) { + schedule(); + } else { + local_irq_enable(); + if (thread_flags & _TIF_SIGPENDING) { + do_signal(regs, r0, r19); + r0 = 0; + } else { + clear_thread_flag(TIF_NOTIFY_RESUME); + tracehook_notify_resume(regs); + } + } + local_irq_disable(); + thread_flags = current_thread_info()->flags; + } while (thread_flags & _TIF_WORK_MASK); } diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 6d2f7f5c0036..431c3753145a 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -25,6 +25,7 @@ config ARM select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL) select ARCH_BINFMT_ELF_RANDOMIZE_PIE select HAVE_GENERIC_DMA_COHERENT + select HAVE_DEBUG_KMEMLEAK select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZO select HAVE_KERNEL_LZMA @@ -39,6 +40,7 @@ config ARM select HARDIRQS_SW_RESEND select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW + select HAVE_UID16 select ARCH_WANT_IPC_PARSE_VERSION select HARDIRQS_SW_RESEND select CPU_PM if (SUSPEND || CPU_IDLE) @@ -50,6 +52,8 @@ config ARM select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN + select GENERIC_KERNEL_THREAD + select GENERIC_KERNEL_EXECVE help The ARM series is a line of low-power-consumption RISC chip designs licensed by ARM Ltd and targeted at embedded applications and @@ -491,7 +495,6 @@ config ARCH_IOP32X depends on MMU select CPU_XSCALE select NEED_MACH_GPIO_H - select NEED_MACH_IO_H select NEED_RET_TO_USER select PLAT_IOP select PCI @@ -505,7 +508,6 @@ config ARCH_IOP33X depends on MMU select CPU_XSCALE select NEED_MACH_GPIO_H - select NEED_MACH_IO_H select NEED_RET_TO_USER select PLAT_IOP select PCI @@ -1769,6 +1771,7 @@ source "mm/Kconfig" config FORCE_MAX_ZONEORDER int "Maximum zone order" if ARCH_SHMOBILE range 11 64 if ARCH_SHMOBILE + default "12" if SOC_AM33XX default "9" if SA1111 default "11" help diff --git a/trunk/arch/arm/boot/compressed/.gitignore b/trunk/arch/arm/boot/compressed/.gitignore index d0d441c429ae..f79a08efe000 100644 --- a/trunk/arch/arm/boot/compressed/.gitignore +++ b/trunk/arch/arm/boot/compressed/.gitignore @@ -1,6 +1,7 @@ ashldi3.S font.c lib1funcs.S +hyp-stub.S piggy.gzip piggy.lzo piggy.lzma diff --git a/trunk/arch/arm/boot/compressed/Makefile b/trunk/arch/arm/boot/compressed/Makefile index bb267562e7ed..a517153a13ea 100644 --- a/trunk/arch/arm/boot/compressed/Makefile +++ b/trunk/arch/arm/boot/compressed/Makefile @@ -30,6 +30,10 @@ FONTC = $(srctree)/drivers/video/console/font_acorn_8x8.c OBJS += string.o CFLAGS_string.o := -Os +ifeq ($(CONFIG_ARM_VIRT_EXT),y) +OBJS += hyp-stub.o +endif + # # Architecture dependencies # @@ -126,7 +130,7 @@ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) endif ccflags-y := -fpic -fno-builtin -I$(obj) -asflags-y := -Wa,-march=all +asflags-y := -Wa,-march=all -DZIMAGE # Supply kernel BSS size to the decompressor via a linker symbol. KBSS_SZ = $(shell $(CROSS_COMPILE)size $(obj)/../../../../vmlinux | \ @@ -198,3 +202,6 @@ $(obj)/font.c: $(FONTC) $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile $(KCONFIG_CONFIG) @sed "$(SEDFLAGS)" < $< > $@ + +$(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S + $(call cmd,shipped) diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index bc67cbff3944..90275f036cd1 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/arch/arm/boot/compressed/head.S @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ #include +#include /* * Debugging stuff @@ -132,7 +133,12 @@ start: .word start @ absolute load/run zImage address .word _edata @ zImage end address THUMB( .thumb ) -1: mov r7, r1 @ save architecture ID +1: + mrs r9, cpsr +#ifdef CONFIG_ARM_VIRT_EXT + bl __hyp_stub_install @ get into SVC mode, reversibly +#endif + mov r7, r1 @ save architecture ID mov r8, r2 @ save atags pointer #ifndef __ARM_ARCH_2__ @@ -148,9 +154,9 @@ start: ARM( swi 0x123456 ) @ angel_SWI_ARM THUMB( svc 0xab ) @ angel_SWI_THUMB not_angel: - mrs r2, cpsr @ turn off interrupts to - orr r2, r2, #0xc0 @ prevent angel from running - msr cpsr_c, r2 + safe_svcmode_maskall r0 + msr spsr_cxsf, r9 @ Save the CPU boot mode in + @ SPSR #else teqp pc, #0x0c000003 @ turn off interrupts #endif @@ -350,6 +356,20 @@ dtb_check_done: adr r5, restart bic r5, r5, #31 +/* Relocate the hyp vector base if necessary */ +#ifdef CONFIG_ARM_VIRT_EXT + mrs r0, spsr + and r0, r0, #MODE_MASK + cmp r0, #HYP_MODE + bne 1f + + bl __hyp_get_vectors + sub r0, r0, r5 + add r0, r0, r10 + bl __hyp_set_vectors +1: +#endif + sub r9, r6, r5 @ size to copy add r9, r9, #31 @ rounded up to a multiple bic r9, r9, #31 @ ... of 32 bytes @@ -458,11 +478,29 @@ not_relocated: mov r0, #0 bl decompress_kernel bl cache_clean_flush bl cache_off - mov r0, #0 @ must be zero mov r1, r7 @ restore architecture number mov r2, r8 @ restore atags pointer - ARM( mov pc, r4 ) @ call kernel - THUMB( bx r4 ) @ entry point is always ARM + +#ifdef CONFIG_ARM_VIRT_EXT + mrs r0, spsr @ Get saved CPU boot mode + and r0, r0, #MODE_MASK + cmp r0, #HYP_MODE @ if not booted in HYP mode... + bne __enter_kernel @ boot kernel directly + + adr r12, .L__hyp_reentry_vectors_offset + ldr r0, [r12] + add r0, r0, r12 + + bl __hyp_set_vectors + __HVC(0) @ otherwise bounce to hyp mode + + b . @ should never be reached + + .align 2 +.L__hyp_reentry_vectors_offset: .long __hyp_reentry_vectors - . +#else + b __enter_kernel +#endif .align 2 .type LC0, #object @@ -1196,6 +1234,25 @@ memdump: mov r12, r0 #endif .ltorg + +#ifdef CONFIG_ARM_VIRT_EXT +.align 5 +__hyp_reentry_vectors: + W(b) . @ reset + W(b) . @ undef + W(b) . @ svc + W(b) . @ pabort + W(b) . @ dabort + W(b) __enter_kernel @ hyp + W(b) . @ irq + W(b) . @ fiq +#endif /* CONFIG_ARM_VIRT_EXT */ + +__enter_kernel: + mov r0, #0 @ must be 0 + ARM( mov pc, r4 ) @ call kernel + THUMB( bx r4 ) @ entry point is always ARM + reloc_code_end: .align diff --git a/trunk/arch/arm/boot/dts/Makefile b/trunk/arch/arm/boot/dts/Makefile index 29f541f0e653..c1ce813fcc4a 100644 --- a/trunk/arch/arm/boot/dts/Makefile +++ b/trunk/arch/arm/boot/dts/Makefile @@ -25,14 +25,6 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ exynos4210-trats.dtb \ exynos5250-smdk5250.dtb dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb -dtb-$(CONFIG_ARCH_IMX5) += imx51-babbage.dtb \ - imx53-ard.dtb \ - imx53-evk.dtb \ - imx53-qsb.dtb \ - imx53-smd.dtb -dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \ - imx6q-sabrelite.dtb \ - imx6q-sabresd.dtb dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ kirkwood-dns325.dtb \ @@ -76,7 +68,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap4-pandaES.dtb \ omap4-var_som.dtb \ omap4-sdp.dtb \ - omap5-evm.dtb + omap5-evm.dtb \ + am335x-evm.dtb \ + am335x-bone.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb dtb-$(CONFIG_ARCH_U8500) += snowball.dtb dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ @@ -104,5 +98,8 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \ vexpress-v2p-ca15-tc1.dtb \ vexpress-v2p-ca15_a7.dtb \ xenvm-4.2.dtb +dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ + wm8505-ref.dtb \ + wm8650-mid.dtb endif diff --git a/trunk/arch/arm/boot/dts/at91sam9260.dtsi b/trunk/arch/arm/boot/dts/at91sam9260.dtsi index 7c95f76398de..d410581a5a85 100644 --- a/trunk/arch/arm/boot/dts/at91sam9260.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9260.dtsi @@ -28,6 +28,7 @@ gpio2 = &pioC; tcb0 = &tcb0; tcb1 = &tcb1; + i2c0 = &i2c0; }; cpus { cpu@0 { @@ -202,6 +203,15 @@ status = "disabled"; }; + i2c0: i2c@fffac000 { + compatible = "atmel,at91sam9260-i2c"; + reg = <0xfffac000 0x100>; + interrupts = <11 4 6>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + adc0: adc@fffe0000 { compatible = "atmel,at91sam9260-adc"; reg = <0xfffe0000 0x100>; diff --git a/trunk/arch/arm/boot/dts/at91sam9263.dtsi b/trunk/arch/arm/boot/dts/at91sam9263.dtsi index 195019b7ca0e..3e6e5c1abbf3 100644 --- a/trunk/arch/arm/boot/dts/at91sam9263.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9263.dtsi @@ -24,6 +24,7 @@ gpio3 = &pioD; gpio4 = &pioE; tcb0 = &tcb0; + i2c0 = &i2c0; }; cpus { cpu@0 { @@ -185,6 +186,15 @@ interrupts = <24 4 2>; status = "disabled"; }; + + i2c0: i2c@fff88000 { + compatible = "atmel,at91sam9263-i2c"; + reg = <0xfff88000 0x100>; + interrupts = <13 4 6>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; }; nand0: nand@40000000 { diff --git a/trunk/arch/arm/boot/dts/at91sam9g20.dtsi b/trunk/arch/arm/boot/dts/at91sam9g20.dtsi index 2a1d1ca8bd86..75ce6e760016 100644 --- a/trunk/arch/arm/boot/dts/at91sam9g20.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9g20.dtsi @@ -18,6 +18,10 @@ ahb { apb { + i2c0: i2c@fffac000 { + compatible = "atmel,at91sam9g20-i2c"; + }; + adc0: adc@fffe0000 { atmel,adc-startup-time = <40>; }; diff --git a/trunk/arch/arm/boot/dts/at91sam9g25ek.dts b/trunk/arch/arm/boot/dts/at91sam9g25ek.dts index 96514c134e54..877c08f06763 100644 --- a/trunk/arch/arm/boot/dts/at91sam9g25ek.dts +++ b/trunk/arch/arm/boot/dts/at91sam9g25ek.dts @@ -32,6 +32,18 @@ phy-mode = "rmii"; status = "okay"; }; + + i2c0: i2c@f8010000 { + status = "okay"; + }; + + i2c1: i2c@f8014000 { + status = "okay"; + }; + + i2c2: i2c@f8018000 { + status = "okay"; + }; }; usb0: ohci@00600000 { diff --git a/trunk/arch/arm/boot/dts/at91sam9g45.dtsi b/trunk/arch/arm/boot/dts/at91sam9g45.dtsi index 63751b1e744b..3add030d61f8 100644 --- a/trunk/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9g45.dtsi @@ -29,6 +29,8 @@ gpio4 = &pioE; tcb0 = &tcb0; tcb1 = &tcb1; + i2c0 = &i2c0; + i2c1 = &i2c1; }; cpus { cpu@0 { @@ -206,6 +208,24 @@ status = "disabled"; }; + i2c0: i2c@fff84000 { + compatible = "atmel,at91sam9g10-i2c"; + reg = <0xfff84000 0x100>; + interrupts = <12 4 6>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c1: i2c@fff88000 { + compatible = "atmel,at91sam9g10-i2c"; + reg = <0xfff88000 0x100>; + interrupts = <13 4 6>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + adc0: adc@fffb0000 { compatible = "atmel,at91sam9260-adc"; reg = <0xfffb0000 0x100>; diff --git a/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts b/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts index a3633bd13111..15e1dd43f625 100644 --- a/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/trunk/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -46,6 +46,14 @@ phy-mode = "rmii"; status = "okay"; }; + + i2c0: i2c@fff84000 { + status = "okay"; + }; + + i2c1: i2c@fff88000 { + status = "okay"; + }; }; nand0: nand@40000000 { diff --git a/trunk/arch/arm/boot/dts/at91sam9n12.dtsi b/trunk/arch/arm/boot/dts/at91sam9n12.dtsi index ef9336ae9614..82508d68aa7e 100644 --- a/trunk/arch/arm/boot/dts/at91sam9n12.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9n12.dtsi @@ -26,6 +26,8 @@ gpio3 = &pioD; tcb0 = &tcb0; tcb1 = &tcb1; + i2c0 = &i2c0; + i2c1 = &i2c1; }; cpus { cpu@0 { @@ -182,6 +184,24 @@ atmel,use-dma-tx; status = "disabled"; }; + + i2c0: i2c@f8010000 { + compatible = "atmel,at91sam9x5-i2c"; + reg = <0xf8010000 0x100>; + interrupts = <9 4 6>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c1: i2c@f8014000 { + compatible = "atmel,at91sam9x5-i2c"; + reg = <0xf8014000 0x100>; + interrupts = <10 4 6>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; }; nand0: nand@40000000 { diff --git a/trunk/arch/arm/boot/dts/at91sam9n12ek.dts b/trunk/arch/arm/boot/dts/at91sam9n12ek.dts index f4e43e38f3a1..912b2c283d6f 100644 --- a/trunk/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/trunk/arch/arm/boot/dts/at91sam9n12ek.dts @@ -37,6 +37,14 @@ dbgu: serial@fffff200 { status = "okay"; }; + + i2c0: i2c@f8010000 { + status = "okay"; + }; + + i2c1: i2c@f8014000 { + status = "okay"; + }; }; nand0: nand@40000000 { diff --git a/trunk/arch/arm/boot/dts/at91sam9x5.dtsi b/trunk/arch/arm/boot/dts/at91sam9x5.dtsi index 8a387a8d61b7..03fc136421c5 100644 --- a/trunk/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9x5.dtsi @@ -27,6 +27,9 @@ gpio3 = &pioD; tcb0 = &tcb0; tcb1 = &tcb1; + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; }; cpus { cpu@0 { @@ -196,6 +199,33 @@ status = "disabled"; }; + i2c0: i2c@f8010000 { + compatible = "atmel,at91sam9x5-i2c"; + reg = <0xf8010000 0x100>; + interrupts = <9 4 6>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c1: i2c@f8014000 { + compatible = "atmel,at91sam9x5-i2c"; + reg = <0xf8014000 0x100>; + interrupts = <10 4 6>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + i2c2: i2c@f8018000 { + compatible = "atmel,at91sam9x5-i2c"; + reg = <0xf8018000 0x100>; + interrupts = <11 4 6>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + adc0: adc@f804c000 { compatible = "atmel,at91sam9260-adc"; reg = <0xf804c000 0x100>; diff --git a/trunk/arch/arm/boot/dts/imx28.dtsi b/trunk/arch/arm/boot/dts/imx28.dtsi index 59fbfba23df8..e16d63155480 100644 --- a/trunk/arch/arm/boot/dts/imx28.dtsi +++ b/trunk/arch/arm/boot/dts/imx28.dtsi @@ -764,6 +764,7 @@ reg = <0x80058000 0x2000>; interrupts = <111 68>; clock-frequency = <100000>; + fsl,i2c-dma-channel = <6>; status = "disabled"; }; @@ -774,6 +775,7 @@ reg = <0x8005a000 0x2000>; interrupts = <110 69>; clock-frequency = <100000>; + fsl,i2c-dma-channel = <7>; status = "disabled"; }; diff --git a/trunk/arch/arm/boot/dts/imx51.dtsi b/trunk/arch/arm/boot/dts/imx51.dtsi index 2f71a91ca98e..75d069fcf897 100644 --- a/trunk/arch/arm/boot/dts/imx51.dtsi +++ b/trunk/arch/arm/boot/dts/imx51.dtsi @@ -407,6 +407,13 @@ status = "disabled"; }; + nand@83fdb000 { + compatible = "fsl,imx51-nand"; + reg = <0x83fdb000 0x1000 0xcfff0000 0x10000>; + interrupts = <8>; + status = "disabled"; + }; + ssi3: ssi@83fe8000 { compatible = "fsl,imx51-ssi", "fsl,imx21-ssi"; reg = <0x83fe8000 0x4000>; diff --git a/trunk/arch/arm/boot/dts/imx53.dtsi b/trunk/arch/arm/boot/dts/imx53.dtsi index 221cf3321b0a..76ebb1ad2675 100644 --- a/trunk/arch/arm/boot/dts/imx53.dtsi +++ b/trunk/arch/arm/boot/dts/imx53.dtsi @@ -518,6 +518,13 @@ status = "disabled"; }; + nand@63fdb000 { + compatible = "fsl,imx53-nand"; + reg = <0x63fdb000 0x1000 0xf7ff0000 0x10000>; + interrupts = <8>; + status = "disabled"; + }; + ssi3: ssi@63fe8000 { compatible = "fsl,imx53-ssi", "fsl,imx21-ssi"; reg = <0x63fe8000 0x4000>; diff --git a/trunk/arch/arm/boot/dts/omap4-panda.dts b/trunk/arch/arm/boot/dts/omap4-panda.dts index 20b966ee1bb3..e8f927cbb376 100644 --- a/trunk/arch/arm/boot/dts/omap4-panda.dts +++ b/trunk/arch/arm/boot/dts/omap4-panda.dts @@ -59,6 +59,41 @@ }; }; +&omap4_pmx_core { + pinctrl-names = "default"; + pinctrl-0 = < + &twl6040_pins + &mcpdm_pins + &mcbsp1_pins + >; + + twl6040_pins: pinmux_twl6040_pins { + pinctrl-single,pins = < + 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ + 0x160 0x100 /* sys_nirq2.sys_nirq2 INPUT | MODE0 */ + >; + }; + + mcpdm_pins: pinmux_mcpdm_pins { + pinctrl-single,pins = < + 0xc6 0x108 /* abe_pdm_ul_data.abe_pdm_ul_data INPUT PULLDOWN | MODE0 */ + 0xc8 0x108 /* abe_pdm_dl_data.abe_pdm_dl_data INPUT PULLDOWN | MODE0 */ + 0xca 0x118 /* abe_pdm_frame.abe_pdm_frame INPUT PULLUP | MODE0 */ + 0xcc 0x108 /* abe_pdm_lb_clk.abe_pdm_lb_clk INPUT PULLDOWN | MODE0 */ + 0xce 0x108 /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */ + >; + }; + + mcbsp1_pins: pinmux_mcbsp1_pins { + pinctrl-single,pins = < + 0xbe 0x100 /* abe_mcbsp1_clkx.abe_mcbsp1_clkx INPUT | MODE0 */ + 0xc0 0x108 /* abe_mcbsp1_dr.abe_mcbsp1_dr INPUT PULLDOWN | MODE0 */ + 0xc2 0x8 /* abe_mcbsp1_dx.abe_mcbsp1_dx OUTPUT PULLDOWN | MODE0 */ + 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */ + >; + }; +}; + &i2c1 { clock-frequency = <400000>; @@ -137,3 +172,15 @@ cs1-used; device-handle = <&elpida_ECB240ABACN>; }; + +&mcbsp2 { + status = "disabled"; +}; + +&mcbsp3 { + status = "disabled"; +}; + +&dmic { + status = "disabled"; +}; diff --git a/trunk/arch/arm/boot/dts/omap4-sdp.dts b/trunk/arch/arm/boot/dts/omap4-sdp.dts index 94a23b39033d..5b7e04fbff50 100644 --- a/trunk/arch/arm/boot/dts/omap4-sdp.dts +++ b/trunk/arch/arm/boot/dts/omap4-sdp.dts @@ -117,6 +117,15 @@ }; &omap4_pmx_core { + pinctrl-names = "default"; + pinctrl-0 = < + &twl6040_pins + &mcpdm_pins + &dmic_pins + &mcbsp1_pins + &mcbsp2_pins + >; + uart2_pins: pinmux_uart2_pins { pinctrl-single,pins = < 0xd8 0x118 /* uart2_cts.uart2_cts INPUT_PULLUP | MODE0 */ @@ -141,6 +150,50 @@ 0x11e 0 /* uart4_tx.uart4_tx OUTPUT | MODE0 */ >; }; + + twl6040_pins: pinmux_twl6040_pins { + pinctrl-single,pins = < + 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ + 0x160 0x100 /* sys_nirq2.sys_nirq2 INPUT | MODE0 */ + >; + }; + + mcpdm_pins: pinmux_mcpdm_pins { + pinctrl-single,pins = < + 0xc6 0x108 /* abe_pdm_ul_data.abe_pdm_ul_data INPUT PULLDOWN | MODE0 */ + 0xc8 0x108 /* abe_pdm_dl_data.abe_pdm_dl_data INPUT PULLDOWN | MODE0 */ + 0xca 0x118 /* abe_pdm_frame.abe_pdm_frame INPUT PULLUP | MODE0 */ + 0xcc 0x108 /* abe_pdm_lb_clk.abe_pdm_lb_clk INPUT PULLDOWN | MODE0 */ + 0xce 0x108 /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */ + >; + }; + + dmic_pins: pinmux_dmic_pins { + pinctrl-single,pins = < + 0xd0 0 /* abe_dmic_clk1.abe_dmic_clk1 OUTPUT | MODE0 */ + 0xd2 0x100 /* abe_dmic_din1.abe_dmic_din1 INPUT | MODE0 */ + 0xd4 0x100 /* abe_dmic_din2.abe_dmic_din2 INPUT | MODE0 */ + 0xd6 0x100 /* abe_dmic_din3.abe_dmic_din3 INPUT | MODE0 */ + >; + }; + + mcbsp1_pins: pinmux_mcbsp1_pins { + pinctrl-single,pins = < + 0xbe 0x100 /* abe_mcbsp1_clkx.abe_mcbsp1_clkx INPUT | MODE0 */ + 0xc0 0x108 /* abe_mcbsp1_dr.abe_mcbsp1_dr INPUT PULLDOWN | MODE0 */ + 0xc2 0x8 /* abe_mcbsp1_dx.abe_mcbsp1_dx OUTPUT PULLDOWN | MODE0 */ + 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */ + >; + }; + + mcbsp2_pins: pinmux_mcbsp2_pins { + pinctrl-single,pins = < + 0xb6 0x100 /* abe_mcbsp2_clkx.abe_mcbsp2_clkx INPUT | MODE0 */ + 0xb8 0x108 /* abe_mcbsp2_dr.abe_mcbsp2_dr INPUT PULLDOWN | MODE0 */ + 0xba 0x8 /* abe_mcbsp2_dx.abe_mcbsp2_dx OUTPUT PULLDOWN | MODE0 */ + 0xbc 0x100 /* abe_mcbsp2_fsx.abe_mcbsp2_fsx INPUT | MODE0 */ + >; + }; }; &i2c1 { @@ -349,3 +402,7 @@ pinctrl-names = "default"; pinctrl-0 = <&uart4_pins>; }; + +&mcbsp3 { + status = "disabled"; +}; diff --git a/trunk/arch/arm/boot/dts/omap5-evm.dts b/trunk/arch/arm/boot/dts/omap5-evm.dts index 9c41a3f311aa..c663eba73168 100644 --- a/trunk/arch/arm/boot/dts/omap5-evm.dts +++ b/trunk/arch/arm/boot/dts/omap5-evm.dts @@ -27,6 +27,60 @@ }; +&omap5_pmx_core { + pinctrl-names = "default"; + pinctrl-0 = < + &twl6040_pins + &mcpdm_pins + &dmic_pins + &mcbsp1_pins + &mcbsp2_pins + >; + + twl6040_pins: pinmux_twl6040_pins { + pinctrl-single,pins = < + 0x18a 0x6 /* perslimbus2_clock.gpio5_145 OUTPUT | MODE6 */ + >; + }; + + mcpdm_pins: pinmux_mcpdm_pins { + pinctrl-single,pins = < + 0x142 0x108 /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */ + 0x15c 0x108 /* abemcpdm_ul_data.abemcpdm_ul_data INPUT PULLDOWN | MODE0 */ + 0x15e 0x108 /* abemcpdm_dl_data.abemcpdm_dl_data INPUT PULLDOWN | MODE0 */ + 0x160 0x118 /* abemcpdm_frame.abemcpdm_frame INPUT PULLUP | MODE0 */ + 0x162 0x108 /* abemcpdm_lb_clk.abemcpdm_lb_clk INPUT PULLDOWN | MODE0 */ + >; + }; + + dmic_pins: pinmux_dmic_pins { + pinctrl-single,pins = < + 0x144 0x100 /* abedmic_din1.abedmic_din1 INPUT | MODE0 */ + 0x146 0x100 /* abedmic_din2.abedmic_din2 INPUT | MODE0 */ + 0x148 0x100 /* abedmic_din3.abedmic_din3 INPUT | MODE0 */ + 0x14a 0 /* abedmic_clk1.abedmic_clk1 OUTPUT | MODE0 */ + >; + }; + + mcbsp1_pins: pinmux_mcbsp1_pins { + pinctrl-single,pins = < + 0x14c 0x101 /* abedmic_clk2.abemcbsp1_fsx INPUT | MODE1 */ + 0x14e 0x9 /* abedmic_clk3.abemcbsp1_dx OUTPUT PULLDOWN | MODE1 */ + 0x150 0x101 /* abeslimbus1_clock.abemcbsp1_clkx INPUT | MODE0 */ + 0x152 0x109 /* abeslimbus1_data.abemcbsp1_dr INPUT PULLDOWN | MODE1 */ + >; + }; + + mcbsp2_pins: pinmux_mcbsp2_pins { + pinctrl-single,pins = < + 0x154 0x108 /* abemcbsp2_dr.abemcbsp2_dr INPUT PULLDOWN | MODE0 */ + 0x156 0x8 /* abemcbsp2_dx.abemcbsp2_dx OUTPUT PULLDOWN | MODE0 */ + 0x158 0x100 /* abemcbsp2_fsx.abemcbsp2_fsx INPUT | MODE0 */ + 0x15a 0x100 /* abemcbsp2_clkx.abemcbsp2_clkx INPUT | MODE0 */ + >; + }; +}; + &mmc1 { vmmc-supply = <&vmmcsd_fixed>; bus-width = <4>; @@ -82,3 +136,7 @@ 0x020700d9>; /* SEARCH */ linux,input-no-autorepeat; }; + +&mcbsp3 { + status = "disabled"; +}; diff --git a/trunk/arch/arm/boot/dts/omap5.dtsi b/trunk/arch/arm/boot/dts/omap5.dtsi index 5db33f481a33..42c78beb4fdc 100644 --- a/trunk/arch/arm/boot/dts/omap5.dtsi +++ b/trunk/arch/arm/boot/dts/omap5.dtsi @@ -77,6 +77,23 @@ ranges; ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3"; + omap5_pmx_core: pinmux@4a002840 { + compatible = "ti,omap4-padconf", "pinctrl-single"; + reg = <0x4a002840 0x01b6>; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-single,register-width = <16>; + pinctrl-single,function-mask = <0x7fff>; + }; + omap5_pmx_wkup: pinmux@4ae0c840 { + compatible = "ti,omap4-padconf", "pinctrl-single"; + reg = <0x4ae0c840 0x0038>; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-single,register-width = <16>; + pinctrl-single,function-mask = <0x7fff>; + }; + gic: interrupt-controller@48211000 { compatible = "arm,cortex-a15-gic"; interrupt-controller; diff --git a/trunk/arch/arm/boot/dts/spear300-evb.dts b/trunk/arch/arm/boot/dts/spear300-evb.dts index d71b8d581e3d..1e7c7a8e2123 100644 --- a/trunk/arch/arm/boot/dts/spear300-evb.dts +++ b/trunk/arch/arm/boot/dts/spear300-evb.dts @@ -80,8 +80,7 @@ }; sdhci@70000000 { - int-gpio = <&gpio1 0 0>; - power-gpio = <&gpio1 2 1>; + cd-gpios = <&gpio1 0 0>; status = "okay"; }; diff --git a/trunk/arch/arm/boot/dts/spear320-evb.dts b/trunk/arch/arm/boot/dts/spear320-evb.dts index e4e912f95024..082328bd64ab 100644 --- a/trunk/arch/arm/boot/dts/spear320-evb.dts +++ b/trunk/arch/arm/boot/dts/spear320-evb.dts @@ -103,8 +103,6 @@ }; sdhci@70000000 { - power-gpio = <&gpio0 2 1>; - power_always_enb; status = "okay"; }; diff --git a/trunk/arch/arm/boot/dts/tegra20-seaboard.dts b/trunk/arch/arm/boot/dts/tegra20-seaboard.dts index e60dc7124e92..f0ba901676ac 100644 --- a/trunk/arch/arm/boot/dts/tegra20-seaboard.dts +++ b/trunk/arch/arm/boot/dts/tegra20-seaboard.dts @@ -539,7 +539,7 @@ nvidia,invert-interrupt; }; - memory-controller@0x7000f400 { + memory-controller@7000f400 { emc-table@190000 { reg = <190000>; compatible = "nvidia,tegra20-emc-table"; diff --git a/trunk/arch/arm/boot/dts/tegra20.dtsi b/trunk/arch/arm/boot/dts/tegra20.dtsi index 67a6cd910b96..f3a09d0d45bc 100644 --- a/trunk/arch/arm/boot/dts/tegra20.dtsi +++ b/trunk/arch/arm/boot/dts/tegra20.dtsi @@ -170,7 +170,7 @@ reg = <0x7000e400 0x400>; }; - memory-controller@0x7000f000 { + memory-controller@7000f000 { compatible = "nvidia,tegra20-mc"; reg = <0x7000f000 0x024 0x7000f03c 0x3c4>; @@ -183,7 +183,7 @@ 0x58000000 0x02000000>; /* GART aperture */ }; - memory-controller@0x7000f400 { + memory-controller@7000f400 { compatible = "nvidia,tegra20-emc"; reg = <0x7000f400 0x200>; #address-cells = <1>; diff --git a/trunk/arch/arm/common/it8152.c b/trunk/arch/arm/common/it8152.c index c4110d1b1f2d..001f4913799c 100644 --- a/trunk/arch/arm/common/it8152.c +++ b/trunk/arch/arm/common/it8152.c @@ -284,11 +284,17 @@ int dma_set_coherent_mask(struct device *dev, u64 mask) int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) { - it8152_io.start = IT8152_IO_BASE + 0x12000; - it8152_io.end = IT8152_IO_BASE + 0x12000 + 0x100000; + /* + * FIXME: use pci_ioremap_io to remap the IO space here and + * move over to the generic io.h implementation. + * This requires solving the same problem for PXA PCMCIA + * support. + */ + it8152_io.start = (unsigned long)IT8152_IO_BASE + 0x12000; + it8152_io.end = (unsigned long)IT8152_IO_BASE + 0x12000 + 0x100000; sys->mem_offset = 0x10000000; - sys->io_offset = IT8152_IO_BASE; + sys->io_offset = (unsigned long)IT8152_IO_BASE; if (request_resource(&ioport_resource, &it8152_io)) { printk(KERN_ERR "PCI: unable to allocate IO region\n"); diff --git a/trunk/arch/arm/configs/cam60_defconfig b/trunk/arch/arm/configs/cam60_defconfig index cedc92ef88ab..14579711d8fc 100644 --- a/trunk/arch/arm/configs/cam60_defconfig +++ b/trunk/arch/arm/configs/cam60_defconfig @@ -49,7 +49,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PLATRAM=m CONFIG_MTD_DATAFLASH=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_ATMEL=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y diff --git a/trunk/arch/arm/configs/corgi_defconfig b/trunk/arch/arm/configs/corgi_defconfig index e53c47563845..4b8a25d9e686 100644 --- a/trunk/arch/arm/configs/corgi_defconfig +++ b/trunk/arch/arm/configs/corgi_defconfig @@ -97,7 +97,6 @@ CONFIG_MTD_BLOCK=y CONFIG_MTD_ROM=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_SHARPSL=y CONFIG_BLK_DEV_LOOP=y CONFIG_IDE=y diff --git a/trunk/arch/arm/configs/ep93xx_defconfig b/trunk/arch/arm/configs/ep93xx_defconfig index 8e97b2f7ceec..806005a4c4c1 100644 --- a/trunk/arch/arm/configs/ep93xx_defconfig +++ b/trunk/arch/arm/configs/ep93xx_defconfig @@ -61,7 +61,6 @@ CONFIG_MTD_CFI_STAA=y CONFIG_MTD_ROM=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_BLK_DEV_NBD=y CONFIG_EEPROM_LEGACY=y CONFIG_SCSI=y diff --git a/trunk/arch/arm/configs/mini2440_defconfig b/trunk/arch/arm/configs/mini2440_defconfig index 082175c54e7c..00630e6af45c 100644 --- a/trunk/arch/arm/configs/mini2440_defconfig +++ b/trunk/arch/arm/configs/mini2440_defconfig @@ -102,7 +102,6 @@ CONFIG_MTD_CFI_STAA=y CONFIG_MTD_RAM=y CONFIG_MTD_ROM=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_S3C2410=y CONFIG_MTD_NAND_PLATFORM=y CONFIG_MTD_LPDDR=y diff --git a/trunk/arch/arm/configs/mv78xx0_defconfig b/trunk/arch/arm/configs/mv78xx0_defconfig index 7305ebddb510..1f08219c1b3c 100644 --- a/trunk/arch/arm/configs/mv78xx0_defconfig +++ b/trunk/arch/arm/configs/mv78xx0_defconfig @@ -49,7 +49,6 @@ CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_ORION=y CONFIG_BLK_DEV_LOOP=y # CONFIG_SCSI_PROC_FS is not set diff --git a/trunk/arch/arm/configs/nhk8815_defconfig b/trunk/arch/arm/configs/nhk8815_defconfig index bf123c5384d4..240b25eea565 100644 --- a/trunk/arch/arm/configs/nhk8815_defconfig +++ b/trunk/arch/arm/configs/nhk8815_defconfig @@ -57,7 +57,6 @@ CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_ECC_SMC=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_NOMADIK=y CONFIG_MTD_ONENAND=y CONFIG_MTD_ONENAND_VERIFY_WRITE=y diff --git a/trunk/arch/arm/configs/orion5x_defconfig b/trunk/arch/arm/configs/orion5x_defconfig index a288d7033950..cd5e6ba9a54d 100644 --- a/trunk/arch/arm/configs/orion5x_defconfig +++ b/trunk/arch/arm/configs/orion5x_defconfig @@ -72,7 +72,6 @@ CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_PLATFORM=y CONFIG_MTD_NAND_ORION=y CONFIG_BLK_DEV_LOOP=y diff --git a/trunk/arch/arm/configs/pxa3xx_defconfig b/trunk/arch/arm/configs/pxa3xx_defconfig index 1677a0607ca9..60e313834b3f 100644 --- a/trunk/arch/arm/configs/pxa3xx_defconfig +++ b/trunk/arch/arm/configs/pxa3xx_defconfig @@ -36,7 +36,6 @@ CONFIG_MTD_CONCAT=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_PXA3xx=y CONFIG_MTD_NAND_PXA3xx_BUILTIN=y CONFIG_MTD_ONENAND=y diff --git a/trunk/arch/arm/configs/spitz_defconfig b/trunk/arch/arm/configs/spitz_defconfig index 70158273c6dd..df77931a4326 100644 --- a/trunk/arch/arm/configs/spitz_defconfig +++ b/trunk/arch/arm/configs/spitz_defconfig @@ -94,7 +94,6 @@ CONFIG_MTD_BLOCK=y CONFIG_MTD_ROM=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y CONFIG_MTD_NAND_SHARPSL=y CONFIG_BLK_DEV_LOOP=y CONFIG_IDE=y diff --git a/trunk/arch/arm/include/asm/assembler.h b/trunk/arch/arm/include/asm/assembler.h index 5c8b3bf4d825..2ef95813fce0 100644 --- a/trunk/arch/arm/include/asm/assembler.h +++ b/trunk/arch/arm/include/asm/assembler.h @@ -22,6 +22,7 @@ #include #include +#include #define IOMEM(x) (x) @@ -239,6 +240,34 @@ .endm #endif +/* + * Helper macro to enter SVC mode cleanly and mask interrupts. reg is + * a scratch register for the macro to overwrite. + * + * This macro is intended for forcing the CPU into SVC mode at boot time. + * you cannot return to the original mode. + * + * Beware, it also clobers LR. + */ +.macro safe_svcmode_maskall reg:req + mrs \reg , cpsr + mov lr , \reg + and lr , lr , #MODE_MASK + cmp lr , #HYP_MODE + orr \reg , \reg , #PSR_I_BIT | PSR_F_BIT + bic \reg , \reg , #MODE_MASK + orr \reg , \reg , #SVC_MODE +THUMB( orr \reg , \reg , #PSR_T_BIT ) + bne 1f + orr \reg, \reg, #PSR_A_BIT + adr lr, BSYM(2f) + msr spsr_cxsf, \reg + __MSR_ELR_HYP(14) + __ERET +1: msr cpsr_c, \reg +2: +.endm + /* * STRT/LDRT access macros with ARM and Thumb-2 variants */ diff --git a/trunk/arch/arm/include/asm/cacheflush.h b/trunk/arch/arm/include/asm/cacheflush.h index e4448e16046d..e1489c54cd12 100644 --- a/trunk/arch/arm/include/asm/cacheflush.h +++ b/trunk/arch/arm/include/asm/cacheflush.h @@ -49,6 +49,13 @@ * * Unconditionally clean and invalidate the entire cache. * + * flush_kern_louis() + * + * Flush data cache levels up to the level of unification + * inner shareable and invalidate the I-cache. + * Only needed from v7 onwards, falls back to flush_cache_all() + * for all other processor versions. + * * flush_user_all() * * Clean and invalidate all user space cache entries @@ -97,6 +104,7 @@ struct cpu_cache_fns { void (*flush_icache_all)(void); void (*flush_kern_all)(void); + void (*flush_kern_louis)(void); void (*flush_user_all)(void); void (*flush_user_range)(unsigned long, unsigned long, unsigned int); @@ -119,6 +127,7 @@ extern struct cpu_cache_fns cpu_cache; #define __cpuc_flush_icache_all cpu_cache.flush_icache_all #define __cpuc_flush_kern_all cpu_cache.flush_kern_all +#define __cpuc_flush_kern_louis cpu_cache.flush_kern_louis #define __cpuc_flush_user_all cpu_cache.flush_user_all #define __cpuc_flush_user_range cpu_cache.flush_user_range #define __cpuc_coherent_kern_range cpu_cache.coherent_kern_range @@ -139,6 +148,7 @@ extern struct cpu_cache_fns cpu_cache; extern void __cpuc_flush_icache_all(void); extern void __cpuc_flush_kern_all(void); +extern void __cpuc_flush_kern_louis(void); extern void __cpuc_flush_user_all(void); extern void __cpuc_flush_user_range(unsigned long, unsigned long, unsigned int); extern void __cpuc_coherent_kern_range(unsigned long, unsigned long); @@ -204,6 +214,11 @@ static inline void __flush_icache_all(void) __flush_icache_preferred(); } +/* + * Flush caches up to Level of Unification Inner Shareable + */ +#define flush_cache_louis() __cpuc_flush_kern_louis() + #define flush_cache_all() __cpuc_flush_kern_all() static inline void vivt_flush_cache_mm(struct mm_struct *mm) diff --git a/trunk/arch/arm/include/asm/glue-cache.h b/trunk/arch/arm/include/asm/glue-cache.h index 4f8d2c0dc441..cca9f15704ed 100644 --- a/trunk/arch/arm/include/asm/glue-cache.h +++ b/trunk/arch/arm/include/asm/glue-cache.h @@ -132,6 +132,7 @@ #ifndef MULTI_CACHE #define __cpuc_flush_icache_all __glue(_CACHE,_flush_icache_all) #define __cpuc_flush_kern_all __glue(_CACHE,_flush_kern_cache_all) +#define __cpuc_flush_kern_louis __glue(_CACHE,_flush_kern_cache_louis) #define __cpuc_flush_user_all __glue(_CACHE,_flush_user_cache_all) #define __cpuc_flush_user_range __glue(_CACHE,_flush_user_cache_range) #define __cpuc_coherent_kern_range __glue(_CACHE,_coherent_kern_range) diff --git a/trunk/arch/arm/include/asm/opcodes-virt.h b/trunk/arch/arm/include/asm/opcodes-virt.h index b85665a96f8e..efcfdf92d9d5 100644 --- a/trunk/arch/arm/include/asm/opcodes-virt.h +++ b/trunk/arch/arm/include/asm/opcodes-virt.h @@ -26,4 +26,14 @@ 0xF7E08000 | (((imm16) & 0xF000) << 4) | ((imm16) & 0x0FFF) \ ) +#define __ERET __inst_arm_thumb32( \ + 0xE160006E, \ + 0xF3DE8F00 \ +) + +#define __MSR_ELR_HYP(regnum) __inst_arm_thumb32( \ + 0xE12EF300 | regnum, \ + 0xF3808E30 | (regnum << 16) \ +) + #endif /* ! __ASM_ARM_OPCODES_VIRT_H */ diff --git a/trunk/arch/arm/include/asm/processor.h b/trunk/arch/arm/include/asm/processor.h index 99afa7498260..06e7d509eaac 100644 --- a/trunk/arch/arm/include/asm/processor.h +++ b/trunk/arch/arm/include/asm/processor.h @@ -85,11 +85,6 @@ unsigned long get_wchan(struct task_struct *p); #define cpu_relax() barrier() #endif -/* - * Create a new kernel thread - */ -extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); - #define task_pt_regs(p) \ ((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1) diff --git a/trunk/arch/arm/include/asm/ptrace.h b/trunk/arch/arm/include/asm/ptrace.h index 355ece523f41..142d6ae41231 100644 --- a/trunk/arch/arm/include/asm/ptrace.h +++ b/trunk/arch/arm/include/asm/ptrace.h @@ -44,6 +44,7 @@ #define IRQ_MODE 0x00000012 #define SVC_MODE 0x00000013 #define ABT_MODE 0x00000017 +#define HYP_MODE 0x0000001a #define UND_MODE 0x0000001b #define SYSTEM_MODE 0x0000001f #define MODE32_BIT 0x00000010 @@ -254,6 +255,11 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs) return regs->ARM_sp; } +#define current_pt_regs(void) ({ \ + register unsigned long sp asm ("sp"); \ + (struct pt_regs *)((sp | (THREAD_SIZE - 1)) - 7) - 1; \ +}) + #endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ diff --git a/trunk/arch/arm/include/asm/system.h b/trunk/arch/arm/include/asm/system.h index 74542c52f9be..368165e33c1c 100644 --- a/trunk/arch/arm/include/asm/system.h +++ b/trunk/arch/arm/include/asm/system.h @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include diff --git a/trunk/arch/arm/include/asm/thread_info.h b/trunk/arch/arm/include/asm/thread_info.h index f71cdab18b87..8477b4c1d39f 100644 --- a/trunk/arch/arm/include/asm/thread_info.h +++ b/trunk/arch/arm/include/asm/thread_info.h @@ -151,7 +151,6 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, #define TIF_SYSCALL_TRACE 8 #define TIF_SYSCALL_AUDIT 9 #define TIF_SYSCALL_TRACEPOINT 10 -#define TIF_POLLING_NRFLAG 16 #define TIF_USING_IWMMXT 17 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ #define TIF_RESTORE_SIGMASK 20 @@ -164,7 +163,6 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT) -#define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG) #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT) #define _TIF_SECCOMP (1 << TIF_SECCOMP) diff --git a/trunk/arch/arm/include/asm/unistd.h b/trunk/arch/arm/include/asm/unistd.h index d9ff5cc3a506..91819ad54424 100644 --- a/trunk/arch/arm/include/asm/unistd.h +++ b/trunk/arch/arm/include/asm/unistd.h @@ -478,6 +478,7 @@ #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_SYS_SOCKETCALL #endif +#define __ARCH_WANT_SYS_EXECVE /* * "Conditional" syscalls diff --git a/trunk/arch/arm/include/asm/vfpmacros.h b/trunk/arch/arm/include/asm/vfpmacros.h index a7aadbd9a6dd..6a6f1e485f41 100644 --- a/trunk/arch/arm/include/asm/vfpmacros.h +++ b/trunk/arch/arm/include/asm/vfpmacros.h @@ -28,7 +28,7 @@ ldr \tmp, =elf_hwcap @ may not have MVFR regs ldr \tmp, [\tmp, #0] tst \tmp, #HWCAP_VFPv3D16 - ldceq p11, cr0, [\base],#32*4 @ FLDMIAD \base!, {d16-d31} + ldceql p11, cr0, [\base],#32*4 @ FLDMIAD \base!, {d16-d31} addne \base, \base, #32*4 @ step over unused register space #else VFPFMRX \tmp, MVFR0 @ Media and VFP Feature Register 0 @@ -52,7 +52,7 @@ ldr \tmp, =elf_hwcap @ may not have MVFR regs ldr \tmp, [\tmp, #0] tst \tmp, #HWCAP_VFPv3D16 - stceq p11, cr0, [\base],#32*4 @ FSTMIAD \base!, {d16-d31} + stceql p11, cr0, [\base],#32*4 @ FSTMIAD \base!, {d16-d31} addne \base, \base, #32*4 @ step over unused register space #else VFPFMRX \tmp, MVFR0 @ Media and VFP Feature Register 0 diff --git a/trunk/arch/arm/include/asm/virt.h b/trunk/arch/arm/include/asm/virt.h new file mode 100644 index 000000000000..86164df86cb4 --- /dev/null +++ b/trunk/arch/arm/include/asm/virt.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2012 Linaro Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef VIRT_H +#define VIRT_H + +#include + +/* + * Flag indicating that the kernel was not entered in the same mode on every + * CPU. The zImage loader stashes this value in an SPSR, so we need an + * architecturally defined flag bit here (the N flag, as it happens) + */ +#define BOOT_CPU_MODE_MISMATCH (1<<31) + +#ifndef __ASSEMBLY__ + +#ifdef CONFIG_ARM_VIRT_EXT +/* + * __boot_cpu_mode records what mode the primary CPU was booted in. + * A correctly-implemented bootloader must start all CPUs in the same mode: + * if it fails to do this, the flag BOOT_CPU_MODE_MISMATCH is set to indicate + * that some CPU(s) were booted in a different mode. + * + * This allows the kernel to flag an error when the secondaries have come up. + */ +extern int __boot_cpu_mode; + +void __hyp_set_vectors(unsigned long phys_vector_base); +unsigned long __hyp_get_vectors(void); +#else +#define __boot_cpu_mode (SVC_MODE) +#endif + +#ifndef ZIMAGE +void hyp_mode_check(void); + +/* Reports the availability of HYP mode */ +static inline bool is_hyp_mode_available(void) +{ + return ((__boot_cpu_mode & MODE_MASK) == HYP_MODE && + !(__boot_cpu_mode & BOOT_CPU_MODE_MISMATCH)); +} + +/* Check if the bootloader has booted CPUs in different modes */ +static inline bool is_hyp_mode_mismatched(void) +{ + return !!(__boot_cpu_mode & BOOT_CPU_MODE_MISMATCH); +} +#endif + +#endif /* __ASSEMBLY__ */ + +#endif /* ! VIRT_H */ diff --git a/trunk/arch/arm/kernel/Makefile b/trunk/arch/arm/kernel/Makefile index 5dfef9d97ed9..5bbec7b8183e 100644 --- a/trunk/arch/arm/kernel/Makefile +++ b/trunk/arch/arm/kernel/Makefile @@ -81,4 +81,6 @@ head-y := head$(MMUEXT).o obj-$(CONFIG_DEBUG_LL) += debug.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o + extra-y := $(head-y) vmlinux.lds diff --git a/trunk/arch/arm/kernel/calls.S b/trunk/arch/arm/kernel/calls.S index e337879595e5..831cd38c8d99 100644 --- a/trunk/arch/arm/kernel/calls.S +++ b/trunk/arch/arm/kernel/calls.S @@ -20,7 +20,7 @@ CALL(sys_creat) CALL(sys_link) /* 10 */ CALL(sys_unlink) - CALL(sys_execve_wrapper) + CALL(sys_execve) CALL(sys_chdir) CALL(OBSOLETE(sys_time)) /* used by libc4 */ CALL(sys_mknod) diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S index f45987037bf1..417bac1846bd 100644 --- a/trunk/arch/arm/kernel/entry-common.S +++ b/trunk/arch/arm/kernel/entry-common.S @@ -86,8 +86,11 @@ ENDPROC(ret_to_user) */ ENTRY(ret_from_fork) bl schedule_tail + cmp r5, #0 + movne r0, r4 + movne lr, pc + movne pc, r5 get_thread_info tsk - mov why, #1 b ret_slow_syscall ENDPROC(ret_from_fork) @@ -517,11 +520,6 @@ sys_vfork_wrapper: b sys_vfork ENDPROC(sys_vfork_wrapper) -sys_execve_wrapper: - add r3, sp, #S_OFF - b sys_execve -ENDPROC(sys_execve_wrapper) - sys_clone_wrapper: add ip, sp, #S_OFF str ip, [sp, #4] diff --git a/trunk/arch/arm/kernel/head.S b/trunk/arch/arm/kernel/head.S index 9874d0741191..4eee351f4668 100644 --- a/trunk/arch/arm/kernel/head.S +++ b/trunk/arch/arm/kernel/head.S @@ -83,8 +83,12 @@ ENTRY(stext) THUMB( .thumb ) @ switch to Thumb now. THUMB(1: ) - setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode - @ and irqs disabled +#ifdef CONFIG_ARM_VIRT_EXT + bl __hyp_stub_install +#endif + @ ensure svc mode and all interrupts masked + safe_svcmode_maskall r9 + mrc p15, 0, r9, c0, c0 @ get processor id bl __lookup_processor_type @ r5=procinfo r9=cpuid movs r10, r5 @ invalid processor (r5=0)? @@ -326,7 +330,11 @@ ENTRY(secondary_startup) * the processor type - there is no need to check the machine type * as it has already been validated by the primary processor. */ - setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 +#ifdef CONFIG_ARM_VIRT_EXT + bl __hyp_stub_install +#endif + safe_svcmode_maskall r9 + mrc p15, 0, r9, c0, c0 @ get processor id bl __lookup_processor_type movs r10, r5 @ invalid processor? diff --git a/trunk/arch/arm/kernel/hyp-stub.S b/trunk/arch/arm/kernel/hyp-stub.S new file mode 100644 index 000000000000..65b2417aebce --- /dev/null +++ b/trunk/arch/arm/kernel/hyp-stub.S @@ -0,0 +1,223 @@ +/* + * Copyright (c) 2012 Linaro Limited. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include +#include + +#ifndef ZIMAGE +/* + * For the kernel proper, we need to find out the CPU boot mode long after + * boot, so we need to store it in a writable variable. + * + * This is not in .bss, because we set it sufficiently early that the boot-time + * zeroing of .bss would clobber it. + */ +.data +ENTRY(__boot_cpu_mode) + .long 0 +.text + + /* + * Save the primary CPU boot mode. Requires 3 scratch registers. + */ + .macro store_primary_cpu_mode reg1, reg2, reg3 + mrs \reg1, cpsr + and \reg1, \reg1, #MODE_MASK + adr \reg2, .L__boot_cpu_mode_offset + ldr \reg3, [\reg2] + str \reg1, [\reg2, \reg3] + .endm + + /* + * Compare the current mode with the one saved on the primary CPU. + * If they don't match, record that fact. The Z bit indicates + * if there's a match or not. + * Requires 3 additionnal scratch registers. + */ + .macro compare_cpu_mode_with_primary mode, reg1, reg2, reg3 + adr \reg2, .L__boot_cpu_mode_offset + ldr \reg3, [\reg2] + ldr \reg1, [\reg2, \reg3] + cmp \mode, \reg1 @ matches primary CPU boot mode? + orrne r7, r7, #BOOT_CPU_MODE_MISMATCH + strne r7, [r5, r6] @ record what happened and give up + .endm + +#else /* ZIMAGE */ + + .macro store_primary_cpu_mode reg1:req, reg2:req, reg3:req + .endm + +/* + * The zImage loader only runs on one CPU, so we don't bother with mult-CPU + * consistency checking: + */ + .macro compare_cpu_mode_with_primary mode, reg1, reg2, reg3 + cmp \mode, \mode + .endm + +#endif /* ZIMAGE */ + +/* + * Hypervisor stub installation functions. + * + * These must be called with the MMU and D-cache off. + * They are not ABI compliant and are only intended to be called from the kernel + * entry points in head.S. + */ +@ Call this from the primary CPU +ENTRY(__hyp_stub_install) + store_primary_cpu_mode r4, r5, r6 +ENDPROC(__hyp_stub_install) + + @ fall through... + +@ Secondary CPUs should call here +ENTRY(__hyp_stub_install_secondary) + mrs r4, cpsr + and r4, r4, #MODE_MASK + + /* + * If the secondary has booted with a different mode, give up + * immediately. + */ + compare_cpu_mode_with_primary r4, r5, r6, r7 + bxne lr + + /* + * Once we have given up on one CPU, we do not try to install the + * stub hypervisor on the remaining ones: because the saved boot mode + * is modified, it can't compare equal to the CPSR mode field any + * more. + * + * Otherwise... + */ + + cmp r4, #HYP_MODE + bxne lr @ give up if the CPU is not in HYP mode + +/* + * Configure HSCTLR to set correct exception endianness/instruction set + * state etc. + * Turn off all traps + * Eventually, CPU-specific code might be needed -- assume not for now + * + * This code relies on the "eret" instruction to synchronize the + * various coprocessor accesses. + */ + @ Now install the hypervisor stub: + adr r7, __hyp_stub_vectors + mcr p15, 4, r7, c12, c0, 0 @ set hypervisor vector base (HVBAR) + + @ Disable all traps, so we don't get any nasty surprise + mov r7, #0 + mcr p15, 4, r7, c1, c1, 0 @ HCR + mcr p15, 4, r7, c1, c1, 2 @ HCPTR + mcr p15, 4, r7, c1, c1, 3 @ HSTR + +THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE +#ifdef CONFIG_CPU_BIG_ENDIAN + orr r7, #(1 << 9) @ HSCTLR.EE +#endif + mcr p15, 4, r7, c1, c0, 0 @ HSCTLR + + mrc p15, 4, r7, c1, c1, 1 @ HDCR + and r7, #0x1f @ Preserve HPMN + mcr p15, 4, r7, c1, c1, 1 @ HDCR + +#if !defined(ZIMAGE) && defined(CONFIG_ARM_ARCH_TIMER) + @ make CNTP_* and CNTPCT accessible from PL1 + mrc p15, 0, r7, c0, c1, 1 @ ID_PFR1 + lsr r7, #16 + and r7, #0xf + cmp r7, #1 + bne 1f + mrc p15, 4, r7, c14, c1, 0 @ CNTHCTL + orr r7, r7, #3 @ PL1PCEN | PL1PCTEN + mcr p15, 4, r7, c14, c1, 0 @ CNTHCTL +1: +#endif + + bic r7, r4, #MODE_MASK + orr r7, r7, #SVC_MODE +THUMB( orr r7, r7, #PSR_T_BIT ) + msr spsr_cxsf, r7 @ This is SPSR_hyp. + + __MSR_ELR_HYP(14) @ msr elr_hyp, lr + __ERET @ return, switching to SVC mode + @ The boot CPU mode is left in r4. +ENDPROC(__hyp_stub_install_secondary) + +__hyp_stub_do_trap: + cmp r0, #-1 + mrceq p15, 4, r0, c12, c0, 0 @ get HVBAR + mcrne p15, 4, r0, c12, c0, 0 @ set HVBAR + __ERET +ENDPROC(__hyp_stub_do_trap) + +/* + * __hyp_set_vectors: Call this after boot to set the initial hypervisor + * vectors as part of hypervisor installation. On an SMP system, this should + * be called on each CPU. + * + * r0 must be the physical address of the new vector table (which must lie in + * the bottom 4GB of physical address space. + * + * r0 must be 32-byte aligned. + * + * Before calling this, you must check that the stub hypervisor is installed + * everywhere, by waiting for any secondary CPUs to be brought up and then + * checking that BOOT_CPU_MODE_HAVE_HYP(__boot_cpu_mode) is true. + * + * If not, there is a pre-existing hypervisor, some CPUs failed to boot, or + * something else went wrong... in such cases, trying to install a new + * hypervisor is unlikely to work as desired. + * + * When you call into your shiny new hypervisor, sp_hyp will contain junk, + * so you will need to set that to something sensible at the new hypervisor's + * initialisation entry point. + */ +ENTRY(__hyp_get_vectors) + mov r0, #-1 +ENDPROC(__hyp_get_vectors) + @ fall through +ENTRY(__hyp_set_vectors) + __HVC(0) + bx lr +ENDPROC(__hyp_set_vectors) + +#ifndef ZIMAGE +.align 2 +.L__boot_cpu_mode_offset: + .long __boot_cpu_mode - . +#endif + +.align 5 +__hyp_stub_vectors: +__hyp_stub_reset: W(b) . +__hyp_stub_und: W(b) . +__hyp_stub_svc: W(b) . +__hyp_stub_pabort: W(b) . +__hyp_stub_dabort: W(b) . +__hyp_stub_trap: W(b) __hyp_stub_do_trap +__hyp_stub_irq: W(b) . +__hyp_stub_fiq: W(b) . +ENDPROC(__hyp_stub_vectors) + diff --git a/trunk/arch/arm/kernel/process.c b/trunk/arch/arm/kernel/process.c index 04eea22d7958..90084a6de35a 100644 --- a/trunk/arch/arm/kernel/process.c +++ b/trunk/arch/arm/kernel/process.c @@ -381,13 +381,20 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start, struct thread_info *thread = task_thread_info(p); struct pt_regs *childregs = task_pt_regs(p); - *childregs = *regs; - childregs->ARM_r0 = 0; - childregs->ARM_sp = stack_start; - memset(&thread->cpu_context, 0, sizeof(struct cpu_context_save)); - thread->cpu_context.sp = (unsigned long)childregs; + + if (likely(regs)) { + *childregs = *regs; + childregs->ARM_r0 = 0; + childregs->ARM_sp = stack_start; + } else { + memset(childregs, 0, sizeof(struct pt_regs)); + thread->cpu_context.r4 = stk_sz; + thread->cpu_context.r5 = stack_start; + childregs->ARM_cpsr = SVC_MODE; + } thread->cpu_context.pc = (unsigned long)ret_from_fork; + thread->cpu_context.sp = (unsigned long)childregs; clear_ptrace_hw_breakpoint(p); @@ -423,63 +430,6 @@ int dump_fpu (struct pt_regs *regs, struct user_fp *fp) } EXPORT_SYMBOL(dump_fpu); -/* - * Shuffle the argument into the correct register before calling the - * thread function. r4 is the thread argument, r5 is the pointer to - * the thread function, and r6 points to the exit function. - */ -extern void kernel_thread_helper(void); -asm( ".pushsection .text\n" -" .align\n" -" .type kernel_thread_helper, #function\n" -"kernel_thread_helper:\n" -#ifdef CONFIG_TRACE_IRQFLAGS -" bl trace_hardirqs_on\n" -#endif -" msr cpsr_c, r7\n" -" mov r0, r4\n" -" mov lr, r6\n" -" mov pc, r5\n" -" .size kernel_thread_helper, . - kernel_thread_helper\n" -" .popsection"); - -#ifdef CONFIG_ARM_UNWIND -extern void kernel_thread_exit(long code); -asm( ".pushsection .text\n" -" .align\n" -" .type kernel_thread_exit, #function\n" -"kernel_thread_exit:\n" -" .fnstart\n" -" .cantunwind\n" -" bl do_exit\n" -" nop\n" -" .fnend\n" -" .size kernel_thread_exit, . - kernel_thread_exit\n" -" .popsection"); -#else -#define kernel_thread_exit do_exit -#endif - -/* - * Create a kernel thread. - */ -pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) -{ - struct pt_regs regs; - - memset(®s, 0, sizeof(regs)); - - regs.ARM_r4 = (unsigned long)arg; - regs.ARM_r5 = (unsigned long)fn; - regs.ARM_r6 = (unsigned long)kernel_thread_exit; - regs.ARM_r7 = SVC_MODE | PSR_ENDSTATE | PSR_ISETSTATE; - regs.ARM_pc = (unsigned long)kernel_thread_helper; - regs.ARM_cpsr = regs.ARM_r7 | PSR_I_BIT; - - return do_fork(flags|CLONE_VM|CLONE_UNTRACED, 0, ®s, 0, NULL, NULL); -} -EXPORT_SYMBOL(kernel_thread); - unsigned long get_wchan(struct task_struct *p) { struct stackframe frame; diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c index febafa0f552d..da1d1aa20ad9 100644 --- a/trunk/arch/arm/kernel/setup.c +++ b/trunk/arch/arm/kernel/setup.c @@ -53,6 +53,7 @@ #include #include #include +#include #include "atags.h" #include "tcm.h" @@ -703,6 +704,21 @@ static int __init meminfo_cmp(const void *_a, const void *_b) return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; } +void __init hyp_mode_check(void) +{ +#ifdef CONFIG_ARM_VIRT_EXT + if (is_hyp_mode_available()) { + pr_info("CPU: All CPU(s) started in HYP mode.\n"); + pr_info("CPU: Virtualization extensions available.\n"); + } else if (is_hyp_mode_mismatched()) { + pr_warn("CPU: WARNING: CPU(s) started in wrong/inconsistent modes (primary CPU mode 0x%x)\n", + __boot_cpu_mode & MODE_MASK); + pr_warn("CPU: This may indicate a broken bootloader or firmware.\n"); + } else + pr_info("CPU: All CPU(s) started in SVC mode.\n"); +#endif +} + void __init setup_arch(char **cmdline_p) { struct machine_desc *mdesc; @@ -748,6 +764,10 @@ void __init setup_arch(char **cmdline_p) smp_init_cpus(); } #endif + + if (!is_smp()) + hyp_mode_check(); + reserve_crashkernel(); tcm_init(); diff --git a/trunk/arch/arm/kernel/signal.c b/trunk/arch/arm/kernel/signal.c index f27789e4e38a..56f72d257ebd 100644 --- a/trunk/arch/arm/kernel/signal.c +++ b/trunk/arch/arm/kernel/signal.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c index d100eacdb798..8e20754dd31d 100644 --- a/trunk/arch/arm/kernel/smp.c +++ b/trunk/arch/arm/kernel/smp.c @@ -43,6 +43,7 @@ #include #include #include +#include #include /* @@ -202,8 +203,11 @@ int __cpuinit __cpu_disable(void) /* * Flush user cache and TLB mappings, and then remove this CPU * from the vm mask set of all processes. + * + * Caches are flushed to the Level of Unification Inner Shareable + * to write-back dirty lines to unified caches shared by all CPUs. */ - flush_cache_all(); + flush_cache_louis(); local_flush_tlb_all(); clear_tasks_mm_cpumask(cpu); @@ -355,6 +359,8 @@ void __init smp_cpus_done(unsigned int max_cpus) num_online_cpus(), bogosum / (500000/HZ), (bogosum / (5000/HZ)) % 100); + + hyp_mode_check(); } void __init smp_prepare_boot_cpu(void) diff --git a/trunk/arch/arm/kernel/suspend.c b/trunk/arch/arm/kernel/suspend.c index 1794cc3b0f18..358bca3a995e 100644 --- a/trunk/arch/arm/kernel/suspend.c +++ b/trunk/arch/arm/kernel/suspend.c @@ -17,6 +17,8 @@ extern void cpu_resume_mmu(void); */ void __cpu_suspend_save(u32 *ptr, u32 ptrsz, u32 sp, u32 *save_ptr) { + u32 *ctx = ptr; + *save_ptr = virt_to_phys(ptr); /* This must correspond to the LDM in cpu_resume() assembly */ @@ -26,7 +28,20 @@ void __cpu_suspend_save(u32 *ptr, u32 ptrsz, u32 sp, u32 *save_ptr) cpu_do_suspend(ptr); - flush_cache_all(); + flush_cache_louis(); + + /* + * flush_cache_louis does not guarantee that + * save_ptr and ptr are cleaned to main memory, + * just up to the Level of Unification Inner Shareable. + * Since the context pointer and context itself + * are to be retrieved with the MMU off that + * data must be cleaned from all cache levels + * to main memory using "area" cache primitives. + */ + __cpuc_flush_dcache_area(ctx, ptrsz); + __cpuc_flush_dcache_area(save_ptr, sizeof(*save_ptr)); + outer_clean_range(*save_ptr, *save_ptr + ptrsz); outer_clean_range(virt_to_phys(save_ptr), virt_to_phys(save_ptr) + sizeof(*save_ptr)); diff --git a/trunk/arch/arm/kernel/sys_arm.c b/trunk/arch/arm/kernel/sys_arm.c index 76cbb055dd05..c2a898aa57aa 100644 --- a/trunk/arch/arm/kernel/sys_arm.c +++ b/trunk/arch/arm/kernel/sys_arm.c @@ -59,69 +59,6 @@ asmlinkage int sys_vfork(struct pt_regs *regs) return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->ARM_sp, regs, 0, NULL, NULL); } -/* sys_execve() executes a new program. - * This is called indirectly via a small wrapper - */ -asmlinkage int sys_execve(const char __user *filenamei, - const char __user *const __user *argv, - const char __user *const __user *envp, struct pt_regs *regs) -{ - int error; - char * filename; - - filename = getname(filenamei); - error = PTR_ERR(filename); - if (IS_ERR(filename)) - goto out; - error = do_execve(filename, argv, envp, regs); - putname(filename); -out: - return error; -} - -int kernel_execve(const char *filename, - const char *const argv[], - const char *const envp[]) -{ - struct pt_regs regs; - int ret; - - memset(®s, 0, sizeof(struct pt_regs)); - ret = do_execve(filename, - (const char __user *const __user *)argv, - (const char __user *const __user *)envp, ®s); - if (ret < 0) - goto out; - - /* - * Save argc to the register structure for userspace. - */ - regs.ARM_r0 = ret; - - /* - * We were successful. We won't be returning to our caller, but - * instead to user space by manipulating the kernel stack. - */ - asm( "add r0, %0, %1\n\t" - "mov r1, %2\n\t" - "mov r2, %3\n\t" - "bl memmove\n\t" /* copy regs to top of stack */ - "mov r8, #0\n\t" /* not a syscall */ - "mov r9, %0\n\t" /* thread structure */ - "mov sp, r0\n\t" /* reposition stack pointer */ - "b ret_to_user" - : - : "r" (current_thread_info()), - "Ir" (THREAD_START_SP - sizeof(regs)), - "r" (®s), - "Ir" (sizeof(regs)) - : "r0", "r1", "r2", "r3", "r8", "r9", "ip", "lr", "memory"); - - out: - return ret; -} -EXPORT_SYMBOL(kernel_execve); - /* * Since loff_t is a 64 bit type we avoid a lot of ABI hassle * with a different argument ordering. diff --git a/trunk/arch/arm/mach-at91/at91rm9200.c b/trunk/arch/arm/mach-at91/at91rm9200.c index 6f50c6722276..b4f0565aff63 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200.c +++ b/trunk/arch/arm/mach-at91/at91rm9200.c @@ -187,6 +187,7 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200", &twi_clk), /* fake hclk clock */ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), CLKDEV_CON_ID("pioA", &pioA_clk), diff --git a/trunk/arch/arm/mach-at91/at91rm9200_devices.c b/trunk/arch/arm/mach-at91/at91rm9200_devices.c index 9ac427a702da..a563189cdfc3 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200_devices.c +++ b/trunk/arch/arm/mach-at91/at91rm9200_devices.c @@ -511,7 +511,7 @@ static struct resource twi_resources[] = { }; static struct platform_device at91rm9200_twi_device = { - .name = "at91_i2c", + .name = "i2c-at91rm9200", .id = -1, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), diff --git a/trunk/arch/arm/mach-at91/at91sam9260.c b/trunk/arch/arm/mach-at91/at91sam9260.c index 30c7f26a4668..ad29f93f20ca 100644 --- a/trunk/arch/arm/mach-at91/at91sam9260.c +++ b/trunk/arch/arm/mach-at91/at91sam9260.c @@ -211,6 +211,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20", &twi_clk), /* more usart lookup table for DT entries */ CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck), CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk), @@ -219,6 +221,7 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("usart", "fffd0000.serial", &usart3_clk), CLKDEV_CON_DEV_ID("usart", "fffd4000.serial", &usart4_clk), CLKDEV_CON_DEV_ID("usart", "fffd8000.serial", &usart5_clk), + CLKDEV_CON_DEV_ID(NULL, "fffac000.i2c", &twi_clk), /* more tc lookup table for DT entries */ CLKDEV_CON_DEV_ID("t0_clk", "fffa0000.timer", &tc0_clk), CLKDEV_CON_DEV_ID("t1_clk", "fffa0000.timer", &tc1_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9260_devices.c b/trunk/arch/arm/mach-at91/at91sam9260_devices.c index af50ff3281c7..a76b8684f52d 100644 --- a/trunk/arch/arm/mach-at91/at91sam9260_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9260_devices.c @@ -421,7 +421,6 @@ static struct resource twi_resources[] = { }; static struct platform_device at91sam9260_twi_device = { - .name = "at91_i2c", .id = -1, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), @@ -429,6 +428,13 @@ static struct platform_device at91sam9260_twi_device = { void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) { + /* IP version is not the same on 9260 and g20 */ + if (cpu_is_at91sam9g20()) { + at91sam9260_twi_device.name = "i2c-at91sam9g20"; + } else { + at91sam9260_twi_device.name = "i2c-at91sam9260"; + } + /* pins used for TWI interface */ at91_set_A_periph(AT91_PIN_PA23, 0); /* TWD */ at91_set_multi_drive(AT91_PIN_PA23, 1); diff --git a/trunk/arch/arm/mach-at91/at91sam9261.c b/trunk/arch/arm/mach-at91/at91sam9261.c index f40762c5fede..8d999eb1a137 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261.c +++ b/trunk/arch/arm/mach-at91/at91sam9261.c @@ -178,6 +178,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9261", &twi_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10", &twi_clk), CLKDEV_CON_ID("pioA", &pioA_clk), CLKDEV_CON_ID("pioB", &pioB_clk), CLKDEV_CON_ID("pioC", &pioC_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9261_devices.c b/trunk/arch/arm/mach-at91/at91sam9261_devices.c index 11e9fa835cde..9752f17efba9 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9261_devices.c @@ -317,7 +317,6 @@ static struct resource twi_resources[] = { }; static struct platform_device at91sam9261_twi_device = { - .name = "at91_i2c", .id = -1, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), @@ -325,12 +324,19 @@ static struct platform_device at91sam9261_twi_device = { void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices) { + /* IP version is not the same on 9261 and g10 */ + if (cpu_is_at91sam9g10()) { + at91sam9261_twi_device.name = "i2c-at91sam9g10"; + /* I2C PIO must not be configured as open-drain on this chip */ + } else { + at91sam9261_twi_device.name = "i2c-at91sam9261"; + at91_set_multi_drive(AT91_PIN_PA7, 1); + at91_set_multi_drive(AT91_PIN_PA8, 1); + } + /* pins used for TWI interface */ at91_set_A_periph(AT91_PIN_PA7, 0); /* TWD */ - at91_set_multi_drive(AT91_PIN_PA7, 1); - at91_set_A_periph(AT91_PIN_PA8, 0); /* TWCK */ - at91_set_multi_drive(AT91_PIN_PA8, 1); i2c_register_board_info(0, devices, nr_devices); platform_device_register(&at91sam9261_twi_device); diff --git a/trunk/arch/arm/mach-at91/at91sam9263.c b/trunk/arch/arm/mach-at91/at91sam9263.c index 144ef5de51b6..6a01d0360dfb 100644 --- a/trunk/arch/arm/mach-at91/at91sam9263.c +++ b/trunk/arch/arm/mach-at91/at91sam9263.c @@ -193,6 +193,7 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260", &twi_clk), /* fake hclk clock */ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), CLKDEV_CON_ID("pioA", &pioA_clk), @@ -210,6 +211,7 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("hclk", "a00000.ohci", &ohci_clk), CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk), CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk), + CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi_clk), }; static struct clk_lookup usart_clocks_lookups[] = { diff --git a/trunk/arch/arm/mach-at91/at91sam9263_devices.c b/trunk/arch/arm/mach-at91/at91sam9263_devices.c index 7c0898fe20fa..8dde220b42b6 100644 --- a/trunk/arch/arm/mach-at91/at91sam9263_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9263_devices.c @@ -599,7 +599,7 @@ static struct resource twi_resources[] = { }; static struct platform_device at91sam9263_twi_device = { - .name = "at91_i2c", + .name = "i2c-at91sam9260", .id = -1, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), diff --git a/trunk/arch/arm/mach-at91/at91sam9g45.c b/trunk/arch/arm/mach-at91/at91sam9g45.c index ef6cedd52e3c..84af1b506d92 100644 --- a/trunk/arch/arm/mach-at91/at91sam9g45.c +++ b/trunk/arch/arm/mach-at91/at91sam9g45.c @@ -237,6 +237,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb0_clk), CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.0", &twi0_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.1", &twi1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID(NULL, "atmel-trng", &trng_clk), @@ -254,6 +256,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "fffd4000.timer", &tcb0_clk), CLKDEV_CON_DEV_ID("hclk", "700000.ohci", &uhphs_clk), CLKDEV_CON_DEV_ID("ehci_clk", "800000.ehci", &uhphs_clk), + CLKDEV_CON_DEV_ID(NULL, "fff84000.i2c", &twi0_clk), + CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi1_clk), /* fake hclk clock */ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk), CLKDEV_CON_ID("pioA", &pioA_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9g45_devices.c b/trunk/arch/arm/mach-at91/at91sam9g45_devices.c index e4c3b3709204..b1596072dcc2 100644 --- a/trunk/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9g45_devices.c @@ -653,7 +653,7 @@ static struct resource twi0_resources[] = { }; static struct platform_device at91sam9g45_twi0_device = { - .name = "at91_i2c", + .name = "i2c-at91sam9g10", .id = 0, .resource = twi0_resources, .num_resources = ARRAY_SIZE(twi0_resources), @@ -673,7 +673,7 @@ static struct resource twi1_resources[] = { }; static struct platform_device at91sam9g45_twi1_device = { - .name = "at91_i2c", + .name = "i2c-at91sam9g10", .id = 1, .resource = twi1_resources, .num_resources = ARRAY_SIZE(twi1_resources), @@ -686,18 +686,12 @@ void __init at91_add_device_i2c(short i2c_id, struct i2c_board_info *devices, in /* pins used for TWI interface */ if (i2c_id == 0) { at91_set_A_periph(AT91_PIN_PA20, 0); /* TWD */ - at91_set_multi_drive(AT91_PIN_PA20, 1); - at91_set_A_periph(AT91_PIN_PA21, 0); /* TWCK */ - at91_set_multi_drive(AT91_PIN_PA21, 1); platform_device_register(&at91sam9g45_twi0_device); } else { at91_set_A_periph(AT91_PIN_PB10, 0); /* TWD */ - at91_set_multi_drive(AT91_PIN_PB10, 1); - at91_set_A_periph(AT91_PIN_PB11, 0); /* TWCK */ - at91_set_multi_drive(AT91_PIN_PB11, 1); platform_device_register(&at91sam9g45_twi1_device); } diff --git a/trunk/arch/arm/mach-at91/at91sam9n12.c b/trunk/arch/arm/mach-at91/at91sam9n12.c index 08494664ab78..732d3d3f4ec5 100644 --- a/trunk/arch/arm/mach-at91/at91sam9n12.c +++ b/trunk/arch/arm/mach-at91/at91sam9n12.c @@ -169,6 +169,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "f8008000.timer", &tcb_clk), CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb_clk), CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma_clk), + CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk), + CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk), CLKDEV_CON_ID("pioA", &pioAB_clk), CLKDEV_CON_ID("pioB", &pioAB_clk), CLKDEV_CON_ID("pioC", &pioCD_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9rl.c b/trunk/arch/arm/mach-at91/at91sam9rl.c index 72ce50a50de5..72e908412222 100644 --- a/trunk/arch/arm/mach-at91/at91sam9rl.c +++ b/trunk/arch/arm/mach-at91/at91sam9rl.c @@ -186,6 +186,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi0_clk), + CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.1", &twi1_clk), CLKDEV_CON_ID("pioA", &pioA_clk), CLKDEV_CON_ID("pioB", &pioB_clk), CLKDEV_CON_ID("pioC", &pioC_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c index deafea0e493d..d6ca0543ce8d 100644 --- a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c @@ -346,7 +346,7 @@ static struct resource twi_resources[] = { }; static struct platform_device at91sam9rl_twi_device = { - .name = "at91_i2c", + .name = "i2c-at91sam9g20", .id = -1, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), diff --git a/trunk/arch/arm/mach-at91/at91sam9x5.c b/trunk/arch/arm/mach-at91/at91sam9x5.c index 477cf9d06672..e5035380dcbc 100644 --- a/trunk/arch/arm/mach-at91/at91sam9x5.c +++ b/trunk/arch/arm/mach-at91/at91sam9x5.c @@ -231,6 +231,9 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk), CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma0_clk), CLKDEV_CON_DEV_ID("dma_clk", "ffffee00.dma-controller", &dma1_clk), + CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk), + CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk), + CLKDEV_CON_DEV_ID(NULL, "f8018000.i2c", &twi2_clk), CLKDEV_CON_ID("pioA", &pioAB_clk), CLKDEV_CON_ID("pioB", &pioAB_clk), CLKDEV_CON_ID("pioC", &pioCD_clk), diff --git a/trunk/arch/arm/mach-at91/include/mach/at91_twi.h b/trunk/arch/arm/mach-at91/include/mach/at91_twi.h deleted file mode 100644 index bb2880f6ba37..000000000000 --- a/trunk/arch/arm/mach-at91/include/mach/at91_twi.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * arch/arm/mach-at91/include/mach/at91_twi.h - * - * Copyright (C) 2005 Ivan Kokshaysky - * Copyright (C) SAN People - * - * Two-wire Interface (TWI) registers. - * Based on AT91RM9200 datasheet revision E. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef AT91_TWI_H -#define AT91_TWI_H - -#define AT91_TWI_CR 0x00 /* Control Register */ -#define AT91_TWI_START (1 << 0) /* Send a Start Condition */ -#define AT91_TWI_STOP (1 << 1) /* Send a Stop Condition */ -#define AT91_TWI_MSEN (1 << 2) /* Master Transfer Enable */ -#define AT91_TWI_MSDIS (1 << 3) /* Master Transfer Disable */ -#define AT91_TWI_SVEN (1 << 4) /* Slave Transfer Enable [SAM9260 only] */ -#define AT91_TWI_SVDIS (1 << 5) /* Slave Transfer Disable [SAM9260 only] */ -#define AT91_TWI_SWRST (1 << 7) /* Software Reset */ - -#define AT91_TWI_MMR 0x04 /* Master Mode Register */ -#define AT91_TWI_IADRSZ (3 << 8) /* Internal Device Address Size */ -#define AT91_TWI_IADRSZ_NO (0 << 8) -#define AT91_TWI_IADRSZ_1 (1 << 8) -#define AT91_TWI_IADRSZ_2 (2 << 8) -#define AT91_TWI_IADRSZ_3 (3 << 8) -#define AT91_TWI_MREAD (1 << 12) /* Master Read Direction */ -#define AT91_TWI_DADR (0x7f << 16) /* Device Address */ - -#define AT91_TWI_SMR 0x08 /* Slave Mode Register [SAM9260 only] */ -#define AT91_TWI_SADR (0x7f << 16) /* Slave Address */ - -#define AT91_TWI_IADR 0x0c /* Internal Address Register */ - -#define AT91_TWI_CWGR 0x10 /* Clock Waveform Generator Register */ -#define AT91_TWI_CLDIV (0xff << 0) /* Clock Low Divisor */ -#define AT91_TWI_CHDIV (0xff << 8) /* Clock High Divisor */ -#define AT91_TWI_CKDIV (7 << 16) /* Clock Divider */ - -#define AT91_TWI_SR 0x20 /* Status Register */ -#define AT91_TWI_TXCOMP (1 << 0) /* Transmission Complete */ -#define AT91_TWI_RXRDY (1 << 1) /* Receive Holding Register Ready */ -#define AT91_TWI_TXRDY (1 << 2) /* Transmit Holding Register Ready */ -#define AT91_TWI_SVREAD (1 << 3) /* Slave Read [SAM9260 only] */ -#define AT91_TWI_SVACC (1 << 4) /* Slave Access [SAM9260 only] */ -#define AT91_TWI_GACC (1 << 5) /* General Call Access [SAM9260 only] */ -#define AT91_TWI_OVRE (1 << 6) /* Overrun Error [AT91RM9200 only] */ -#define AT91_TWI_UNRE (1 << 7) /* Underrun Error [AT91RM9200 only] */ -#define AT91_TWI_NACK (1 << 8) /* Not Acknowledged */ -#define AT91_TWI_ARBLST (1 << 9) /* Arbitration Lost [SAM9260 only] */ -#define AT91_TWI_SCLWS (1 << 10) /* Clock Wait State [SAM9260 only] */ -#define AT91_TWI_EOSACC (1 << 11) /* End of Slave Address [SAM9260 only] */ - -#define AT91_TWI_IER 0x24 /* Interrupt Enable Register */ -#define AT91_TWI_IDR 0x28 /* Interrupt Disable Register */ -#define AT91_TWI_IMR 0x2c /* Interrupt Mask Register */ -#define AT91_TWI_RHR 0x30 /* Receive Holding Register */ -#define AT91_TWI_THR 0x34 /* Transmit Holding Register */ - -#endif - diff --git a/trunk/arch/arm/mach-at91/pm.c b/trunk/arch/arm/mach-at91/pm.c index 2c2d86505a54..5315f05896e9 100644 --- a/trunk/arch/arm/mach-at91/pm.c +++ b/trunk/arch/arm/mach-at91/pm.c @@ -153,7 +153,9 @@ static int at91_pm_verify_clocks(void) } } -#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS + if (!IS_ENABLED(CONFIG_AT91_PROGRAMMABLE_CLOCKS)) + return 1; + /* PCK0..PCK3 must be disabled, or configured to use clk32k */ for (i = 0; i < 4; i++) { u32 css; @@ -167,7 +169,6 @@ static int at91_pm_verify_clocks(void) return 0; } } -#endif return 1; } diff --git a/trunk/arch/arm/mach-at91/setup.c b/trunk/arch/arm/mach-at91/setup.c index e6f52de1062f..da9881b161e1 100644 --- a/trunk/arch/arm/mach-at91/setup.c +++ b/trunk/arch/arm/mach-at91/setup.c @@ -87,7 +87,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length) iotable_init(desc, 1); } -static struct map_desc at91_io_desc __initdata = { +static struct map_desc at91_io_desc __initdata __maybe_unused = { .virtual = (unsigned long)AT91_VA_BASE_SYS, .pfn = __phys_to_pfn(AT91_BASE_SYS), .length = SZ_16K, diff --git a/trunk/arch/arm/mach-clps711x/autcpu12.c b/trunk/arch/arm/mach-clps711x/autcpu12.c index 3fb79a1d0bde..32871918bb6e 100644 --- a/trunk/arch/arm/mach-clps711x/autcpu12.c +++ b/trunk/arch/arm/mach-clps711x/autcpu12.c @@ -23,6 +23,8 @@ #include #include #include +#include +#include #include #include @@ -62,9 +64,26 @@ void __init autcpu12_map_io(void) iotable_init(autcpu12_io_desc, ARRAY_SIZE(autcpu12_io_desc)); } +static struct resource autcpu12_nvram_resource[] __initdata = { + DEFINE_RES_MEM_NAMED(AUTCPU12_PHYS_NVRAM, SZ_128K, "SRAM"), +}; + +static struct platform_device autcpu12_nvram_pdev __initdata = { + .name = "autcpu12_nvram", + .id = -1, + .resource = autcpu12_nvram_resource, + .num_resources = ARRAY_SIZE(autcpu12_nvram_resource), +}; + +static void __init autcpu12_init(void) +{ + platform_device_register(&autcpu12_nvram_pdev); +} + MACHINE_START(AUTCPU12, "autronix autcpu12") /* Maintainer: Thomas Gleixner */ .atag_offset = 0x20000, + .init_machine = autcpu12_init, .map_io = autcpu12_map_io, .init_irq = clps711x_init_irq, .timer = &clps711x_timer, diff --git a/trunk/arch/arm/mach-davinci/Kconfig b/trunk/arch/arm/mach-davinci/Kconfig index ab99c3c3b752..026b4b277ae5 100644 --- a/trunk/arch/arm/mach-davinci/Kconfig +++ b/trunk/arch/arm/mach-davinci/Kconfig @@ -186,6 +186,13 @@ config DA850_UI_RMII NOTE: Please take care while choosing this option, MII PHY will not be functional if RMII mode is selected. +config DA850_UI_SD_VIDEO_PORT + bool "Video Port Interface" + help + Say Y if you want to use Video Port Interface (VPIF) on the + DA850/OMAP-L138 EVM. The Video decoders/encoders are found on the + UI daughter card that is supplied with the EVM. + endchoice config DA850_WL12XX diff --git a/trunk/arch/arm/mach-davinci/board-da850-evm.c b/trunk/arch/arm/mach-davinci/board-da850-evm.c index 1295e616ceee..32ee3f895967 100644 --- a/trunk/arch/arm/mach-davinci/board-da850-evm.c +++ b/trunk/arch/arm/mach-davinci/board-da850-evm.c @@ -45,6 +45,9 @@ #include #include +#include +#include + #define DA850_EVM_PHY_ID "davinci_mdio-0:00" #define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8) #define DA850_LCD_BL_PIN GPIO_TO_PIN(2, 15) @@ -452,6 +455,15 @@ static void da850_evm_ui_keys_init(unsigned gpio) } } +#ifdef CONFIG_DA850_UI_SD_VIDEO_PORT +static inline void da850_evm_setup_video_port(int video_sel) +{ + gpio_set_value_cansleep(video_sel, 0); +} +#else +static inline void da850_evm_setup_video_port(int video_sel) { } +#endif + static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio, unsigned ngpio, void *c) { @@ -497,6 +509,8 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio, da850_evm_setup_emac_rmii(sel_a); + da850_evm_setup_video_port(sel_c); + return 0; exp_setup_keys_fail: @@ -1149,6 +1163,169 @@ static __init int da850_evm_init_cpufreq(void) static __init int da850_evm_init_cpufreq(void) { return 0; } #endif +#if defined(CONFIG_DA850_UI_SD_VIDEO_PORT) + +#define TVP5147_CH0 "tvp514x-0" +#define TVP5147_CH1 "tvp514x-1" + +/* VPIF capture configuration */ +static struct tvp514x_platform_data tvp5146_pdata = { + .clk_polarity = 0, + .hs_polarity = 1, + .vs_polarity = 1, +}; + +#define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL) + +static const struct vpif_input da850_ch0_inputs[] = { + { + .input = { + .index = 0, + .name = "Composite", + .type = V4L2_INPUT_TYPE_CAMERA, + .capabilities = V4L2_IN_CAP_STD, + .std = TVP514X_STD_ALL, + }, + .input_route = INPUT_CVBS_VI2B, + .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC, + .subdev_name = TVP5147_CH0, + }, +}; + +static const struct vpif_input da850_ch1_inputs[] = { + { + .input = { + .index = 0, + .name = "S-Video", + .type = V4L2_INPUT_TYPE_CAMERA, + .capabilities = V4L2_IN_CAP_STD, + .std = TVP514X_STD_ALL, + }, + .input_route = INPUT_SVIDEO_VI2C_VI1C, + .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC, + .subdev_name = TVP5147_CH1, + }, +}; + +static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = { + { + .name = TVP5147_CH0, + .board_info = { + I2C_BOARD_INFO("tvp5146", 0x5d), + .platform_data = &tvp5146_pdata, + }, + }, + { + .name = TVP5147_CH1, + .board_info = { + I2C_BOARD_INFO("tvp5146", 0x5c), + .platform_data = &tvp5146_pdata, + }, + }, +}; + +static struct vpif_capture_config da850_vpif_capture_config = { + .subdev_info = da850_vpif_capture_sdev_info, + .subdev_count = ARRAY_SIZE(da850_vpif_capture_sdev_info), + .chan_config[0] = { + .inputs = da850_ch0_inputs, + .input_count = ARRAY_SIZE(da850_ch0_inputs), + .vpif_if = { + .if_type = VPIF_IF_BT656, + .hd_pol = 1, + .vd_pol = 1, + .fid_pol = 0, + }, + }, + .chan_config[1] = { + .inputs = da850_ch1_inputs, + .input_count = ARRAY_SIZE(da850_ch1_inputs), + .vpif_if = { + .if_type = VPIF_IF_BT656, + .hd_pol = 1, + .vd_pol = 1, + .fid_pol = 0, + }, + }, + .card_name = "DA850/OMAP-L138 Video Capture", +}; + +/* VPIF display configuration */ +static struct vpif_subdev_info da850_vpif_subdev[] = { + { + .name = "adv7343", + .board_info = { + I2C_BOARD_INFO("adv7343", 0x2a), + }, + }, +}; + +static const struct vpif_output da850_ch0_outputs[] = { + { + .output = { + .index = 0, + .name = "Composite", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .capabilities = V4L2_OUT_CAP_STD, + .std = V4L2_STD_ALL, + }, + .subdev_name = "adv7343", + .output_route = ADV7343_COMPOSITE_ID, + }, + { + .output = { + .index = 1, + .name = "S-Video", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .capabilities = V4L2_OUT_CAP_STD, + .std = V4L2_STD_ALL, + }, + .subdev_name = "adv7343", + .output_route = ADV7343_SVIDEO_ID, + }, +}; + +static struct vpif_display_config da850_vpif_display_config = { + .subdevinfo = da850_vpif_subdev, + .subdev_count = ARRAY_SIZE(da850_vpif_subdev), + .chan_config[0] = { + .outputs = da850_ch0_outputs, + .output_count = ARRAY_SIZE(da850_ch0_outputs), + }, + .card_name = "DA850/OMAP-L138 Video Display", +}; + +static __init void da850_vpif_init(void) +{ + int ret; + + ret = da850_register_vpif(); + if (ret) + pr_warn("da850_evm_init: VPIF setup failed: %d\n", ret); + + ret = davinci_cfg_reg_list(da850_vpif_capture_pins); + if (ret) + pr_warn("da850_evm_init: VPIF capture mux setup failed: %d\n", + ret); + + ret = da850_register_vpif_capture(&da850_vpif_capture_config); + if (ret) + pr_warn("da850_evm_init: VPIF capture setup failed: %d\n", ret); + + ret = davinci_cfg_reg_list(da850_vpif_display_pins); + if (ret) + pr_warn("da850_evm_init: VPIF display mux setup failed: %d\n", + ret); + + ret = da850_register_vpif_display(&da850_vpif_display_config); + if (ret) + pr_warn("da850_evm_init: VPIF display setup failed: %d\n", ret); +} + +#else +static __init void da850_vpif_init(void) {} +#endif + #ifdef CONFIG_DA850_WL12XX static void wl12xx_set_power(int index, bool power_on) @@ -1375,6 +1552,8 @@ static __init void da850_evm_init(void) pr_warning("da850_evm_init: suspend registration failed: %d\n", ret); + da850_vpif_init(); + ret = da8xx_register_spi(1, da850evm_spi_info, ARRAY_SIZE(da850evm_spi_info)); if (ret) diff --git a/trunk/arch/arm/mach-davinci/board-dm644x-evm.c b/trunk/arch/arm/mach-davinci/board-dm644x-evm.c index ca72fc4b8cca..f22572cee49d 100644 --- a/trunk/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/trunk/arch/arm/mach-davinci/board-dm644x-evm.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -620,7 +621,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = { { .name = "ntsc", .timings_type = VPBE_ENC_STD, - .timings = {V4L2_STD_525_60}, + .std_id = V4L2_STD_525_60, .interlaced = 1, .xres = 720, .yres = 480, @@ -632,7 +633,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = { { .name = "pal", .timings_type = VPBE_ENC_STD, - .timings = {V4L2_STD_625_50}, + .std_id = V4L2_STD_625_50, .interlaced = 1, .xres = 720, .yres = 576, @@ -647,8 +648,8 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = { static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = { { .name = "480p59_94", - .timings_type = VPBE_ENC_DV_PRESET, - .timings = {V4L2_DV_480P59_94}, + .timings_type = VPBE_ENC_CUSTOM_TIMINGS, + .dv_timings = V4L2_DV_BT_CEA_720X480P59_94, .interlaced = 0, .xres = 720, .yres = 480, @@ -659,8 +660,8 @@ static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = { }, { .name = "576p50", - .timings_type = VPBE_ENC_DV_PRESET, - .timings = {V4L2_DV_576P50}, + .timings_type = VPBE_ENC_CUSTOM_TIMINGS, + .dv_timings = V4L2_DV_BT_CEA_720X576P50, .interlaced = 0, .xres = 720, .yres = 576, @@ -698,7 +699,7 @@ static struct vpbe_output dm644xevm_vpbe_outputs[] = { .index = 1, .name = "Component", .type = V4L2_OUTPUT_TYPE_ANALOG, - .capabilities = V4L2_OUT_CAP_PRESETS, + .capabilities = V4L2_OUT_CAP_DV_TIMINGS, }, .subdev_name = VPBE_VENC_SUBDEV_NAME, .default_mode = "480p59_94", diff --git a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c index 9944367b4931..1dbf85beed1b 100644 --- a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -496,18 +497,49 @@ static struct vpif_subdev_info dm646x_vpif_subdev[] = { }, }; -static const char *output[] = { - "Composite", - "Component", - "S-Video", +static const struct vpif_output dm6467_ch0_outputs[] = { + { + .output = { + .index = 0, + .name = "Composite", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .capabilities = V4L2_OUT_CAP_STD, + .std = V4L2_STD_ALL, + }, + .subdev_name = "adv7343", + .output_route = ADV7343_COMPOSITE_ID, + }, + { + .output = { + .index = 1, + .name = "Component", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS, + }, + .subdev_name = "adv7343", + .output_route = ADV7343_COMPONENT_ID, + }, + { + .output = { + .index = 2, + .name = "S-Video", + .type = V4L2_OUTPUT_TYPE_ANALOG, + .capabilities = V4L2_OUT_CAP_STD, + .std = V4L2_STD_ALL, + }, + .subdev_name = "adv7343", + .output_route = ADV7343_SVIDEO_ID, + }, }; static struct vpif_display_config dm646x_vpif_display_config = { .set_clock = set_vpif_clock, .subdevinfo = dm646x_vpif_subdev, .subdev_count = ARRAY_SIZE(dm646x_vpif_subdev), - .output = output, - .output_count = ARRAY_SIZE(output), + .chan_config[0] = { + .outputs = dm6467_ch0_outputs, + .output_count = ARRAY_SIZE(dm6467_ch0_outputs), + }, .card_name = "DM646x EVM", }; @@ -601,15 +633,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = { I2C_BOARD_INFO("tvp5146", 0x5d), .platform_data = &tvp5146_pdata, }, - .input = INPUT_CVBS_VI2B, - .output = OUTPUT_10BIT_422_EMBEDDED_SYNC, - .can_route = 1, - .vpif_if = { - .if_type = VPIF_IF_BT656, - .hd_pol = 1, - .vd_pol = 1, - .fid_pol = 0, - }, }, { .name = TVP5147_CH1, @@ -617,15 +640,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = { I2C_BOARD_INFO("tvp5146", 0x5c), .platform_data = &tvp5146_pdata, }, - .input = INPUT_SVIDEO_VI2C_VI1C, - .output = OUTPUT_10BIT_422_EMBEDDED_SYNC, - .can_route = 1, - .vpif_if = { - .if_type = VPIF_IF_BT656, - .hd_pol = 1, - .vd_pol = 1, - .fid_pol = 0, - }, }, }; @@ -635,9 +649,12 @@ static const struct vpif_input dm6467_ch0_inputs[] = { .index = 0, .name = "Composite", .type = V4L2_INPUT_TYPE_CAMERA, + .capabilities = V4L2_IN_CAP_STD, .std = TVP514X_STD_ALL, }, .subdev_name = TVP5147_CH0, + .input_route = INPUT_CVBS_VI2B, + .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC, }, }; @@ -647,9 +664,12 @@ static const struct vpif_input dm6467_ch1_inputs[] = { .index = 0, .name = "S-Video", .type = V4L2_INPUT_TYPE_CAMERA, + .capabilities = V4L2_IN_CAP_STD, .std = TVP514X_STD_ALL, }, .subdev_name = TVP5147_CH1, + .input_route = INPUT_SVIDEO_VI2C_VI1C, + .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC, }, }; @@ -661,10 +681,22 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { .chan_config[0] = { .inputs = dm6467_ch0_inputs, .input_count = ARRAY_SIZE(dm6467_ch0_inputs), + .vpif_if = { + .if_type = VPIF_IF_BT656, + .hd_pol = 1, + .vd_pol = 1, + .fid_pol = 0, + }, }, .chan_config[1] = { .inputs = dm6467_ch1_inputs, .input_count = ARRAY_SIZE(dm6467_ch1_inputs), + .vpif_if = { + .if_type = VPIF_IF_BT656, + .hd_pol = 1, + .vd_pol = 1, + .fid_pol = 0, + }, }, }; diff --git a/trunk/arch/arm/mach-davinci/da850.c b/trunk/arch/arm/mach-davinci/da850.c index 6676dee7104e..b90c172d5541 100644 --- a/trunk/arch/arm/mach-davinci/da850.c +++ b/trunk/arch/arm/mach-davinci/da850.c @@ -347,6 +347,13 @@ static struct clk spi1_clk = { .flags = DA850_CLK_ASYNC3, }; +static struct clk vpif_clk = { + .name = "vpif", + .parent = &pll0_sysclk2, + .lpsc = DA850_LPSC1_VPIF, + .gpsc = 1, +}; + static struct clk sata_clk = { .name = "sata", .parent = &pll0_sysclk2, @@ -397,6 +404,7 @@ static struct clk_lookup da850_clks[] = { CLK(NULL, "usb20", &usb20_clk), CLK("spi_davinci.0", NULL, &spi0_clk), CLK("spi_davinci.1", NULL, &spi1_clk), + CLK("vpif", NULL, &vpif_clk), CLK("ahci", NULL, &sata_clk), CLK(NULL, NULL, NULL), }; @@ -573,6 +581,46 @@ static const struct mux_config da850_pins[] = { MUX_CFG(DA850, GPIO6_10, 13, 20, 15, 8, false) MUX_CFG(DA850, GPIO6_13, 13, 8, 15, 8, false) MUX_CFG(DA850, RTC_ALARM, 0, 28, 15, 2, false) + /* VPIF Capture */ + MUX_CFG(DA850, VPIF_DIN0, 15, 4, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN1, 15, 0, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN2, 14, 28, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN3, 14, 24, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN4, 14, 20, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN5, 14, 16, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN6, 14, 12, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN7, 14, 8, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN8, 16, 4, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN9, 16, 0, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN10, 15, 28, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN11, 15, 24, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN12, 15, 20, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN13, 15, 16, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN14, 15, 12, 15, 1, false) + MUX_CFG(DA850, VPIF_DIN15, 15, 8, 15, 1, false) + MUX_CFG(DA850, VPIF_CLKIN0, 14, 0, 15, 1, false) + MUX_CFG(DA850, VPIF_CLKIN1, 14, 4, 15, 1, false) + MUX_CFG(DA850, VPIF_CLKIN2, 19, 8, 15, 1, false) + MUX_CFG(DA850, VPIF_CLKIN3, 19, 16, 15, 1, false) + /* VPIF Display */ + MUX_CFG(DA850, VPIF_DOUT0, 17, 4, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT1, 17, 0, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT2, 16, 28, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT3, 16, 24, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT4, 16, 20, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT5, 16, 16, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT6, 16, 12, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT7, 16, 8, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT8, 18, 4, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT9, 18, 0, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT10, 17, 28, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT11, 17, 24, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT12, 17, 20, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT13, 17, 16, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT14, 17, 12, 15, 1, false) + MUX_CFG(DA850, VPIF_DOUT15, 17, 8, 15, 1, false) + MUX_CFG(DA850, VPIF_CLKO2, 19, 12, 15, 1, false) + MUX_CFG(DA850, VPIF_CLKO3, 19, 20, 15, 1, false) #endif }; @@ -595,6 +643,26 @@ const short da850_lcdcntl_pins[] __initconst = { -1 }; +const short da850_vpif_capture_pins[] __initdata = { + DA850_VPIF_DIN0, DA850_VPIF_DIN1, DA850_VPIF_DIN2, DA850_VPIF_DIN3, + DA850_VPIF_DIN4, DA850_VPIF_DIN5, DA850_VPIF_DIN6, DA850_VPIF_DIN7, + DA850_VPIF_DIN8, DA850_VPIF_DIN9, DA850_VPIF_DIN10, DA850_VPIF_DIN11, + DA850_VPIF_DIN12, DA850_VPIF_DIN13, DA850_VPIF_DIN14, DA850_VPIF_DIN15, + DA850_VPIF_CLKIN0, DA850_VPIF_CLKIN1, DA850_VPIF_CLKIN2, + DA850_VPIF_CLKIN3, + -1 +}; + +const short da850_vpif_display_pins[] __initdata = { + DA850_VPIF_DOUT0, DA850_VPIF_DOUT1, DA850_VPIF_DOUT2, DA850_VPIF_DOUT3, + DA850_VPIF_DOUT4, DA850_VPIF_DOUT5, DA850_VPIF_DOUT6, DA850_VPIF_DOUT7, + DA850_VPIF_DOUT8, DA850_VPIF_DOUT9, DA850_VPIF_DOUT10, + DA850_VPIF_DOUT11, DA850_VPIF_DOUT12, DA850_VPIF_DOUT13, + DA850_VPIF_DOUT14, DA850_VPIF_DOUT15, DA850_VPIF_CLKO2, + DA850_VPIF_CLKO3, + -1 +}; + /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */ static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = { [IRQ_DA8XX_COMMTX] = 7, @@ -939,7 +1007,7 @@ static struct platform_device da850_cpufreq_device = { unsigned int da850_max_speed = 300000; -int __init da850_register_cpufreq(char *async_clk) +int da850_register_cpufreq(char *async_clk) { int i; @@ -1064,6 +1132,90 @@ int __init da850_register_pm(struct platform_device *pdev) return ret; } +/* VPIF resource, platform data */ +static u64 da850_vpif_dma_mask = DMA_BIT_MASK(32); + +static struct resource da850_vpif_resource[] = { + { + .start = DA8XX_VPIF_BASE, + .end = DA8XX_VPIF_BASE + 0xfff, + .flags = IORESOURCE_MEM, + } +}; + +static struct platform_device da850_vpif_dev = { + .name = "vpif", + .id = -1, + .dev = { + .dma_mask = &da850_vpif_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, + .resource = da850_vpif_resource, + .num_resources = ARRAY_SIZE(da850_vpif_resource), +}; + +static struct resource da850_vpif_display_resource[] = { + { + .start = IRQ_DA850_VPIFINT, + .end = IRQ_DA850_VPIFINT, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device da850_vpif_display_dev = { + .name = "vpif_display", + .id = -1, + .dev = { + .dma_mask = &da850_vpif_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, + .resource = da850_vpif_display_resource, + .num_resources = ARRAY_SIZE(da850_vpif_display_resource), +}; + +static struct resource da850_vpif_capture_resource[] = { + { + .start = IRQ_DA850_VPIFINT, + .end = IRQ_DA850_VPIFINT, + .flags = IORESOURCE_IRQ, + }, + { + .start = IRQ_DA850_VPIFINT, + .end = IRQ_DA850_VPIFINT, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device da850_vpif_capture_dev = { + .name = "vpif_capture", + .id = -1, + .dev = { + .dma_mask = &da850_vpif_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, + .resource = da850_vpif_capture_resource, + .num_resources = ARRAY_SIZE(da850_vpif_capture_resource), +}; + +int __init da850_register_vpif(void) +{ + return platform_device_register(&da850_vpif_dev); +} + +int __init da850_register_vpif_display(struct vpif_display_config + *display_config) +{ + da850_vpif_display_dev.dev.platform_data = display_config; + return platform_device_register(&da850_vpif_display_dev); +} + +int __init da850_register_vpif_capture(struct vpif_capture_config + *capture_config) +{ + da850_vpif_capture_dev.dev.platform_data = capture_config; + return platform_device_register(&da850_vpif_capture_dev); +} + static struct davinci_soc_info davinci_soc_info_da850 = { .io_desc = da850_io_desc, .io_desc_num = ARRAY_SIZE(da850_io_desc), diff --git a/trunk/arch/arm/mach-davinci/dm644x.c b/trunk/arch/arm/mach-davinci/dm644x.c index 0755d466221a..cd0c8b1e1ecf 100644 --- a/trunk/arch/arm/mach-davinci/dm644x.c +++ b/trunk/arch/arm/mach-davinci/dm644x.c @@ -701,7 +701,7 @@ static struct resource dm644x_venc_resources[] = { #define DM644X_VPSS_DACCLKEN BIT(4) static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type, - unsigned int mode) + unsigned int pclock) { int ret = 0; u32 v = DM644X_VPSS_VENCLKEN; @@ -711,27 +711,18 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type, v |= DM644X_VPSS_DACCLKEN; writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); break; - case VPBE_ENC_DV_PRESET: - switch (mode) { - case V4L2_DV_480P59_94: - case V4L2_DV_576P50: + case VPBE_ENC_CUSTOM_TIMINGS: + if (pclock <= 27000000) { v |= DM644X_VPSS_MUXSEL_PLL2_MODE | DM644X_VPSS_DACCLKEN; writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); - break; - case V4L2_DV_720P60: - case V4L2_DV_1080I60: - case V4L2_DV_1080P30: + } else { /* * For HD, use external clock source since * HD requires higher clock rate */ v |= DM644X_VPSS_MUXSEL_VPBECLK_MODE; writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); - break; - default: - ret = -EINVAL; - break; } break; default: diff --git a/trunk/arch/arm/mach-davinci/include/mach/da8xx.h b/trunk/arch/arm/mach-davinci/include/mach/da8xx.h index c9ee723c56f3..aaccdc4528fc 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/trunk/arch/arm/mach-davinci/include/mach/da8xx.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -26,6 +27,8 @@ #include #include +#include + extern void __iomem *da8xx_syscfg0_base; extern void __iomem *da8xx_syscfg1_base; @@ -63,6 +66,7 @@ extern unsigned int da850_max_speed; #define DA8XX_PLL0_BASE 0x01c11000 #define DA8XX_TIMER64P0_BASE 0x01c20000 #define DA8XX_TIMER64P1_BASE 0x01c21000 +#define DA8XX_VPIF_BASE 0x01e17000 #define DA8XX_GPIO_BASE 0x01e26000 #define DA8XX_PSC1_BASE 0x01e27000 #define DA8XX_AEMIF_CS2_BASE 0x60000000 @@ -92,6 +96,11 @@ int da8xx_register_cpuidle(void); void __iomem * __init da8xx_get_mem_ctlr(void); int da850_register_pm(struct platform_device *pdev); int __init da850_register_sata(unsigned long refclkpn); +int __init da850_register_vpif(void); +int __init da850_register_vpif_display + (struct vpif_display_config *display_config); +int __init da850_register_vpif_capture + (struct vpif_capture_config *capture_config); void da8xx_restart(char mode, const char *cmd); extern struct platform_device da8xx_serial_device; @@ -126,6 +135,8 @@ extern const short da830_ecap1_pins[]; extern const short da830_ecap2_pins[]; extern const short da830_eqep0_pins[]; extern const short da830_eqep1_pins[]; +extern const short da850_vpif_capture_pins[]; +extern const short da850_vpif_display_pins[]; extern const short da850_i2c0_pins[]; extern const short da850_i2c1_pins[]; diff --git a/trunk/arch/arm/mach-davinci/include/mach/mux.h b/trunk/arch/arm/mach-davinci/include/mach/mux.h index a7e92fca32e6..9e95b8a1edb6 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/mux.h +++ b/trunk/arch/arm/mach-davinci/include/mach/mux.h @@ -928,6 +928,48 @@ enum davinci_da850_index { DA850_GPIO6_10, DA850_GPIO6_13, DA850_RTC_ALARM, + + /* VPIF Capture */ + DA850_VPIF_DIN0, + DA850_VPIF_DIN1, + DA850_VPIF_DIN2, + DA850_VPIF_DIN3, + DA850_VPIF_DIN4, + DA850_VPIF_DIN5, + DA850_VPIF_DIN6, + DA850_VPIF_DIN7, + DA850_VPIF_DIN8, + DA850_VPIF_DIN9, + DA850_VPIF_DIN10, + DA850_VPIF_DIN11, + DA850_VPIF_DIN12, + DA850_VPIF_DIN13, + DA850_VPIF_DIN14, + DA850_VPIF_DIN15, + DA850_VPIF_CLKIN0, + DA850_VPIF_CLKIN1, + DA850_VPIF_CLKIN2, + DA850_VPIF_CLKIN3, + + /* VPIF Display */ + DA850_VPIF_DOUT0, + DA850_VPIF_DOUT1, + DA850_VPIF_DOUT2, + DA850_VPIF_DOUT3, + DA850_VPIF_DOUT4, + DA850_VPIF_DOUT5, + DA850_VPIF_DOUT6, + DA850_VPIF_DOUT7, + DA850_VPIF_DOUT8, + DA850_VPIF_DOUT9, + DA850_VPIF_DOUT10, + DA850_VPIF_DOUT11, + DA850_VPIF_DOUT12, + DA850_VPIF_DOUT13, + DA850_VPIF_DOUT14, + DA850_VPIF_DOUT15, + DA850_VPIF_CLKO2, + DA850_VPIF_CLKO3, }; enum davinci_tnetv107x_index { diff --git a/trunk/arch/arm/mach-davinci/include/mach/psc.h b/trunk/arch/arm/mach-davinci/include/mach/psc.h index 405318e35bf6..40a0027838e8 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/psc.h +++ b/trunk/arch/arm/mach-davinci/include/mach/psc.h @@ -166,6 +166,7 @@ #define DA830_LPSC1_McASP1 8 #define DA850_LPSC1_SATA 8 #define DA830_LPSC1_McASP2 9 +#define DA850_LPSC1_VPIF 9 #define DA8XX_LPSC1_SPI1 10 #define DA8XX_LPSC1_I2C 11 #define DA8XX_LPSC1_UART1 12 diff --git a/trunk/arch/arm/mach-exynos/dma.c b/trunk/arch/arm/mach-exynos/dma.c index f60b66dbcf84..21d568b3b149 100644 --- a/trunk/arch/arm/mach-exynos/dma.c +++ b/trunk/arch/arm/mach-exynos/dma.c @@ -303,10 +303,12 @@ static int __init exynos_dma_init(void) dma_cap_set(DMA_SLAVE, exynos_pdma0_pdata.cap_mask); dma_cap_set(DMA_CYCLIC, exynos_pdma0_pdata.cap_mask); + dma_cap_set(DMA_PRIVATE, exynos_pdma0_pdata.cap_mask); amba_device_register(&exynos_pdma0_device, &iomem_resource); dma_cap_set(DMA_SLAVE, exynos_pdma1_pdata.cap_mask); dma_cap_set(DMA_CYCLIC, exynos_pdma1_pdata.cap_mask); + dma_cap_set(DMA_PRIVATE, exynos_pdma1_pdata.cap_mask); amba_device_register(&exynos_pdma1_device, &iomem_resource); dma_cap_set(DMA_MEMCPY, exynos_mdma1_pdata.cap_mask); diff --git a/trunk/arch/arm/mach-exynos/mach-nuri.c b/trunk/arch/arm/mach-exynos/mach-nuri.c index 480cd78f1920..c05d7aa84031 100644 --- a/trunk/arch/arm/mach-exynos/mach-nuri.c +++ b/trunk/arch/arm/mach-exynos/mach-nuri.c @@ -29,6 +29,7 @@ #include #include