From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Thu, 14 Jun 2012 12:01:30 +0000 (+0200)
Subject: x86: dma-mapping: fix broken allocation when dma_mask has been provided
X-Git-Tag: v3.5-rc3~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c080e26edc3a2a3cdfa4c430c663ee1c3bbd8fae;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed