Skip to contentSkip to conversation

kmemtrace: gfp_t is an unsigned int, not an unsigned long

PATCH In review Harvey Harrison 2 participants 2 messages Nov 18, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kmemtrace: gfp_t is an unsigned int, not an unsigned long

As a bonus, gets rid of all the sparse warnings as you are casting a restricted type (gfp_t) without __force.

include/linux/kmemtrace.h:33:2: warning: cast from restricted gfp_t

---
 include/linux/kmemtrace.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/kmemtrace.h +2 -2
index 5bea8ea..80e9a7a 100644
@@ -31,10 +31,10 @@ static inline void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
 					     int node)
 {
 	trace_mark(kmemtrace_alloc, "type_id %d call_site %lu ptr %lu "
-		   "bytes_req %lu bytes_alloc %lu gfp_flags %lu node %d",
+		   "bytes_req %lu bytes_alloc %lu gfp_flags %u node %d",
 		   type_id, call_site, (unsigned long) ptr,
 		   (unsigned long) bytes_req, (unsigned long) bytes_alloc,
-		   (unsigned long) gfp_flags, node);
+		   gfp_flags, node);
 }
 
 static inline void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
Signature · 1 line
1.6.0.4.994.g16bd3e
#1 lore raw
Quoted 31 lines · Harvey Harrison

As a bonus, gets rid of all the sparse warnings as you are casting a restricted type (gfp_t) without __force.

include/linux/kmemtrace.h:33:2: warning: cast from restricted gfp_t

---
 include/linux/kmemtrace.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/kmemtrace.h +2 -2
index 5bea8ea..80e9a7a 100644
@@ -31,10 +31,10 @@ static inline void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
 					     int node)
 {
 	trace_mark(kmemtrace_alloc, "type_id %d call_site %lu ptr %lu "
-		   "bytes_req %lu bytes_alloc %lu gfp_flags %lu node %d",
+		   "bytes_req %lu bytes_alloc %lu gfp_flags %u node %d",
 		   type_id, call_site, (unsigned long) ptr,
 		   (unsigned long) bytes_req, (unsigned long) bytes_alloc,
-		   (unsigned long) gfp_flags, node);
+		   gfp_flags, node);
 }
 
 static inline void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
Signature · 1 line
1.6.0.4.994.g16bd3e

This is incomplete, because marker format also needs to be changed, along with va_arg stuff from the probe function.

But thanks, I'll fix it and forward it to Pekka.

Cheers,
Eduard