Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752320Ab3ELMOr (ORCPT ); Sun, 12 May 2013 08:14:47 -0400 Received: from mail1.asahi-net.or.jp ([202.224.39.197]:30887 "EHLO mail1.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751831Ab3ELMOp (ORCPT ); Sun, 12 May 2013 08:14:45 -0400 X-Greylist: delayed 1432 seconds by postgrey-1.27 at vger.kernel.org; Sun, 12 May 2013 08:14:45 EDT Date: Sun, 12 May 2013 20:50:51 +0900 Message-ID: <87fvxsh0x0.wl%ysato@users.sourceforge.jp> From: Yoshinori Sato To: Geert Uytterhoeven Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH] h8300: Fix In-Reply-To: <1367920372-18429-1-git-send-email-geert@linux-m68k.org> References: <1367920372-18429-1-git-send-email-geert@linux-m68k.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-2022-JP-2?B?R29qGyQoRCtXGyhC?=) APEL/10.8 Emacs/23.4 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1671 Lines: 63 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, 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 Acked-by: Yoshinori Sato > --- > 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 > > #endif > - > -#endif > -- > 1.7.0.4 > -- Yoshinori Sato -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/