Skip to content

Commit

Permalink
arch/sh/include/asm/tlb.h: remove duplicate include
Browse files Browse the repository at this point in the history
'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 <zhang.yunkai@zte.com.cn>
Cc: Yoshinori Sato <ysato@users.osdn.me>
Cc: Rich Felker <dalias@libc.org>
Cc: Zhang Yunkai <zhang.yunkai@zte.com.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Zhang Yunkai authored and torvalds committed Apr 30, 2021
1 parent 21917bd commit 91a8528
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions arch/sh/include/asm/tlb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 */

0 comments on commit 91a8528

Please sign in to comment.