diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-18 15:49:58 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-18 15:49:58 -0800 |
commit | 91c6c8dcc7c30ed2d5861c670621a23f3b37e293 (patch) | |
tree | 7cb57402cfae69601e2b432690f547c828889b89 /include | |
parent | 341bbdc512633592198e6b434ca99a29bab7e02a (diff) | |
parent | 39544ac9df20f73e49fc6b9ac19ff533388c82c0 (diff) | |
download | linux-91c6c8dcc7c30ed2d5861c670621a23f3b37e293.tar.gz linux-91c6c8dcc7c30ed2d5861c670621a23f3b37e293.tar.bz2 linux-91c6c8dcc7c30ed2d5861c670621a23f3b37e293.zip |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A range of ARM fixes. Biggest change is the stage-2 attributes used
for for hyp mode which were wrong. I've killed some bits in a couple
of DT files which turned out not to be required, and a few other
fixes.
One fix touches code outside of arch/arm, which is related to sorting
out the DMA masks correctly. There is a long standing issue with the
conversion from PFNs to addresses where people assume that shifting an
unsigned long left by PAGE_SHIFT results in a correct address. This
is not the case with C: the integer promotion happens at assignment
after evaluation. This fixes the recently introduced dma_max_pfn()
function, but there's a number of other places where we try this
directly on an unsigned long in the mm code"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 7957/1: add DSB after icache flush in __flush_icache_all()
Fix uses of dma_max_pfn() when converting to a limiting address
ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev
ARM: 7953/1: mm: ensure TLB invalidation is complete before enabling MMU
ARM: 7952/1: mm: Fix the memblock allocation for LPAE machines
ARM: 7950/1: mm: Fix stage-2 device memory attributes
ARM: dts: fix spdif pinmux configuration
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions