Commit e2862c94 authored Oct 27, 2008 by Stephen Rothwell Committed by Ingo Molnar Oct 27, 2008

trace: fix printk warning for u64

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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 4944dd62

kernel/trace/ring_buffer.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message