[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 2e0442fa3653d80fb4a0fee937205b3d765dc73d..ffb1c9e652749284a225d34c031213636de89ec2 100644 (file)
--- 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);