2013-05-07 09:52:57

by Geert Uytterhoeven

Subject: [PATCH] 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 <[email protected]>
---
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

2013-05-12 12:14:47

by Yoshinori Sato

Subject: Re: [PATCH] h8300: Fix <asm/tlb.h>

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 <[email protected]>
Acked-by: Yoshinori Sato <[email protected]>

> ---
> 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
<[email protected]>