1. 25 1月, 2013 1 次提交
  2. 24 1月, 2013 6 次提交
  3. 23 1月, 2013 13 次提交
  4. 22 1月, 2013 6 次提交
  5. 19 1月, 2013 3 次提交
  6. 18 1月, 2013 2 次提交
  7. 17 1月, 2013 9 次提交
    • F
      video: imxfb: Do not crash on reboot · e6b267ce
      Fabio Estevam 提交于
      Issuing a "reboot" command after the LCD times out causes the following
      warnings:
      
      Requesting system reboot
      ------------[ cut here ]------------
      WARNING: at drivers/clk/clk.c:471 clk_disable+0x24/0x50()
      Modules linked in:
      [<c001ad90>] (unwind_backtrace+0x0/0xf4) from [<c0025aac>] (warn_slowpath_common+0x48/0x60)
      [<c0025aac>] (warn_slowpath_common+0x48/0x60) from [<c0025ae0>] (warn_slowpath_null+0x1c/0x24)
      [<c0025ae0>] (warn_slowpath_null+0x1c/0x24) from [<c03960a0>] (clk_disable+0x24/0x50)
      [<c03960a0>] (clk_disable+0x24/0x50) from [<c02695a0>] (imxfb_disable_controller+0x48/0x7c)
      [<c02695a0>] (imxfb_disable_controller+0x48/0x7c) from [<c029d838>] (platform_drv_shutdown+0x18/0x1c)
      [<c029d838>] (platform_drv_shutdown+0x18/0x1c) from [<c02990fc>] (device_shutdown+0x48/0x14c)
      [<c02990fc>] (device_shutdown+0x48/0x14c) from [<c003d09c>] (kernel_restart_prepare+0x2c/0x3c)
      [<c003d09c>] (kernel_restart_prepare+0x2c/0x3c) from [<c003d0e4>] (kernel_restart+0xc/0x48)
      [<c003d0e4>] (kernel_restart+0xc/0x48) from [<c003d1e8>] (sys_reboot+0xc0/0x1bc)
      [<c003d1e8>] (sys_reboot+0xc0/0x1bc) from [<c0014ca0>] (ret_fast_syscall+0x0/0x2c)
      ---[ end trace da6b502ca79c854f ]---
      ------------[ cut here ]------------
      WARNING: at drivers/clk/clk.c:380 clk_unprepare+0x1c/0x2c()
      Modules linked in:
      [<c001ad90>] (unwind_backtrace+0x0/0xf4) from [<c0025aac>] (warn_slowpath_common+0x48/0x60)
      [<c0025aac>] (warn_slowpath_common+0x48/0x60) from [<c0025ae0>] (warn_slowpath_null+0x1c/0x24)
      [<c0025ae0>] (warn_slowpath_null+0x1c/0x24) from [<c0396338>] (clk_unprepare+0x1c/0x2c)
      [<c0396338>] (clk_unprepare+0x1c/0x2c) from [<c02695a8>] (imxfb_disable_controller+0x50/0x7c)
      [<c02695a8>] (imxfb_disable_controller+0x50/0x7c) from [<c029d838>] (platform_drv_shutdown+0x18/0x1c)
      [<c029d838>] (platform_drv_shutdown+0x18/0x1c) from [<c02990fc>] (device_shutdown+0x48/0x14c)
      [<c02990fc>] (device_shutdown+0x48/0x14c) from [<c003d09c>] (kernel_restart_prepare+0x2c/0x3c)
      [<c003d09c>] (kernel_restart_prepare+0x2c/0x3c) from [<c003d0e4>] (kernel_restart+0xc/0x48)
      [<c003d0e4>] (kernel_restart+0xc/0x48) from [<c003d1e8>] (sys_reboot+0xc0/0x1bc)
      [<c003d1e8>] (sys_reboot+0xc0/0x1bc) from [<c0014ca0>] (ret_fast_syscall+0x0/0x2c)
      ---[ end trace da6b502ca79c8550 ]---
      ------------[ cut here ]------------
      
      This happens because "reboot" triggers imxfb_shutdown(), which calls
      imxfb_disable_controller with the clocks already disabled.
      
      To prevent this, add a clock enabled status so that we can check if the clocks
      are enabled before disabling them.
      Acked-by: NSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      e6b267ce
    • O
      Merge branch 'v3.8-samsung-fixes-3' of... · 5046e385
      Olof Johansson 提交于
      Merge branch 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
      
      From Kukjin Kim:
      
      That branch fixes build error for S3C24XX/S3C64xx. And corrects dw-mshc
      properties on EXYNOS5 DT and fixes IRQ mapping on Cragganmore board.
      
      * 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
        ARM: dts: correct the dw-mshc timing properties as per binding
        ARM: S3C64XX: Fix build error with CONFIG_S3C_DEV_FB disabled
        + Linux 3.8-rc3
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      5046e385
    • L
      Merge tag 'for-linus-v3.8-rc4' of git://oss.sgi.com/xfs/xfs · dfdebc24
      Linus Torvalds 提交于
      Pull xfs bugfixes from Ben Myers:
      
       - fix(es) for compound buffers
      
       - fix for dquot soft timer asserts due to overflow of d_blk_softlimit
      
       - fix for regression in dir v2 code introduced in commit 20f7e9f3
         ("xfs: factor dir2 block read operations")
      
      * tag 'for-linus-v3.8-rc4' of git://oss.sgi.com/xfs/xfs:
        xfs: recalculate leaf entry pointer after compacting a dir2 block
        xfs: remove int casts from debug dquot soft limit timer asserts
        xfs: fix the multi-segment log buffer format
        xfs: fix segment in xfs_buf_item_format_segment
        xfs: rename bli_format to avoid confusion with bli_formats
        xfs: use b_maps[] for discontiguous buffers
      dfdebc24
    • D
      ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore · b86dc0d8
      Dimitris Papastamos 提交于
      We are using S3C_EINT(4) instead of S3C_EINT(5).
      Signed-off-by: NDimitris Papastamos <dp@opensource.wolfsonmicro.com>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      b86dc0d8
    • A
      ARM: dts: correct the dw-mshc timing properties as per binding · 753bd6dd
      Alim Akhtar 提交于
      As per the current exynos-dw-mshc bindings, dw-mshc-sdr-timing and
      dw-mshc-ddr-timing properties are having only two cells, these properties
      are wrongly set for exynos5250 based cros5250 and smdk5250 platfroms. This
      patch corrects above timing propreties for above platfroms
      Signed-off-by: NAlim Akhtar <alim.akhtar@samsung.com>
      Tested-by: NDoug Anderson <dianders@chromium.org>
      Acked-by: NDoug Anderson <dianders@chromium.org>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      753bd6dd
    • T
      ARM: S3C64XX: Fix build error with CONFIG_S3C_DEV_FB disabled · c0d6cfd3
      Tomasz Figa 提交于
      If there is no board selecting CONFIG_S3C_DEV_FB enabled, build will
      fail on arch/arm/mach-s3c64xx/pm.c, where s3c_device_fb is referenced.
      
      This patch adds ifdef guard around the code making it compile only
      when CONFIG_S3C_DEV_FB is enabled.
      Signed-off-by: NTomasz Figa <tomasz.figa@gmail.com>
      Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
      c0d6cfd3
    • L
      Merge tag 'pm+acpi-for-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 309b51e8
      Linus Torvalds 提交于
      Pull ACPI and power management fixes from Rafael Wysocki:
      
       - cpuidle regression fix related to the initialization of state
         kobjects from Krzysztof Mazur.
      
       - cpuidle fix removing some not very useful code and making some
         user-visible problems go away at the same time.  From Daniel Lezcano.
      
       - ACPI build fix from Yinghai Lu.
      
      * tag 'pm+acpi-for-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpuidle: remove the power_specified field in the driver
        ACPI / glue: Fix build with ACPI_GLUE_DEBUG set
        cpuidle: fix number of initialized/destroyed states
      309b51e8
    • U
      ARM: compile fix for DEBUG_LL=y && MMU=n · a73b59c5
      Uwe Kleine-König 提交于
      debug_ll_addr is only used on machines with an MMU so it can be #ifdef'ed
      out safely. This fixes:
      
      arch/arm/kernel/debug.S: Assembler messages:
      arch/arm/kernel/debug.S:104: Error: too many positional arguments
      
      The problem was introduced in e5c5f2ad ARM: implement debug_ll_io_init().
      Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
      Reviewed-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NRob Herring <rob.herring@calxeda.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      a73b59c5
    • E
      xfs: recalculate leaf entry pointer after compacting a dir2 block · 37f13561
      Eric Sandeen 提交于
      Dave Jones hit this assert when doing a compile on recent git, with
      CONFIG_XFS_DEBUG enabled:
      
      XFS: Assertion failed: (char *)dup - (char *)hdr == be16_to_cpu(*xfs_dir2_data_unused_tag_p(dup)), file: fs/xfs/xfs_dir2_data.c, line: 828
      
      Upon further digging, the tag found by xfs_dir2_data_unused_tag_p(dup)
      contained "2" and not the proper offset, and I found that this value was
      changed after the memmoves under "Use a stale leaf for our new entry."
      in xfs_dir2_block_addname(), i.e.
      
                              memmove(&blp[mid + 1], &blp[mid],
                                      (highstale - mid) * sizeof(*blp));
      
      overwrote it.
      
      What has happened is that the previous call to xfs_dir2_block_compact()
      has rearranged things; it changes btp->count as well as the
      blp array.  So after we make that call, we must recalculate the
      proper pointer to the leaf entries by making another call to
      xfs_dir2_block_leaf_p().
      
      Dave provided a metadump image which led to a simple reproducer
      (create a particular filename in the affected directory) and this
      resolves the testcase as well as the bug on his live system.
      
      Thanks also to dchinner for looking at this one with me.
      Signed-off-by: NEric Sandeen <sandeen@redhat.com>
      Tested-by: NDave Jones <davej@redhat.com>
      Reviewed-by: NDave Chinner <dchinner@redhat.com>
      Reviewed-by: NMark Tinguely <tinguely@sgi.com>
      Signed-off-by: NBen Myers <bpm@sgi.com>
      37f13561