[PATCH -tip] fix compilation error

[PATCH -tip] fix compilation error

[Jaswinder Singh Rajput]

Impact: cleanup, avoid compilation error

fixes this compilation error:
  CC      mm/slab.o
mm/slab.c:105:29: error: linux/kmemtrace.h: No such file or directory
make[1]: *** [mm/slab.o] Error 1
make: *** [mm] Error 2

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
 mm/slab.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/slab.c b/mm/slab.c
index 90e0cac..ce072de 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -102,7 +102,7 @@
 #include	<linux/cpu.h>
 #include	<linux/sysctl.h>
 #include	<linux/module.h>
-#include	<linux/kmemtrace.h>
+#include	<trace/kmemtrace.h>
 #include	<linux/rcupdate.h>
 #include	<linux/string.h>
 #include	<linux/uaccess.h>
-- 
1.5.5.1

Re: [PATCH -tip] fix compilation error

[Frederic Weisbecker]

On Tue, Dec 30, 2008 at 08:10:07PM +0530, Jaswinder Singh Rajput wrote:
> Impact: cleanup, avoid compilation error
> 
> fixes this compilation error:
>   CC      mm/slab.o
> mm/slab.c:105:29: error: linux/kmemtrace.h: No such file or directory
> make[1]: *** [mm/slab.o] Error 1
> make: *** [mm] Error 2
> 
> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
> ---
>  mm/slab.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/mm/slab.c b/mm/slab.c
> index 90e0cac..ce072de 100644
> --- a/mm/slab.c
> +++ b/mm/slab.c
> @@ -102,7 +102,7 @@
>  #include	<linux/cpu.h>
>  #include	<linux/sysctl.h>
>  #include	<linux/module.h>
> -#include	<linux/kmemtrace.h>
> +#include	<trace/kmemtrace.h>
>  #include	<linux/rcupdate.h>
>  #include	<linux/string.h>
>  #include	<linux/uaccess.h>
> -- 
> 1.5.5.1
> 
> 
> 

Oops, looks like I've forgot this one.
Thanks.

Re: [PATCH -tip] fix compilation error

[H. Peter Anvin]

Frederic Weisbecker wrote:
> On Tue, Dec 30, 2008 at 08:10:07PM +0530, Jaswinder Singh Rajput wrote:
>> Impact: cleanup, avoid compilation error
>>
>> fixes this compilation error:
>>   CC      mm/slab.o
>> mm/slab.c:105:29: error: linux/kmemtrace.h: No such file or directory
>> make[1]: *** [mm/slab.o] Error 1
>> make: *** [mm] Error 2
>>
>> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
> 
> Oops, looks like I've forgot this one.
> Thanks.
> 

Applied to tip:tracing/kmemtrace2.

	-hpa

Re: [PATCH -tip] fix compilation error

[H. Peter Anvin]

H. Peter Anvin wrote:
> 
> Applied to tip:tracing/kmemtrace2.
> 

Hm, there still seems to be a build failure, in particular
trace_output.h is missing.  It looks to me at the moment as if just
removing the #include works; assuming that compiles I will check that in
to tip:tracing/kmemtrace2 as well.

	-hpa

Re: [PATCH -tip] fix compilation error

[Frederic Weisbecker]

On Tue, Dec 30, 2008 at 04:34:00PM -0800, H. Peter Anvin wrote:
> H. Peter Anvin wrote:
> > 
> > Applied to tip:tracing/kmemtrace2.
> > 
> 
> Hm, there still seems to be a build failure, in particular
> trace_output.h is missing.  It looks to me at the moment as if just
> removing the #include works; assuming that compiles I will check that in
> to tip:tracing/kmemtrace2 as well.
> 
> 	-hpa

While I worked on this tracer, I had to base the thing against tracing/kmemtrace
because I needed the kmemtrace bits.
But I saw that this topic was a bit out of sync against tip/master, some updates from
Steven were not merged. But I didn't wonder, thinking that Ingo would resolve the
conflicts. But it seems there were some lost stuffs :-)

I'm checking it and will send a patch to solve the rest...

Re: [PATCH -tip] fix compilation error

[H. Peter Anvin]

Frederic Weisbecker wrote:
> On Tue, Dec 30, 2008 at 04:34:00PM -0800, H. Peter Anvin wrote:
>> H. Peter Anvin wrote:
>>> Applied to tip:tracing/kmemtrace2.
>>>
>> Hm, there still seems to be a build failure, in particular
>> trace_output.h is missing.  It looks to me at the moment as if just
>> removing the #include works; assuming that compiles I will check that in
>> to tip:tracing/kmemtrace2 as well.
>>
>> 	-hpa
> 
> While I worked on this tracer, I had to base the thing against tracing/kmemtrace
> because I needed the kmemtrace bits.
> But I saw that this topic was a bit out of sync against tip/master, some updates from
> Steven were not merged. But I didn't wonder, thinking that Ingo would resolve the
> conflicts. But it seems there were some lost stuffs :-)
> 
> I'm checking it and will send a patch to solve the rest...
> 

If it's only the trace_output.h #include removal, don't worry about it;
I'm about to commit that patch, but it would be good if you could check
out the tracing/kmemtrace2 branch afterwards.

	-hpa

Re: [PATCH -tip] fix compilation error

[Frederic Weisbecker]

On Tue, Dec 30, 2008 at 05:01:17PM -0800, H. Peter Anvin wrote:
> Frederic Weisbecker wrote:
> > On Tue, Dec 30, 2008 at 04:34:00PM -0800, H. Peter Anvin wrote:
> >> H. Peter Anvin wrote:
> >>> Applied to tip:tracing/kmemtrace2.
> >>>
> >> Hm, there still seems to be a build failure, in particular
> >> trace_output.h is missing.  It looks to me at the moment as if just
> >> removing the #include works; assuming that compiles I will check that in
> >> to tip:tracing/kmemtrace2 as well.
> >>
> >> 	-hpa
> > 
> > While I worked on this tracer, I had to base the thing against tracing/kmemtrace
> > because I needed the kmemtrace bits.
> > But I saw that this topic was a bit out of sync against tip/master, some updates from
> > Steven were not merged. But I didn't wonder, thinking that Ingo would resolve the
> > conflicts. But it seems there were some lost stuffs :-)
> > 
> > I'm checking it and will send a patch to solve the rest...
> > 
> 
> If it's only the trace_output.h #include removal, don't worry about it;
> I'm about to commit that patch, but it would be good if you could check
> out the tracing/kmemtrace2 branch afterwards.


Yes this topic builds well after your patch. So it was just this header.

Thanks!

Re: [PATCH -tip] fix compilation error

[Ingo Molnar]

* Frederic Weisbecker <fweisbec@gmail.com> wrote:

> On Tue, Dec 30, 2008 at 05:01:17PM -0800, H. Peter Anvin wrote:
> > Frederic Weisbecker wrote:
> > > On Tue, Dec 30, 2008 at 04:34:00PM -0800, H. Peter Anvin wrote:
> > >> H. Peter Anvin wrote:
> > >>> Applied to tip:tracing/kmemtrace2.
> > >>>
> > >> Hm, there still seems to be a build failure, in particular
> > >> trace_output.h is missing.  It looks to me at the moment as if just
> > >> removing the #include works; assuming that compiles I will check that in
> > >> to tip:tracing/kmemtrace2 as well.
> > >>
> > >> 	-hpa
> > > 
> > > While I worked on this tracer, I had to base the thing against tracing/kmemtrace
> > > because I needed the kmemtrace bits.
> > > But I saw that this topic was a bit out of sync against tip/master, some updates from
> > > Steven were not merged. But I didn't wonder, thinking that Ingo would resolve the
> > > conflicts. But it seems there were some lost stuffs :-)
> > > 
> > > I'm checking it and will send a patch to solve the rest...
> > > 
> > 
> > If it's only the trace_output.h #include removal, don't worry about it;
> > I'm about to commit that patch, but it would be good if you could check
> > out the tracing/kmemtrace2 branch afterwards.
> 
> 
> Yes this topic builds well after your patch. So it was just this header.

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 ...

	Ingo

Re: [PATCH -tip] fix compilation error

[Jaswinder Singh Rajput]

Hello Ingo,

On Wed, Dec 31, 2008 at 1:44 PM, Ingo Molnar <mingo@elte.hu> 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

Thank you,
JSR

Re: [PATCH -tip] fix compilation error

[Ingo Molnar]

* Jaswinder Singh Rajput <jaswinderlinux@gmail.com> wrote:

> Hello Ingo,
> 
> On Wed, Dec 31, 2008 at 1:44 PM, Ingo Molnar <mingo@elte.hu> 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?

	Ingo

Re: [PATCH -tip] fix compilation error

[Jaswinder Singh Rajput]

On Wed, 2008-12-31 at 09:44 +0100, Ingo Molnar wrote:
> * Jaswinder Singh Rajput <jaswinderlinux@gmail.com> wrote:
> 
> > Hello Ingo,
> > 
> > On Wed, Dec 31, 2008 at 1:44 PM, Ingo Molnar <mingo@elte.hu> 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 :


---
 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 <linux/module.h>
 #include <linux/kallsyms.h>
@@ -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	<linux/cpu.h>
 #include	<linux/sysctl.h>
 #include	<linux/module.h>
-#include	<trace/kmemtrace.h>
 #include	<linux/rcupdate.h>
 #include	<linux/string.h>
 #include	<linux/uaccess.h>
@@ -114,6 +113,7 @@
 #include	<linux/reciprocal_div.h>
 #include	<linux/debugobjects.h>
 #include	<linux/kmemcheck.h>
+#include	<trace/kmemtrace.h>
 
 #include	<asm/cacheflush.h>
 #include	<asm/tlbflush.h>
-- 
1.5.5.1

Re: [PATCH -tip] fix compilation error

[Frederic Weisbecker]

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 <jaswinderlinux@gmail.com> wrote:
> > 
> > > Hello Ingo,
> > > 
> > > On Wed, Dec 31, 2008 at 1:44 PM, Ingo Molnar <mingo@elte.hu> 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 <linux/module.h>
>  #include <linux/kallsyms.h>
> @@ -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	<linux/cpu.h>
>  #include	<linux/sysctl.h>
>  #include	<linux/module.h>
> -#include	<trace/kmemtrace.h>
>  #include	<linux/rcupdate.h>
>  #include	<linux/string.h>
>  #include	<linux/uaccess.h>
> @@ -114,6 +113,7 @@
>  #include	<linux/reciprocal_div.h>
>  #include	<linux/debugobjects.h>
>  #include	<linux/kmemcheck.h>
> +#include	<trace/kmemtrace.h>
>  
>  #include	<asm/cacheflush.h>
>  #include	<asm/tlbflush.h>
> -- 
> 1.5.5.1
> 
> 
> 

Re: [PATCH -tip] fix compilation error

[Ingo Molnar]

* Frederic Weisbecker <fweisbec@gmail.com> wrote:

> 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 <jaswinderlinux@gmail.com> wrote:
> > > 
> > > > Hello Ingo,
> > > > 
> > > > On Wed, Dec 31, 2008 at 1:44 PM, Ingo Molnar <mingo@elte.hu> 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.

yeah - it's also good to have a central repository of all tracepoints in 
one directory. The header guard fixes look correct nevertheless:

> > ---
> >  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 <linux/module.h>
> >  #include <linux/kallsyms.h>
> > @@ -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 */

	Ingo