1. 25 5月, 2015 25 次提交
  2. 19 5月, 2015 5 次提交
    • M
      coresight: etb10: Fix check for bogus buffer depth · f5da7cb2
      Mark Brown 提交于
      We attempt to sanity check the buffer depth reported by the hardware by
      making sure it is not less than zero however this check will never be true
      since the buffer depth is stored in an unsigned integer. Instead change
      the check to look for the top bit being set which was the intention.
      Signed-off-by: NMark Brown <broonie@kernel.org>
      Signed-off-by: NMathieu Poirier <mathieu.poirier@linaro.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      f5da7cb2
    • M
      coresight: etb10: Print size of buffer we fail to allocate · cc545449
      Mark Brown 提交于
      When we initialise the ETB driver we attempt to allocate a buffer suitable
      for storing the data buffered in the hardware based on sizing information
      reported by the hardware. Unfortunately if the hardware is not properly
      configured (for example if power domains are not set up correctly) then we
      may read back a nonsensically large value and therefore the allocation will
      be too big to succeed. Print an error message showing the amount of memory
      we tried to allocate if the buffer allocation fails to help users diagnose
      such problems.
      
      Normally it is bad practice to print an error message on memory allocation
      failures since there are verbose core messages reported for this but in
      this case where the allocation size might be incorrect it is a useful hint.
      Signed-off-by: NMark Brown <broonie@kernel.org>
      Signed-off-by: NMathieu Poirier <mathieu.poirier@linaro.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      cc545449
    • L
      Linux 4.1-rc4 · e2608180
      Linus Torvalds 提交于
      e2608180
    • P
      watchdog: Fix merge 'conflict' · ab992dc3
      Peter Zijlstra 提交于
      Two watchdog changes that came through different trees had a non
      conflicting conflict, that is, one changed the semantics of a variable
      but no actual code conflict happened. So the merge appeared fine, but
      the resulting code did not behave as expected.
      
      Commit 195daf66 ("watchdog: enable the new user interface of the
      watchdog mechanism") changes the semantics of watchdog_user_enabled,
      which thereafter is only used by the functions introduced by
      b3738d29 ("watchdog: Add watchdog enable/disable all functions").
      
      There further appears to be a distinct lack of serialization between
      setting and using watchdog_enabled, so perhaps we should wrap the
      {en,dis}able_all() things in watchdog_proc_mutex.
      
      This patch fixes a s2r failure reported by Michal; which I cannot
      readily explain. But this does make the code internally consistent
      again.
      Reported-and-tested-by: NMichal Hocko <mhocko@suse.cz>
      Signed-off-by: NPeter Zijlstra (Intel) <peterz@infradead.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ab992dc3
    • L
      Merge tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd · 7cf7d424
      Linus Torvalds 提交于
      Pull MTD fixes from Brian Norris:
       "Two MTD fixes for 4.1:
      
         - readtest: the signal-handling code was clobbering the error codes
           we should be handling/reporting in this test, rendering it useless.
           Noticed by Coverity.
      
         - the common SPI NOR flash DT binding (merged for 4.1-rc1) is being
           revised, so let's change that before 4.1 is minted"
      
      * tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd:
        Documentation: dt: mtd: replace "nor-jedec" binding with "jedec, spi-nor"
        mtd: readtest: don't clobber error reports
      7cf7d424
  3. 17 5月, 2015 10 次提交