linux-kernel - [PATCH] sh: remove duplicate include in tlb.h

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20210304132020.196811-1-zhang.yunkai@zte.com.cn>
Date:   Thu,  4 Mar 2021 05:20:20 -0800
From:   menglong8.dong@...il.com
To:     aneesh.kumar@...ux.ibm.com
Cc:     will@...nel.org, akpm@...ux-foundation.org, npiggin@...il.com,
        peterz@...radead.org, ysato@...rs.sourceforge.jp, dalias@...c.org,
        linux-arch@...r.kernel.org, linux-mm@...ck.org,
        linux-sh@...r.kernel.org, linux-kernel@...r.kernel.org,
        Zhang Yunkai <zhang.yunkai@....com.cn>
Subject: [PATCH] sh: remove duplicate include in tlb.h

From: Zhang Yunkai <zhang.yunkai@....com.cn>

'asm-generic/tlb.h' included in 'asm/tlb.h' is duplicated.

Signed-off-by: Zhang Yunkai <zhang.yunkai@....com.cn>
---
 arch/sh/include/asm/tlb.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h
index 360f713d009b..aeb8915e9254 100644
--- a/arch/sh/include/asm/tlb.h
+++ b/arch/sh/include/asm/tlb.h
@@ -4,12 +4,11 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/pagemap.h>
+#include <asm-generic/tlb.h>
 
 #ifdef CONFIG_MMU
 #include <linux/swap.h>
 
-#include <asm-generic/tlb.h>
-
 #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 <asm-generic/tlb.h>
-
+#endif /* CONFIG_CPU_SH4 */
 #endif /* CONFIG_MMU */
 #endif /* __ASSEMBLY__ */
 #endif /* __ASM_SH_TLB_H */
-- 
2.25.1