diff options
| -rw-r--r-- | kernel/trace/ring_buffer.c | 8 | ||||
| -rw-r--r-- | kernel/trace/trace.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index fa64e1f003eb..dc18b5b9ccb4 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -59,7 +59,7 @@ enum { | |||
| 59 | RB_BUFFERS_DISABLED = 1 << RB_BUFFERS_DISABLED_BIT, | 59 | RB_BUFFERS_DISABLED = 1 << RB_BUFFERS_DISABLED_BIT, |
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | static long ring_buffer_flags __read_mostly = RB_BUFFERS_ON; | 62 | static unsigned long ring_buffer_flags __read_mostly = RB_BUFFERS_ON; |
| 63 | 63 | ||
| 64 | /** | 64 | /** |
| 65 | * tracing_on - enable all tracing buffers | 65 | * tracing_on - enable all tracing buffers |
| @@ -2501,7 +2501,7 @@ static ssize_t | |||
| 2501 | rb_simple_read(struct file *filp, char __user *ubuf, | 2501 | rb_simple_read(struct file *filp, char __user *ubuf, |
| 2502 | size_t cnt, loff_t *ppos) | 2502 | size_t cnt, loff_t *ppos) |
| 2503 | { | 2503 | { |
| 2504 | long *p = filp->private_data; | 2504 | unsigned long *p = filp->private_data; |
| 2505 | char buf[64]; | 2505 | char buf[64]; |
| 2506 | int r; | 2506 | int r; |
| 2507 | 2507 | ||
| @@ -2517,9 +2517,9 @@ static ssize_t | |||
| 2517 | rb_simple_write(struct file *filp, const char __user *ubuf, | 2517 | rb_simple_write(struct file *filp, const char __user *ubuf, |
| 2518 | size_t cnt, loff_t *ppos) | 2518 | size_t cnt, loff_t *ppos) |
| 2519 | { | 2519 | { |
| 2520 | long *p = filp->private_data; | 2520 | unsigned long *p = filp->private_data; |
| 2521 | char buf[64]; | 2521 | char buf[64]; |
| 2522 | long val; | 2522 | unsigned long val; |
| 2523 | int ret; | 2523 | int ret; |
| 2524 | 2524 | ||
| 2525 | if (cnt >= sizeof(buf)) | 2525 | if (cnt >= sizeof(buf)) |
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c157ba70f30c..e2434990277c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -2147,7 +2147,7 @@ tracing_ctrl_write(struct file *filp, const char __user *ubuf, | |||
| 2147 | { | 2147 | { |
| 2148 | struct trace_array *tr = filp->private_data; | 2148 | struct trace_array *tr = filp->private_data; |
| 2149 | char buf[64]; | 2149 | char buf[64]; |
| 2150 | long val; | 2150 | unsigned long val; |
| 2151 | int ret; | 2151 | int ret; |
| 2152 | 2152 | ||
| 2153 | if (cnt >= sizeof(buf)) | 2153 | if (cnt >= sizeof(buf)) |
| @@ -2295,9 +2295,9 @@ static ssize_t | |||
| 2295 | tracing_max_lat_write(struct file *filp, const char __user *ubuf, | 2295 | tracing_max_lat_write(struct file *filp, const char __user *ubuf, |
| 2296 | size_t cnt, loff_t *ppos) | 2296 | size_t cnt, loff_t *ppos) |
| 2297 | { | 2297 | { |
| 2298 | long *ptr = filp->private_data; | 2298 | unsigned long *ptr = filp->private_data; |
| 2299 | char buf[64]; | 2299 | char buf[64]; |
| 2300 | long val; | 2300 | unsigned long val; |
| 2301 | int ret; | 2301 | int ret; |
| 2302 | 2302 | ||
| 2303 | if (cnt >= sizeof(buf)) | 2303 | if (cnt >= sizeof(buf)) |
