From patchwork Mon Jun 24 09:48:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 2769491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9128A9F245 for ; Mon, 24 Jun 2013 09:48:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B575720146 for ; Mon, 24 Jun 2013 09:48:51 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AD2742013F for ; Mon, 24 Jun 2013 09:48:50 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ur3O7-0006TJ-Rt; Mon, 24 Jun 2013 09:48:44 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ur3O5-0003bH-4g; Mon, 24 Jun 2013 09:48:41 +0000 Received: from mail-wg0-x236.google.com ([2a00:1450:400c:c00::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ur3O1-0003Zq-EB for linux-arm-kernel@lists.infradead.org; Mon, 24 Jun 2013 09:48:38 +0000 Received: by mail-wg0-f54.google.com with SMTP id n11so8328248wgh.9 for ; Mon, 24 Jun 2013 02:48:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=1P/u74gqmBZsThEeiPwzR9p/rELyzYjphln7dV5bsEg=; b=OsxlxJddjHK8tP7xa2cjQYN5GFPZwdO/+93hVa0t+Gg5T0e3dBSV3pqTIoiDeijqsG 9Bajsh15Z+7w8GB2mIQXPIUpw8WyIYzqlf+2rrZKvWHa0p4VpxcmjLYb1P9Qgu99EHVk GE3wl+ux4yKLXjBFnBrRQ9oujWt9DjSs6WNYijUMBCU6+K49gNHleZvTEnQ9a51RscAu YtNYs+dp4x8iRWSzQMW44Y2pwDQPSI/WWno+u6incwU6fM0JI+kKC5bmP+NYlq6zu/dT w4SPOIchDnR4j9sN4wtlRUXEXT48jFAiJnWzT7yQ3DbF58uojbJiGrjrF2uZ2FL3lUrv CDnw== X-Received: by 10.180.12.135 with SMTP id y7mr3906687wib.46.1372067294668; Mon, 24 Jun 2013 02:48:14 -0700 (PDT) Received: from localhost.localdomain (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id w4sm15240274wia.9.2013.06.24.02.48.13 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 24 Jun 2013 02:48:13 -0700 (PDT) From: Steve Capper To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: mm: Remove do_sect_fault from LPAE code Date: Mon, 24 Jun 2013 10:48:04 +0100 Message-Id: <1372067284-13389-1-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQmfCNwqeNrHWp3q5hyBF3UXrbrt6cEa5Lsxc+E2FtEoq2Wx3WFbin4lvaQOdr0iSvyp4msC X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130624_054837_605946_74847484 X-CRM114-Status: GOOD ( 10.98 ) X-Spam-Score: -1.9 (-) Cc: Steve Capper , arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For LPAE, do_sect_fault used to be invoked as the second level access flag handler. When transparent huge pages were introduced for LPAE, do_page_fault was used instead. Unfortunately, do_sect_fault remains defined but not used for LPAE code resulting in a compile warning. This patch surrounds do_sect_fault with #ifndef CONFIG_ARM_LPAE to fix this warning. Signed-off-by: Steve Capper Acked-by: Arnd Bergmann --- arch/arm/mm/fault.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 5dbf13f..c97f794 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -491,12 +491,14 @@ do_translation_fault(unsigned long addr, unsigned int fsr, * Some section permission faults need to be handled gracefully. * They can happen due to a __{get,put}_user during an oops. */ +#ifndef CONFIG_ARM_LPAE static int do_sect_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) { do_bad_area(addr, fsr, regs); return 0; } +#endif /* CONFIG_ARM_LPAE */ /* * This abort handler always returns "fault".