At Tue, 7 May 2013 11:52:52 +0200,
Geert Uytterhoeven wrote:
>
> 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.
> Signed-off-by: Geert Uytterhoeven <ge...@linux-m68k.org>
Acked-by: Yoshinori Sato <ys...@users.sourceforge.jp>
> ---
> 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 3dea80a..7f07430 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
> --
> 1.7.0.4
>
--
Yoshinori Sato
<ys...@users.sourceforge.jp>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
