From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751922AbbJFLYp (ORCPT ); Tue, 6 Oct 2015 07:24:45 -0400 Received: from LGEAMRELO12.lge.com ([156.147.23.52]:54177 "EHLO lgeamrelo12.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751248AbbJFLYo (ORCPT ); Tue, 6 Oct 2015 07:24:44 -0400 X-Greylist: delayed 899 seconds by postgrey-1.27 at vger.kernel.org; Tue, 06 Oct 2015 07:24:44 EDT X-Original-SENDERIP: 156.147.1.151 X-Original-MAILFROM: chanho.min@lge.com X-Original-SENDERIP: 165.244.98.204 X-Original-MAILFROM: chanho.min@lge.com X-Original-SENDERIP: 10.186.119.199 X-Original-MAILFROM: chanho.min@lge.com From: Chanho Min To: Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org CC: Jongsung Kim , Gunho Lee , Chanho Min Subject: [PATCH] ARM:mm: fix kmap_atomic_to_page Date: Tue, 6 Oct 2015 20:09:33 +0900 Message-ID: <1444129773-12632-1-git-send-email-chanho.min@lge.com> X-Mailer: git-send-email 1.7.9.5 X-MIMETrack: Itemize by SMTP Server on LGEKRMHUB05/LGE/LG Group(Release 8.5.3FP6|November 21, 2013) at 2015/10/06 20:09:41, Serialize by Router on LGEKRMHUB05/LGE/LG Group(Release 8.5.3FP6|November 21, 2013) at 2015/10/06 20:09:41, Serialize complete at 2015/10/06 20:09:41 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since kmap_atomic returns the pkmap address without a new mapping to fixmap for the page that is already mapped by kmap, It should be considered for the pkmap address in kmap_atomic_to_page. Signed-off-by: Chanho Min --- arch/arm/mm/highmem.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c index 45aeaac..3e973b7 100644 --- a/arch/arm/mm/highmem.c +++ b/arch/arm/mm/highmem.c @@ -145,8 +145,13 @@ struct page *kmap_atomic_to_page(const void *ptr) { unsigned long vaddr = (unsigned long)ptr; - if (vaddr < FIXADDR_START) - return virt_to_page(ptr); + if (vaddr >= PKMAP_ADDR(0) && vaddr < PKMAP_ADDR(LAST_PKMAP)) { + int i = PKMAP_NR(vaddr); + return pte_page(pkmap_page_table[i]); + } + + if (vaddr >= FIXADDR_START) + return pte_page(get_fixmap_pte(vaddr)); - return pte_page(get_fixmap_pte(vaddr)); + return virt_to_page(ptr); } -- 1.7.9.5