From patchwork Sat Apr 27 10:42:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Hongjiang X-Patchwork-Id: 2497031 X-Patchwork-Delegate: deller@gmx.de Return-Path: X-Original-To: patchwork-linux-parisc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0A2BB3FD1A for ; Sat, 27 Apr 2013 10:42:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754333Ab3D0Kml (ORCPT ); Sat, 27 Apr 2013 06:42:41 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:52226 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753862Ab3D0Kmk (ORCPT ); Sat, 27 Apr 2013 06:42:40 -0400 Received: from 172.24.2.119 (EHLO szxeml211-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id BAT77427; Sat, 27 Apr 2013 18:42:27 +0800 (CST) Received: from SZXEML462-HUB.china.huawei.com (10.82.67.205) by szxeml211-edg.china.huawei.com (172.24.2.182) with Microsoft SMTP Server (TLS) id 14.1.323.7; Sat, 27 Apr 2013 18:42:19 +0800 Received: from [127.0.0.1] (10.135.72.200) by szxeml462-hub.china.huawei.com (10.82.67.205) with Microsoft SMTP Server id 14.1.323.7; Sat, 27 Apr 2013 18:42:15 +0800 Message-ID: <517BAB83.2060308@huawei.com> Date: Sat, 27 Apr 2013 18:42:11 +0800 From: Zhao Hongjiang User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130328 Thunderbird/17.0.5 MIME-Version: 1.0 To: , CC: , Andrew Morton , Subject: [PATCH] parisc: remove the second argument of kmap_atomic X-Originating-IP: [10.135.72.200] X-CFilter-Loop: Reflected Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org kmap_atomic allows only one argument now, just move the second. Signed-off-by: Zhao Hongjiang --- arch/parisc/kernel/cache.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index 4b12890..6df734a 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c @@ -609,7 +609,7 @@ void clear_user_highpage(struct page *page, unsigned long vaddr) /* Clear using TMPALIAS region. The page doesn't need to be flushed but the kernel mapping needs to be purged. */ - vto = kmap_atomic(page, KM_USER0); + vto = kmap_atomic(page); /* The PA-RISC 2.0 Architecture book states on page F-6: "Before a write-capable translation is enabled, *all* @@ -644,8 +644,8 @@ void copy_user_highpage(struct page *to, struct page *from, the `to' page must be flushed in copy_user_page_asm since it can be used to bring in executable code. */ - vfrom = kmap_atomic(from, KM_USER0); - vto = kmap_atomic(to, KM_USER1); + vfrom = kmap_atomic(from); + vto = kmap_atomic(to); purge_kernel_dcache_page_asm((unsigned long)vto); purge_tlb_start(flags);