1. 23 3月, 2012 2 次提交
    • M
      arm: omap3: pm34xx.c: Fix omap3_pm_init() error out paths · ce229c5d
      Mark A. Greer 提交于
      It appears that the error paths were overlooked when the
      omap3_pm_init() routine had the prcm chain handler code
      added.  Fix this by adding a goto target and reordering
      the error handling code.  Also fix how the irq argument
      for free_irq() is determined.
      Signed-off-by: NMark A. Greer <mgreer@animalcreek.com>
      Acked-by: NTero Kristo <t-kristo@ti.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      ce229c5d
    • S
      ARM: OMAP4: Workaround the OCP synchronisation issue with 32K synctimer. · 68523f42
      Santosh Shilimkar 提交于
      On OMAP4, recently a synchronisation bug is discovered by hardware
      team, which leads to incorrect timer value read from 32K sync timer
      IP when the IP is comming out of idle.
      
      The issue is due to the synchronization methodology used in the SYNCTIMER IP.
      The value of the counter register in 32kHz domain is synchronized to the OCP
      domain register only at count up event, and if the OCP clock is switched off,
      the OCP register gets out of synch until the first count up event after the
      clock is switched back -at the next falling edge of the 32kHz clock.
      
      Further investigation revealed that it applies to gptimer1 and watchdog timer2
      as well which may run on 32KHz. This patch fixes the issue for all the
      applicable modules.
      
      The BUG has not made it yet to the OMAP errata list and it is applicable to
      OMAP1/2/3/4/5. OMAP1/2/3 it is taken care indirectly by autodeps.
      
      By enabling static depedency of wakeup clockdomain with MPU, as soon as MPU
      is woken up from lowpower state(idle) or whenever MPU is active, PRCM forces
      the OCP clock to be running and allow the counter value to be updated properly
      in the OCP clock domain.
      
      The bug is going to fixed in future OMAP versions.
      
      Reported-Tested-by: dave.long@linaro.org
      [dave.long@linaro.org: Reported the oprofile time stamp issue with synctimer
      and helped to test this patch]
      Signed-off-by: NSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      68523f42
  2. 19 3月, 2012 2 次提交
  3. 18 3月, 2012 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c579bc7e
      Linus Torvalds 提交于
      Pull networking changes from David Miller:
       "1) icmp6_dst_alloc() returns NULL instead of ERR_PTR() leading to
           crashes, particularly during shutdown.  Reported by Dave Jones and
           fixed by Eric Dumazet.
      
        2) hyperv and wimax/i2400m return NETDEV_TX_BUSY when they have
           already freed the SKB, which causes crashes as to the caller this
           means requeue the packet.  Fixes from Eric Dumazet.
      
        3) usbnet driver doesn't allocate the right amount of headroom on
           fresh RX SKBs, fix from Eric Dumazet.
      
        4) Fix regression in ip6_mc_find_dev_rcu(), as an RCU lookup it
           abolutely should not take a reference to 'dev', this leads to
           leaks.  Fix from RonQing Li.
      
        5) Fix netfilter ctnetlink race between delete and timeout expiration.
           From Pablo Neira Ayuso.
      
        6) Revert SFQ change which causes regressions, specifically queueing
           to tail can lead to unavoidable flow starvation.  From Eric
           Dumazet.
      
        7) Fix a memory leak and a crash on corrupt firmware files in bnx2x,
           from Michal Schmidt."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        netfilter: ctnetlink: fix race between delete and timeout expiration
        ipv6: Don't dev_hold(dev) in ip6_mc_find_dev_rcu.
        wimax/i2400m: fix erroneous NETDEV_TX_BUSY use
        net/hyperv: fix erroneous NETDEV_TX_BUSY use
        net/usbnet: reserve headroom on rx skbs
        bnx2x: fix memory leak in bnx2x_init_firmware()
        bnx2x: fix a crash on corrupt firmware file
        sch_sfq: revert dont put new flow at the end of flows
        ipv6: fix icmp6_dst_alloc()
      c579bc7e
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 96ee0499
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tools, x86: Build perf on older user-space as well
        perf tools: Use scnprintf where applicable
        perf tools: Incorrect use of snprintf results in SEGV
      96ee0499
  4. 17 3月, 2012 9 次提交
  5. 16 3月, 2012 25 次提交