]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
projects / can-eth-gw-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fdb1117) | patch
x86: dma-mapping: fix broken allocation when dma_mask has been provided
authorMarek Szyprowski <m.szyprowski@samsung.com>
Thu, 14 Jun 2012 12:01:30 +0000 (14:01 +0200)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Thu, 14 Jun 2012 12:01:30 +0000 (14:01 +0200)
commitc080e26edc3a2a3cdfa4c430c663ee1c3bbd8fae
tree218ba0a4f52a1dbc790af46f5a8bf18afd6372fetree | snapshot
parentfdb1117325ad719dc39e81209bc622d511db70e0commit | diff
x86: dma-mapping: fix broken allocation when dma_mask has been provided

Commit 0a2b9a6ea93 ("X86: integrate CMA with DMA-mapping subsystem")
broke memory allocation with dma_mask. This patch fixes possible kernel
ops caused by lack of resetting page variable when jumping to 'again' label.

Reported-by: Konrad Rzeszutek Wilk <konrad@darnok.org>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
arch/x86/kernel/pci-dma.c diff | blob | history