From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755706AbcA3GIr (ORCPT ); Sat, 30 Jan 2016 01:08:47 -0500 Received: from mail-pf0-f175.google.com ([209.85.192.175]:35468 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752570AbcA3GHu (ORCPT ); Sat, 30 Jan 2016 01:07:50 -0500 From: John Stultz To: lkml Cc: Amit Pundir , Android Kernel Team , Greg KH , Laura Abbott , Sumit Semwal , John Stultz Subject: [PATCH 9/9] staging: ion: Fix page pool cache policy Date: Fri, 29 Jan 2016 22:07:38 -0800 Message-Id: <1454134058-16466-10-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454134058-16466-1-git-send-email-john.stultz@linaro.org> References: <1454134058-16466-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Amit Pundir Fix redundant "buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE" checks in if(!cached ...) condition block. The previous patch, "ion: Handle the memory mapping correctly on x86", is broken on android-3.18+ kernels. It conflicts with upstream commit commit 53a91c68fa7b ("staging: ion: Add private buffer flag to skip page pooling on free"), and breaks the ION_PRIV_FLAG_SHRINKER_FREE private flag check logic. Cc: Android Kernel Team Cc: Greg KH Cc: Laura Abbott Cc: Sumit Semwal Reported-by: chenfeng Signed-off-by: Amit Pundir Signed-off-by: John Stultz --- drivers/staging/android/ion/ion_system_heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c index fa62cc4..57d115d 100644 --- a/drivers/staging/android/ion/ion_system_heap.c +++ b/drivers/staging/android/ion/ion_system_heap.c @@ -83,7 +83,7 @@ static void free_buffer_page(struct ion_system_heap *heap, unsigned int order = compound_order(page); bool cached = ion_buffer_cached(buffer); - if (!cached && !(buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE)) { + if (!cached) { struct ion_page_pool *pool = heap->pools[order_to_index(order)]; if (buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE) ion_page_pool_free_immediate(pool, page); -- 1.9.1