Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756192AbYLaONJ (ORCPT ); Wed, 31 Dec 2008 09:13:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755352AbYLaOMz (ORCPT ); Wed, 31 Dec 2008 09:12:55 -0500 Received: from mail-bw0-f29.google.com ([209.85.218.29]:54509 "EHLO mail-bw0-f29.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753859AbYLaOMy (ORCPT ); Wed, 31 Dec 2008 09:12:54 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=cLUH9qtUbEAgAYuOLleR0VUnTiY+qg4ou9XqmByVVGykYKYia0Lj+sVIY4gnv6ENqE iy882j6jJSGoOVF/1DYsLqfODyyEEcyja/ryIDeu1BsyMbdlxoAAVwGwQm6pvUT2IKyQ BCAtc6B8EixChYT9dJz/SmbHDCvPDRH8HDvFU= Date: Wed, 31 Dec 2008 15:12:50 +0100 From: Frederic Weisbecker To: Jaswinder Singh Rajput Cc: Ingo Molnar , Jaswinder Singh Rajput , "H. Peter Anvin" , x86 maintainers , LKML , Andrew Morton Subject: Re: [PATCH -tip] fix compilation error Message-ID: <20081231141248.GA5748@nowhere> References: <20081230205230.GA6151@nowhere> <495AA87D.9060704@kernel.org> <495ABDF8.2070703@kernel.org> <20081231004722.GA28472@nowhere> <495AC45D.8010102@kernel.org> <20081231014747.GB28472@nowhere> <20081231081458.GB12942@elte.hu> <3f9a31f40812310040y27c39b87v456ae38e46031624@mail.gmail.com> <20081231084420.GA13665@elte.hu> <1230716702.24316.3.camel@jaswinder.satnam> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1230716702.24316.3.camel@jaswinder.satnam> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3430 Lines: 112 On Wed, Dec 31, 2008 at 03:15:02PM +0530, Jaswinder Singh Rajput wrote: > On Wed, 2008-12-31 at 09:44 +0100, Ingo Molnar wrote: > > * Jaswinder Singh Rajput wrote: > > > > > Hello Ingo, > > > > > > On Wed, Dec 31, 2008 at 1:44 PM, Ingo Molnar wrote: > > > > > > > > Could you check whether latest tip/master is still OK? I had these > > > > problems resolved locally (but forgot to push them out), and now i also > > > > had to do a few conflict resolutions with latest -git, hopefully i have > > > > not lost hpa's fixes ... > > > > > > > > > > With latest/tip, I am still getting error on X86_32 machines : > > > > > > CC mm/slab.o > > > mm/slab.c:105:31: error: tracing/kmemtrace.h: No such file or directory > > > make[1]: *** [mm/slab.o] Error 1 > > > make: *** [mm] Error 2 > > > > ok, pushed out a new one - does it build fine now? > > > > Yes, Now it looks better, thanks :-) > > I think it will be better to move trace/XXX below to linux/XXX to aviod > confusion and some minor cleanup in trace folder, do you thinks this is > useful : I'm not sure. The tracer's headers are small files that are only included in very few c files. They should be rarely included for general uses. > > --- > include/trace/boot.h | 6 +++--- > include/trace/kmemtrace.h | 6 +++--- > mm/slab.c | 2 +- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/include/trace/boot.h b/include/trace/boot.h > index 088ea08..21dcce3 100644 > --- a/include/trace/boot.h > +++ b/include/trace/boot.h > @@ -1,5 +1,5 @@ > -#ifndef _LINUX_TRACE_BOOT_H > -#define _LINUX_TRACE_BOOT_H > +#ifndef _TRACE_BOOT_H > +#define _TRACE_BOOT_H > > #include > #include > @@ -57,4 +57,4 @@ static inline void enable_boot_trace(void) { } > static inline void disable_boot_trace(void) { } > #endif /* CONFIG_BOOT_TRACER */ > > -#endif /* __LINUX_TRACE_BOOT_H */ > +#endif /* _TRACE_BOOT_H */ > diff --git a/include/trace/kmemtrace.h b/include/trace/kmemtrace.h > index ad8b785..4ea5300 100644 > --- a/include/trace/kmemtrace.h > +++ b/include/trace/kmemtrace.h > @@ -4,8 +4,8 @@ > * This file is released under GPL version 2. > */ > > -#ifndef _LINUX_KMEMTRACE_H > -#define _LINUX_KMEMTRACE_H > +#ifndef _TRACE_KMEMTRACE_H > +#define _TRACE_KMEMTRACE_H > > #ifdef __KERNEL__ > > @@ -71,5 +71,5 @@ static inline void kmemtrace_mark_alloc(enum kmemtrace_type_id type_id, > > #endif /* __KERNEL__ */ > > -#endif /* _LINUX_KMEMTRACE_H */ > +#endif /* _TRACE_KMEMTRACE_H */ > > diff --git a/mm/slab.c b/mm/slab.c > index ae76de2..0913e88 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -102,7 +102,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -114,6 +113,7 @@ > #include > #include > #include > +#include > > #include > #include > -- > 1.5.5.1 > > > -- 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/