OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21917bd
)
arch/sh/include/asm/tlb.h: remove duplicate include
author
Zhang Yunkai
<zhang.yunkai@zte.com.cn>
Fri, 30 Apr 2021 05:53:59 +0000
(22:53 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 30 Apr 2021 18:20:35 +0000
(11:20 -0700)
'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>
arch/sh/include/asm/tlb.h
patch
|
blob
|
history
diff --git
a/arch/sh/include/asm/tlb.h
b/arch/sh/include/asm/tlb.h
index
360f713
..
aeb8915
100644
(file)
--- 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 */