From 0981377922617cdacff181657ca83657fafd7ac1 Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Tue, 10 Feb 2009 19:44:34 +0100 Subject: [PATCH] --- yaml --- r: 140727 b: refs/heads/master c: 5e39841c45cf5e6ea930ede1b0303309e03037a2 h: refs/heads/master i: 140725: e60511c9c640101b953dcc6c5907782664a0fd49 140723: 8fecff635ca2e9b7e521ccfc8c7f892a820a85fa 140719: 47005baa963963678d8300cfe46e6e471f4a02a1 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ring_buffer.c | 8 ++++---- trunk/kernel/trace/trace.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1cf060432fc6..9f85af762601 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fd2735881bf4d8bf5e30979f31fc2f1b1d505fa +refs/heads/master: 5e39841c45cf5e6ea930ede1b0303309e03037a2 diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c index fa64e1f003eb..dc18b5b9ccb4 100644 --- a/trunk/kernel/trace/ring_buffer.c +++ b/trunk/kernel/trace/ring_buffer.c @@ -59,7 +59,7 @@ enum { RB_BUFFERS_DISABLED = 1 << RB_BUFFERS_DISABLED_BIT, }; -static long ring_buffer_flags __read_mostly = RB_BUFFERS_ON; +static unsigned long ring_buffer_flags __read_mostly = RB_BUFFERS_ON; /** * tracing_on - enable all tracing buffers @@ -2501,7 +2501,7 @@ static ssize_t rb_simple_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) { - long *p = filp->private_data; + unsigned long *p = filp->private_data; char buf[64]; int r; @@ -2517,9 +2517,9 @@ static ssize_t rb_simple_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) { - long *p = filp->private_data; + unsigned long *p = filp->private_data; char buf[64]; - long val; + unsigned long val; int ret; if (cnt >= sizeof(buf)) diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index c157ba70f30c..e2434990277c 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -2147,7 +2147,7 @@ tracing_ctrl_write(struct file *filp, const char __user *ubuf, { struct trace_array *tr = filp->private_data; char buf[64]; - long val; + unsigned long val; int ret; if (cnt >= sizeof(buf)) @@ -2295,9 +2295,9 @@ static ssize_t tracing_max_lat_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) { - long *ptr = filp->private_data; + unsigned long *ptr = filp->private_data; char buf[64]; - long val; + unsigned long val; int ret; if (cnt >= sizeof(buf))