diff options
| -rw-r--r-- | patches/0001-tracing-Merge-irqflags-preempt-counter.patch | 23 | ||||
| -rw-r--r-- | patches/localversion.patch | 2 |
2 files changed, 12 insertions, 13 deletions
diff --git a/patches/0001-tracing-Merge-irqflags-preempt-counter.patch b/patches/0001-tracing-Merge-irqflags-preempt-counter.patch index d9fb7e05c5bf..70151b6362df 100644 --- a/patches/0001-tracing-Merge-irqflags-preempt-counter.patch +++ b/patches/0001-tracing-Merge-irqflags-preempt-counter.patch @@ -59,7 +59,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- include/linux/trace_events.h | 25 +++- kernel/trace/blktrace.c | 17 +- - kernel/trace/trace.c | 208 ++++++++++++++++++----------------- + kernel/trace/trace.c | 206 ++++++++++++++++++----------------- kernel/trace/trace.h | 38 ++---- kernel/trace/trace_branch.c | 6 - kernel/trace/trace_event_perf.c | 5 @@ -71,10 +71,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/trace/trace_irqsoff.c | 86 ++++++-------- kernel/trace/trace_kprobe.c | 10 - kernel/trace/trace_mmiotrace.c | 14 +- - kernel/trace/trace_sched_wakeup.c | 71 +++++------ + kernel/trace/trace_sched_wakeup.c | 71 +++++------- kernel/trace/trace_syscalls.c | 20 +-- kernel/trace/trace_uprobe.c | 4 - 17 files changed, 287 insertions(+), 308 deletions(-) + 17 files changed, 286 insertions(+), 307 deletions(-) --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -434,22 +434,21 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> { struct ring_buffer_event *entry; int val; -@@ -2746,15 +2773,15 @@ trace_event_buffer_lock_reserve(struct t +@@ -2746,7 +2773,7 @@ trace_event_buffer_lock_reserve(struct t /* Try to use the per cpu buffer first */ val = this_cpu_inc_return(trace_buffered_event_cnt); - if (val == 1) { + if ((len < (PAGE_SIZE - sizeof(*entry))) && val == 1) { - trace_event_setup(entry, type, flags, pc); + trace_event_setup(entry, type, trace_ctx); entry->array[0] = len; return entry; } - this_cpu_dec(trace_buffered_event_cnt); +@@ -2754,7 +2781,7 @@ trace_event_buffer_lock_reserve(struct t } -- entry = __trace_buffer_lock_reserve(*current_rb, + entry = __trace_buffer_lock_reserve(*current_rb, - type, len, flags, pc); -+ entry = __trace_buffer_lock_reserve(*current_rb, type, len, -+ trace_ctx); ++ type, len, trace_ctx); /* * If tracing is off, but we have triggers enabled * we still need to look at the event data. Use the temp_buffer @@ -947,7 +946,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if (!fbuffer->event) return NULL; -@@ -3678,12 +3675,11 @@ function_test_events_call(unsigned long +@@ -3679,12 +3676,11 @@ function_test_events_call(unsigned long struct trace_buffer *buffer; struct ring_buffer_event *event; struct ftrace_entry *entry; @@ -962,7 +961,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> preempt_disable_notrace(); cpu = raw_smp_processor_id(); disabled = atomic_inc_return(&per_cpu(ftrace_test_event_disable, cpu)); -@@ -3691,11 +3687,9 @@ function_test_events_call(unsigned long +@@ -3692,11 +3688,9 @@ function_test_events_call(unsigned long if (disabled != 1) goto out; @@ -975,7 +974,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if (!event) goto out; entry = ring_buffer_event_data(event); -@@ -3703,7 +3697,7 @@ function_test_events_call(unsigned long +@@ -3704,7 +3698,7 @@ function_test_events_call(unsigned long entry->parent_ip = parent_ip; event_trigger_unlock_commit(&event_trace_file, buffer, event, diff --git a/patches/localversion.patch b/patches/localversion.patch index 8ee6f37e8e1e..649a1abccb53 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt30 ++-rt31 |