From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB26EC433ED for ; Fri, 30 Apr 2021 05:54:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 760CB6144D for ; Fri, 30 Apr 2021 05:54:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 760CB6144D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 194156B0088; Fri, 30 Apr 2021 01:54:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A8EA6B0089; Fri, 30 Apr 2021 01:54:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8C816B008A; Fri, 30 Apr 2021 01:54:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0215.hostedemail.com [216.40.44.215]) by kanga.kvack.org (Postfix) with ESMTP id CA5566B0088 for ; Fri, 30 Apr 2021 01:54:01 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 8B0FB249A for ; Fri, 30 Apr 2021 05:54:01 +0000 (UTC) X-FDA: 78087967482.20.2144C43 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf09.hostedemail.com (Postfix) with ESMTP id 7419C600013E for ; Fri, 30 Apr 2021 05:53:53 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 12726613F8; Fri, 30 Apr 2021 05:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1619762040; bh=4a/XTG4LuO45vZLIU4A9hVkSTdNK7dU2jJuXDEyWLIs=; h=Date:From:To:Subject:In-Reply-To:From; b=iB/HYSVKdLVVexZgp6cTc16wwbamgdbPY9rQrvPUBLVj2OSV+cCxf2/bxI36DYIW3 upttfbP5eikFQImznU4FCzxOMrNBTWXIpjnuVY7qV1AwXHY1XJ7L/B6jolYsrr/11W uoUeA02oip29hIU/C+sdbrZst8QZBZ+ZFCAfvHo4= Date: Thu, 29 Apr 2021 22:53:59 -0700 From: Andrew Morton To: akpm@linux-foundation.org, dalias@libc.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, ysato@users.osdn.me, zhang.yunkai@zte.com.cn Subject: [patch 015/178] arch/sh/include/asm/tlb.h: remove duplicate include Message-ID: <20210430055359.Jbad4DY22%akpm@linux-foundation.org> In-Reply-To: <20210429225251.02b6386d21b69255b4f6c163@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7419C600013E Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b="iB/HYSVK"; dmarc=none; spf=pass (imf09.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org X-Stat-Signature: mazudu4d395dmk1g5e3za5eq39jy6zgu Received-SPF: none (linux-foundation.org>: No applicable sender policy available) receiver=imf09; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619762033-938787 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Zhang Yunkai Subject: arch/sh/include/asm/tlb.h: remove duplicate include 'asm-generic/tlb.h' included in 'asm/tlb.h' is duplicated. Link: https://lkml.kernel.org/r/20210304132020.196811-1-zhang.yunkai@zte.com.cn Signed-off-by: Zhang Yunkai Cc: Yoshinori Sato Cc: Rich Felker Cc: Zhang Yunkai Signed-off-by: Andrew Morton --- arch/sh/include/asm/tlb.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) --- a/arch/sh/include/asm/tlb.h~sh-remove-duplicate-include-in-tlbh +++ a/arch/sh/include/asm/tlb.h @@ -4,12 +4,11 @@ #ifndef __ASSEMBLY__ #include +#include #ifdef CONFIG_MMU #include -#include - #if defined(CONFIG_CPU_SH4) extern void tlb_wire_entry(struct vm_area_struct *, unsigned long, pte_t); extern void tlb_unwire_entry(void); @@ -24,12 +23,7 @@ static inline void tlb_unwire_entry(void { BUG(); } -#endif - -#else /* CONFIG_MMU */ - -#include - +#endif /* CONFIG_CPU_SH4 */ #endif /* CONFIG_MMU */ #endif /* __ASSEMBLY__ */ #endif /* __ASM_SH_TLB_H */ _