summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-15ARM: at91/dt: ethernut5: use at91sam9xe.dtsiAlexandre Belloni
The ethernut5 is actually based on an at91sam9xe, use the correct dts include. Cc: Martin Reimann <martin.reimann@egnite.de> Cc: Tim Schendekehl <tim.schendekehl@egnite.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: Add a dtsi for at91sam9xeAlexandre Belloni
at91sam9xe is slightly different from at91sam9260, in particular it has a different SRAM size and location. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: add SRAM nodesAlexandre Belloni
Add nodes for the SRAM available on atmel SoCs For the at91sam9260 and the at91sam9g20, address mirroring is used to create a single contiguous SRAM range instead of declaring two separate banks. Also remove leftover TODOs in the sam9g45 file Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> [nicolas.ferre@atmel.com: correct at91sam9rl sram size => 0x10000] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: at91rm9200ek: enable RTCAlexandre Belloni
Enable the RTC on the at91rm9200ek. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: rm9200: add RTC nodeAlexandre Belloni
Add a node for the RTC available on at91rm9200. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: at91sam9n12: Add RTC nodeAlexandre Belloni
Add node for the RTC available on the at91sam9n12. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: sama5d4: Add SFRAlexandre Belloni
The sama4d4 has Special Function Registers that allow to manage DDR, OHCI, EBI and AIC interrupt redirection. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> [nicolas.ferre@atmel.com: reg size: 0x60] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: sama5d3: Add SFRAlexandre Belloni
The sama5d3 has Special Function Registers that allow to manage OHCI, EBI and the UTMI clock. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> [nicolas.ferre@atmel.com: reg size: 0x60] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91: Add Special Function Registers binding documentationAlexandre Belloni
The special function registers gather some registers that allow to tweak features provided by IPs controlled through another register range. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> [nicolas.ferre@atmel.com: reg size: 0x60] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: sam9263: Fix typo: ac91_clk -> ac97_clkAlexander Stein
That clock should be called ac97_clk. Signed-off-by: Alexander Stein <alexanders83@web.de> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-15ARM: at91/dt: sama5d3: enable D2 as the heartbeat LEDJosh Wu
This D2 led is available for all sama5d3x-ek board. So make it a heartbeat LED. Signed-off-by: Josh Wu <josh.wu@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2015-01-14Merge tag 'mvebu-dt-3.20' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson
Merge "mvebu: dt for v3.20" from Andrew Lunn: mvebu dt changes for v3.20 (part #1) - Add Armada 388 General Purpose Development Board support - Add Device Tree description of the Armada 388 SoC - Document the Device Tree binding for the Armada 388 SoC - a38x: Add missing labels - a38x: Add more pinctrl functions - Add Armada 385 Access Point Development Board support - Add a number of pinctrl functions - A38x: Remove redundant pinctrl informations - a38x: Fix node names - Add support for Seagate BlackArmor NAS220 - kirkwood: enable phy driver for SATA controller on 88f6192 - gpio_poweroff support for Iomega ix2-200 - Use all remaining MTD space foor rootfs of Iomega ix2-200 * tag 'mvebu-dt-3.20' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Add Armada 388 General Purpose Development Board support ARM: mvebu: Add Device Tree description of the Armada 388 SoC ARM: mvebu: Document the Device Tree binding for the Armada 388 SoC ARM: mvebu: a38x: Add missing labels ARM: mvebu: a38x: Add more pinctrl functions ARM: mvebu: Add Armada 385 Access Point Development Board support ARM: mvebu: Add a number of pinctrl functions ARM: mvebu: A38x: Remove redundant pinctrl informations ARM: mvebu: a38x: Fix node names Kirkwood: add support for Seagate BlackArmor NAS220 ARM: dts: kirkwood: enable phy driver for SATA controller on 88f6192 ARM: dts: add gpio_poweroff support for Iomega ix2-200 ARM: dts: use all remaining MTD space foor rootfs of Iomega ix2-200 Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-15ARM: shmobile: sh73a0 dtsi: Add memory-controller nodesGeert Uytterhoeven
Add device nodes for the two SDRAM Bus State Controllers. The SBSCs are located in the A4BC0 resp. A4BC1 PM domains, which must not be powered down, else the system will crash. References to the A4BC0 and A4BC1 PM domains will be added later. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-15ARM: shmobile: r8a7740 dtsi: Add memory-controller nodeGeert Uytterhoeven
Add a device node for the DDR3 Bus State Controller (DBSC3). The DBSC3 is located in the A4S PM domain, which must not be powered down, else the system will crash. This has no visible effect for now, as A4S was never turned off anyway because its child PM domain A3SM contains the CPU core. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-15ARM: shmobile: r8a73a4 dtsi: Add memory-controller nodesGeert Uytterhoeven
Add device nodes for the two DDR Bus State Controllers (DBSC). The DBSCs are located in the A3BC PM domain, which must not be powered down, else the system will crash. A reference to the A3BC PM domain will be added later. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-15ARM: shmobile: Add DT bindings for Renesas memory controllersGeert Uytterhoeven
Add DT bindings for Renesas R-Mobile and SH-Mobile memory controllers. Currently memory controller device nodes are used only to reference PM domains, and prevent these PM domains from being powered down, which would crash the system. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13Merge tag 'v3.20-next-dts' of https://github.com/mbgg/linux-mediatek into ↵Olof Johansson
next/dt Merge "ARM: mediatek: DT changes for v3.20 (round 1)" from Matthias Brugger: This adds support for the mediatek sysirq and the uarts for the following SoCs: - mt8135 - mt8127 - mt6598 For mt6592 only the sysirq support was added. * tag 'v3.20-next-dts' of https://github.com/mbgg/linux-mediatek: ARM: mediatek: dts: Add uart to Aquaris5 ARM: mediatek: dts: Add uart to mt6589 dt-bindings: add mt6592 compatible string for mediatek sysirq ARM: mediatek: Add sysirq device node to mt6592 dtsi ARM: mediatek: dts: Add UART dts for MT8127 and MT8135 boards DTS: serial: Add bindings document for the Mediatek UARTs ARM: mediatek: add UART dts for mt8127 and mt8135 ARM: mediatek: Add sysirq in mt6589/mt8135/mt8127 dtsi Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-13ARM: dts: omap3-gta04: Add handling for tv outputMarek Belisko
Add handling for gta04 tv out chain: venc -> opa362 -> svideo Use invert-polarity in venc node because opa362 is doing polarity inversion also. Signed-off-by: Marek Belisko <marek@goldelico.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-13ARM: dts: cm-t3x: add NAND supportDmitry Lifshitz
CM-T3517, CM-T3530 and CM-T3730 features NAND storage chip connected to GPMC bus. Add GPMC DT entry into the root DT file omap3-cm-t3x.dtsi, common for all three modules. NAND timings are calculated to be safe for CM-T3x devices as it works now in non DT boot (in this case the timings are updated by U-Boot). Update GPMC ranges in boards DT files to include all connected devices. Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-13ARM: dts: add init dts file for CSR atlas7 SoCZhiwu Song
CSR atlas7 uses Network on Chip(NoC) bus architecture, there are dozens of MARCOs, in each MARCO, there are dozens of hardware modules. Signed-off-by: Zhiwu Song <Zhiwu.Song@csr.com> Signed-off-by: Hao Liu <Hao.Liu@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2015-01-13ARM: dts: vfxxx: Add SNVS nodeSanchayan Maity
Add device tree node for the Secure Non-Volatile Storage (SNVS) on the VF610 platform. The SNVS block also has a Real Time Counter (RTC). Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-01-13Merge branch 'imx/soc' into imx/dtShawn Guo
2015-01-13ARM: imx: clk-vf610: Add clock for SNVSSanchayan Maity
Add support for clock gating of the SNVS peripheral. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-01-13ARM: imx: clk-vf610: Add clock for UART4 and UART5Bhuvanchandra DV
Add support for clock gating of UART4 and UART5. We use these UART's in a (not yet mainlined) device tree. Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2015-01-13ARM: shmobile: r8a7791: add SRC interrupt number on DTSIKuninori Morimoto
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13ARM: shmobile: r8a7790: add SRC interrupt number on DTSIKuninori Morimoto
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13ARM: shmobile: r8a7791: fix MSTP8 input clocksSergei Shtylyov
I made a mistake when rebasing Andrey Gusakov's patch adding MLB+ clock to the R8A7791 device tree, inserting <&hp_clk> into the "clocks" property of the MSTP8 node at a wrong position, so that the input clocks for MLB+ and IPMMU-SGX got swapped... Fixes: 7408d3061d2f ("ARM: shmobile: r8a7791: add MLB+ clock") Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13ARM: shmobile: r8a7740 dtsi: Add PM domain supportGeert Uytterhoeven
Add a device node for the System Controller, with subnodes that represent the hardware power area hierarchy. Hook up all devices to their respective PM domains. Add a minimal device node for the Coresight-ETM hardware block, and hook it up to the D4 PM domain, so the R-Mobile System Controller driver can keep the domain powered, until the new Coresight code handles runtime PM. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13PM / Domains: Add DT bindings for the R-Mobile System ControllerGeert Uytterhoeven
The Renesas R-Mobile System Controller provides a.o. power management support, following the generic PM domain bindings in Documentation/devicetree/bindings/power/power_domain.txt. For now this supports the R-Mobile A1 (r8a7740) only, but it should be sufficiently generic to handle other members of the SH-Mobile/R-Mobile family in the future. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13ARM: shmobile: r8a7791: tidyup #sound-dai-cells settingsKuninori Morimoto
Renesas sound driver needs #sound-dai-cells settings, but, this usage is a little bit confusable. It came from ALSA SoC historical reasons. The sound DAI naming method is different between Single/Multi DAI in the ALSA framework, and it is used for sound card matching. And this #sound-dai-cells has relationship to it. Current SoC dtsi has #sound-dai-cells = <1> as default settings (= it is assuming that board/platform has multi DAI), and board/platform side needs to overwrite it if board/platform was single DAI. This style is more confusable for users. This patch removes SoC side default settings, and force to set it by board/platform side. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13ARM: shmobile: r8a7790: tidyup #sound-dai-cells settingsKuninori Morimoto
Renesas sound driver needs #sound-dai-cells settings, but, this usage is a little bit confusable. It came from ALSA SoC historical reasons. The sound DAI naming method is different between Single/Multi DAI in the ALSA framework, and it is used for sound card matching. And this #sound-dai-cells has relationship to it. Current SoC dtsi has #sound-dai-cells = <1> as default settings (= it is assuming that board/platform has multi DAI), and board/platform side needs to overwrite it if board/platform was single DAI. This style is more confusable for users. This patch removes SoC side default settings, and force to set it by board/platform side. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13ARM: shmobile: r8a7791 dtsi: Drop "renesas,rcar_sound" compatible valueGeert Uytterhoeven
The "renesas,rcar_sound" compatible property value was never processed nor documented. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-13ARM: shmobile: r8a7790 dtsi: Drop "renesas,rcar_sound" compatible valueGeert Uytterhoeven
The "renesas,rcar_sound" compatible property value was never processed nor documented. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-01-12Merge tag 'berlin-dt-for-3.20-1' of ↵Olof Johansson
git://git.infradead.org/users/hesselba/linux-berlin into next/dt Merge "ARM: berlin: DT changes for v3.20 (round 1)" from Sebastian Hesselbarth: Berlin DT changes for v3.20 (round 1) - add PMU nodes for BG2Q and BG2CD - add PPI CPU masks for TWD timer interrupts * tag 'berlin-dt-for-3.20-1' of git://git.infradead.org/users/hesselba/linux-berlin: ARM: dts: berlin: add PPI cpu mask to twd timer interrupts ARM: dts: berlin: add pmu node for BG2Q and BG2CD Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-12ARM: dts: Only build dtb if associated Arch and/or SoC is enabledPeter Robinson
A number of arches (EXYNOS/IMX/TEGRA) are separated out into finer grained definitions whether it be sub ARCH or SOC definitions. The device tree blobs should only be built if the specific option is enabled that supports that device or it might be that there's an expectation that the device is supported when in actual fact it's not. This ensures only the relevant bits are built. Also standardised the line break between the arch/soc definitions and the dtbs to be on separate lines for better consistency as per feedback. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> Acked-by: Thierry Reding <treding@nvidia.com> Acked-by: Stephen Warren <swarren@nvidia.com> Acked-by: Shawn Guo <shawn.guo@freescale.com> [olof: Fixed stray \ in one of the IMX rules] Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-12Merge tag 'renesas-dt-for-v3.20' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Renesas ARM Based SoC DT Updates for v3.20" from Simon Horman: * Use clock-indices instead of deprecated renesas,clock-indices * Prepare for r8a73a4 multiplatform support * Increase clock coverage for r8a779[014] * Correct r8a7779 clock usage * Correct LAN9220 VDDVARIO voltage on ape6evm * Correct QSPI SPI-Flash mode of lager and koelsch * Correct flash partition label and size on koelsch * Correct mask for GIC PPI interrupts on r8a779[14] * Correct BSC bus range on ape6evm-reference * tag 'renesas-dt-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (30 commits) ARM: shmobile: r8a7791: add MLB+ clock ARM: shmobile: r8a7790: add MLB+ clock ARM: shmobile: ape6evm: Fix LAN9220 VDDVARIO voltage ARM: shmobile: r8a73a4: Add r8a73a4-ape6evm.dtb to ARCH_SHMOBILE_MULTI ARM: shmobile: ape6evm: Add keypad to the device tree ARM: shmobile: ape6evm: Add LEDs to the device tree ARM: shmobile: ape6evm: synchronize dts with reference platform ARM: shmobile: ape6evm: fix compatible string for Ethernet controller ARM: shmobile: r8a7794: Add MMCIF clock to device tree ARM: shmobile: r8a7794: Add SDHI clocks to device tree ARM: shmobile: r8a7794: Add I2C clocks to device tree ARM: shmobile: r8a7779: Add TWD device to DTS ARM: shmobile: r8a7779: Use MSTP for SCIF clocks ARM: shmobile: r8a7779: Use R8A7779_CLK_P as SCIF parent clock ARM: shmobile: r8a7794: Add QSPI clock to device tree ARM: shmobile: lager: Fix QSPI mode of SPI-Flash into mode3 ARM: shmobile: r8a7794: Add SYS-DMAC clocks to device tree ARM: shmobile: r8a7791: Add IPMMU-SGX clock to device tree ARM: shmobile: koelsch: Fix QSPI mode of SPI-Flash into mode3 ARM: shmobile: r8a7794: Add USBDMAC[01] clocks to device tree ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-12Merge tag 'renesas-dt-cleanups-for-v3.20' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Renesas ARM Based SoC DT Cleanups for v3.20" from Simon Horman: * Replace status value "ok" with "okay" * tag 'renesas-dt-cleanups-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: kzm9g-reference dts: Replace status value "ok" by "okay" ARM: shmobile: alt dts: Replace status value "ok" by "okay" ARM: shmobile: koelsch dts: Replace status value "ok" by "okay" ARM: shmobile: henninger dts: Replace status value "ok" by "okay" ARM: shmobile: lager dts: Replace status value "ok" by "okay" ARM: shmobile: armadillo800eva dts: Replace status value "ok" by "okay" ARM: shmobile: genmai dts: Replace status value "ok" by "okay" Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-11linux 3.19-rc4v3.19-rc4Linus Torvalds
2015-01-11Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-armLinus Torvalds
Pull ARM fixes from Russell King: "Three small fixes from over the Christmas period, and wiring up the new execveat syscall for ARM" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error ARM: 8253/1: mm: use phys_addr_t type in map_lowmem() for kernel mem region ARM: 8249/1: mm: dump: don't skip regions ARM: wire up execveat syscall
2015-01-11ARM: mediatek: dts: Add uart to Aquaris5Matthias Brugger
This patch enables uart port for the Aquaris5 mobile phone. Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
2015-01-11ARM: mediatek: dts: Add uart to mt6589Matthias Brugger
This patch adds the uart ports to the device tree of Mediatek mt6589 SoC. Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
2015-01-11Merge branch 'x86-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fixes from Ingo Molnar: "Misc fixes: two vdso fixes, two kbuild fixes and a boot failure fix with certain odd memory mappings" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, vdso: Use asm volatile in __getcpu x86/build: Clean auto-generated processor feature files x86: Fix mkcapflags.sh bash-ism x86: Fix step size adjustment during initial memory mapping x86_64, vdso: Fix the vdso address randomization algorithm
2015-01-11Merge branch 'sched-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull scheduler fixes from Ingo Molnar: "Misc fixes: group scheduling corner case fix, two deadline scheduler fixes, effective_load() overflow fix, nested sleep fix, 6144 CPUs system fix" * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/fair: Fix RCU stall upon -ENOMEM in sched_create_group() sched/deadline: Avoid double-accounting in case of missed deadlines sched/deadline: Fix migration of SCHED_DEADLINE tasks sched: Fix odd values in effective_load() calculations sched, fanotify: Deal with nested sleeps sched: Fix KMALLOC_MAX_SIZE overflow during cpumask allocation
2015-01-11Merge branch 'perf-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull perf fixes from Ingo Molnar: "Mostly tooling fixes, but also some kernel side fixes: uncore PMU driver fix, user regs sampling fix and an instruction decoder fix that unbreaks PEBS precise sampling" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/uncore/hsw-ep: Handle systems with only two SBOXes perf/x86_64: Improve user regs sampling perf: Move task_pt_regs sampling into arch code x86: Fix off-by-one in instruction decoder perf hists browser: Fix segfault when showing callchain perf callchain: Free callchains when hist entries are deleted perf hists: Fix children sort key behavior perf diff: Fix to sort by baseline field by default perf list: Fix --raw-dump option perf probe: Fix crash in dwarf_getcfi_elf perf probe: Fix to fall back to find probe point in symbols perf callchain: Append callchains only when requested perf ui/tui: Print backtrace symbols when segfault occurs perf report: Show progress bar for output resorting
2015-01-11Merge branch 'locking-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull locking fixes from Ingo Molnar: "A liblockdep fix and a mutex_unlock() mutex-debugging fix" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: mutex: Always clear owner field upon mutex_unlock() tools/liblockdep: Fix debug_check thinko in mutex destroy
2015-01-11mm: fix corner case in anon_vma endless growing preventionKonstantin Khlebnikov
Fix for BUG_ON(anon_vma->degree) splashes in unlink_anon_vmas() ("kernel BUG at mm/rmap.c:399!") caused by commit 7a3ef208e662 ("mm: prevent endless growth of anon_vma hierarchy") Anon_vma_clone() is usually called for a copy of source vma in destination argument. If source vma has anon_vma it should be already in dst->anon_vma. NULL in dst->anon_vma is used as a sign that it's called from anon_vma_fork(). In this case anon_vma_clone() finds anon_vma for reusing. Vma_adjust() calls it differently and this breaks anon_vma reusing logic: anon_vma_clone() links vma to old anon_vma and updates degree counters but vma_adjust() overrides vma->anon_vma right after that. As a result final unlink_anon_vmas() decrements degree for wrong anon_vma. This patch assigns ->anon_vma before calling anon_vma_clone(). Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com> Reported-and-tested-by: Chris Clayton <chris2553@googlemail.com> Reported-and-tested-by: Oded Gabbay <oded.gabbay@amd.com> Reported-and-tested-by: Chih-Wei Huang <cwhuang@android-x86.org> Acked-by: Rik van Riel <riel@redhat.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Cc: Daniel Forrest <dan.forrest@ssec.wisc.edu> Cc: Michal Hocko <mhocko@suse.cz> Cc: stable@vger.kernel.org # to match back-porting of 7a3ef208e662 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-01-11mm: Don't count the stack guard page towards RLIMIT_STACKLinus Torvalds
Commit fee7e49d4514 ("mm: propagate error from stack expansion even for guard page") made sure that we return the error properly for stack growth conditions. It also theorized that counting the guard page towards the stack limit might break something, but also said "Let's see if anybody notices". Somebody did notice. Apparently android-x86 sets the stack limit very close to the limit indeed, and including the guard page in the rlimit check causes the android 'zygote' process problems. So this adds the (fairly trivial) code to make the stack rlimit check be against the actual real stack size, rather than the size of the vma that includes the guard page. Reported-and-tested-by: Chih-Wei Huang <cwhuang@android-x86.org> Cc: Jay Foad <jay.foad@gmail.com> Cc: stable@kernel.org # to match back-porting of fee7e49d4514 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-01-11ARM: dts: drop MARCO platform DT stuffBarry Song
MARCO will not be supported any more. it has been replaced by CSR atlas7. Signed-off-by: Barry Song <Baohua.Song@csr.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2015-01-11Merge branch 'core/urgent' into locking/urgent, to collect all pending ↵Ingo Molnar
locking fixes Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-01-10Merge tag 'vfio-v3.19-rc4' of git://github.com/awilliam/linux-vfioLinus Torvalds
Pull VFIO fix from Alex Williamson: "Fix PCI header check in vfio_pci_probe() (Wei Yang)" * tag 'vfio-v3.19-rc4' of git://github.com/awilliam/linux-vfio: vfio-pci: Fix the check on pci device type in vfio_pci_probe()