From: Greg Kroah-Hartman Date: Mon, 29 Mar 2010 21:52:26 +0000 (-0700) Subject: fix up some build problems with some .32 patches X-Git-Tag: v2.6.27.46~22 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ec53028f22fa916b58e7ac15ea5ca3de7ff20d6;p=thirdparty%2Fkernel%2Fstable-queue.git fix up some build problems with some .32 patches --- diff --git a/queue-2.6.32/series b/queue-2.6.32/series index 9be628aefe9..7090ee840fe 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -16,7 +16,6 @@ ath5k-fix-setup-for-cab-queue.patch ring-buffer-move-disabled-check-into-preempt-disable-section.patch function-graph-init-curr_ret_stack-with-ret_stack.patch bluetooth-fix-sleeping-function-in-rfcomm-within-invalid-context.patch -tracing-fix-warning-in-s_next-of-trace-file-ops.patch tracing-use-same-local-variable-when-resetting-the-ring-buffer.patch tracing-disable-buffer-switching-when-starting-or-stopping-trace.patch tracing-do-not-record-user-stack-trace-from-nmi-context.patch diff --git a/queue-2.6.32/tracing-disable-buffer-switching-when-starting-or-stopping-trace.patch b/queue-2.6.32/tracing-disable-buffer-switching-when-starting-or-stopping-trace.patch index 978e5db137b..8e155fe095b 100644 --- a/queue-2.6.32/tracing-disable-buffer-switching-when-starting-or-stopping-trace.patch +++ b/queue-2.6.32/tracing-disable-buffer-switching-when-starting-or-stopping-trace.patch @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman } + /* Prevent the buffers from switching */ -+ arch_spin_lock(&ftrace_max_lock); ++ __raw_spin_lock(&ftrace_max_lock); buffer = global_trace.buffer; if (buffer) @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman if (buffer) ring_buffer_record_enable(buffer); -+ arch_spin_unlock(&ftrace_max_lock); ++ __raw_spin_unlock(&ftrace_max_lock); + ftrace_start(); out: @@ -69,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman goto out; + /* Prevent the buffers from switching */ -+ arch_spin_lock(&ftrace_max_lock); ++ __raw_spin_lock(&ftrace_max_lock); + buffer = global_trace.buffer; if (buffer) @@ -78,7 +78,7 @@ Signed-off-by: Greg Kroah-Hartman if (buffer) ring_buffer_record_disable(buffer); -+ arch_spin_unlock(&ftrace_max_lock); ++ __raw_spin_unlock(&ftrace_max_lock); + out: spin_unlock_irqrestore(&tracing_start_lock, flags); diff --git a/queue-2.6.32/tracing-fix-warning-in-s_next-of-trace-file-ops.patch b/queue-2.6.32/tracing-fix-warning-in-s_next-of-trace-file-ops.patch deleted file mode 100644 index a60a9ab1704..00000000000 --- a/queue-2.6.32/tracing-fix-warning-in-s_next-of-trace-file-ops.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ac91d85456372a90af5b85eb6620fd2efb1e431b Mon Sep 17 00:00:00 2001 -From: Lai Jiangshan -Date: Tue, 2 Mar 2010 17:54:50 +0800 -Subject: tracing: Fix warning in s_next of trace file ops - -From: Lai Jiangshan - -commit ac91d85456372a90af5b85eb6620fd2efb1e431b upstream. - -This warning in s_next() can be triggered by lseek(): - [] ? s_next+0x77/0x80 - [] warn_slowpath_common+0x81/0xa0 - [] ? s_next+0x77/0x80 - [] warn_slowpath_null+0x1a/0x20 - [] s_next+0x77/0x80 - [] traverse+0x117/0x200 - [] seq_lseek+0xa3/0x120 - [] ? seq_lseek+0x0/0x120 - [] vfs_llseek+0x41/0x50 - [] sys_llseek+0x66/0xa0 - [] sysenter_do_call+0x12/0x26 - -The iterator "leftover" variable is zeroed in the opening of the trace -file. But lseek can call s_start() which will call s_next() without -reseting the "leftover" variable back to zero, which might trigger -the WARN_ON_ONCE(iter->leftover) that is in s_next(). - -Signed-off-by: Lai Jiangshan -LKML-Reference: <4B8CE06A.9090207@cn.fujitsu.com> -Signed-off-by: Steven Rostedt -Signed-off-by: Greg Kroah-Hartman - ---- - kernel/trace/trace.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/kernel/trace/trace.c -+++ b/kernel/trace/trace.c -@@ -1609,6 +1609,7 @@ static void *s_start(struct seq_file *m, - - ftrace_enable_cpu(); - -+ iter->leftover = 0; - for (p = iter; p && l < *pos; p = s_next(m, p, &l)) - ; -