03 Feb, 2015

1 commit


29 Jan, 2015

1 commit

  • The recently added mtd_mmap_capabilities can be used from loadable
    modules, in particular romfs, but is not exported, so we get

    ERROR: "mtd_mmap_capabilities" [fs/romfs/romfs.ko] undefined!

    This adds the missing export.

    Signed-off-by: Arnd Bergmann
    Fixes: b4caecd48005f ("fs: introduce f_op->mmap_capabilities for nommu mmap support")
    Acked-by: Christoph Hellwig
    Acked-by: Brian Norris
    Signed-off-by: Jens Axboe

    Arnd Bergmann
     

22 Jan, 2015

2 commits

  • Running a heavy fs workload, I ran into a situation where we pass
    down a page for writeback/swap that doesn't have an inode mapping:

    BUG: unable to handle kernel NULL pointer dereference at 0000000000000028
    IP: [] inode_to_bdi+0xf/0x50
    PGD 0
    Oops: 0000 [#1] PREEMPT SMP
    Modules linked in: wl(O) tun cfg80211 btusb joydev hid_apple hid_generic usbhid hid bcm5974 usb_storage nouveau snd_hda_codec_hdmi snd_hda_codec_cirrus snd_hda_codec_generic x86_pkg_temp_thermal snd_hda_intel kvm_intel snd_hda_controller snd_hda_codec kvm snd_hwdep snd_pcm applesmc input_polldev snd_seq_midi snd_seq_midi_event snd_rawmidi snd_seq snd_timer snd_seq_device snd xhci_pci xhci_hcd ttm thunderbolt soundcore apple_gmux apple_bl bluetooth binfmt_misc fuse nls_iso8859_1 nls_cp437 vfat fat [last unloaded: wl]
    CPU: 4 PID: 50 Comm: kswapd0 Tainted: G U O 3.19.0-rc5+ #60
    Hardware name: Apple Inc. MacBookPro11,3/Mac-2BD1B31983FE1663, BIOS MBP112.88Z.0138.B02.1310181745 10/18/2013
    task: ffff880462e917f0 ti: ffff880462edc000 task.ti: ffff880462edc000
    RIP: 0010:[] [] inode_to_bdi+0xf/0x50
    RSP: 0000:ffff880462edf8e8 EFLAGS: 00010282
    RAX: ffffffff81c4cd80 RBX: ffffea0001b3abc0 RCX: 0000000000000000
    RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000000000000000
    RBP: ffff880462edf8f8 R08: 00000000001e8500 R09: ffff880460f7cb68
    R10: ffff880462edfa00 R11: 0000000000000101 R12: 0000000000000000
    R13: ffffffff81c4cd98 R14: 0000000000000000 R15: ffff880460f7c9c0
    FS: 0000000000000000(0000) GS:ffff88047f300000(0000) knlGS:0000000000000000
    CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    CR2: 0000000000000028 CR3: 00000002b6341000 CR4: 00000000001407e0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
    Stack:
    ffffea0001b3abc0 ffffffff81c4cd80 ffff880462edf948 ffffffff811244aa
    ffffffff811565b0 ffff880460f7c9c0 ffff880462edf948 ffffea0001b3abc0
    0000000000000001 ffff880462edfb40 ffff880008b999c0 ffff880460f7c9c0
    Call Trace:
    [] __test_set_page_writeback+0x3a/0x170
    [] ? SyS_madvise+0x790/0x790
    [] __swap_writepage+0x216/0x280
    [] ? radix_tree_insert+0x32/0xe0
    [] ? swap_info_get+0x61/0xf0
    [] ? page_swapcount+0x4c/0x60
    [] swap_writepage+0x2d/0x50
    [] shmem_writepage+0x198/0x2c0
    [] shrink_page_list+0x464/0xa00
    [] shrink_inactive_list+0x266/0x500
    [] shrink_lruvec+0x5d5/0x720
    [] shrink_zone+0x5b/0x190
    [] kswapd+0x48f/0x8d0
    [] ? try_to_free_pages+0x4c0/0x4c0
    [] kthread+0xd2/0xf0
    [] ? workqueue_congested+0x30/0x80
    [] ? kthread_create_on_node+0x180/0x180
    [] ret_from_fork+0x7c/0xb0
    [] ? kthread_create_on_node+0x180/0x180
    Code: 00 48 c7 c7 8d 8d a4 81 e8 3f 62 eb ff e9 fc fe ff ff 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 55 48 89 e5 41 54 49 89 fc 53 8b 5f 28 48 89 df e8 15 f8 00 00 85 c0 75 11 48 8b 83 d8 00
    RIP [] inode_to_bdi+0xf/0x50
    RSP
    CR2: 0000000000000028
    ---[ end trace eb0e21aa7dad3ddf ]---

    Handle this in inode_to_bdi() by punting it to noop_backing_dev_info,
    if mapping->host is NULL.

    Signed-off-by: Jens Axboe

    Jens Axboe
     
  • With removal of backing_dev_info from struct address_space,
    we don't need to assign it in Lustre either.

    Signed-off-by: Oleg Drokin
    Signed-off-by: Jens Axboe

    Oleg Drokin
     

21 Jan, 2015

12 commits

  • Now that default_backing_dev_info is not used for writeback purposes we can
    git rid of it easily:

    - instead of using it's name for tracing unregistered bdi we just use
    "unknown"
    - btrfs and ceph can just assign the default read ahead window themselves
    like several other filesystems already do.
    - we can assign noop_backing_dev_info as the default one in alloc_super.
    All filesystems already either assigned their own or
    noop_backing_dev_info.

    Signed-off-by: Christoph Hellwig
    Reviewed-by: Tejun Heo
    Reviewed-by: Jan Kara
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • If we have dirty inodes we need to call the filesystem for it, even if the
    device has been removed and the filesystem will error out early. The
    current code does that by reassining all dirty inodes to the default
    backing_dev_info when a bdi is unlinked, but that's pretty pointless given
    that the bdi must always outlive the super block.

    Instead of stopping writeback at unregister time and moving inodes to the
    default bdi just keep the current bdi alive until it is destroyed. The
    containing objects of the bdi ensure this doesn't happen until all
    writeback has finished by erroring out.

    Signed-off-by: Christoph Hellwig
    Reviewed-by: Tejun Heo
    Reviewed-by: Jan Kara

    Killed the redundant WARN_ON(), as noticed by Jan.

    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • bdi_destroy already does all the work, and if we delay freeing the
    anon bdev we can get away with just that single call.

    Addintionally remove the call during mount failure, as
    deactivate_super_locked will already call ->kill_sb and clean up
    the bdi for us.

    Signed-off-by: Christoph Hellwig
    Reviewed-by: Jan Kara
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • bdi_destroy already does all the work, and if we delay freeing the
    anon bdev we can get away with just that single call.

    Signed-off-by: Christoph Hellwig
    Reviewed-by: Jan Kara
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • Now that we never use the backing_dev_info pointer in struct address_space
    we can simply remove it and save 4 to 8 bytes in every inode.

    Signed-off-by: Christoph Hellwig
    Acked-by: Ryusuke Konishi
    Reviewed-by: Tejun Heo
    Reviewed-by: Jan Kara
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • Now that we got rid of the bdi abuse on character devices we can always use
    sb->s_bdi to get at the backing_dev_info for a file, except for the block
    device special case. Export inode_to_bdi and replace uses of
    mapping->backing_dev_info with it to prepare for the removal of
    mapping->backing_dev_info.

    Signed-off-by: Christoph Hellwig
    Reviewed-by: Tejun Heo
    Reviewed-by: Jan Kara
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • mapping->backing_dev_info will go away, so don't rely on it.

    Signed-off-by: Christoph Hellwig
    Acked-by: Ryusuke Konishi
    Reviewed-by: Tejun Heo
    Reviewed-by: Jan Kara
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • Directly grab the backing_dev_info from the request_queue instead of
    detouring through the address_space.

    Signed-off-by: Christoph Hellwig
    Reviewed-by: Tejun Heo
    Reviewed-by: Jan Kara
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • Since 018a17bdc865 ("bdi: reimplement bdev_inode_switch_bdi()") the
    block device code writes out all dirty data whenever switching the
    backing_dev_info for a block device inode. But a block device inode can
    only be dirtied when it is in use, which means we only have to write it
    out on the final blkdev_put, but not when doing a blkdev_get.

    Factoring out the write out from the bdi list switch prepares from
    removing the list switch later in the series.

    Signed-off-by: Christoph Hellwig
    Acked-by: Tejun Heo
    Reviewed-by: Jan Kara
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • Since "BDI: Provide backing device capability information [try #3]" the
    backing_dev_info structure also provides flags for the kind of mmap
    operation available in a nommu environment, which is entirely unrelated
    to it's original purpose.

    Introduce a new nommu-only file operation to provide this information to
    the nommu mmap code instead. Splitting this from the backing_dev_info
    structure allows to remove lots of backing_dev_info instance that aren't
    otherwise needed, and entirely gets rid of the concept of providing a
    backing_dev_info for a character device. It also removes the need for
    the mtd_inodefs filesystem.

    Signed-off-by: Christoph Hellwig
    Reviewed-by: Tejun Heo
    Acked-by: Brian Norris
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • This bdi flag isn't too useful - we can determine that a vma is backed by
    either swap or shmem trivially in the caller.

    This also allows removing the backing_dev_info instaces for swap and shmem
    in favor of noop_backing_dev_info.

    Signed-off-by: Christoph Hellwig
    Reviewed-by: Tejun Heo
    Reviewed-by: Jan Kara
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     
  • hugetlbfs, kernfs and dlmfs can simply use noop_backing_dev_info instead
    of creating a local duplicate.

    Signed-off-by: Christoph Hellwig
    Reviewed-by: Jan Kara
    Acked-by: Tejun Heo
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     

18 Jan, 2015

9 commits

  • Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "We've been sitting on our fixes branch for a while, so this batch is
    unfortunately on the large side.

    A lot of these are tweaks and fixes to device trees, fixing various
    bugs around clocks, reg ranges, etc. There's also a few defconfig
    updates (which are on the late side, no more of those).

    All in all the diffstat is bigger than ideal at this time, but nothing
    in here seems particularly risky"

    * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
    reset: sunxi: fix spinlock initialization
    ARM: dts: disable CCI on exynos5420 based arndale-octa
    drivers: bus: check cci device tree node status
    ARM: rockchip: disable jtag/sdmmc autoswitching on rk3288
    ARM: nomadik: fix up leftover device tree pins
    ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree
    ARM: at91/dt: sam9263: Add missing clocks to lcdc node
    ARM: at91: sama5d3: dt: correct the sound route
    ARM: at91/dt: sama5d4: fix the timer reg length
    ARM: exynos_defconfig: Enable LM90 driver
    ARM: exynos_defconfig: Enable options for display panel support
    arm: dts: Use pmu_system_controller phandle for dp phy
    ARM: shmobile: sh73a0 legacy: Set .control_parent for all irqpin instances
    ARM: dts: berlin: correct BG2Q's SM GPIO location.
    ARM: dts: berlin: add broken-cd and set bus width for eMMC in Marvell DMP DT
    ARM: dts: berlin: fix io clk and add missing core clk for BG2Q sdhci2 host
    ARM: dts: Revert disabling of smc91x for n900
    ARM: dts: imx51-babbage: Fix ULPI PHY reset modelling
    ARM: dts: dra7-evm: fix qspi device tree partition size
    ARM: omap2plus_defconfig: use CONFIG_CPUFREQ_DT
    ...

    Linus Torvalds
     
  • Pull clock driver fixes from Mike Turquette:
    "Small number of fixes for clock drivers and a single null pointer
    dereference fix in the framework core code.

    The driver fixes vary from fixing section mismatch warnings to
    preventing machines from hanging (and preventing developers from
    crying)"

    * tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux:
    clk: fix possible null pointer dereference
    Revert "clk: ppc-corenet: Fix Section mismatch warning"
    clk: rockchip: fix deadlock possibility in cpuclk
    clk: berlin: bg2q: remove non-exist "smemc" gate clock
    clk: at91: keep slow clk enabled to prevent system hang
    clk: rockchip: fix rk3288 cpuclk core dividers
    clk: rockchip: fix rk3066 pll lock bit location
    clk: rockchip: Fix clock gate for rk3188 hclk_emem_peri
    clk: rockchip: add CLK_IGNORE_UNUSED flag to fix rk3066/rk3188 USB Host

    Linus Torvalds
     
  • Pull SCSI fixes from James Bottomley:
    "This is one fix for a Multiqueue sleeping in invalid context problem
    and a MAINTAINER file update for Qlogic"

    * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
    scsi: ->queue_rq can't sleep
    MAINTAINERS: Update maintainer list for qla4xxx

    Linus Torvalds
     
  • The commit 646cafc6 (clk: Change clk_ops->determine_rate to
    return a clk_hw as the best parent) opens a possibility for
    null pointer dereference, fix this.

    Signed-off-by: Stanimir Varbanov
    Reviewed-by: Stephen Boyd
    Signed-off-by: Michael Turquette

    Stanimir Varbanov
     
  • This reverts commit da788acb28386aa896224e784954bb73c99ff26c.

    That commit tried to fix the section mismatch warning by moving the
    ppc_corenet_clk_driver struct to init section. This is definitely wrong
    because the kernel would free the memories occupied by this struct
    after boot while this driver is still registered in the driver core.
    The kernel would panic when accessing this driver struct.

    Cc: stable@vger.kernel.org # 3.17
    Signed-off-by: Kevin Hao
    Acked-by: Scott Wood
    Signed-off-by: Michael Turquette

    Kevin Hao
     
  • Lockdep reported a possible deadlock between the cpuclk lock and for example
    the i2c driver.

    CPU0 CPU1
    ---- ----
    lock(clk_lock);
    local_irq_disable();
    lock(&(&i2c->lock)->rlock);
    lock(clk_lock);

    lock(&(&i2c->lock)->rlock);

    *** DEADLOCK ***

    The generic clock-types of the core ccf already use spin_lock_irqsave when
    touching clock registers, so do the same for the cpuclk.

    Signed-off-by: Heiko Stuebner
    Reviewed-by: Doug Anderson
    Signed-off-by: Michael Turquette
    [mturquette@linaro.org: removed initialization of "flags"]

    Heiko Stübner
     
  • Pull dmaengine fixes from Vinod Koul:
    "Two patches, the first by Andy to fix dw dmac runtime pm and second
    one by me to fix the dmaengine headers in MAINTAINERS"

    * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
    dmaengine: dw: balance PM runtime calls
    MAINTAINERS: dmaengine: fix the header file for dmaengine

    Linus Torvalds
     
  • Pull perf fixes from Ingo Molnar:
    "Mostly tooling fixes, but also two PMU driver fixes"

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    perf tools powerpc: Use dwfl_report_elf() instead of offline.
    perf tools: Fix segfault for symbol annotation on TUI
    perf test: Fix dwarf unwind using libunwind.
    perf tools: Avoid build splat for syscall numbers with uclibc
    perf tools: Elide strlcpy warning with uclibc
    perf tools: Fix statfs.f_type data type mismatch build error with uclibc
    tools: Remove bitops/hweight usage of bits in tools/perf
    perf machine: Fix __machine__findnew_thread() error path
    perf tools: Fix building error in x86_64 when dwarf unwind is on
    perf probe: Propagate error code when write(2) failed
    perf/x86/intel: Fix bug for "cycles:p" and "cycles:pp" on SLM
    perf/rapl: Fix sysfs_show() initialization for RAPL PMU

    Linus Torvalds
     

17 Jan, 2015

15 commits

  • …it/acme/linux into perf/urgent

    Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

    - Fix segfault when using both the map symtab viewer and annotation
    in the TUI (Namhyung Kim).

    - uClibc build fixes (Alexey Brodkin, Vineet Gupta).

    - bitops/hweight were moved from tools/perf/ too tools/include, move
    some leftovers (Arnaldo Carvalho de Melo)

    - Fix dwarf unwind x86_64 build error (Namhyung Kim)

    - Fix __machine__findnew_thread() error path (Namhyung Kim)

    - Propagate error code when write(2) failed in 'perf probe' (Namhyung Kim)

    - Use dwfl_report_elf() instead of offline in powerpc bits to
    properly handle non prelinked DSOs (Sukadev Bhattiprolu).

    - Fix dwarf unwind using libunwind in 'perf test' (Wang Nan)

    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

    Ingo Molnar
     
  • …kgene/linux-samsung into fixes

    Merge "Samsung fixes for v3.19" from Kukjin Kim:

    Samsung fixes for v3.19
    - exynos_defconfig: enable LM90 driver and display panel support
    - HWMON
    - SENSORS_LM90
    - Direct Rendering Manager (DRM)
    - DRM bridge registration and lookup framework
    - Parade ps8622/ps8625 eDP/LVDS bridge
    - NXP ptn3460 eDP/LVDS bridge
    - Exynos Fully Interactive Mobile Display controller (FIMD)
    - Panel registration and lookup framework
    - Simple panels
    - Backlight & LCD device support

    - use pmu_system_controller phandle for dp phy
    : DP PHY requires pmu_system_controller to handle PMU reg. now

    * tag 'samsung-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
    ARM: exynos_defconfig: Enable LM90 driver
    ARM: exynos_defconfig: Enable options for display panel support
    arm: dts: Use pmu_system_controller phandle for dp phy

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • Call spin_lock_init() before the spinlocks are used, both in early init
    and probe functions preventing a lockdep splat.

    I have been observing lockdep complaining [1] during boot on my a80 optimus [2]
    when CONFIG_PROVE_LOCKING has been enabled. This patch resolves the splat,
    and has been tested on a few other sunxi platforms without issue.

    [1] http://storage.kernelci.org/next/next-20150107/arm-multi_v7_defconfig+CONFIG_PROVE_LOCKING=y/lab-tbaker/boot-sun9i-a80-optimus.html
    [2] http://kernelci.org/boot/?a80-optimus

    Signed-off-by: Tyler Baker
    Cc:
    Acked-by: Philipp Zabel
    Signed-off-by: Kevin Hilman
    Signed-off-by: Olof Johansson

    Tyler Baker
     
  • …rnel/git/horms/renesas into fixes

    Merge "Renesas ARM Based SoC Fixes for v3.19" from Simon Horman:

    Renesas ARM Based SoC Fixes for v3.19

    This pull request is based on the last round of SoC updates for v3.19,
    Fourth Round of Renesas ARM Based SoC Updates for v3.19, tagged as
    renesas-soc3-for-v3.19, merged into your next/soc branch and included in
    v3.19-rc1.

    - ARM: shmobile: r8a7740: Instantiate GIC from C board code in legacy builds

    Set .control_parent for all irqpin instances for sh73a0 SoC when booting
    using legacy C.

    - ARM: shmobile: r8a7740: Instantiate GIC from C board code in legacy builds

    This fixes a long standing problem which has been present since
    the sh73a0 SoC started using the INTC External IRQ pin driver.

    The patch that introduced the problem is 341eb5465f67437a ("ARM:
    shmobile: INTC External IRQ pin driver on sh73a0") which was included
    in v3.10.

    * tag 'renesas-soc-fixes-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
    ARM: shmobile: sh73a0 legacy: Set .control_parent for all irqpin instances
    ARM: shmobile: r8a7740: Instantiate GIC from C board code in legacy builds

    Olof Johansson
     
  • The arndale-octa board was giving "imprecise external aborts" during
    boot-up with MCPM enabled. CCI enablement of the boot cluster was found
    to be the cause of these aborts (possibly because the secure f/w was not
    allowing it). Hence, disable CCI for the arndale-octa board.

    Signed-off-by: Abhilash Kesavan
    Tested-by: Krzysztof Kozlowski
    Tested-by: Kevin Hilman
    Tested-by: Tyler Baker
    Signed-off-by: Olof Johansson

    Abhilash Kesavan
     
  • The arm-cci driver completes the probe sequence even if the cci node is
    marked as disabled. Add a check in the driver to honour the cci status
    in the device tree.

    Signed-off-by: Abhilash Kesavan
    Acked-by: Sudeep Holla
    Acked-by: Nicolas Pitre
    Tested-by: Sudeep Holla
    Tested-by: Kevin Hilman
    Signed-off-by: Olof Johansson

    Abhilash Kesavan
     
  • Merge "at91: fixes for 3.19 #1 (ter)" from Nicolas Ferre:

    First fixes batch for AT91 on 3.19:
    - fix some DT entries
    - correct clock entry for the at91sam9263 LCD
    - add a phy_fixup for Eth1 on sama5d4

    * tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
    ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree
    ARM: at91/dt: sam9263: Add missing clocks to lcdc node
    ARM: at91: sama5d3: dt: correct the sound route
    ARM: at91/dt: sama5d4: fix the timer reg length

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • rk3288 SoCs have a function to automatically switch between jtag/sdmmc pinmux
    settings depending on the card state. This collides with a lot of assumptions.

    It only works when using the internal card-detect mechanism and breaks
    horribly when using either the normal card-detect via the slot-gpio function
    or via any other pin. Also there is of course no link between the mmc and jtag
    on the software-side, so the jtag clocks may very well be disabled when the
    card is ejected and the soc switches back to the jtag pinmux.

    Leaving the switching function enabled did result in mmc timeouts and rcu
    stalls thus hanging the system on 3.19-rc1. Therefore disable it in all cases,
    as we expect the devicetree to explicitly select either mmc or jtag pinmuxes
    anyway.

    Signed-off-by: Heiko Stuebner
    Signed-off-by: Olof Johansson

    Heiko Stübner
     
  • …nux-berlin into fixes

    Merge "ARM: berlin: Fixes for v3.19 (round 1)" from Sebastian Hesselbarth:

    Marvell Berlin fixes for v3.19 round 1:
    - SDHCI DT fixes for BG2Q and BG2Q reference board
    - BG2Q SM GPIO DT node relocation

    * tag 'berlin-fixes-for-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
    ARM: dts: berlin: correct BG2Q's SM GPIO location.
    ARM: dts: berlin: add broken-cd and set bus width for eMMC in Marvell DMP DT
    ARM: dts: berlin: fix io clk and add missing core clk for BG2Q sdhci2 host

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • We altered the device tree bindings for the Nomadik family of
    pin controllers to be standard, this file was merged out-of-order
    so we missed fixing this. Fix it up.

    Signed-off-by: Linus Walleij
    Signed-off-by: Olof Johansson

    Linus Walleij
     
  • …l/git/tmlind/linux-omap into fixes

    Merge "omap fixes against v3.19-rc1" from Tony Lindgren:

    Fixes for omaps mostly to deal with dra7 timer issues
    and hypervisor mode. The other fixes are minor fixes for
    various boards. The summary of the fixes is:

    - Fix real-time counter rate typos for some frequencies
    - Fix counter frequency drift for am572x
    - Fix booting of secondary CPU in HYP mode
    - Fix n900 board name for legacy user space
    - Fix cpufreq in omap2plus_defconfig after Kconfig change
    - Fix dra7 qspi partitions

    And also, let's re-enable smc91x on some n900 boards that
    we have sitting in a few test boot systems after the boot
    loader dependencies got fixed.

    * tag 'omap-for-v3.19/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: dts: Revert disabling of smc91x for n900
    ARM: dts: dra7-evm: fix qspi device tree partition size
    ARM: omap2plus_defconfig: use CONFIG_CPUFREQ_DT
    ARM: OMAP2+: Fix n900 board name for legacy user space
    ARM: omap5/dra7xx: Enable booting secondary CPU in HYP mode
    ARM: dra7xx: Fix counter frequency drift for AM572x errata i856
    ARM: omap5/dra7xx: Fix frequency typos

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • …nguo/linux into fixes

    Merge "ARM: imx: fixes for 3.19" from Shawn Guo:

    The i.MX fixes for 3.19:
    - One fix for incorrect i.MX25 SPI1 clock assignment in device tree,
    which causes system hang when accessing SPI1.
    - Correct i.MX6SX QSPI parent clock configuration to fix a kernel Oops.
    - Fix ULPI PHY reset modelling on imx51-babbage board to remove the
    dependency on bootloader for USB3317 ULPI PHY reset.
    - Correct video divider setting on i.MX6Q rev T0 1.0 to fix the issue
    that HDMI is not working at high resolution on T0 1.0.
    - One incremental fix for CODA960 VPU enabling in device tree to
    correct interrupt order.
    - LS1021A SCFG block works in BE mode, add device tree property
    big-endian to make it right.

    * tag 'imx-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
    ARM: dts: imx51-babbage: Fix ULPI PHY reset modelling
    ARM: imx6sx: Set PLL2 as parent of QSPI clocks
    ARM: dts: imx25: Fix the SPI1 clocks
    ARM: clk-imx6q: fix video divider for rev T0 1.0
    ARM: dts: imx6qdl: Fix CODA960 interrupt order
    ARM: ls1021a: dtsi: add 'big-endian' property for scfg node

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • …l/git/mmind/linux-rockchip into fixes

    Merge "ARM: rockchip: dts fix for 3.19" from Heiko Stübner:

    Increase drive-strength to sdmmc pins on rk3288-evb to fix
    an issue with the fixed highspeed card detection.

    * tag 'v3.19-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
    ARM: dts: rockchip: bump sd card pin drive strength up on rk3288-evb

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • Avoid overflow possibility.

    [ The overflow is purely theoretical, since this is used for memory
    ranges that aren't even close to using the full 64 bits, but this is
    the right thing to do regardless. - Linus ]

    Signed-off-by: Louis Langholtz
    Cc: Yinghai Lu
    Cc: Peter Anvin
    Cc: Andrew Morton
    Signed-off-by: Linus Torvalds

    Louis Langholtz
     
  • dwfl_report_offline() works only when libraries are prelinked.

    Replace dwfl_report_offline() with dwfl_report_elf() so we correctly
    extract debug info even from libraries that are not prelinked.

    Reported-by: Jiri Olsa
    Signed-off-by: Sukadev Bhattiprolu
    Tested-by: Jiri Olsa
    Cc: Jiri Olsa
    Cc: Michael Ellerman
    Link: http://lkml.kernel.org/r/20150114221045.GA17703@us.ibm.com
    Signed-off-by: Arnaldo Carvalho de Melo

    Sukadev Bhattiprolu