2008-11-18 21:31:54

by Harvey Harrison

[permalink] [raw]
Subject: [PATCH] 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

Signed-off-by: Harvey Harrison <[email protected]>
---
include/linux/kmemtrace.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/kmemtrace.h b/include/linux/kmemtrace.h
index 5bea8ea..80e9a7a 100644
--- a/include/linux/kmemtrace.h
+++ b/include/linux/kmemtrace.h
@@ -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,
--
1.6.0.4.994.g16bd3e



Subject: Re: [PATCH] kmemtrace: gfp_t is an unsigned int, not an unsigned long

On Tue, Nov 18, 2008 at 01:31:43PM -0800, Harvey Harrison wrote:
> 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
>
> Signed-off-by: Harvey Harrison <[email protected]>
> ---
> include/linux/kmemtrace.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/kmemtrace.h b/include/linux/kmemtrace.h
> index 5bea8ea..80e9a7a 100644
> --- a/include/linux/kmemtrace.h
> +++ b/include/linux/kmemtrace.h
> @@ -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,
> --
> 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