From patchwork Wed Feb 19 11:24:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thorsten Blum X-Patchwork-Id: 13981961 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AEB32C021AA for ; Wed, 19 Feb 2025 11:26:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=tjDbFbRwm3HhAGF25M09T2irsMdw4QN9fdCTcQJrGfg=; b=FLOFBD1FrpmnFeNQG1MtzmMUOm d7C63YHcYsdwXgGs/kFhjtdjMBd3Me/se4nsM02BHv03Nth0h0hU18aXRwCHA+/W2clGm+R8DaNGR Pwr08Xq1HQWaNj5fpJJtB/VaUWX0tPIBWPiNKZfnXAq0WYTavuQo9SFT1fA14Q99Rrr1YexsVcLwf cd7a3E+qxFeuQF6Z0rTC5jVMkjMJtFDE3H26tuQoHtvxqEWftIUfIyXrqZZ9pcckipidoJxPCHxzb xdW/E5nfpE211Bftst4X4T2h2uLuM2eZWjSR2cOM0gG3XFR4qYtgjZw+WRj6DT1GP+rzaCEGccd/3 /ZWlWrXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tkiDM-0000000COCE-0Yeh; Wed, 19 Feb 2025 11:26:04 +0000 Received: from out-171.mta0.migadu.com ([2001:41d0:1004:224b::ab]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tkiBp-0000000CNlc-0j89 for linux-arm-kernel@lists.infradead.org; Wed, 19 Feb 2025 11:24:30 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1739964267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tjDbFbRwm3HhAGF25M09T2irsMdw4QN9fdCTcQJrGfg=; b=SlF/kiXEjlP6HlrFs11HBI9F7XgCptauWa2B87XST3dQ12yha6j5izpbBLr8BkRwPKMWni iCok8SlEmO6MiAkAFa50iK+AknonSi0ULWLpsbHvUcZ04vN9a/5V0OAa2vPs93l1jegfVn ZchL29wxS8QbRZdu6HYA0WfJt3i981M= From: Thorsten Blum To: Russell King , "Mike Rapoport (Microsoft)" , Andrew Morton , David Hildenbrand , Thorsten Blum Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH] arm/pgtable: Remove duplicate included header file Date: Wed, 19 Feb 2025 12:24:02 +0100 Message-ID: <20250219112403.3959-2-thorsten.blum@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250219_032429_417366_BBCAE644 X-CRM114-Status: UNSURE ( 9.21 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The header file asm-generic/pgtable-nopud.h is included whether CONFIG_MMU is defined or not. Include it only once before the #ifndef/#else/#endif preprocessor directives and remove the following make includecheck warning: asm-generic/pgtable-nopud.h is included more than once Reviewed-by: Mike Rapoport (Microsoft) Signed-off-by: Thorsten Blum --- arch/arm/include/asm/pgtable.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index be91e376df79..6b986ef6042f 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -19,14 +19,13 @@ extern struct page *empty_zero_page; #define ZERO_PAGE(vaddr) (empty_zero_page) #endif -#ifndef CONFIG_MMU - #include + +#ifndef CONFIG_MMU #include #else -#include #include #include