diff options
| author | Linus Torvalds | 2012-07-17 08:43:12 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2012-07-17 08:43:12 -0700 |
| commit | 5bb93f1a212e756834bc380682210647b5cdfcf1 (patch) | |
| tree | e9628306c2158dc0a62d636e4c7ba981df0978ca /mm/nobootmem.c | |
| parent | e5254a625d1d3f3119d80ddc30a6e6fe64001231 (diff) | |
| parent | 46c87852e99cf8ce97e207b11cde19085837e39c (diff) | |
Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull CMA and DMA-mapping fixes from Marek Szyprowski:
"Another set of minor fixups for recently merged Contiguous Memory
Allocator and ARM DMA-mapping changes. Those patches fix mysterious
crashes on systems with CMA and Himem enabled as well as some corner
cases caused by typical off-by-one bug."
* 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
ARM: dma-mapping: modify condition check while freeing pages
mm: cma: fix condition check when setting global cma area
mm: cma: don't replace lowmem pages with highmem
Diffstat (limited to 'mm/nobootmem.c')
0 files changed, 0 insertions, 0 deletions