From patchwork Mon Dec 2 15:48:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thorsten Blum X-Patchwork-Id: 13890986 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 93D45D78334 for ; Mon, 2 Dec 2024 16:10:09 +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=uD9wlcdgr+495Yqpkm0OP1E+ksdFV3b6uUdgVFXlDZI=; b=q4H89gh2oxyXZW/Wsr94XtYvwl O2MjxCG9yQO/Ps9Vru/+gidTJkbkm6e1rgxYxTfeLUNUzWHEdkISk6n3pOF7uD8rwyXfqcB/NiR5O oOkHnz7p5CmGdeI1s1fgQJ2iCnV1G2SMFyAr0Xtx0DbqQu3iMo9qe+XvjV13ynHicAnWMzZf2dG7T 87uM744WilRhL6FbDwaoRsUM87Jp/UmJFdAa9xtGR4XNPdGTmDd/LI4xKhHVxffa0fe/qsqAtXITt V1UXFwuzIOFsrPD/OAo6QUULgrtZL8t2l7V1/J4QgOqHcsjBrqb22iPph4l1XCsBGoGuUdMOxWJzo 9aA5NEKQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tI8zk-00000006myM-3Bao; Mon, 02 Dec 2024 16:09:56 +0000 Received: from out-187.mta1.migadu.com ([95.215.58.187]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tI8fe-00000006inD-20BL for linux-arm-kernel@lists.infradead.org; Mon, 02 Dec 2024 15:49:11 +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=1733154543; 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=uD9wlcdgr+495Yqpkm0OP1E+ksdFV3b6uUdgVFXlDZI=; b=rb+Fn9RI73OPUdp0Aw7Ih3CNOchIpr1oU6wHZlag1lyPnQekT89D7ruSOAtevwdaOPW9nw nIEbKrTsfSN3ZRhIGU40BkAlxd5DifmppRfeul78L8n6oykj3JvT8BhwnuG9mbWJ6AR0Ls 2HLz84bW+1lWfj3wcHPRb/4M0WobZhg= From: Thorsten Blum To: Russell King , Palmer Dabbelt , "Mike Rapoport (IBM)" , Andrew Morton , David Hildenbrand , Alexandre Ghiti Cc: Thorsten Blum , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm/pgtable: Remove duplicate included header file Date: Mon, 2 Dec 2024 16:48:39 +0100 Message-ID: <20241202154840.1343-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-20241202_074910_654320_ACD375A4 X-CRM114-Status: UNSURE ( 8.45 ) 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 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