From: Cho KyongHo <pullip.cho@samsung.com>
Date: Tue, 3 Apr 2018 14:12:17 +0000 (+0900)
Subject: [COMMON] ion: fix conflicts
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d1ab1cbde22232a68cf6ddf105ad58d8935dc0fc;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[COMMON] ion: fix conflicts

Change-Id: I250c65be08f436f8cef3fc00674587a74886ea61
Signed-off-by: Cho KyongHo <pullip.cho@samsung.com>
---

diff --git a/drivers/staging/android/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c
index 2e0442fa3653..ffb1c9e65274 100644
--- a/drivers/staging/android/ion/ion_cma_heap.c
+++ b/drivers/staging/android/ion/ion_cma_heap.c
@@ -125,9 +125,9 @@ err:
 static void ion_cma_free(struct ion_buffer *buffer)
 {
 	struct ion_cma_heap *cma_heap = to_cma_heap(buffer->heap);
-	unsigned long nr_pages = PAGE_ALIGN(buffer->size) >> PAGE_SHIFT;
 	bool protected = cma_heap->secure &&
 			 (buffer->flags & ION_FLAG_PROTECTED);
+	unsigned long nr_pages = PAGE_ALIGN(buffer->size) >> PAGE_SHIFT;
 
 	if (protected)
 		ion_buffer_unprotect(buffer->priv_virt);