Skip to contentSkip to conversation

fix compilation error

PATCH Applied Jaswinder Singh Rajput 5 participants 13 messages Dec 30, 2008 – Jan 2, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix compilation error

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

---
 mm/slab.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
mm/slab.c +1 -1
index 90e0cac..ce072de 100644
@@ -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>
Signature · 1 line
1.5.5.1
#1 lore raw
Quoted 31 lines · 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

---
 mm/slab.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
mm/slab.c +1 -1
index 90e0cac..ce072de 100644
@@ -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>
Signature · 1 line
1.5.5.1

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

#2 lore raw
Quoted 9 lines · Frederic Weisbecker
Quoted 8 lines · 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

Quoted 5 lines
Quoted 1 line

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

Applied to tip:tracing/kmemtrace2.

-hpa

#3 lore raw
Quoted 3 lines · H. Peter Anvin

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

#4 lore raw
Quoted 11 lines · H. Peter Anvin
Quoted 3 lines · H. Peter Anvin

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

#5 lore raw
Quoted 11 lines · Frederic Weisbecker
Quoted 9 lines · H. Peter Anvin
Quoted 2 lines · H. Peter Anvin

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

Quoted 8 lines

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

#6 lore raw
Quoted 18 lines · H. Peter Anvin
Quoted 17 lines · Frederic Weisbecker
Quoted 9 lines · H. Peter Anvin
Quoted 2 lines · H. Peter Anvin

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 :-)

Quoted 6 lines
Quoted 2 lines

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!

#7 lore raw
Quoted 22 lines · Frederic Weisbecker
Quoted 21 lines · H. Peter Anvin
Quoted 19 lines · Frederic Weisbecker
Quoted 9 lines · H. Peter Anvin
Quoted 2 lines · H. Peter Anvin

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

Quoted 6 lines
Quoted 3 lines

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

#8 lore raw

Hello Ingo,

Quoted 6 lines · Ingo Molnar

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

#9 lore raw
Quoted 10 lines · Jaswinder Singh Rajput

Hello Ingo,

Quoted 6 lines · Ingo Molnar

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

Quoted 6 lines

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

#10 lore raw
Quoted 12 lines · Ingo Molnar
Quoted 10 lines · Jaswinder Singh Rajput

Hello Ingo,

Quoted 6 lines · Ingo Molnar

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

Quoted 9 lines
Quoted 6 lines

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(-)
include/trace/boot.h +3 -3
index 088ea08..21dcce3 100644
@@ -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 */
include/trace/kmemtrace.h +3 -3
index ad8b785..4ea5300 100644
@@ -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 */
 
mm/slab.c +1 -1
index ae76de2..0913e88 100644
@@ -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>
Signature · 1 line
1.5.5.1
#11 lore raw
Quoted 20 lines · Jaswinder Singh Rajput
Quoted 19 lines · Ingo Molnar
Quoted 16 lines · Jaswinder Singh Rajput

Hello Ingo,

Quoted 6 lines · Ingo Molnar

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

Quoted 8 lines
Quoted 2 lines

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.

Quoted 72 lines
---
 include/trace/boot.h      |    6 +++---
 include/trace/kmemtrace.h |    6 +++---
 mm/slab.c                 |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
include/trace/boot.h +3 -3
index 088ea08..21dcce3 100644
@@ -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 */
include/trace/kmemtrace.h +3 -3
index ad8b785..4ea5300 100644
@@ -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 */
 
mm/slab.c +1 -1
index ae76de2..0913e88 100644
@@ -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>
Signature · 1 line
1.5.5.1
#12 lore raw
Quoted 26 lines · Frederic Weisbecker
Quoted 25 lines · Jaswinder Singh Rajput
Quoted 12 lines · Ingo Molnar
Quoted 10 lines · Jaswinder Singh Rajput

Hello Ingo,

Quoted 6 lines · Ingo Molnar

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

Quoted 9 lines
Quoted 6 lines

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 :-)

Quoted 8 lines
Quoted 3 lines

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:

Quoted 37 lines
Quoted 37 lines
---
 include/trace/boot.h      |    6 +++---
 include/trace/kmemtrace.h |    6 +++---
 mm/slab.c                 |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
include/trace/boot.h +3 -3
index 088ea08..21dcce3 100644
@@ -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 */
include/trace/kmemtrace.h +2 -2
index ad8b785..4ea5300 100644
@@ -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
 
Quoted 8 lines

include/trace/kmemtrace.h static inline void kmemtrace_mark_alloc(enum kmemtrace_type_id type_id, · line 74

Quoted 8 lines
include/trace/kmemtrace.h +1 -1
 #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