diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-07 10:27:53 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-06-23 15:55:02 +0200 |
| commit | 1e2b3bdaa770fa2d6fe8435e57cd2452d91cd18b (patch) | |
| tree | 02b043c58127775469b0af479be6c5e65c14b45a /arch/h8300 | |
| parent | db5ede6f5e653cc986b3fd6008de970f996d9431 (diff) | |
| download | lwn-1e2b3bdaa770fa2d6fe8435e57cd2452d91cd18b.tar.gz lwn-1e2b3bdaa770fa2d6fe8435e57cd2452d91cd18b.zip | |
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 @@ -/* - 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 |