diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 11:27:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 11:27:10 -0800 |
| commit | c45564e91604ca4d03505ba4d567541c7e4f86fe (patch) | |
| tree | f686dce956b8ceef91215aff55009555875b394c /drivers/edac/edac_mc.c | |
| parent | 93874681aa3f538a2b9d59a6c5b7c0e882a36978 (diff) | |
| parent | 4009793e15d44469da1547a46ab129cc08ffa503 (diff) | |
| download | linux-c45564e91604ca4d03505ba4d567541c7e4f86fe.tar.gz linux-c45564e91604ca4d03505ba4d567541c7e4f86fe.tar.xz | |
Merge branch 'for-v3.8' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull CMA and DMA-mapping update from Marek Szyprowski:
"Another set of Contiguous Memory Allocator and DMA-mapping framework
updates for v3.8.
This pull request consists only of two patches. The first fixes a
long standing issue with dmapools (the code predates current GIT
history), which forced all allocations to use GFP_ATOMIC flag,
ignoring the flags passed by the caller. The second patch changes CMA
code to correctly use phys_addr_t type what enables support for LPAE
systems."
* 'for-v3.8' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
drivers: cma: represent physical addresses as phys_addr_t
mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls
Diffstat (limited to 'drivers/edac/edac_mc.c')
0 files changed, 0 insertions, 0 deletions