X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=kernel%2Ftrace%2Ftrace.h;h=e685ac2b2ba10f1dcf24fef92180d94b75f76367;hb=c93f216b5b985a12a18323e5ca2eb01db3d2f000;hp=cbc168f1e43db4e78e41a990cd5b0265cf9a96d4;hpb=c61b79b6ef266890954213a701d8f6021d8c1289;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index cbc168f1e43..e685ac2b2ba 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -602,7 +602,7 @@ extern int trace_selftest_startup_branch(struct tracer *trace,
 #endif /* CONFIG_FTRACE_STARTUP_TEST */
 
 extern void *head_page(struct trace_array_cpu *data);
-extern long ns2usecs(cycle_t nsec);
+extern unsigned long long ns2usecs(cycle_t nsec);
 extern int
 trace_vbprintk(unsigned long ip, const char *fmt, va_list args);
 extern int