trace: fix printk warning for u64

trace: fix printk warning for u64

[Stephen Rothwell]

A powerpc ppc64_defconfig build produces these warnings:

kernel/trace/ring_buffer.c: In function 'rb_add_time_stamp':
kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 2 has type 'u64'
kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'u64'
kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'u64'

Just cast the u64s to unsigned long long like we do everywhere else.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

---

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 94af1fe..faf3be9 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -966,7 +966,9 @@ rb_add_time_stamp(struct ring_buffer_per_cpu *cpu_buffer,
 	if (unlikely(*delta > (1ULL << 59) && !once++)) {
 		printk(KERN_WARNING "Delta way too big! %llu"
 		       " ts=%llu write stamp = %llu\n",
-		       *delta, *ts, cpu_buffer->write_stamp);
+		       (unsigned long long)*delta,
+		       (unsigned long long)*ts,
+		       (unsigned long long)cpu_buffer->write_stamp);
 		WARN_ON(1);
 	}
 
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: trace: fix printk warning for u64

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> A powerpc ppc64_defconfig build produces these warnings:
> 
> kernel/trace/ring_buffer.c: In function 'rb_add_time_stamp':
> kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 2 has type 'u64'
> kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'u64'
> kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'u64'
> 
> Just cast the u64s to unsigned long long like we do everywhere else.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

applied to tip/tracing/urgent, thanks Stephen!

(btw., did the "unify u64 definitions across all platforms" project 
get anywhere?)

	Ingo

Re: trace: fix printk warning for u64

[Steven Rostedt]

On Mon, 27 Oct 2008, Stephen Rothwell wrote:

> A powerpc ppc64_defconfig build produces these warnings:
> 
> kernel/trace/ring_buffer.c: In function 'rb_add_time_stamp':
> kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 2 has type 'u64'
> kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'u64'
> kernel/trace/ring_buffer.c:969: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'u64'
> 
> Just cast the u64s to unsigned long long like we do everywhere else.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Acked-by: Steven Rostedt <srostedt@redhat.com>

-- Steve

Re: trace: fix printk warning for u64

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

Hi Ingo,

On Mon, 27 Oct 2008 10:52:48 +0100 Ingo Molnar <mingo@elte.hu> wrote:
>
> (btw., did the "unify u64 definitions across all platforms" project 
> get anywhere?)

I think (from a comment from DaveM) that it led into a real mess.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: trace: fix printk warning for u64

[Andrew Morton]

On Tue, 28 Oct 2008 00:12:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Ingo,
> 
> On Mon, 27 Oct 2008 10:52:48 +0100 Ingo Molnar <mingo@elte.hu> wrote:
> >
> > (btw., did the "unify u64 definitions across all platforms" project 
> > get anywhere?)
> 
> I think (from a comment from DaveM) that it led into a real mess.

The problem is the large amount of arch-specific code which is printing
u64's with %lu because it "knows" that u64 is implemented as ulong. 
They all need to be switched to %ll.

A better strategy to get all this done would be to convert the
offending architectures to `long long' individually.  Then when that's
all done, unifying the typedef is a trivial step.

Re: trace: fix printk warning for u64

[Ingo Molnar]

* Andrew Morton <akpm@linux-foundation.org> wrote:

> On Tue, 28 Oct 2008 00:12:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi Ingo,
> > 
> > On Mon, 27 Oct 2008 10:52:48 +0100 Ingo Molnar <mingo@elte.hu> wrote:
> > >
> > > (btw., did the "unify u64 definitions across all platforms" project 
> > > get anywhere?)
> > 
> > I think (from a comment from DaveM) that it led into a real mess.
> 
> The problem is the large amount of arch-specific code which is 
> printing u64's with %lu because it "knows" that u64 is implemented 
> as ulong. They all need to be switched to %ll.
> 
> A better strategy to get all this done would be to convert the 
> offending architectures to `long long' individually.  Then when 
> that's all done, unifying the typedef is a trivial step.

so here's the patch below which achieves just that. 64-bit platforms 
using the old int-l64.h header will get build warnings which they can 
fix gradually.

There's no runtime failures expected, nor any non-warning build 
failures, correct? So lets just do this, hm?

	Ingo

---
 include/asm-generic/int-l64.h |   63 +---------------------------------------
 1 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h
index 2af9b75..a152df9 100644
--- a/include/asm-generic/int-l64.h
+++ b/include/asm-generic/int-l64.h
@@ -1,71 +1,12 @@
 /*
  * asm-generic/int-l64.h
  *
- * Integer declarations for architectures which use "long"
- * for 64-bit types.
+ * migration helper, will go away soon.
  */
 
 #ifndef _ASM_GENERIC_INT_L64_H
 #define _ASM_GENERIC_INT_L64_H
 
-#ifndef __ASSEMBLY__
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-typedef __signed__ long __s64;
-typedef unsigned long __u64;
-
-#endif /* __ASSEMBLY__ */
-
-#ifdef __KERNEL__
-
-#ifndef __ASSEMBLY__
-
-typedef signed char s8;
-typedef unsigned char u8;
-
-typedef signed short s16;
-typedef unsigned short u16;
-
-typedef signed int s32;
-typedef unsigned int u32;
-
-typedef signed long s64;
-typedef unsigned long u64;
-
-#define S8_C(x)  x
-#define U8_C(x)  x ## U
-#define S16_C(x) x
-#define U16_C(x) x ## U
-#define S32_C(x) x
-#define U32_C(x) x ## U
-#define S64_C(x) x ## L
-#define U64_C(x) x ## UL
-
-#else /* __ASSEMBLY__ */
-
-#define S8_C(x)  x
-#define U8_C(x)  x
-#define S16_C(x) x
-#define U16_C(x) x
-#define S32_C(x) x
-#define U32_C(x) x
-#define S64_C(x) x
-#define U64_C(x) x
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
+#include <asm-generic/int-ll64.h>
 
 #endif /* _ASM_GENERIC_INT_L64_H */