h8300: Fix <asm/tlb.h>
PATCH 1/1 h8300: Fix <asm/tlb.h>
Ten years ago, a mismerge happened, concatenating two slightly different versions of the same file. As a consequence, <asm-generic/tlb.h> was never included, leading to a build failure only now:
kernel/cpu/idle.c: In function 'cpu_idle_loop':kernel/cpu/idle.c:70:4: error: implicit declaration of function 'check_pgt_cache' [-Werror=implicit-function-declaration]
Remove the duplicates, and the header comment with the no longer correct file name.
--- arch/h8300/include/asm/tlb.h | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-)
arch/h8300/include/asm/tlb.h +0 -15
@@ -1,16 +1,3 @@ -/* -include/asm-h8300/tlb.h -*/ - -#ifndef __H8300_TLB_H__ -#define __H8300_TLB_H__ - -#define tlb_flush (tlb) do { } while(0) - -/* -include/asm-h8300/tlb.h -*/ -#ifndef __H8300_TLB_H__#define __H8300_TLB_H__
@@ -19,5 +6,3 @@#include <asm-generic/tlb.h> #endif - -#endif
Signature · 1 line
1.7.0.4
At Tue, 7 May 2013 11:52:52 +0200,
Quoted 10 lines · Geert Uytterhoeven
Ten years ago, a mismerge happened, concatenating two slightly different versions of the same file. As a consequence, <
asm-generic/tlb.h> was never included, leading to a build failure only now:
kernel/cpu/idle.c: In function 'cpu_idle_loop':kernel/cpu/idle.c:70:4: error: implicit declaration of function 'check_pgt_cache' [-Werror=implicit-function-declaration]Remove the duplicates, and the header comment with the no longer correct file name.
Sorry. too late reply.
OK. I will fix my tree.
Thanks.
Quoted 1 line
Signed-off-by Geert Uytterhoeven <[email protected]>
Quoted 34 lines
--- arch/h8300/include/asm/tlb.h | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-)arch/h8300/include/asm/tlb.h +0
-15@@ -1,16 +1,3 @@ -/* -include/asm-h8300/tlb.h -*/ - -#ifndef __H8300_TLB_H__ -#define __H8300_TLB_H__ - -#define tlb_flush (tlb) do { } while(0) - -/* -include/asm-h8300/tlb.h -*/ -#ifndef __H8300_TLB_H__#define __H8300_TLB_H__@@ -19,5 +6,3 @@#include <asm-generic/tlb.h> #endif - -#endif Signature · 1 line
1.7.0.4
Signature · 2 lines
Yoshinori Sato <[email protected]>