1. 31 Oct, 2013 19 commits
  2. 21 Sep, 2013 16 commits
  3. 17 Sep, 2013 2 commits
    • Russell King's avatar
      DMA-API: net: brocade/bna/bnad.c: fix 32-bit DMA mask handling · 3e548079
      Russell King authored
      The fallback to 32-bit DMA mask is rather odd:
      	if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
      	    !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
      		*using_dac = true;
      	} else {
      		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
      		if (err) {
      			err = dma_set_coherent_mask(&pdev->dev,
      						    DMA_BIT_MASK(32));
      			if (err)
      				goto release_regions;
      		}
      
      This means we only try and set the coherent DMA mask if we failed to
      set a 32-bit DMA mask, and only if both fail do we fail the driver.
      Adjust this so that if either setting fails, we fail the driver - and
      thereby end up properly setting both the DMA mask and the coherent
      DMA mask in the fallback case.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      3e548079
    • Russell King's avatar
      DMA-API: provide a helper to set both DMA and coherent DMA masks · 4aa806b7
      Russell King authored
      Provide a helper to set both the DMA and coherent DMA masks to the
      same value - this avoids duplicated code in a number of drivers,
      sometimes with buggy error handling, and also allows us identify
      which drivers do things differently.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      4aa806b7
  4. 16 Sep, 2013 3 commits
    • Linus Torvalds's avatar
      Linux 3.12-rc1 · 272b98c6
      Linus Torvalds authored
      272b98c6
    • Linus Torvalds's avatar
      Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a4ae54f9
      Linus Torvalds authored
      Pull timer code update from Thomas Gleixner:
       - armada SoC clocksource overhaul with a trivial merge conflict
       - Minor improvements to various SoC clocksource drivers
      
      * 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding
        clocksource: armada-370-xp: Get reference fixed-clock by name
        clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
        clocksource: armada-370-xp: Fix device-tree binding
        clocksource: armada-370-xp: Introduce new compatibles
        clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
        clocksource: armada-370-xp: Simplify TIMER_CTRL register access
        clocksource: armada-370-xp: Use BIT()
        ARM: timer-sp: Set dynamic irq affinity
        ARM: nomadik: add dynamic irq flag to the timer
        clocksource: sh_cmt: 32-bit control register support
        clocksource: em_sti: Convert to devm_* managed helpers
      a4ae54f9
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 3369d116
      Linus Torvalds authored
      Pull CIFS fixes from Steve French:
       "Two minor cifs fixes and a minor documentation cleanup for cifs.txt"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: update cifs.txt and remove some outdated infos
        cifs: Avoid calling unlock_page() twice in cifs_readpage() when using fscache
        cifs: Do not take a reference to the page in cifs_readpage_worker()
      3369d116