diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-07 04:27:53 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-06-23 09:55:02 -0400 |
commit | 1e2b3bdaa770fa2d6fe8435e57cd2452d91cd18b (patch) | |
tree | 02b043c58127775469b0af479be6c5e65c14b45a /arch/h8300 | |
parent | db5ede6f5e653cc986b3fd6008de970f996d9431 (diff) |
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.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Diffstat (limited to 'arch/h8300')
-rw-r--r-- | arch/h8300/include/asm/tlb.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/h8300/include/asm/tlb.h b/arch/h8300/include/asm/tlb.h index 3dea80ad9e6f..7f0743051ad5 100644 --- a/arch/h8300/include/asm/tlb.h +++ b/arch/h8300/include/asm/tlb.h | |||
@@ -1,16 +1,3 @@ | |||
1 | /* | ||
2 | include/asm-h8300/tlb.h | ||
3 | */ | ||
4 | |||
5 | #ifndef __H8300_TLB_H__ | ||
6 | #define __H8300_TLB_H__ | ||
7 | |||
8 | #define tlb_flush(tlb) do { } while(0) | ||
9 | |||
10 | /* | ||
11 | include/asm-h8300/tlb.h | ||
12 | */ | ||
13 | |||
14 | #ifndef __H8300_TLB_H__ | 1 | #ifndef __H8300_TLB_H__ |
15 | #define __H8300_TLB_H__ | 2 | #define __H8300_TLB_H__ |
16 | 3 | ||
@@ -19,5 +6,3 @@ | |||
19 | #include <asm-generic/tlb.h> | 6 | #include <asm-generic/tlb.h> |
20 | 7 | ||
21 | #endif | 8 | #endif |
22 | |||
23 | #endif | ||