Skip to content
  1. Apr 25, 2014
  2. Apr 24, 2014
    • Stephen Warren's avatar
      dt: tegra: remove non-existent clock IDs · 9ef1af9e
      Stephen Warren authored
      
      
      The Tegra124 clock DT binding currently provides 3 clocks that don't
      actually exist; 2 for NAND and one for UART5/UARTE. Delete these. While
      this is technically an incompatible DT ABI change, nothing could have
      used these clock IDs for anything practical, since the HW doesn't exist.
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      9ef1af9e
    • Stephen Warren's avatar
      clk: tegra: remove non-existent clocks · 9ba71705
      Stephen Warren authored
      
      
      The Tegra124 clock driver currently provides 3 clocks that don't actually
      exist; 2 for NAND and one for UART5/UARTE. Delete these.
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      9ba71705
    • Stephen Warren's avatar
      ARM: tegra: remove UART5/UARTE from tegra124.dtsi · 862f0eea
      Stephen Warren authored
      
      
      Tegra124 only has 4 UARTs. Parts of the documentation hint at a fifth
      UART, but this appears to be left-over from earlier SoC documentation.
      Remove the non-existent DT node for UART5.
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      862f0eea
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v3.15/fixes-v2-signed' of... · f126776a
      Arnd Bergmann authored
      
      Merge tag 'omap-for-v3.15/fixes-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Fixes for omaps, mostly to fix some GPMC, DSS and USB issues for
      device tree based booting. And turns out BeagleBoard xM A/B
      needs it's own minimal dts in addition to the related u-boot
      changes. Also few minor documentation and typo fixes are merged
      to get them out of the way.
      
      * tag 'omap-for-v3.15/fixes-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: Fix GPMC remap for devices using an offset
        ARM: OMAP2+: Fix oops for GPMC free
        ARM: dts: Add support for the BeagleBoard xM A/B
        ARM: dts: Grammar /that will/it will/
        ARM: dts: Grammar /is uses/ is used/
        ARM: OMAP2+: Fix config name for USB3 PHY
        ARM: dts: am335x: update USB DT references
        ARM: dts: OMAP2+: remove uses of obsolete gpmc,device-nand
        ARM: AM335X: EVM: fix pinmux documentation in devicetree
        ARM: OMAP2+: N900: remove omapdss init for DT boot
        ARM: dts: dra7xx-clocks: Correct mcasp2_ahclkx_mux bit-shift
        ARM: dts: omap5: Add clocks to USB3 PHY node
        ARM: OMAP2+: hwmod: fix missing braces in _init()
        ARM: AM43xx: fix dpll init in bypass mode
        ARM: OMAP3: hwmod data: Correct clock domains for USB modules
        ARM: OMAP3: PM: remove access to PRM_VOLTCTRL register
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      f126776a
    • Arnd Bergmann's avatar
      Merge tag 'ux500-defconfig-for-arm-soc' of... · 072c8b3f
      Arnd Bergmann authored
      
      Merge tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes
      
      This is a patch set for some ST-Ericsson devices:
      - Updates the Ux500 (U8500) defconfig
      - Selects PARTITION_ADVANCED for Ux500 and U300
      - Configure in IIO sensor drivers for the Ux500
      - Configure in the CW1200 WLAN chip for the Ux500
      
      * tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        ARM: ux500: configure for CW1200 WLAN chip
        ARM: ux500: configure in sensors
        ARM: u300: u300_defconfig: Enable PARTITION_ADVANCED
        ARM: ux500: u8500_defconfig: Enable PARTITION_ADVANCED
        ARM: ux500: update defconfig
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      072c8b3f
    • Arnd Bergmann's avatar
      Merge tag 'renesas-fixes-for-v3.15' of... · 6e1ae422
      Arnd Bergmann authored
      
      Merge tag 'renesas-fixes-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
      
      Renesas ARM Based SoC Fixes Updates for v3.15
      
      r8a7791 (R-Car M2) based koelsch board
      * Correct renesas,gpios to renesas,groups in sd[012] pfc
      
      8a7790 (R-Car H2) based lager board
      * Correct SND_SOC_DAIFMT_CBx_CFx flags
      
      r8a7740 (R-Mobile A1) SoC
      * Drop address cells from GIC node
      
      r8a7740 (R-Mobile A1) based Armadillo800 EVA board
      * Correct SND_SOC_DAIFMT_CBx_CFx flags
      
      sh73a0 (SH-Mobile AG5) SoC
      * Drop address cells from GIC node
      
      * tag 'renesas-fixes-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: koelsch: correct renesas,gpios to renesas,groups in sd[012] pfc
        ARM: shmobile: r8a7740: drop address cells from GIC node
        ARM: shmobile: sh73a0: drop address cells from GIC node
        ARM: shmobile: armadillo800eva: fixup SND_SOC_DAIFMT_CBx_CFx flags
        ARM: shmobile: lager: fixup SND_SOC_DAIFMT_CBx_CFx flags
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      6e1ae422
    • Arnd Bergmann's avatar
      Merge tag 'renesas-dt5-for-v3.15' of... · 8a52a116
      Arnd Bergmann authored
      
      Merge tag 'renesas-dt5-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
      
      Fifth Round of Renesas ARM Based SoC DT Updates for v3.15
      
      Correct renesas,groups in SDHI nodes of for r8a7790 (R-Car H2) based
      Lager board.
      
      * tag 'renesas-dt5-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: lager: correct renesas,gpios to renesas,groups in sd[02] pfc
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      8a52a116
    • Arnd Bergmann's avatar
      Merge tag 'v3.15-rockchip-fixes1' of... · 59209c9a
      Arnd Bergmann authored
      
      Merge tag 'v3.15-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
      
      Fixing uart-rx pull settings and a copy'n'paste error in a smp message
      
      * tag 'v3.15-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        ARM: rockchip: fix copy'n'paste error in smp error messages
        ARM: rockchip: rk3188: enable pull-ups on UART RX pins
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      59209c9a
    • Arnd Bergmann's avatar
      Merge tag 'imx-fixes-3.15' of... · 9dbb7e24
      Arnd Bergmann authored
      
      Merge tag 'imx-fixes-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
      
      The i.MX fixes for 3.15:
       - A couple of dts changes for the fallout of imx-drm binding update
       - Parent DI clocks to video PLL for better HDMI support
       - PCIe interrupt mapping and GIC node fixes
       - A series of edmqmx6 board fixes
       - Other small and random fixes on imx5 and imx6 dts
      
      * tag 'imx-fixes-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: i.MX6: ipu_di_sel clocks can set parent rates
        ARM: imx6q: clk: Parent DI clocks to video PLL via di_pre_sel
        ARM: dts: imx: add required #clock-cells for fixed-clock
        ARM: dts: vybrid: drop address and size cells from GIC node
        ARM: dts: imx6sl-evk: Add an entry for MX6SL_PAD_ECSPI1_SS0__GPIO4_IO11
        ARM: dts: imx53: fix apparent copy/paste error
        ARM: dts: imx6q-gw5xxx: remove dead 'crtcs' property
        ARM: dts: imx53-tx53: add IPU DI ports and endpoints
        ARM: dts: imx6: edmqmx6: add second STMPE
        ARM: dts: imx6: edmqmx6: USB H1 only supports host mode
        ARM: dts: imx6: edmqmx6: Do not use the OTG switch as VBUS regulator
        ARM: dts: imx6: edmqmx6: Fix usbotg id pin
        ARM: dt: microsom: don't set bit 7 for ethernet mux settings
        ARM: imx6q-clk: parent lvds_gate from lvds_sel
        ARM: dts: imx: drop invalid size and address cells properties
        ARM: dts: mx5: fix wrong stmpe-ts bindings
        ARM: dts: imx53-m53evk: Fix memory region description
        ARM: dts: imx53-qsb-common: Fix memory region description
        ARM: dts: imx6: add PCIe interrupt mapping properties
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      9dbb7e24
    • Arnd Bergmann's avatar
      Merge tag 'mvebu-dt-fixes-non-crit-3.15' of git://git.infradead.org/linux-mvebu into fixes · 191bcd81
      Arnd Bergmann authored
      
      
      mvebu DT fixes-non-critical (for v3.15-rc1)
      
       - kirkwood
          - add some missing vendor prefixes to keep checkpatch happy
      
       - mvebu
          - add clock ref to mdio node on 370/XP/38x
      
      * tag 'mvebu-dt-fixes-non-crit-3.15' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: ensure the mdio node has a clock reference on Armada 38x
        ARM: mvebu: ensure the mdio node has a clock reference on Armada 370/XP
        ARM: Kirkwood: DT: Add missing vendor prefix
        ARM: Kirkwood: Fix Atmel vendor prefix
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      191bcd81
    • Paul Bolle's avatar
      ARM: tegra: remove TEGRA_EMC_SCALING_ENABLE · cab4d503
      Paul Bolle authored
      Commit a7cbe92c
      
       ("ARM: tegra: remove tegra EMC scaling driver")
      removed the only user of TEGRA_EMC_SCALING_ENABLE. Remove its Kconfig
      entry too.
      
      Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      cab4d503
    • Domenico Andreoli's avatar
      ARM: Tidy up DTB Makefile entries · af81c08c
      Domenico Andreoli authored
      
      
      Few things were out of order:
      
      - removed ARCH_BCM2835 duplicate
      - shuffled ARCH_BCM_5301X, ARCH_U8500 and ARCH_U300 around so to keep the
        list sorted
      
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Olof Johansson <olof@lixom.net>
      Signed-by: default avatarDomenico Andreoli <domenico.andreoli@linux.com>
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      af81c08c
    • Rob Herring's avatar
      ARM: fix missing CLKSRC_OF on multi-platform · 6d0add40
      Rob Herring authored
      In commit ddb902cc
      
       (ARM: centralize common multi-platform kconfig
      options), CLKSRC_OF was removed from some platforms, but not added to
      ARCH_MULTIPLATFORM. Fix this.
      
      Reported-by: default avatarLauri Hintsala <lauri.hintsala@bluegiga.com>
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      6d0add40
    • Alex Elder's avatar
      ARM: spear: add __init to spear_clocksource_init() · 1be5f692
      Alex Elder authored
      
      
      I get a build warning because spear_clocksource_init() calls
      clocksource_mmio_init(), but it doesn't have an __init annotation.
      Fix that.
      
      Signed-off-by: default avatarAlex Elder <elder@linaro.org>
      Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      1be5f692
    • Andrea Adami's avatar
      ARM: pxa: hx4700.h: include "irqs.h" for PXA_NR_BUILTIN_GPIO · c02b50e9
      Andrea Adami authored
      hx4700 needs the same fix as in
      9705e746
      
      
      "ARM: pxa: fix various compilation problems"
      
      Fix build errors. Initial one is:
      /linux/arch/arm/mach-pxa/include/mach/hx4700.h:18:32: error:
       'PXA_NR_BUILTIN_GPIO' undeclared here (not in a function)
      |  #define HX4700_ASIC3_GPIO_BASE PXA_NR_BUILTIN_GPIO
      
      Cc: stable@vger.kernel.org # v3.13+
      Signed-off-by: default avatarAndrea Adami <andrea.adami@gmail.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      c02b50e9
    • Heinrich Schuchardt's avatar
      arm/mach-vexpress: array accessed out of bounds · bb6dd575
      Heinrich Schuchardt authored
      
      
      dcscb_allcpus_mask is an array of size 2.
      
      The index variable cluster has to be checked against this limit
      before accessing the array.
      
      Signed-off-by: default avatarHeinrich Schuchardt <xypron.glpk@gmx.de>
      Acked-by: default avatarNicolas Pitre <nico@linaro.org>
      Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
      bb6dd575
    • Dan Carpenter's avatar
      clk: vexpress: NULL dereference on error path · 6b4ed8b0
      Dan Carpenter authored
      If the allocation fails then we dereference the NULL in the error path.
      Just return directly.
      
      Fixes: ed27ff1d
      
       ('clk: Versatile Express clock generators ("osc") driver')
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
      6b4ed8b0
    • Tony Lindgren's avatar
      ARM: OMAP2+: Fix GPMC remap for devices using an offset · fb677ef7
      Tony Lindgren authored
      
      
      At least the smc91x driver expects the device to be at 0x300
      offset from bus base address. This does not work currently
      for GPMC when booted in device tree mode as it attempts to
      remap the the allocated GPMC partition to the address
      configured by the device tree plus the device offset.
      
      Note that this works just fine when booted with legacy mode.
      
      Let's fix the issue by just ignoring any device specific
      offset while remapping. And let's make sure the remap
      address confirms to the GPMC 16MB minimum granularity
      as listed in the TRM for GPMC_CONFIG7 BASEADDRESS bits.
      
      Otherwise we can get something like this:
      
      omap-gpmc 6e000000.gpmc: cannot remap GPMC CS 1 to 0x01000300
      
      Cc: Pekon Gupta <pekon@ti.com>
      Reviewed-by: default avatarJavier Martinez Canillas <javier@dowhile0.org>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      fb677ef7
  3. Apr 22, 2014
  4. Apr 21, 2014
    • Linus Torvalds's avatar
      Linux 3.15-rc2 · a798c10f
      Linus Torvalds authored
      v3.15-rc2
      a798c10f
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 372feacb
      Linus Torvalds authored
      Pull slave-dmaengine fixes from Vinod Koul:
       "Back from long weekend here in India and now the time to send fixes
        for slave dmaengine.
         - Dan's fix of sirf xlate code
         - Jean's fix for timberland
         - edma fixes by Sekhar for SG handling and Yuan for changing init
           call"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dma: fix eDMA driver as a subsys_initcall
        dmaengine: sirf: off by one in of_dma_sirfsoc_xlate()
        platform: Fix timberdale dependencies
        dma: edma: fix incorrect SG list handling
      372feacb
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 5269519f
      Linus Torvalds authored
      Pull iommu fixes from Joerg Roedel:
       "Fixes for regressions:
      
         - fix wrong IOMMU enumeration causing some SCSI device drivers
           initialization failures
         - ARM-SMMU fixes for a panic condition and a wrong return value"
      
      * tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/arm-smmu: fix panic in arm_smmu_alloc_init_pte
        iommu/arm-smmu: Return 0 on unmap failure
        iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors
        iommu/vt-d: Fix get_domain_for_dev() handling of upstream PCIe bridges
        iommu/vt-d: fix memory leakage caused by commit ea8ea460
      5269519f
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 200bde27
      Linus Torvalds authored
      Pull perf tooling fixes from Ingo Molnar:
       "Three small tooling fixes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tools: Improve error reporting
        perf tools: Adjust symbols in VDSO
        perf kvm: Fix 'Min time' counting in report command
      200bde27
  5. Apr 20, 2014
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo' of... · fd741edc
      Ingo Molnar authored
      
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/urgent
      
      Pull perf/urgent fixes from Jiri Olsa:
      
      User visible changes:
      
        * Adjust symbols in VDSO to properly resolve its function names (Vladimir Nikulichev)
      
        * Improve error reporting for record session failure (Adrien BAK)
      
        * Fix 'Min time' counting in report command (Alexander Yarygin)
      
      Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      fd741edc
    • Adrien BAK's avatar
      perf tools: Improve error reporting · ffa91880
      Adrien BAK authored
      
      
      In the current version, when using perf record, if something goes
      wrong in tools/perf/builtin-record.c:375
        session = perf_session__new(file, false, NULL);
      
      The error message:
      "Not enough memory for reading per file header"
      
      is issued. This error message seems to be outdated and is not very
      helpful. This patch proposes to replace this error message by
      "Perf session creation failed"
      
      I believe this issue has been brought to lkml:
      https://lkml.org/lkml/2014/2/24/458
      although this patch only tackles a (small) part of the issue.
      
      Additionnaly, this patch improves error reporting in
      tools/perf/util/data.c open_file_write.
      
      Currently, if the call to open fails, the user is unaware of it.
      This patch logs the error, before returning the error code to
      the caller.
      
      Reported-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarAdrien BAK <adrien.bak@metascale.org>
      Link: http://lkml.kernel.org/r/1397786443.3093.4.camel@beast
      [ Reorganize the changelog into paragraphs ]
      [ Added empty line after fd declaration in open_file_write ]
      Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
      ffa91880
    • Vladimir Nikulichev's avatar
      perf tools: Adjust symbols in VDSO · 922d0e4d
      Vladimir Nikulichev authored
      
      
      pert-report doesn't resolve function names in VDSO:
      
      $ perf report --stdio -g flat,0.0,15,callee --sort pid
      ...
                  8.76%
                     0x7fff6b1fe861
                     __gettimeofday
                     ACE_OS::gettimeofday()
      ...
      
      In this case symbol values should be adjusted the same way as for executables,
      relocatable objects and prelinked libraries.
      
      After fix:
      
      $ perf report --stdio -g flat,0.0,15,callee --sort pid
      ...
                  8.76%
                     __vdso_gettimeofday
                     __gettimeofday
                     ACE_OS::gettimeofday()
      
      Signed-off-by: default avatarVladimir Nikulichev <nvs@tbricks.com>
      Tested-by: default avatarNamhyung Kim <namhyung@kernel.org>
      Reviewed-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
      Link: http://lkml.kernel.org/r/969812.163009436-sendEmail@nvs
      Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
      922d0e4d
    • Alexander Yarygin's avatar
      perf kvm: Fix 'Min time' counting in report command · acb61fc8
      Alexander Yarygin authored
      
      
      Every event in the perf-kvm has a 'stats' structure, which contains
      max/min/average/etc times of handling this event.
      The problem is that the 'perf-kvm stat report' command always shows
      that 'min time' is 0us for every event. Example:
      
       # perf kvm stat report
      
       Analyze events for all VCPUs:
      
          VM-EXIT    Samples  Samples%     Time%   Min Time   Max Time Avg time
        [..]
        0xB2 MSCH         12     0.07%     0.00%        0us        8us 7.31us ( +-   2.11% )
        0xB2 CHSC         12     0.07%     0.00%        0us       18us 9.39us ( +-   9.49% )
        0xB2 STPX          8     0.05%     0.00%        0us        2us 1.88us ( +-   7.18% )
        0xB2 STSI          7     0.04%     0.00%        0us       44us 16.49us ( +-  38.20% )
        [..]
      
      This happens because the 'stats' structure is not initialized and
      stats->min equals to 0. Lets initialize the structure for every
      event after its allocation using init_stats() function. This initializes
      stats->min to -1 and makes 'Min time' statistics counting work:
      
       # perf kvm stat report
      
       Analyze events for all VCPUs:
      
          VM-EXIT    Samples  Samples%     Time%   Min Time   Max Time Avg time
        [..]
        0xB2 MSCH         12     0.07%     0.00%        6us        8us 7.31us ( +-   2.11% )
        0xB2 CHSC         12     0.07%     0.00%        7us       18us 9.39us ( +-   9.49% )
        0xB2 STPX          8     0.05%     0.00%        1us        2us 1.88us ( +-   7.18% )
        0xB2 STSI          7     0.04%     0.00%        1us       44us 16.49us ( +-  38.20% )
        [..]
      
      Signed-off-by: default avatarAlexander Yarygin <yarygin@linux.vnet.ibm.com>
      Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
      Link: http://lkml.kernel.org/r/1397053319-2130-3-git-send-email-borntraeger@de.ibm.com
      [ Fixing the perf examples changelog output ]
      Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
      acb61fc8
    • Eric Dumazet's avatar
      coredump: fix va_list corruption · 404ca80e
      Eric Dumazet authored
      A va_list needs to be copied in case it needs to be used twice.
      
      Thanks to Hugh for debugging this issue, leading to various panics.
      
      Tested:
      
        lpq84:~# echo "|/foobar12345 %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h" >/proc/sys/kernel/core_pattern
      
      'produce_core' is simply : main() { *(int *)0 = 1;}
      
        lpq84:~# ./produce_core
        Segmentation fault (core dumped)
        lpq84:~# dmesg | tail -1
        [  614.352947] Core dump to |/foobar12345 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 lpq84 (null) pipe failed
      
      Notice the last argument was replaced by a NULL (we were lucky enough to
      not crash, but do not try this on your production machine !)
      
      After fix :
      
        lpq83:~# echo "|/foobar12345 %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h %h" >/proc/sys/kernel/core_pattern
        lpq83:~# ./produce_core
        Segmentation fault
        lpq83:~# dmesg | tail -1
        [  740.800441] Core dump to |/foobar12345 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 lpq83 pipe failed
      
      Fixes: 5fe9d8ca
      
       ("coredump: cn_vprintf() has no reason to call vsnprintf() twice")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Diagnosed-by: default avatarHugh Dickins <hughd@google.com>
      Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
      Cc: Neil Horman <nhorman@tuxdriver.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: stable@vger.kernel.org # 3.11+
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      404ca80e
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6d459690
      Linus Torvalds authored
      Pull x86 fix from Ingo Molnar:
       "This fixes the preemption-count imbalance crash reported by Owen
        Kibel"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mce: Fix CMCI preemption bugs
      6d459690
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8f98f6f5
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Two fixes:
      
         - a SCHED_DEADLINE task selection fix
         - a sched/numa related lockdep splat fix"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched: Check for stop task appearance when balancing happens
        sched/numa: Fix task_numa_free() lockdep splat
      8f98f6f5
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8de3f7a7
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Two kernel side fixes:
      
         - an Intel uncore PMU driver potential crash fix
         - a kprobes/perf-call-graph interaction fix"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86/intel: Use rdmsrl_safe() when initializing RAPL PMU
        kprobes/x86: Fix page-fault handling logic
      8de3f7a7
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · b9312420
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Unfortunately this contains no easter eggs, its a bit larger than I'd
        like, but I included a patch that just moves code from one file to
        another and I'd like to avoid merge conflicts with that later, so it
        makes it seem worse than it is,
      
        Otherwise:
         - radeon: fixes to use new microcode to stabilise some cards, use
           some common displayport code, some runtime pm fixes, pll regression
           fixes
         - i915: fix for some context oopses, a warn in a used path, backlight
           fixes
         - nouveau: regression fix
         - omap: a bunch of fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (51 commits)
        drm: bochs: drop unused struct fields
        drm: bochs: add power management support
        drm: cirrus: add power management support
        drm: Split out drm_probe_helper.c from drm_crtc_helper.c
        drm/plane-helper: Don't fake-implement primary plane disabling
        drm/ast: fix value check in cbr_scan2
        drm/nouveau/bios: fix a bit shift error introduced by 457e77b2
        drm/radeon/ci: make sure mc ucode is loaded before checking the size
        drm/radeon/si: make sure mc ucode is loaded before checking the size
        drm/radeon: improve PLL params if we don't match exactly v2
        drm/radeon: memory leak on bo reservation failure. v2
        drm/radeon: fix VCE fence command
        drm/radeon: re-enable mclk dpm on R7 260X asics
        drm/radeon: add support for newer mc ucode on CI (v2)
        drm/radeon: add support for newer mc ucode on SI (v2)
        drm/radeon: apply more strict limits for PLL params v2
        drm/radeon: update CI DPM powertune settings
        drm/radeon: fix runpm handling on APUs (v4)
        drm/radeon: disable mclk dpm on R7 260X
        drm/tegra: Remove gratuitous pad field
        ...
      b9312420
  6. Apr 19, 2014
    • Dave Airlie's avatar
      Merge branch 'drm-next-3.15-wip' of git://people.freedesktop.org/~deathsimple/linux into drm-next · a42892ed
      Dave Airlie authored
      Some i2c fixes over DisplayPort.
      
      * 'drm-next-3.15-wip' of git://people.freedesktop.org/~deathsimple/linux:
        drm/radeon: Improve vramlimit module param documentation
        drm/radeon: fix audio pin counts for DCE6+ (v2)
        drm/radeon/dp: switch to the common i2c over aux code
        drm/dp/i2c: Update comments about common i2c over dp assumptions (v3)
        drm/dp/i2c: send bare addresses to properly reset i2c connections (v4)
        drm/radeon/dp: handle zero sized i2c over aux transactions (v2)
        drm/i915: support address only i2c-over-aux transactions
        drm/tegra: dp: Support address-only I2C-over-AUX transactions
      a42892ed
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · ebfc45ee
      Linus Torvalds authored
      Pull more networking fixes from David Miller:
      
       1) Fix mlx4_en_netpoll implementation, it needs to schedule a NAPI
          context, not synchronize it.  From Chris Mason.
      
       2) Ipv4 flow input interface should never be zero, it should be
          LOOPBACK_IFINDEX instead.  From Cong Wang and Julian Anastasov.
      
       3) Properly configure MAC to PHY connection in mvneta devices, from
          Thomas Petazzoni.
      
       4) sys_recv should use SYSCALL_DEFINE.  From Jan Glauber.
      
       5) Tunnel driver ioctls do not use the correct namespace, fix from
          Nicolas Dichtel.
      
       6) Fix memory leak on seccomp filter attach, from Kees Cook.
      
       7) Fix lockdep warning for nested vlans, from Ding Tianhong.
      
       8) Crashes can happen in SCTP due to how the auth_enable value is
          managed, fix from Vlad Yasevich.
      
       9) Wireless fixes from John W Linville and co.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
        net: sctp: cache auth_enable per endpoint
        tg3: update rx_jumbo_pending ring param only when jumbo frames are enabled
        vlan: Fix lockdep warning when vlan dev handle notification
        seccomp: fix memory leak on filter attach
        isdn: icn: buffer overflow in icn_command()
        ip6_tunnel: use the right netns in ioctl handler
        sit: use the right netns in ioctl handler
        ip_tunnel: use the right netns in ioctl handler
        net: use SYSCALL_DEFINEx for sys_recv
        net: mdio-gpio: Add support for separate MDI and MDO gpio pins
        net: mdio-gpio: Add support for active low gpio pins
        net: mdio-gpio: Use devm_ functions where possible
        ipv4, route: pass 0 instead of LOOPBACK_IFINDEX to fib_validate_source()
        ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
        mlx4_en: don't use napi_synchronize inside mlx4_en_netpoll
        net: mvneta: properly configure the MAC <-> PHY connection in all situations
        net: phy: add minimal support for QSGMII PHY
        sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)
        mwifiex: fix hung task on command timeout
        mwifiex: process event before command response
        ...
      ebfc45ee