From 20787d9c9d247d33ae5e14ffb6859affac9dcaf4 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Wed, 7 Mar 2012 14:05:29 -0800 Subject: [PATCH] --- yaml --- r: 295668 b: refs/heads/master c: 4d02be5a6550ebf09936802c2cb8d359ce1ab29c h: refs/heads/master v: v3 --- [refs] | 2 +- .../feature-removal-schedule.txt | 14 - trunk/MAINTAINERS | 15 +- trunk/Makefile | 2 +- trunk/arch/arm/Kconfig | 2 +- trunk/arch/arm/Kconfig.debug | 2 +- trunk/arch/arm/boot/dts/exynos4210.dtsi | 1 + trunk/arch/arm/boot/dts/tegra-paz00.dts | 6 +- trunk/arch/arm/common/it8152.c | 7 - trunk/arch/arm/common/pl330.c | 3 +- trunk/arch/arm/configs/at91cap9_defconfig | 108 - trunk/arch/arm/include/asm/assembler.h | 5 + trunk/arch/arm/include/asm/hardware/pl330.h | 2 +- trunk/arch/arm/include/asm/processor.h | 1 + trunk/arch/arm/kernel/ptrace.c | 9 +- trunk/arch/arm/kernel/smp_twd.c | 2 +- trunk/arch/arm/kernel/traps.c | 5 +- trunk/arch/arm/kernel/vmlinux.lds.S | 1 + trunk/arch/arm/mach-at91/Kconfig | 26 +- trunk/arch/arm/mach-at91/Makefile | 4 - trunk/arch/arm/mach-at91/Makefile.boot | 6 +- trunk/arch/arm/mach-at91/at91cap9.c | 404 ---- trunk/arch/arm/mach-at91/at91cap9_devices.c | 1273 ---------- trunk/arch/arm/mach-at91/at91rm9200_devices.c | 2 +- .../arch/arm/mach-at91/at91sam9260_devices.c | 9 +- .../arch/arm/mach-at91/at91sam9261_devices.c | 2 +- .../arch/arm/mach-at91/at91sam9263_devices.c | 8 +- trunk/arch/arm/mach-at91/board-cap9adk.c | 396 ---- trunk/arch/arm/mach-at91/clock.c | 5 +- trunk/arch/arm/mach-at91/cpuidle.c | 11 +- trunk/arch/arm/mach-at91/generic.h | 1 - .../arm/mach-at91/include/mach/at91_pmc.h | 14 +- .../arm/mach-at91/include/mach/at91cap9.h | 122 - .../mach-at91/include/mach/at91cap9_matrix.h | 137 -- .../mach-at91/include/mach/at91sam9_ddrsdr.h | 10 - .../arm/mach-at91/include/mach/at91sam9_smc.h | 29 + trunk/arch/arm/mach-at91/include/mach/cpu.h | 21 - .../arm/mach-at91/include/mach/hardware.h | 4 +- trunk/arch/arm/mach-at91/pm.c | 17 +- trunk/arch/arm/mach-at91/pm.h | 91 +- trunk/arch/arm/mach-at91/pm_slowclock.S | 12 +- trunk/arch/arm/mach-at91/sam9_smc.c | 76 +- trunk/arch/arm/mach-at91/sam9_smc.h | 23 - trunk/arch/arm/mach-at91/setup.c | 17 - trunk/arch/arm/mach-at91/soc.h | 5 - trunk/arch/arm/mach-davinci/board-dm355-evm.c | 3 +- .../arm/mach-davinci/board-dm355-leopard.c | 3 +- trunk/arch/arm/mach-davinci/board-dm365-evm.c | 3 +- .../arch/arm/mach-davinci/board-dm644x-evm.c | 28 +- .../arch/arm/mach-davinci/board-dm646x-evm.c | 32 +- .../arch/arm/mach-davinci/board-neuros-osd2.c | 3 +- trunk/arch/arm/mach-davinci/board-sffsdr.c | 3 +- trunk/arch/arm/mach-davinci/davinci.h | 96 + trunk/arch/arm/mach-davinci/devices.c | 32 +- trunk/arch/arm/mach-davinci/dm355.c | 3 +- trunk/arch/arm/mach-davinci/dm365.c | 19 +- trunk/arch/arm/mach-davinci/dm644x.c | 53 +- trunk/arch/arm/mach-davinci/dm646x.c | 21 +- .../arm/mach-davinci/include/mach/dm355.h | 32 - .../arm/mach-davinci/include/mach/dm365.h | 53 +- .../arm/mach-davinci/include/mach/dm644x.h | 47 - .../arm/mach-davinci/include/mach/dm646x.h | 42 +- .../arm/mach-davinci/include/mach/hardware.h | 2 - trunk/arch/arm/mach-dove/common.c | 3 +- trunk/arch/arm/mach-ep93xx/vision_ep9307.c | 4 +- trunk/arch/arm/mach-exynos/clock-exynos4210.c | 2 + trunk/arch/arm/mach-exynos/clock-exynos4212.c | 2 + trunk/arch/arm/mach-exynos/clock.c | 2 + trunk/arch/arm/mach-exynos/mach-exynos4-dt.c | 8 +- trunk/arch/arm/mach-exynos/mach-nuri.c | 8 +- .../arm/mach-exynos/mach-universal_c210.c | 2 +- trunk/arch/arm/mach-exynos/pm.c | 4 +- trunk/arch/arm/mach-imx/clock-imx31.c | 2 +- trunk/arch/arm/mach-imx/clock-imx35.c | 166 +- .../{crmregs-imx31.h => crmregs-imx3.h} | 15 +- trunk/arch/arm/mach-imx/mach-armadillo5x0.c | 2 +- trunk/arch/arm/mach-kirkwood/common.c | 3 +- trunk/arch/arm/mach-kirkwood/mpp.h | 320 +-- trunk/arch/arm/mach-mv78xx0/common.c | 3 +- trunk/arch/arm/mach-mv78xx0/mpp.h | 226 +- trunk/arch/arm/mach-omap1/gpio15xx.c | 7 +- trunk/arch/arm/mach-omap1/gpio16xx.c | 40 +- trunk/arch/arm/mach-omap1/gpio7xx.c | 14 +- trunk/arch/arm/mach-omap2/Makefile | 4 +- trunk/arch/arm/mach-omap2/board-4430sdp.c | 17 +- trunk/arch/arm/mach-omap2/board-cm-t35.c | 2 +- trunk/arch/arm/mach-omap2/board-generic.c | 4 + trunk/arch/arm/mach-omap2/board-omap3evm.c | 23 +- trunk/arch/arm/mach-omap2/board-omap4panda.c | 6 +- .../arm/mach-omap2/board-zoom-peripherals.c | 6 +- trunk/arch/arm/mach-omap2/gpio.c | 36 +- trunk/arch/arm/mach-omap2/hsmmc.c | 8 +- trunk/arch/arm/mach-omap2/mux.c | 22 +- trunk/arch/arm/mach-omap2/omap-headsmp.S | 1 + trunk/arch/arm/mach-omap2/omap_hwmod.c | 16 +- trunk/arch/arm/mach-omap2/pm24xx.c | 8 +- trunk/arch/arm/mach-omap2/pm34xx.c | 14 - trunk/arch/arm/mach-omap2/prm44xx.c | 1 + trunk/arch/arm/mach-omap2/serial.c | 8 +- trunk/arch/arm/mach-omap2/vc.c | 10 +- .../arm/mach-omap2/voltagedomains3xxx_data.c | 2 + .../arm/mach-omap2/voltagedomains44xx_data.c | 2 + trunk/arch/arm/mach-omap2/vp.c | 5 + trunk/arch/arm/mach-orion5x/common.c | 4 +- trunk/arch/arm/mach-s3c2410/cpu-freq.c | 8 +- trunk/arch/arm/mach-s3c2410/dma.c | 5 +- trunk/arch/arm/mach-s3c2410/pll.c | 2 +- trunk/arch/arm/mach-s3c2410/pm.c | 2 +- trunk/arch/arm/mach-s3c2412/cpu-freq.c | 3 +- trunk/arch/arm/mach-s3c2412/dma.c | 3 +- trunk/arch/arm/mach-s3c2412/irq.c | 2 +- trunk/arch/arm/mach-s3c2412/pm.c | 2 +- trunk/arch/arm/mach-s3c2416/irq.c | 3 +- trunk/arch/arm/mach-s3c2416/pm.c | 2 +- trunk/arch/arm/mach-s3c2440/clock.c | 2 +- trunk/arch/arm/mach-s3c2440/dma.c | 3 +- trunk/arch/arm/mach-s3c2440/irq.c | 2 +- trunk/arch/arm/mach-s3c2440/s3c2440-cpufreq.c | 3 +- .../arm/mach-s3c2440/s3c2440-pll-12000000.c | 2 +- .../arm/mach-s3c2440/s3c2440-pll-16934400.c | 3 +- trunk/arch/arm/mach-s3c2440/s3c2442.c | 2 +- trunk/arch/arm/mach-s3c2440/s3c244x-clock.c | 2 +- trunk/arch/arm/mach-s3c2440/s3c244x-irq.c | 2 +- trunk/arch/arm/mach-s3c2443/dma.c | 3 +- trunk/arch/arm/mach-s3c2443/irq.c | 3 +- trunk/arch/arm/mach-s3c64xx/clock.c | 5 + trunk/arch/arm/mach-s3c64xx/common.c | 2 +- trunk/arch/arm/mach-s5p64x0/pm.c | 2 +- trunk/arch/arm/mach-s5pv210/clock.c | 4 +- trunk/arch/arm/mach-s5pv210/pm.c | 2 +- trunk/arch/arm/mach-shmobile/board-ag5evm.c | 29 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 12 +- trunk/arch/arm/mach-shmobile/board-kota2.c | 3 +- trunk/arch/arm/mach-shmobile/board-mackerel.c | 95 +- trunk/arch/arm/mach-shmobile/clock-sh73a0.c | 113 + .../arm/mach-shmobile/include/mach/sh73a0.h | 6 +- trunk/arch/arm/mach-shmobile/intc-sh73a0.c | 2 + trunk/arch/arm/mach-shmobile/pfc-r8a7779.c | 2 +- trunk/arch/arm/mach-shmobile/pfc-sh7372.c | 41 + trunk/arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- trunk/arch/arm/mach-tegra/Kconfig | 14 + trunk/arch/arm/mach-tegra/Makefile | 3 +- trunk/arch/arm/mach-tegra/board-paz00.c | 8 +- trunk/arch/arm/mach-tegra/board-paz00.h | 2 +- trunk/arch/arm/mach-tegra/common.c | 2 - trunk/arch/arm/mach-tegra/include/mach/dma.h | 10 +- trunk/arch/arm/mach-tegra/usb_phy.c | 11 + trunk/arch/arm/mm/Kconfig | 3 +- trunk/arch/arm/mm/cache-v7.S | 6 + trunk/arch/arm/plat-mxc/audmux-v1.c | 5 +- trunk/arch/arm/plat-mxc/avic.c | 2 +- trunk/arch/arm/plat-omap/include/plat/gpio.h | 29 +- .../arm/plat-omap/include/plat/omap-secure.h | 2 +- trunk/arch/arm/plat-orion/common.c | 9 +- .../arch/arm/plat-orion/include/plat/common.h | 3 +- trunk/arch/arm/plat-orion/mpp.c | 3 +- trunk/arch/arm/plat-samsung/devs.c | 4 +- .../arch/avr32/mach-at32ap/include/mach/cpu.h | 3 - trunk/arch/c6x/boot/Makefile | 2 +- trunk/arch/m68k/include/asm/mcf_pgtable.h | 3 +- trunk/arch/m68k/mm/mcfmmu.c | 9 +- trunk/arch/m68k/platform/coldfire/entry.S | 4 +- trunk/arch/powerpc/configs/ppc64_defconfig | 5 - trunk/arch/powerpc/include/asm/ppc-pci.h | 5 + trunk/arch/powerpc/include/asm/ptrace.h | 20 +- trunk/arch/powerpc/kernel/entry_32.S | 2 +- trunk/arch/powerpc/kernel/entry_64.S | 6 +- trunk/arch/powerpc/kernel/exceptions-64s.S | 2 +- trunk/arch/powerpc/kernel/irq.c | 6 +- trunk/arch/powerpc/kernel/perf_event.c | 8 +- trunk/arch/powerpc/kernel/process.c | 6 +- trunk/arch/powerpc/kernel/rtas.c | 5 +- trunk/arch/powerpc/kernel/signal.c | 12 +- trunk/arch/powerpc/kernel/signal.h | 2 +- trunk/arch/powerpc/platforms/powernv/pci.c | 22 +- trunk/arch/powerpc/platforms/pseries/eeh.c | 4 +- .../arch/powerpc/platforms/pseries/suspend.c | 6 +- trunk/arch/powerpc/platforms/wsp/ics.c | 2 +- trunk/arch/powerpc/platforms/wsp/smp.c | 2 +- trunk/arch/powerpc/platforms/wsp/wsp_pci.c | 8 +- trunk/arch/powerpc/sysdev/fsl_pci.c | 48 +- trunk/arch/s390/kernel/compat_wrapper.S | 2 +- trunk/arch/s390/kernel/process.c | 5 +- trunk/arch/s390/kernel/time.c | 7 +- trunk/arch/s390/mm/pgtable.c | 2 +- trunk/arch/sh/boards/board-sh7757lcr.c | 20 +- trunk/arch/sh/boards/mach-ap325rxa/setup.c | 1 + trunk/arch/sh/boards/mach-ecovec24/setup.c | 2 + trunk/arch/sh/boards/mach-kfr2r09/setup.c | 1 + trunk/arch/sh/boards/mach-migor/setup.c | 2 + trunk/arch/sh/boards/mach-se/7724/setup.c | 1 + trunk/arch/sh/drivers/pci/pci-sh7780.c | 2 +- trunk/arch/sh/include/asm/device.h | 8 +- trunk/arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 2 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 22 +- trunk/arch/sh/kernel/smp.c | 2 +- trunk/arch/sh/kernel/topology.c | 2 +- trunk/arch/sh/mm/cache-sh2a.c | 2 + trunk/arch/x86/include/asm/i387.h | 307 ++- trunk/arch/x86/include/asm/processor.h | 2 + trunk/arch/x86/include/asm/thread_info.h | 2 - trunk/arch/x86/kernel/cpu/common.c | 5 + .../arch/x86/kernel/cpu/perf_event_intel_ds.c | 1 - .../x86/kernel/cpu/perf_event_intel_lbr.c | 2 - trunk/arch/x86/kernel/process_32.c | 26 +- trunk/arch/x86/kernel/process_64.c | 30 +- trunk/arch/x86/kernel/traps.c | 43 +- trunk/arch/x86/kernel/xsave.c | 12 +- trunk/arch/x86/kvm/vmx.c | 2 +- trunk/arch/x86/pci/xen.c | 2 +- trunk/arch/x86/xen/smp.c | 7 + trunk/block/blk-cgroup.c | 2 +- trunk/block/blk-core.c | 33 +- trunk/block/blk-ioc.c | 111 +- trunk/block/blk-merge.c | 37 + trunk/block/blk.h | 2 + trunk/block/bsg.c | 3 +- trunk/block/cfq-iosched.c | 24 +- trunk/block/elevator.c | 55 +- trunk/crypto/sha512_generic.c | 83 +- trunk/drivers/ata/pata_at91.c | 48 +- trunk/drivers/base/cpu.c | 21 + trunk/drivers/base/memory.c | 31 +- trunk/drivers/base/node.c | 8 + trunk/drivers/base/regmap/regcache.c | 4 +- trunk/drivers/bcma/main.c | 4 +- trunk/drivers/bcma/scan.c | 19 +- trunk/drivers/block/floppy.c | 17 +- trunk/drivers/block/loop.c | 24 +- trunk/drivers/block/mtip32xx/mtip32xx.c | 11 +- trunk/drivers/block/mtip32xx/mtip32xx.h | 5 - trunk/drivers/block/nvme.c | 2 + trunk/drivers/cdrom/cdrom.c | 20 +- trunk/drivers/cpuidle/Kconfig | 2 +- trunk/drivers/edac/i3200_edac.c | 15 +- trunk/drivers/gpio/gpio-omap.c | 1101 ++++----- trunk/drivers/gpu/drm/drm_ioc32.c | 3 +- .../drivers/gpu/drm/exynos/exynos_drm_core.c | 3 + .../drivers/gpu/drm/exynos/exynos_drm_crtc.c | 6 +- trunk/drivers/gpu/drm/exynos/exynos_drm_drv.c | 26 +- .../gpu/drm/exynos/exynos_drm_encoder.c | 34 + .../gpu/drm/exynos/exynos_drm_encoder.h | 1 + .../drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 70 +- .../drivers/gpu/drm/exynos/exynos_drm_fimd.c | 7 +- trunk/drivers/gpu/drm/exynos/exynos_mixer.c | 19 +- trunk/drivers/gpu/drm/i915/i915_reg.h | 15 + trunk/drivers/gpu/drm/i915/intel_display.c | 32 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 20 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 8 + trunk/drivers/gpu/drm/radeon/evergreen.c | 2 + trunk/drivers/gpu/drm/radeon/ni.c | 1 + trunk/drivers/gpu/drm/radeon/r100.c | 12 +- trunk/drivers/gpu/drm/radeon/r300.c | 8 +- trunk/drivers/gpu/drm/radeon/r420.c | 8 +- trunk/drivers/gpu/drm/radeon/r520.c | 8 +- trunk/drivers/gpu/drm/radeon/r600.c | 1 + .../drivers/gpu/drm/radeon/radeon_atombios.c | 20 + trunk/drivers/gpu/drm/radeon/radeon_cs.c | 4 + trunk/drivers/gpu/drm/radeon/radeon_fence.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_ring.c | 7 +- trunk/drivers/gpu/drm/radeon/rs400.c | 8 +- trunk/drivers/gpu/drm/radeon/rs600.c | 12 +- trunk/drivers/gpu/drm/radeon/rs690.c | 8 +- trunk/drivers/gpu/drm/radeon/rv515.c | 8 +- trunk/drivers/gpu/drm/radeon/rv770.c | 1 + trunk/drivers/hwmon/ads1015.c | 3 +- trunk/drivers/hwmon/f75375s.c | 18 +- trunk/drivers/hwmon/max6639.c | 22 +- trunk/drivers/hwmon/pmbus/max34440.c | 2 +- trunk/drivers/hwmon/w83627ehf.c | 5 - trunk/drivers/i2c/busses/i2c-tegra.c | 2 +- trunk/drivers/ide/Makefile | 1 - trunk/drivers/ide/at91_ide.c | 366 --- trunk/drivers/infiniband/ulp/ipoib/ipoib.h | 6 +- .../drivers/infiniband/ulp/ipoib/ipoib_main.c | 55 +- .../infiniband/ulp/ipoib/ipoib_multicast.c | 10 +- trunk/drivers/isdn/i4l/isdn_net.c | 2 +- trunk/drivers/macintosh/adb.c | 4 +- trunk/drivers/media/radio/wl128x/Kconfig | 4 +- trunk/drivers/media/rc/imon.c | 26 +- trunk/drivers/media/video/hdpvr/hdpvr-core.c | 18 +- trunk/drivers/media/video/hdpvr/hdpvr-video.c | 46 +- trunk/drivers/media/video/hdpvr/hdpvr.h | 1 + trunk/drivers/media/video/omap3isp/ispccdc.c | 2 +- trunk/drivers/mfd/Kconfig | 2 +- trunk/drivers/mfd/twl-core.c | 6 +- trunk/drivers/mfd/twl4030-power.c | 20 +- trunk/drivers/misc/Kconfig | 17 +- .../drivers/misc/c2port/c2port-duramar2150.c | 1 + trunk/drivers/misc/cb710/core.c | 1 + trunk/drivers/misc/cs5535-mfgpt.c | 2 +- trunk/drivers/misc/vmw_balloon.c | 14 +- trunk/drivers/mmc/card/block.c | 1 + trunk/drivers/mmc/core/core.c | 49 +- trunk/drivers/mmc/core/host.h | 21 - trunk/drivers/mmc/core/mmc.c | 26 +- trunk/drivers/mmc/core/sd.c | 22 +- trunk/drivers/mmc/core/sdio.c | 7 +- trunk/drivers/mmc/core/sdio_irq.c | 10 +- trunk/drivers/mmc/host/Kconfig | 1 - trunk/drivers/mmc/host/at91_mci.c | 1 - trunk/drivers/mmc/host/atmel-mci.c | 3 + trunk/drivers/mmc/host/dw_mmc.c | 144 +- trunk/drivers/mmc/host/of_mmc_spi.c | 4 +- trunk/drivers/mmc/host/sdhci-of-esdhc.c | 32 + trunk/drivers/mmc/host/sdhci-pci.c | 2 +- trunk/drivers/mmc/host/sdhci-pltfm.c | 10 +- trunk/drivers/mmc/host/sh_mmcif.c | 16 +- trunk/drivers/mmc/host/tmio_mmc.h | 7 +- trunk/drivers/mmc/host/tmio_mmc_dma.c | 12 + trunk/drivers/mmc/host/tmio_mmc_pio.c | 6 +- trunk/drivers/net/can/cc770/cc770.c | 4 +- trunk/drivers/net/can/cc770/cc770_isa.c | 16 +- trunk/drivers/net/can/flexcan.c | 7 +- trunk/drivers/net/can/pch_can.c | 3 +- trunk/drivers/net/can/sja1000/peak_pci.c | 23 +- trunk/drivers/net/can/ti_hecc.c | 3 +- trunk/drivers/net/can/usb/ems_usb.c | 9 - trunk/drivers/net/ethernet/3com/3c59x.c | 2 +- .../net/ethernet/broadcom/bcm63xx_enet.c | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 +- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 17 +- .../net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 8 +- .../net/ethernet/brocade/bna/bnad_ethtool.c | 10 +- .../net/ethernet/emulex/benet/be_ethtool.c | 6 +- trunk/drivers/net/ethernet/freescale/fec.c | 4 +- .../net/ethernet/intel/e1000/e1000_main.c | 10 +- .../drivers/net/ethernet/intel/igb/igb_main.c | 3 +- .../drivers/net/ethernet/intel/igbvf/Makefile | 2 +- .../net/ethernet/intel/igbvf/defines.h | 2 +- .../net/ethernet/intel/igbvf/ethtool.c | 2 +- .../drivers/net/ethernet/intel/igbvf/igbvf.h | 2 +- trunk/drivers/net/ethernet/intel/igbvf/mbx.c | 2 +- trunk/drivers/net/ethernet/intel/igbvf/mbx.h | 2 +- .../drivers/net/ethernet/intel/igbvf/netdev.c | 4 +- trunk/drivers/net/ethernet/intel/igbvf/regs.h | 2 +- trunk/drivers/net/ethernet/intel/igbvf/vf.c | 2 +- trunk/drivers/net/ethernet/intel/igbvf/vf.h | 2 +- .../drivers/net/ethernet/intel/ixgbe/Makefile | 2 +- .../drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_82598.c | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_common.h | 4 +- .../net/ethernet/intel/ixgbe/ixgbe_dcb.c | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_dcb.h | 2 +- .../ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 2 +- .../ethernet/intel/ixgbe/ixgbe_dcb_82598.h | 2 +- .../ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 2 +- .../ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 13 +- .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 92 +- .../net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_main.c | 22 +- .../net/ethernet/intel/ixgbe/ixgbe_mbx.c | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_mbx.h | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_phy.c | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_phy.h | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_sriov.c | 8 +- .../net/ethernet/intel/ixgbe/ixgbe_sriov.h | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_type.h | 2 +- .../net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 +- .../net/ethernet/intel/ixgbevf/Makefile | 2 +- .../net/ethernet/intel/ixgbevf/defines.h | 2 +- .../net/ethernet/intel/ixgbevf/ethtool.c | 2 +- .../net/ethernet/intel/ixgbevf/ixgbevf.h | 2 +- .../net/ethernet/intel/ixgbevf/ixgbevf_main.c | 12 +- .../drivers/net/ethernet/intel/ixgbevf/mbx.c | 2 +- .../drivers/net/ethernet/intel/ixgbevf/mbx.h | 2 +- .../drivers/net/ethernet/intel/ixgbevf/regs.h | 2 +- trunk/drivers/net/ethernet/intel/ixgbevf/vf.c | 21 +- trunk/drivers/net/ethernet/intel/ixgbevf/vf.h | 2 +- trunk/drivers/net/ethernet/marvell/skge.c | 71 +- .../drivers/net/ethernet/mellanox/mlx4/cmd.c | 10 +- .../net/ethernet/mellanox/mlx4/en_netdev.c | 3 +- .../net/ethernet/mellanox/mlx4/en_rx.c | 10 +- trunk/drivers/net/ethernet/mellanox/mlx4/eq.c | 5 +- trunk/drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- .../drivers/net/ethernet/mellanox/mlx4/mcg.c | 16 +- .../net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +- trunk/drivers/net/ethernet/mellanox/mlx4/mr.c | 12 +- .../ethernet/mellanox/mlx4/resource_tracker.c | 21 +- trunk/drivers/net/ethernet/micrel/Kconfig | 1 - trunk/drivers/net/ethernet/micrel/ks8851.c | 2 +- .../drivers/net/ethernet/micrel/ks8851_mll.c | 14 +- .../drivers/net/ethernet/octeon/octeon_mgmt.c | 4 +- trunk/drivers/net/ethernet/renesas/sh_eth.c | 4 +- trunk/drivers/net/ethernet/renesas/sh_eth.h | 3 - .../net/ethernet/stmicro/stmmac/common.h | 1 + .../net/ethernet/stmicro/stmmac/enh_desc.c | 2 +- .../net/ethernet/stmicro/stmmac/norm_desc.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac.h | 5 +- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 205 +- .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 6 +- .../ethernet/stmicro/stmmac/stmmac_platform.c | 23 +- trunk/drivers/net/ethernet/ti/cpmac.c | 4 +- trunk/drivers/net/ethernet/ti/davinci_emac.c | 3 +- trunk/drivers/net/ethernet/ti/davinci_mdio.c | 2 +- trunk/drivers/net/ethernet/toshiba/Kconfig | 2 +- trunk/drivers/net/ethernet/via/via-velocity.c | 3 - .../drivers/net/ethernet/xscale/ixp4xx_eth.c | 3 +- trunk/drivers/net/hyperv/netvsc_drv.c | 18 +- trunk/drivers/net/hyperv/rndis_filter.c | 32 + trunk/drivers/net/tokenring/Kconfig | 5 +- trunk/drivers/net/usb/ipheth.c | 5 + trunk/drivers/net/veth.c | 4 +- trunk/drivers/net/wireless/ath/ath9k/hw.c | 7 +- trunk/drivers/net/wireless/ath/ath9k/init.c | 9 +- trunk/drivers/net/wireless/ath/ath9k/rc.c | 2 +- trunk/drivers/net/wireless/ath/ath9k/recv.c | 8 + .../drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 14 +- .../net/wireless/iwlwifi/iwl-commands.h | 1 + .../net/wireless/iwlwifi/iwl-trans-pcie.c | 1 + trunk/drivers/net/wireless/mwifiex/init.c | 3 +- trunk/drivers/net/wireless/mwifiex/main.c | 12 +- .../drivers/net/wireless/mwifiex/sta_ioctl.c | 8 +- trunk/drivers/net/wireless/rt2x00/rt2800lib.c | 8 +- trunk/drivers/net/wireless/rtlwifi/pci.c | 4 +- trunk/drivers/net/wireless/zd1211rw/zd_mac.c | 8 + trunk/drivers/pci/iov.c | 3 +- trunk/drivers/pci/probe.c | 5 + trunk/drivers/pci/remove.c | 28 +- trunk/drivers/pci/xen-pcifront.c | 10 +- trunk/drivers/pinctrl/core.c | 2 +- trunk/drivers/platform/x86/ibm_rtl.c | 15 +- trunk/drivers/platform/x86/intel_ips.c | 15 +- trunk/drivers/power/bq27x00_battery.c | 15 +- trunk/drivers/power/charger-manager.c | 4 +- trunk/drivers/power/lp8727_charger.c | 1 + trunk/drivers/regulator/max8649.c | 2 +- .../regulator/mc13xxx-regulator-core.c | 2 + trunk/drivers/rtc/rtc-at91sam9.c | 13 +- trunk/drivers/rtc/rtc-sa1100.c | 81 +- trunk/drivers/s390/char/con3215.c | 22 +- .../scsi/device_handler/scsi_dh_rdac.c | 25 +- trunk/drivers/scsi/ipr.c | 24 +- trunk/drivers/scsi/isci/host.c | 4 +- trunk/drivers/scsi/mpt2sas/mpt2sas_base.c | 3 +- trunk/drivers/scsi/qla2xxx/qla_attr.c | 13 +- trunk/drivers/scsi/qla2xxx/qla_bsg.c | 50 +- trunk/drivers/scsi/qla2xxx/qla_dbg.c | 3 +- trunk/drivers/scsi/qla2xxx/qla_def.h | 1 + trunk/drivers/scsi/qla2xxx/qla_inline.h | 13 + trunk/drivers/scsi/qla2xxx/qla_isr.c | 1 - trunk/drivers/scsi/qla2xxx/qla_mbx.c | 7 +- trunk/drivers/scsi/qla2xxx/qla_nx.c | 15 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 19 +- trunk/drivers/scsi/qla2xxx/qla_version.h | 2 +- trunk/drivers/scsi/qla4xxx/ql4_nx.c | 23 +- trunk/drivers/scsi/scsi_pm.c | 16 + trunk/drivers/scsi/scsi_priv.h | 1 + trunk/drivers/scsi/scsi_scan.c | 4 +- trunk/drivers/sh/clk/cpg.c | 2 +- trunk/drivers/ssb/driver_pcicore.c | 2 +- trunk/drivers/staging/Kconfig | 4 - trunk/drivers/staging/Makefile | 2 - trunk/drivers/staging/android/Kconfig | 5 +- trunk/drivers/staging/android/Makefile | 1 - trunk/drivers/staging/android/android_pmem.h | 93 - trunk/drivers/staging/android/binder.c | 13 +- .../drivers/staging/android/lowmemorykiller.c | 5 +- trunk/drivers/staging/android/pmem.c | 1345 ----------- trunk/drivers/staging/asus_oled/asus_oled.c | 13 +- trunk/drivers/staging/gma500/Kconfig | 33 - trunk/drivers/staging/gma500/Makefile | 52 - trunk/drivers/staging/gma500/TODO | 15 - trunk/drivers/staging/gma500/accel_2d.c | 414 ---- trunk/drivers/staging/gma500/backlight.c | 49 - trunk/drivers/staging/gma500/cdv_device.c | 350 --- trunk/drivers/staging/gma500/cdv_device.h | 36 - trunk/drivers/staging/gma500/cdv_intel_crt.c | 326 --- .../staging/gma500/cdv_intel_display.c | 1508 ------------ trunk/drivers/staging/gma500/cdv_intel_hdmi.c | 376 --- trunk/drivers/staging/gma500/cdv_intel_lvds.c | 721 ------ trunk/drivers/staging/gma500/displays/hdmi.h | 33 - .../drivers/staging/gma500/displays/pyr_cmd.h | 34 - .../drivers/staging/gma500/displays/pyr_vid.h | 34 - .../drivers/staging/gma500/displays/tmd_cmd.h | 34 - .../drivers/staging/gma500/displays/tmd_vid.h | 34 - .../drivers/staging/gma500/displays/tpo_cmd.h | 35 - .../drivers/staging/gma500/displays/tpo_vid.h | 33 - trunk/drivers/staging/gma500/framebuffer.c | 856 ------- trunk/drivers/staging/gma500/framebuffer.h | 48 - trunk/drivers/staging/gma500/gem.c | 292 --- trunk/drivers/staging/gma500/gem_glue.c | 89 - trunk/drivers/staging/gma500/gem_glue.h | 2 - trunk/drivers/staging/gma500/gtt.c | 553 ----- trunk/drivers/staging/gma500/gtt.h | 64 - trunk/drivers/staging/gma500/intel_bios.c | 303 --- trunk/drivers/staging/gma500/intel_bios.h | 430 ---- trunk/drivers/staging/gma500/intel_i2c.c | 170 -- trunk/drivers/staging/gma500/intel_opregion.c | 81 - trunk/drivers/staging/gma500/mdfld_device.c | 714 ------ trunk/drivers/staging/gma500/mdfld_dsi_dbi.c | 761 ------ trunk/drivers/staging/gma500/mdfld_dsi_dbi.h | 173 -- .../staging/gma500/mdfld_dsi_dbi_dpu.c | 778 ------- .../staging/gma500/mdfld_dsi_dbi_dpu.h | 154 -- trunk/drivers/staging/gma500/mdfld_dsi_dpi.c | 805 ------- trunk/drivers/staging/gma500/mdfld_dsi_dpi.h | 78 - .../drivers/staging/gma500/mdfld_dsi_output.c | 1014 -------- .../drivers/staging/gma500/mdfld_dsi_output.h | 138 -- .../staging/gma500/mdfld_dsi_pkg_sender.c | 1484 ------------ .../staging/gma500/mdfld_dsi_pkg_sender.h | 184 -- .../staging/gma500/mdfld_intel_display.c | 1404 ----------- trunk/drivers/staging/gma500/mdfld_msic.h | 31 - trunk/drivers/staging/gma500/mdfld_output.c | 171 -- trunk/drivers/staging/gma500/mdfld_output.h | 41 - trunk/drivers/staging/gma500/mdfld_pyr_cmd.c | 558 ----- trunk/drivers/staging/gma500/mdfld_tmd_vid.c | 206 -- trunk/drivers/staging/gma500/mdfld_tpo_cmd.c | 509 ---- trunk/drivers/staging/gma500/mdfld_tpo_vid.c | 140 -- trunk/drivers/staging/gma500/medfield.h | 268 --- trunk/drivers/staging/gma500/mid_bios.c | 270 --- trunk/drivers/staging/gma500/mid_bios.h | 21 - trunk/drivers/staging/gma500/mmu.c | 858 ------- trunk/drivers/staging/gma500/mrst.h | 252 -- trunk/drivers/staging/gma500/mrst_crtc.c | 604 ----- trunk/drivers/staging/gma500/mrst_device.c | 634 ----- trunk/drivers/staging/gma500/mrst_hdmi.c | 852 ------- trunk/drivers/staging/gma500/mrst_hdmi_i2c.c | 328 --- trunk/drivers/staging/gma500/mrst_lvds.c | 407 ---- trunk/drivers/staging/gma500/power.c | 318 --- trunk/drivers/staging/gma500/power.h | 67 - trunk/drivers/staging/gma500/psb_device.c | 321 --- trunk/drivers/staging/gma500/psb_drm.h | 219 -- trunk/drivers/staging/gma500/psb_drv.c | 1230 ---------- trunk/drivers/staging/gma500/psb_drv.h | 952 -------- .../staging/gma500/psb_intel_display.c | 1429 ------------ .../staging/gma500/psb_intel_display.h | 28 - trunk/drivers/staging/gma500/psb_intel_drv.h | 230 -- trunk/drivers/staging/gma500/psb_intel_lvds.c | 854 ------- .../drivers/staging/gma500/psb_intel_modes.c | 77 - trunk/drivers/staging/gma500/psb_intel_reg.h | 1235 ---------- trunk/drivers/staging/gma500/psb_intel_sdvo.c | 1293 ----------- .../staging/gma500/psb_intel_sdvo_regs.h | 338 --- trunk/drivers/staging/gma500/psb_irq.c | 627 ----- trunk/drivers/staging/gma500/psb_irq.h | 45 - trunk/drivers/staging/gma500/psb_lid.c | 88 - trunk/drivers/staging/gma500/psb_reg.h | 582 ----- trunk/drivers/staging/omapdrm/Makefile | 1 + trunk/drivers/staging/omapdrm/omap_crtc.c | 191 +- trunk/drivers/staging/omapdrm/omap_drv.c | 81 +- trunk/drivers/staging/omapdrm/omap_drv.h | 52 +- trunk/drivers/staging/omapdrm/omap_fb.c | 224 +- trunk/drivers/staging/omapdrm/omap_fbdev.c | 59 +- trunk/drivers/staging/omapdrm/omap_gem.c | 23 +- trunk/drivers/staging/omapdrm/omap_plane.c | 344 +++ trunk/drivers/staging/omapdrm/omap_priv.h | 12 +- trunk/drivers/staging/pohmelfs/Kconfig | 20 - trunk/drivers/staging/pohmelfs/Makefile | 3 - trunk/drivers/staging/pohmelfs/config.c | 611 ----- trunk/drivers/staging/pohmelfs/crypto.c | 878 ------- trunk/drivers/staging/pohmelfs/dir.c | 1102 --------- trunk/drivers/staging/pohmelfs/inode.c | 2055 ----------------- trunk/drivers/staging/pohmelfs/lock.c | 182 -- trunk/drivers/staging/pohmelfs/mcache.c | 171 -- trunk/drivers/staging/pohmelfs/net.c | 1209 ---------- trunk/drivers/staging/pohmelfs/netfs.h | 919 -------- trunk/drivers/staging/pohmelfs/path_entry.c | 120 - trunk/drivers/staging/pohmelfs/trans.c | 706 ------ trunk/drivers/staging/rtl8712/drv_types.h | 7 + trunk/drivers/staging/rtl8712/hal_init.c | 62 +- trunk/drivers/staging/rtl8712/os_intfs.c | 14 +- trunk/drivers/staging/rtl8712/rtl8712_hal.h | 1 + .../drivers/staging/rtl8712/rtl871x_sta_mgt.c | 1 + trunk/drivers/staging/rtl8712/usb_intf.c | 10 +- .../staging/tidspbridge/core/tiomap3430.c | 2 - .../staging/tidspbridge/rmgr/drv_interface.c | 58 +- trunk/drivers/staging/usbip/stub_main.c | 4 +- trunk/drivers/staging/zcache/zcache-main.c | 25 +- trunk/drivers/tty/serial/8250/8250.c | 2 +- .../drivers/tty/serial/{8250 => }/m32r_sio.c | 0 .../drivers/tty/serial/{8250 => }/m32r_sio.h | 0 .../tty/serial/{8250 => }/m32r_sio_reg.h | 0 trunk/drivers/tty/serial/omap-serial.c | 30 +- trunk/drivers/tty/serial/samsung.c | 3 +- trunk/drivers/usb/core/hcd-pci.c | 5 +- trunk/drivers/usb/core/hcd.c | 6 +- trunk/drivers/usb/core/hub.c | 30 +- trunk/drivers/usb/gadget/Kconfig | 4 +- trunk/drivers/usb/gadget/f_loopback.c | 2 +- trunk/drivers/usb/host/Kconfig | 8 +- trunk/drivers/usb/host/ehci-fsl.c | 11 +- trunk/drivers/usb/host/ehci-fsl.h | 1 + trunk/drivers/usb/host/pci-quirks.c | 17 + trunk/drivers/usb/host/xhci-hub.c | 2 +- trunk/drivers/usb/host/xhci-mem.c | 32 +- trunk/drivers/usb/host/xhci.c | 5 + trunk/drivers/usb/musb/musb_io.h | 3 +- trunk/drivers/usb/otg/Kconfig | 2 +- trunk/drivers/usb/serial/cp210x.c | 2 + trunk/drivers/usb/serial/ftdi_sio.c | 1 + trunk/drivers/usb/serial/ftdi_sio_ids.h | 7 + trunk/drivers/usb/serial/option.c | 40 +- trunk/drivers/usb/serial/qcserial.c | 16 +- trunk/drivers/usb/serial/ti_usb_3410_5052.c | 6 +- trunk/drivers/usb/serial/ti_usb_3410_5052.h | 4 + trunk/drivers/usb/storage/usb.c | 90 +- trunk/drivers/usb/storage/usb.h | 7 +- trunk/drivers/video/omap2/dss/dpi.c | 5 + trunk/drivers/video/pvr2fb.c | 2 +- trunk/drivers/xen/cpu_hotplug.c | 3 +- trunk/drivers/xen/xen-pciback/pci_stub.c | 8 +- trunk/drivers/xen/xen-pciback/xenbus.c | 5 +- .../drivers/xen/xenbus/xenbus_dev_frontend.c | 4 + trunk/fs/autofs4/autofs_i.h | 1 + trunk/fs/autofs4/dev-ioctl.c | 1 + trunk/fs/autofs4/expire.c | 2 + trunk/fs/autofs4/inode.c | 2 + trunk/fs/autofs4/waitq.c | 22 +- trunk/fs/bio.c | 10 +- trunk/fs/btrfs/backref.c | 2 + trunk/fs/btrfs/check-integrity.c | 2 +- trunk/fs/btrfs/compression.c | 2 + trunk/fs/btrfs/ctree.h | 2 +- trunk/fs/btrfs/disk-io.c | 12 + trunk/fs/btrfs/extent-tree.c | 51 +- trunk/fs/btrfs/extent_io.c | 113 +- trunk/fs/btrfs/extent_io.h | 1 + trunk/fs/btrfs/extent_map.h | 4 +- trunk/fs/btrfs/file.c | 29 +- trunk/fs/btrfs/free-space-cache.c | 1 + trunk/fs/btrfs/inode-map.c | 6 +- trunk/fs/btrfs/inode.c | 40 +- trunk/fs/btrfs/ioctl.c | 59 +- trunk/fs/btrfs/scrub.c | 8 +- trunk/fs/btrfs/transaction.c | 16 +- trunk/fs/btrfs/volumes.c | 33 +- trunk/fs/cifs/connect.c | 9 +- trunk/fs/cifs/dir.c | 2 +- trunk/fs/compat.c | 56 +- trunk/fs/dcache.c | 8 +- trunk/fs/direct-io.c | 4 +- trunk/fs/ecryptfs/crypto.c | 68 +- trunk/fs/ecryptfs/ecryptfs_kernel.h | 6 + trunk/fs/ecryptfs/inode.c | 2 + trunk/fs/ecryptfs/keystore.c | 9 +- trunk/fs/ecryptfs/mmap.c | 4 +- trunk/fs/ecryptfs/read_write.c | 4 +- trunk/fs/ecryptfs/super.c | 14 +- trunk/fs/eventpoll.c | 30 +- trunk/fs/fs-writeback.c | 16 +- trunk/fs/inode.c | 8 +- trunk/fs/ioprio.c | 2 +- trunk/fs/namei.c | 4 +- trunk/fs/nfs/nfs4proc.c | 130 +- trunk/fs/nfs/nfs4state.c | 2 + trunk/fs/nfs/nfs4xdr.c | 5 +- trunk/fs/ocfs2/namei.c | 2 +- trunk/fs/quota/quota.c | 24 +- trunk/fs/select.c | 2 +- trunk/fs/signalfd.c | 15 + trunk/fs/super.c | 22 + trunk/fs/xfs/kmem.h | 6 - trunk/fs/xfs/xfs_dquot.c | 127 +- trunk/fs/xfs/xfs_log_recover.c | 8 +- trunk/fs/xfs/xfs_qm.c | 291 +-- trunk/fs/xfs/xfs_qm.h | 14 - trunk/fs/xfs/xfs_qm_stats.c | 4 +- trunk/fs/xfs/xfs_qm_syscalls.c | 4 +- trunk/fs/xfs/xfs_trace.h | 5 +- trunk/fs/xfs/xfs_trans.c | 4 +- trunk/fs/xfs/xfs_trans_dquot.c | 10 +- .../asm-generic/io-64-nonatomic-hi-lo.h | 28 + .../asm-generic/io-64-nonatomic-lo-hi.h | 28 + trunk/include/asm-generic/poll.h | 2 + trunk/include/linux/bitops.h | 20 + trunk/include/linux/blkdev.h | 3 - trunk/include/linux/cdrom.h | 3 +- trunk/include/linux/digsig.h | 4 +- trunk/include/linux/elevator.h | 9 +- trunk/include/linux/fs.h | 1 + trunk/include/linux/hyperv.h | 2 +- trunk/include/linux/iocontext.h | 5 +- trunk/include/linux/mmc/card.h | 4 + trunk/include/linux/mmc/dw_mmc.h | 6 +- trunk/include/linux/mmc/host.h | 20 + trunk/include/linux/nfs_xdr.h | 2 +- trunk/include/linux/proportions.h | 4 + trunk/include/linux/signalfd.h | 5 +- trunk/include/linux/syscalls.h | 2 +- trunk/include/linux/usb/ch11.h | 10 +- trunk/include/linux/usb/ch9.h | 2 +- trunk/include/net/flow.h | 10 + trunk/include/net/netprio_cgroup.h | 48 +- trunk/include/net/route.h | 4 + trunk/include/net/sch_generic.h | 9 +- trunk/include/net/tcp.h | 14 +- trunk/include/trace/events/writeback.h | 7 +- trunk/kernel/events/core.c | 19 +- trunk/kernel/fork.c | 7 +- trunk/kernel/params.c | 3 +- trunk/kernel/pid.c | 4 +- trunk/kernel/relay.c | 10 +- trunk/lib/kstrtox.c | 18 +- trunk/mm/backing-dev.c | 23 +- trunk/mm/memcontrol.c | 5 +- trunk/mm/nommu.c | 9 +- trunk/mm/page_alloc.c | 1 + trunk/net/caif/caif_socket.c | 10 +- trunk/net/caif/cfmuxl.c | 12 +- trunk/net/core/dev.c | 10 +- trunk/net/core/ethtool.c | 2 + trunk/net/core/netpoll.c | 2 +- trunk/net/core/netprio_cgroup.c | 15 +- trunk/net/core/sock.c | 7 +- trunk/net/ipv4/Kconfig | 2 +- trunk/net/ipv4/arp.c | 3 +- trunk/net/ipv4/ip_options.c | 2 +- trunk/net/ipv4/sysctl_net_ipv4.c | 6 - trunk/net/ipv4/tcp.c | 28 +- trunk/net/ipv4/tcp_input.c | 45 +- trunk/net/ipv4/tcp_ipv4.c | 5 + trunk/net/ipv4/tcp_timer.c | 5 +- trunk/net/mac80211/main.c | 4 +- trunk/net/mac80211/rx.c | 2 +- trunk/net/rxrpc/ar-key.c | 4 +- trunk/net/sched/sch_choke.c | 3 +- trunk/net/sched/sch_netem.c | 3 +- trunk/net/sched/sch_sfb.c | 3 +- trunk/net/sched/sch_sfq.c | 5 +- trunk/scripts/coccicheck | 13 +- trunk/scripts/depmod.sh | 6 - trunk/scripts/mod/file2alias.c | 2 +- trunk/scripts/mod/modpost.c | 9 + trunk/scripts/package/builddeb | 12 +- trunk/sound/pci/hda/patch_realtek.c | 42 +- trunk/sound/pci/hda/patch_sigmatel.c | 4 +- trunk/sound/pci/hda/patch_via.c | 3 + trunk/sound/pci/intel8x0.c | 6 + trunk/sound/soc/codecs/ak4642.c | 31 +- trunk/sound/soc/codecs/wm8962.c | 2 +- trunk/sound/soc/sh/fsi.c | 6 +- trunk/sound/usb/caiaq/audio.c | 5 +- trunk/sound/usb/card.h | 1 + trunk/sound/usb/format.c | 4 +- trunk/sound/usb/quirks.c | 6 +- .../tools/perf/bench/mem-memcpy-x86-64-asm.S | 6 + trunk/tools/perf/util/event.c | 2 +- trunk/tools/perf/util/evsel.c | 1 + 742 files changed, 6164 insertions(+), 47754 deletions(-) delete mode 100644 trunk/arch/arm/configs/at91cap9_defconfig delete mode 100644 trunk/arch/arm/mach-at91/at91cap9.c delete mode 100644 trunk/arch/arm/mach-at91/at91cap9_devices.c delete mode 100644 trunk/arch/arm/mach-at91/board-cap9adk.c delete mode 100644 trunk/arch/arm/mach-at91/include/mach/at91cap9.h delete mode 100644 trunk/arch/arm/mach-at91/include/mach/at91cap9_matrix.h create mode 100644 trunk/arch/arm/mach-davinci/davinci.h delete mode 100644 trunk/arch/arm/mach-davinci/include/mach/dm355.h delete mode 100644 trunk/arch/arm/mach-davinci/include/mach/dm644x.h rename trunk/arch/arm/mach-imx/{crmregs-imx31.h => crmregs-imx3.h} (94%) delete mode 100644 trunk/drivers/ide/at91_ide.c delete mode 100644 trunk/drivers/staging/android/android_pmem.h delete mode 100644 trunk/drivers/staging/android/pmem.c delete mode 100644 trunk/drivers/staging/gma500/Kconfig delete mode 100644 trunk/drivers/staging/gma500/Makefile delete mode 100644 trunk/drivers/staging/gma500/TODO delete mode 100644 trunk/drivers/staging/gma500/accel_2d.c delete mode 100644 trunk/drivers/staging/gma500/backlight.c delete mode 100644 trunk/drivers/staging/gma500/cdv_device.c delete mode 100644 trunk/drivers/staging/gma500/cdv_device.h delete mode 100644 trunk/drivers/staging/gma500/cdv_intel_crt.c delete mode 100644 trunk/drivers/staging/gma500/cdv_intel_display.c delete mode 100644 trunk/drivers/staging/gma500/cdv_intel_hdmi.c delete mode 100644 trunk/drivers/staging/gma500/cdv_intel_lvds.c delete mode 100644 trunk/drivers/staging/gma500/displays/hdmi.h delete mode 100644 trunk/drivers/staging/gma500/displays/pyr_cmd.h delete mode 100644 trunk/drivers/staging/gma500/displays/pyr_vid.h delete mode 100644 trunk/drivers/staging/gma500/displays/tmd_cmd.h delete mode 100644 trunk/drivers/staging/gma500/displays/tmd_vid.h delete mode 100644 trunk/drivers/staging/gma500/displays/tpo_cmd.h delete mode 100644 trunk/drivers/staging/gma500/displays/tpo_vid.h delete mode 100644 trunk/drivers/staging/gma500/framebuffer.c delete mode 100644 trunk/drivers/staging/gma500/framebuffer.h delete mode 100644 trunk/drivers/staging/gma500/gem.c delete mode 100644 trunk/drivers/staging/gma500/gem_glue.c delete mode 100644 trunk/drivers/staging/gma500/gem_glue.h delete mode 100644 trunk/drivers/staging/gma500/gtt.c delete mode 100644 trunk/drivers/staging/gma500/gtt.h delete mode 100644 trunk/drivers/staging/gma500/intel_bios.c delete mode 100644 trunk/drivers/staging/gma500/intel_bios.h delete mode 100644 trunk/drivers/staging/gma500/intel_i2c.c delete mode 100644 trunk/drivers/staging/gma500/intel_opregion.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_device.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dbi.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dbi.h delete mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dbi_dpu.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dbi_dpu.h delete mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dpi.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_dpi.h delete mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_output.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_output.h delete mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_pkg_sender.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_dsi_pkg_sender.h delete mode 100644 trunk/drivers/staging/gma500/mdfld_intel_display.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_msic.h delete mode 100644 trunk/drivers/staging/gma500/mdfld_output.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_output.h delete mode 100644 trunk/drivers/staging/gma500/mdfld_pyr_cmd.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_tmd_vid.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_tpo_cmd.c delete mode 100644 trunk/drivers/staging/gma500/mdfld_tpo_vid.c delete mode 100644 trunk/drivers/staging/gma500/medfield.h delete mode 100644 trunk/drivers/staging/gma500/mid_bios.c delete mode 100644 trunk/drivers/staging/gma500/mid_bios.h delete mode 100644 trunk/drivers/staging/gma500/mmu.c delete mode 100644 trunk/drivers/staging/gma500/mrst.h delete mode 100644 trunk/drivers/staging/gma500/mrst_crtc.c delete mode 100644 trunk/drivers/staging/gma500/mrst_device.c delete mode 100644 trunk/drivers/staging/gma500/mrst_hdmi.c delete mode 100644 trunk/drivers/staging/gma500/mrst_hdmi_i2c.c delete mode 100644 trunk/drivers/staging/gma500/mrst_lvds.c delete mode 100644 trunk/drivers/staging/gma500/power.c delete mode 100644 trunk/drivers/staging/gma500/power.h delete mode 100644 trunk/drivers/staging/gma500/psb_device.c delete mode 100644 trunk/drivers/staging/gma500/psb_drm.h delete mode 100644 trunk/drivers/staging/gma500/psb_drv.c delete mode 100644 trunk/drivers/staging/gma500/psb_drv.h delete mode 100644 trunk/drivers/staging/gma500/psb_intel_display.c delete mode 100644 trunk/drivers/staging/gma500/psb_intel_display.h delete mode 100644 trunk/drivers/staging/gma500/psb_intel_drv.h delete mode 100644 trunk/drivers/staging/gma500/psb_intel_lvds.c delete mode 100644 trunk/drivers/staging/gma500/psb_intel_modes.c delete mode 100644 trunk/drivers/staging/gma500/psb_intel_reg.h delete mode 100644 trunk/drivers/staging/gma500/psb_intel_sdvo.c delete mode 100644 trunk/drivers/staging/gma500/psb_intel_sdvo_regs.h delete mode 100644 trunk/drivers/staging/gma500/psb_irq.c delete mode 100644 trunk/drivers/staging/gma500/psb_irq.h delete mode 100644 trunk/drivers/staging/gma500/psb_lid.c delete mode 100644 trunk/drivers/staging/gma500/psb_reg.h create mode 100644 trunk/drivers/staging/omapdrm/omap_plane.c delete mode 100644 trunk/drivers/staging/pohmelfs/Kconfig delete mode 100644 trunk/drivers/staging/pohmelfs/Makefile delete mode 100644 trunk/drivers/staging/pohmelfs/config.c delete mode 100644 trunk/drivers/staging/pohmelfs/crypto.c delete mode 100644 trunk/drivers/staging/pohmelfs/dir.c delete mode 100644 trunk/drivers/staging/pohmelfs/inode.c delete mode 100644 trunk/drivers/staging/pohmelfs/lock.c delete mode 100644 trunk/drivers/staging/pohmelfs/mcache.c delete mode 100644 trunk/drivers/staging/pohmelfs/net.c delete mode 100644 trunk/drivers/staging/pohmelfs/netfs.h delete mode 100644 trunk/drivers/staging/pohmelfs/path_entry.c delete mode 100644 trunk/drivers/staging/pohmelfs/trans.c rename trunk/drivers/tty/serial/{8250 => }/m32r_sio.c (100%) rename trunk/drivers/tty/serial/{8250 => }/m32r_sio.h (100%) rename trunk/drivers/tty/serial/{8250 => }/m32r_sio_reg.h (100%) create mode 100644 trunk/include/asm-generic/io-64-nonatomic-hi-lo.h create mode 100644 trunk/include/asm-generic/io-64-nonatomic-lo-hi.h diff --git a/[refs] b/[refs] index 5b4c493bac68..9f1c6fa1a14a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b43e4e5863fb41d85c3a6583fdeea2ebf3d2b50 +refs/heads/master: 4d02be5a6550ebf09936802c2cb8d359ce1ab29c diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index a0ffac029a0d..1bea46a54b1c 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -510,17 +510,3 @@ Why: The pci_scan_bus_parented() interface creates a new root bus. The convert to using pci_scan_root_bus() so they can supply a list of bus resources when the bus is created. Who: Bjorn Helgaas - ----------------------------- - -What: The CAP9 SoC family will be removed -When: 3.4 -Files: arch/arm/mach-at91/at91cap9.c - arch/arm/mach-at91/at91cap9_devices.c - arch/arm/mach-at91/include/mach/at91cap9.h - arch/arm/mach-at91/include/mach/at91cap9_matrix.h - arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h - arch/arm/mach-at91/board-cap9adk.c -Why: The code is not actively maintained and platforms are now hard to find. -Who: Nicolas Ferre - Jean-Christophe PLAGNIOL-VILLARD diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 55ca0bea142c..75a9a5fc230a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -269,7 +269,6 @@ S: Orphan F: drivers/platform/x86/wmi.c AD1889 ALSA SOUND DRIVER -M: Kyle McMartin M: Thibaut Varene W: http://wiki.parisc-linux.org/AD1889 L: linux-parisc@vger.kernel.org @@ -3047,7 +3046,6 @@ F: drivers/hwspinlock/hwspinlock_* F: include/linux/hwspinlock.h HARMONY SOUND DRIVER -M: Kyle McMartin L: linux-parisc@vger.kernel.org S: Maintained F: sound/parisc/harmony.* @@ -3318,6 +3316,12 @@ S: Maintained F: net/ieee802154/ F: drivers/ieee802154/ +IIO SUBSYSTEM AND DRIVERS +M: Jonathan Cameron +L: linux-iio@vger.kernel.org +S: Maintained +F: drivers/staging/iio/ + IKANOS/ADI EAGLE ADSL USB DRIVER M: Matthieu Castet M: Stanislaw Gruszka @@ -4994,9 +4998,8 @@ F: Documentation/blockdev/paride.txt F: drivers/block/paride/ PARISC ARCHITECTURE -M: Kyle McMartin -M: Helge Deller M: "James E.J. Bottomley" +M: Helge Deller L: linux-parisc@vger.kernel.org W: http://www.parisc-linux.org/ Q: http://patchwork.kernel.org/project/linux-parisc/list/ @@ -5855,7 +5858,7 @@ S: Maintained F: drivers/mmc/host/sdhci-spear.c SECURITY SUBSYSTEM -M: James Morris +M: James Morris L: linux-security-module@vger.kernel.org (suggested Cc:) T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git W: http://security.wiki.kernel.org/ @@ -5868,7 +5871,7 @@ S: Supported SELINUX SECURITY MODULE M: Stephen Smalley -M: James Morris +M: James Morris M: Eric Paris L: selinux@tycho.nsa.gov (subscribers-only, general discussion) W: http://selinuxproject.org diff --git a/trunk/Makefile b/trunk/Makefile index 7c44b676b77a..b61a9638b6fc 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -rc3 +EXTRAVERSION = -rc5 NAME = Saber-toothed Squirrel # *DOCUMENTATION* diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 7d809b7e0504..f2574fef1e41 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -327,7 +327,7 @@ config ARCH_AT91 select CLKDEV_LOOKUP help This enables support for systems based on the Atmel AT91RM9200, - AT91SAM9 and AT91CAP9 processors. + AT91SAM9 processors. config ARCH_BCMRING bool "Broadcom BCMRING" diff --git a/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug index 03646c4c13d1..b895a2a92da8 100644 --- a/trunk/arch/arm/Kconfig.debug +++ b/trunk/arch/arm/Kconfig.debug @@ -86,7 +86,7 @@ choice depends on HAVE_AT91_DBGU0 config AT91_DEBUG_LL_DBGU1 - bool "Kernel low-level debugging on 9263, 9g45 and cap9" + bool "Kernel low-level debugging on 9263 and 9g45" depends on HAVE_AT91_DBGU1 config DEBUG_CLPS711X_UART1 diff --git a/trunk/arch/arm/boot/dts/exynos4210.dtsi b/trunk/arch/arm/boot/dts/exynos4210.dtsi index 63d7578856c1..a1dd2ee83753 100644 --- a/trunk/arch/arm/boot/dts/exynos4210.dtsi +++ b/trunk/arch/arm/boot/dts/exynos4210.dtsi @@ -29,6 +29,7 @@ compatible = "arm,cortex-a9-gic"; #interrupt-cells = <3>; interrupt-controller; + cpu-offset = <0x8000>; reg = <0x10490000 0x1000>, <0x10480000 0x100>; }; diff --git a/trunk/arch/arm/boot/dts/tegra-paz00.dts b/trunk/arch/arm/boot/dts/tegra-paz00.dts index 1a1d7023b69b..825d2957da0b 100644 --- a/trunk/arch/arm/boot/dts/tegra-paz00.dts +++ b/trunk/arch/arm/boot/dts/tegra-paz00.dts @@ -46,11 +46,11 @@ }; serial@70006200 { - status = "disable"; + clock-frequency = <216000000>; }; serial@70006300 { - clock-frequency = <216000000>; + status = "disable"; }; serial@70006400 { @@ -60,7 +60,7 @@ sdhci@c8000000 { cd-gpios = <&gpio 173 0>; /* gpio PV5 */ wp-gpios = <&gpio 57 0>; /* gpio PH1 */ - power-gpios = <&gpio 155 0>; /* gpio PT3 */ + power-gpios = <&gpio 169 0>; /* gpio PV1 */ }; sdhci@c8000200 { diff --git a/trunk/arch/arm/common/it8152.c b/trunk/arch/arm/common/it8152.c index d1bcd7b13ebc..fb1f1cfce60c 100644 --- a/trunk/arch/arm/common/it8152.c +++ b/trunk/arch/arm/common/it8152.c @@ -320,13 +320,6 @@ int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) return -EBUSY; } -/* - * If we set up a device for bus mastering, we need to check the latency - * timer as we don't have even crappy BIOSes to set it properly. - * The implementation is from arch/i386/pci/i386.c - */ -unsigned int pcibios_max_latency = 255; - /* ITE bridge requires setting latency timer to avoid early bus access termination by PCI bus master devices */ diff --git a/trunk/arch/arm/common/pl330.c b/trunk/arch/arm/common/pl330.c index d8e44a43047c..ff3ad2244824 100644 --- a/trunk/arch/arm/common/pl330.c +++ b/trunk/arch/arm/common/pl330.c @@ -1502,12 +1502,13 @@ int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op) struct pl330_thread *thrd = ch_id; struct pl330_dmac *pl330; unsigned long flags; - int ret = 0, active = thrd->req_running; + int ret = 0, active; if (!thrd || thrd->free || thrd->dmac->state == DYING) return -EINVAL; pl330 = thrd->dmac; + active = thrd->req_running; spin_lock_irqsave(&pl330->lock, flags); diff --git a/trunk/arch/arm/configs/at91cap9_defconfig b/trunk/arch/arm/configs/at91cap9_defconfig deleted file mode 100644 index 8826eb218e73..000000000000 --- a/trunk/arch/arm/configs/at91cap9_defconfig +++ /dev/null @@ -1,108 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91CAP9=y -CONFIG_MACH_AT91CAP9ADK=y -CONFIG_MTD_AT91_DATAFLASH_CARD=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_LEDS=y -CONFIG_LEDS_CPU=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram0 rw" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=y -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_FB=y -CONFIG_FB_ATMEL=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_MMC=y -CONFIG_MMC_AT91=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_EXT2_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_USER=y diff --git a/trunk/arch/arm/include/asm/assembler.h b/trunk/arch/arm/include/asm/assembler.h index 62f8095d46de..23371b17b23e 100644 --- a/trunk/arch/arm/include/asm/assembler.h +++ b/trunk/arch/arm/include/asm/assembler.h @@ -137,6 +137,11 @@ disable_irq .endm + .macro save_and_disable_irqs_notrace, oldcpsr + mrs \oldcpsr, cpsr + disable_irq_notrace + .endm + /* * Restore interrupt state previously stored in a register. We don't * guarantee that this will preserve the flags. diff --git a/trunk/arch/arm/include/asm/hardware/pl330.h b/trunk/arch/arm/include/asm/hardware/pl330.h index 575fa8186ca0..c1821385abfa 100644 --- a/trunk/arch/arm/include/asm/hardware/pl330.h +++ b/trunk/arch/arm/include/asm/hardware/pl330.h @@ -41,7 +41,7 @@ enum pl330_dstcachectrl { DCCTRL1, /* Bufferable only */ DCCTRL2, /* Cacheable, but do not allocate */ DCCTRL3, /* Cacheable and bufferable, but do not allocate */ - DINVALID1 = 8, + DINVALID1, /* AWCACHE = 0x1000 */ DINVALID2, DCCTRL6, /* Cacheable write-through, allocate on writes only */ DCCTRL7, /* Cacheable write-back, allocate on writes only */ diff --git a/trunk/arch/arm/include/asm/processor.h b/trunk/arch/arm/include/asm/processor.h index ce280b8d613c..cb8d638924fd 100644 --- a/trunk/arch/arm/include/asm/processor.h +++ b/trunk/arch/arm/include/asm/processor.h @@ -22,6 +22,7 @@ #include #include #include +#include #ifdef __KERNEL__ #define STACK_TOP ((current->personality & ADDR_LIMIT_32BIT) ? \ diff --git a/trunk/arch/arm/kernel/ptrace.c b/trunk/arch/arm/kernel/ptrace.c index e33870ff0ac0..ede6443c34d9 100644 --- a/trunk/arch/arm/kernel/ptrace.c +++ b/trunk/arch/arm/kernel/ptrace.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -904,6 +905,12 @@ long arch_ptrace(struct task_struct *child, long request, return ret; } +#ifdef __ARMEB__ +#define AUDIT_ARCH_NR AUDIT_ARCH_ARMEB +#else +#define AUDIT_ARCH_NR AUDIT_ARCH_ARM +#endif + asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno) { unsigned long ip; @@ -918,7 +925,7 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno) if (!ip) audit_syscall_exit(regs); else - audit_syscall_entry(AUDIT_ARCH_ARMEB, scno, regs->ARM_r0, + audit_syscall_entry(AUDIT_ARCH_NR, scno, regs->ARM_r0, regs->ARM_r1, regs->ARM_r2, regs->ARM_r3); if (!test_thread_flag(TIF_SYSCALL_TRACE)) diff --git a/trunk/arch/arm/kernel/smp_twd.c b/trunk/arch/arm/kernel/smp_twd.c index 4285daa077b0..7a79b24597b2 100644 --- a/trunk/arch/arm/kernel/smp_twd.c +++ b/trunk/arch/arm/kernel/smp_twd.c @@ -129,7 +129,7 @@ static struct notifier_block twd_cpufreq_nb = { static int twd_cpufreq_init(void) { - if (!IS_ERR(twd_clk)) + if (twd_evt && *__this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk)) return cpufreq_register_notifier(&twd_cpufreq_nb, CPUFREQ_TRANSITION_NOTIFIER); diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c index 99a572702509..f84dfe67724f 100644 --- a/trunk/arch/arm/kernel/traps.c +++ b/trunk/arch/arm/kernel/traps.c @@ -266,6 +266,7 @@ void die(const char *str, struct pt_regs *regs, int err) { struct thread_info *thread = current_thread_info(); int ret; + enum bug_trap_type bug_type = BUG_TRAP_TYPE_NONE; oops_enter(); @@ -273,7 +274,9 @@ void die(const char *str, struct pt_regs *regs, int err) console_verbose(); bust_spinlocks(1); if (!user_mode(regs)) - report_bug(regs->ARM_pc, regs); + bug_type = report_bug(regs->ARM_pc, regs); + if (bug_type != BUG_TRAP_TYPE_NONE) + str = "Oops - BUG"; ret = __die(str, err, thread, regs); if (regs && kexec_should_crash(thread->task)) diff --git a/trunk/arch/arm/kernel/vmlinux.lds.S b/trunk/arch/arm/kernel/vmlinux.lds.S index 1e19691e0406..43a31fb06318 100644 --- a/trunk/arch/arm/kernel/vmlinux.lds.S +++ b/trunk/arch/arm/kernel/vmlinux.lds.S @@ -10,6 +10,7 @@ #include #define PROC_INFO \ + . = ALIGN(4); \ VMLINUX_SYMBOL(__proc_info_begin) = .; \ *(.proc.info.init) \ VMLINUX_SYMBOL(__proc_info_end) = .; diff --git a/trunk/arch/arm/mach-at91/Kconfig b/trunk/arch/arm/mach-at91/Kconfig index 71feb00a1e99..0284e66c47f9 100644 --- a/trunk/arch/arm/mach-at91/Kconfig +++ b/trunk/arch/arm/mach-at91/Kconfig @@ -102,15 +102,6 @@ config ARCH_AT91SAM9G45 select HAVE_AT91_DBGU1 select AT91_SAM9G45_RESET -config ARCH_AT91CAP9 - bool "AT91CAP9" - select CPU_ARM926T - select GENERIC_CLOCKEVENTS - select HAVE_FB_ATMEL - select HAVE_NET_MACB - select HAVE_AT91_DBGU1 - select AT91_SAM9G45_RESET - config ARCH_AT91X40 bool "AT91x40" select ARCH_USES_GETTIMEOFFSET @@ -447,21 +438,6 @@ endif # ---------------------------------------------------------- -if ARCH_AT91CAP9 - -comment "AT91CAP9 Board Type" - -config MACH_AT91CAP9ADK - bool "Atmel AT91CAP9A-DK Evaluation Kit" - select HAVE_AT91_DATAFLASH_CARD - help - Select this if you are using Atmel's AT91CAP9A-DK Evaluation Kit. - - -endif - -# ---------------------------------------------------------- - if ARCH_AT91X40 comment "AT91X40 Board Type" @@ -544,7 +520,7 @@ config AT91_EARLY_DBGU0 depends on HAVE_AT91_DBGU0 config AT91_EARLY_DBGU1 - bool "DBGU on 9263, 9g45 and cap9" + bool "DBGU on 9263 and 9g45" depends on HAVE_AT91_DBGU1 config AT91_EARLY_USART0 diff --git a/trunk/arch/arm/mach-at91/Makefile b/trunk/arch/arm/mach-at91/Makefile index 705e1fbded39..aeb76f1690d9 100644 --- a/trunk/arch/arm/mach-at91/Makefile +++ b/trunk/arch/arm/mach-at91/Makefile @@ -20,7 +20,6 @@ obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_d obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o -obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o # AT91RM9200 board-specific support @@ -81,9 +80,6 @@ obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o # AT91SAM board with device-tree obj-$(CONFIG_MACH_AT91SAM_DT) += board-dt.o -# AT91CAP9 board-specific support -obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o - # AT91X40 board-specific support obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o diff --git a/trunk/arch/arm/mach-at91/Makefile.boot b/trunk/arch/arm/mach-at91/Makefile.boot index 8ddafadfdc7d..2fd051eb2449 100644 --- a/trunk/arch/arm/mach-at91/Makefile.boot +++ b/trunk/arch/arm/mach-at91/Makefile.boot @@ -3,11 +3,7 @@ # PARAMS_PHYS must be within 4MB of ZRELADDR # INITRD_PHYS must be in RAM -ifeq ($(CONFIG_ARCH_AT91CAP9),y) - zreladdr-y += 0x70008000 -params_phys-y := 0x70000100 -initrd_phys-y := 0x70410000 -else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y) +ifeq ($(CONFIG_ARCH_AT91SAM9G45),y) zreladdr-y += 0x70008000 params_phys-y := 0x70000100 initrd_phys-y := 0x70410000 diff --git a/trunk/arch/arm/mach-at91/at91cap9.c b/trunk/arch/arm/mach-at91/at91cap9.c deleted file mode 100644 index 8967d75c2ea3..000000000000 --- a/trunk/arch/arm/mach-at91/at91cap9.c +++ /dev/null @@ -1,404 +0,0 @@ -/* - * arch/arm/mach-at91/at91cap9.c - * - * Copyright (C) 2007 Stelian Pop - * Copyright (C) 2007 Lead Tech Design - * Copyright (C) 2007 Atmel Corporation. - * - * 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. - * - */ - -#include - -#include -#include -#include -#include - -#include -#include -#include - -#include "soc.h" -#include "generic.h" -#include "clock.h" -#include "sam9_smc.h" - -/* -------------------------------------------------------------------- - * Clocks - * -------------------------------------------------------------------- */ - -/* - * The peripheral clocks. - */ -static struct clk pioABCD_clk = { - .name = "pioABCD_clk", - .pmc_mask = 1 << AT91CAP9_ID_PIOABCD, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk mpb0_clk = { - .name = "mpb0_clk", - .pmc_mask = 1 << AT91CAP9_ID_MPB0, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk mpb1_clk = { - .name = "mpb1_clk", - .pmc_mask = 1 << AT91CAP9_ID_MPB1, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk mpb2_clk = { - .name = "mpb2_clk", - .pmc_mask = 1 << AT91CAP9_ID_MPB2, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk mpb3_clk = { - .name = "mpb3_clk", - .pmc_mask = 1 << AT91CAP9_ID_MPB3, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk mpb4_clk = { - .name = "mpb4_clk", - .pmc_mask = 1 << AT91CAP9_ID_MPB4, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk usart0_clk = { - .name = "usart0_clk", - .pmc_mask = 1 << AT91CAP9_ID_US0, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk usart1_clk = { - .name = "usart1_clk", - .pmc_mask = 1 << AT91CAP9_ID_US1, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk usart2_clk = { - .name = "usart2_clk", - .pmc_mask = 1 << AT91CAP9_ID_US2, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk mmc0_clk = { - .name = "mci0_clk", - .pmc_mask = 1 << AT91CAP9_ID_MCI0, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk mmc1_clk = { - .name = "mci1_clk", - .pmc_mask = 1 << AT91CAP9_ID_MCI1, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk can_clk = { - .name = "can_clk", - .pmc_mask = 1 << AT91CAP9_ID_CAN, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk twi_clk = { - .name = "twi_clk", - .pmc_mask = 1 << AT91CAP9_ID_TWI, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk spi0_clk = { - .name = "spi0_clk", - .pmc_mask = 1 << AT91CAP9_ID_SPI0, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk spi1_clk = { - .name = "spi1_clk", - .pmc_mask = 1 << AT91CAP9_ID_SPI1, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk ssc0_clk = { - .name = "ssc0_clk", - .pmc_mask = 1 << AT91CAP9_ID_SSC0, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk ssc1_clk = { - .name = "ssc1_clk", - .pmc_mask = 1 << AT91CAP9_ID_SSC1, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk ac97_clk = { - .name = "ac97_clk", - .pmc_mask = 1 << AT91CAP9_ID_AC97C, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk tcb_clk = { - .name = "tcb_clk", - .pmc_mask = 1 << AT91CAP9_ID_TCB, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk pwm_clk = { - .name = "pwm_clk", - .pmc_mask = 1 << AT91CAP9_ID_PWMC, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk macb_clk = { - .name = "pclk", - .pmc_mask = 1 << AT91CAP9_ID_EMAC, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk aestdes_clk = { - .name = "aestdes_clk", - .pmc_mask = 1 << AT91CAP9_ID_AESTDES, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk adc_clk = { - .name = "adc_clk", - .pmc_mask = 1 << AT91CAP9_ID_ADC, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk isi_clk = { - .name = "isi_clk", - .pmc_mask = 1 << AT91CAP9_ID_ISI, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk lcdc_clk = { - .name = "lcdc_clk", - .pmc_mask = 1 << AT91CAP9_ID_LCDC, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk dma_clk = { - .name = "dma_clk", - .pmc_mask = 1 << AT91CAP9_ID_DMA, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk udphs_clk = { - .name = "udphs_clk", - .pmc_mask = 1 << AT91CAP9_ID_UDPHS, - .type = CLK_TYPE_PERIPHERAL, -}; -static struct clk ohci_clk = { - .name = "ohci_clk", - .pmc_mask = 1 << AT91CAP9_ID_UHP, - .type = CLK_TYPE_PERIPHERAL, -}; - -static struct clk *periph_clocks[] __initdata = { - &pioABCD_clk, - &mpb0_clk, - &mpb1_clk, - &mpb2_clk, - &mpb3_clk, - &mpb4_clk, - &usart0_clk, - &usart1_clk, - &usart2_clk, - &mmc0_clk, - &mmc1_clk, - &can_clk, - &twi_clk, - &spi0_clk, - &spi1_clk, - &ssc0_clk, - &ssc1_clk, - &ac97_clk, - &tcb_clk, - &pwm_clk, - &macb_clk, - &aestdes_clk, - &adc_clk, - &isi_clk, - &lcdc_clk, - &dma_clk, - &udphs_clk, - &ohci_clk, - // irq0 .. irq1 -}; - -static struct clk_lookup periph_clocks_lookups[] = { - /* One additional fake clock for macb_hclk */ - CLKDEV_CON_ID("hclk", &macb_clk), - CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk), - CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk), - CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk), - CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.1", &mmc1_clk), - 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("pclk", "ssc.0", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), - /* fake hclk clock */ - CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), - CLKDEV_CON_ID("pioA", &pioABCD_clk), - CLKDEV_CON_ID("pioB", &pioABCD_clk), - CLKDEV_CON_ID("pioC", &pioABCD_clk), - CLKDEV_CON_ID("pioD", &pioABCD_clk), -}; - -static struct clk_lookup usart_clocks_lookups[] = { - CLKDEV_CON_DEV_ID("usart", "atmel_usart.0", &mck), - CLKDEV_CON_DEV_ID("usart", "atmel_usart.1", &usart0_clk), - CLKDEV_CON_DEV_ID("usart", "atmel_usart.2", &usart1_clk), - CLKDEV_CON_DEV_ID("usart", "atmel_usart.3", &usart2_clk), -}; - -/* - * The four programmable clocks. - * You must configure pin multiplexing to bring these signals out. - */ -static struct clk pck0 = { - .name = "pck0", - .pmc_mask = AT91_PMC_PCK0, - .type = CLK_TYPE_PROGRAMMABLE, - .id = 0, -}; -static struct clk pck1 = { - .name = "pck1", - .pmc_mask = AT91_PMC_PCK1, - .type = CLK_TYPE_PROGRAMMABLE, - .id = 1, -}; -static struct clk pck2 = { - .name = "pck2", - .pmc_mask = AT91_PMC_PCK2, - .type = CLK_TYPE_PROGRAMMABLE, - .id = 2, -}; -static struct clk pck3 = { - .name = "pck3", - .pmc_mask = AT91_PMC_PCK3, - .type = CLK_TYPE_PROGRAMMABLE, - .id = 3, -}; - -static void __init at91cap9_register_clocks(void) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(periph_clocks); i++) - clk_register(periph_clocks[i]); - - clkdev_add_table(periph_clocks_lookups, - ARRAY_SIZE(periph_clocks_lookups)); - clkdev_add_table(usart_clocks_lookups, - ARRAY_SIZE(usart_clocks_lookups)); - - clk_register(&pck0); - clk_register(&pck1); - clk_register(&pck2); - clk_register(&pck3); -} - -static struct clk_lookup console_clock_lookup; - -void __init at91cap9_set_console_clock(int id) -{ - if (id >= ARRAY_SIZE(usart_clocks_lookups)) - return; - - console_clock_lookup.con_id = "usart"; - console_clock_lookup.clk = usart_clocks_lookups[id].clk; - clkdev_add(&console_clock_lookup); -} - -/* -------------------------------------------------------------------- - * GPIO - * -------------------------------------------------------------------- */ - -static struct at91_gpio_bank at91cap9_gpio[] __initdata = { - { - .id = AT91CAP9_ID_PIOABCD, - .regbase = AT91CAP9_BASE_PIOA, - }, { - .id = AT91CAP9_ID_PIOABCD, - .regbase = AT91CAP9_BASE_PIOB, - }, { - .id = AT91CAP9_ID_PIOABCD, - .regbase = AT91CAP9_BASE_PIOC, - }, { - .id = AT91CAP9_ID_PIOABCD, - .regbase = AT91CAP9_BASE_PIOD, - } -}; - -static void at91cap9_idle(void) -{ - at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK); - cpu_do_idle(); -} - -/* -------------------------------------------------------------------- - * AT91CAP9 processor initialization - * -------------------------------------------------------------------- */ - -static void __init at91cap9_map_io(void) -{ - at91_init_sram(0, AT91CAP9_SRAM_BASE, AT91CAP9_SRAM_SIZE); -} - -static void __init at91cap9_ioremap_registers(void) -{ - at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC); - at91_ioremap_rstc(AT91CAP9_BASE_RSTC); - at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT); - at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC); -} - -static void __init at91cap9_initialize(void) -{ - arm_pm_idle = at91cap9_idle; - arm_pm_restart = at91sam9g45_restart; - at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1); - - /* Register GPIO subsystem */ - at91_gpio_init(at91cap9_gpio, 4); - - /* Remember the silicon revision */ - if (cpu_is_at91cap9_revB()) - system_rev = 0xB; - else if (cpu_is_at91cap9_revC()) - system_rev = 0xC; -} - -/* -------------------------------------------------------------------- - * Interrupt initialization - * -------------------------------------------------------------------- */ - -/* - * The default interrupt priority levels (0 = lowest, 7 = highest). - */ -static unsigned int at91cap9_default_irq_priority[NR_AIC_IRQS] __initdata = { - 7, /* Advanced Interrupt Controller (FIQ) */ - 7, /* System Peripherals */ - 1, /* Parallel IO Controller A, B, C and D */ - 0, /* MP Block Peripheral 0 */ - 0, /* MP Block Peripheral 1 */ - 0, /* MP Block Peripheral 2 */ - 0, /* MP Block Peripheral 3 */ - 0, /* MP Block Peripheral 4 */ - 5, /* USART 0 */ - 5, /* USART 1 */ - 5, /* USART 2 */ - 0, /* Multimedia Card Interface 0 */ - 0, /* Multimedia Card Interface 1 */ - 3, /* CAN */ - 6, /* Two-Wire Interface */ - 5, /* Serial Peripheral Interface 0 */ - 5, /* Serial Peripheral Interface 1 */ - 4, /* Serial Synchronous Controller 0 */ - 4, /* Serial Synchronous Controller 1 */ - 5, /* AC97 Controller */ - 0, /* Timer Counter 0, 1 and 2 */ - 0, /* Pulse Width Modulation Controller */ - 3, /* Ethernet */ - 0, /* Advanced Encryption Standard, Triple DES*/ - 0, /* Analog-to-Digital Converter */ - 0, /* Image Sensor Interface */ - 3, /* LCD Controller */ - 0, /* DMA Controller */ - 2, /* USB Device Port */ - 2, /* USB Host port */ - 0, /* Advanced Interrupt Controller (IRQ0) */ - 0, /* Advanced Interrupt Controller (IRQ1) */ -}; - -struct at91_init_soc __initdata at91cap9_soc = { - .map_io = at91cap9_map_io, - .default_irq_priority = at91cap9_default_irq_priority, - .ioremap_registers = at91cap9_ioremap_registers, - .register_clocks = at91cap9_register_clocks, - .init = at91cap9_initialize, -}; diff --git a/trunk/arch/arm/mach-at91/at91cap9_devices.c b/trunk/arch/arm/mach-at91/at91cap9_devices.c deleted file mode 100644 index d298fb7cb210..000000000000 --- a/trunk/arch/arm/mach-at91/at91cap9_devices.c +++ /dev/null @@ -1,1273 +0,0 @@ -/* - * arch/arm/mach-at91/at91cap9_devices.c - * - * Copyright (C) 2007 Stelian Pop - * Copyright (C) 2007 Lead Tech Design - * Copyright (C) 2007 Atmel Corporation. - * - * 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. - * - */ -#include -#include -#include - -#include -#include -#include -#include - -#include