fix up some build problems with some .32 patches

diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index 9be628aefe90e8edf360e5b49f65d43f236fdb83..7090ee840fed54d462cef2c7d103d95677d58075 100644 (file)
--- 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 978e5db137b0a982960495b64dc0e121887f0904..8e155fe095bf3b5b877910aa385123ded4894797 100644 (file)
--- 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 <gregkh@suse.de>
        }
  
 +      /* 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 <gregkh@suse.de>
        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 <gregkh@suse.de>
                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 <gregkh@suse.de>
        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 (file)
index a60a9ab..0000000
--- 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 <laijs@cn.fujitsu.com>
-Date: Tue, 2 Mar 2010 17:54:50 +0800
-Subject: tracing: Fix warning in s_next of trace file ops
-
-From: Lai Jiangshan <laijs@cn.fujitsu.com>
-
-commit ac91d85456372a90af5b85eb6620fd2efb1e431b upstream.
-
-This warning in s_next() can be triggered by lseek():
- [<c018b3f7>] ? s_next+0x77/0x80
- [<c013e3c1>] warn_slowpath_common+0x81/0xa0
- [<c018b3f7>] ? s_next+0x77/0x80
- [<c013e3fa>] warn_slowpath_null+0x1a/0x20
- [<c018b3f7>] s_next+0x77/0x80
- [<c01efa77>] traverse+0x117/0x200
- [<c01eff13>] seq_lseek+0xa3/0x120
- [<c01efe70>] ? seq_lseek+0x0/0x120
- [<c01d7081>] vfs_llseek+0x41/0x50
- [<c01d8116>] sys_llseek+0x66/0xa0
- [<c0102bd0>] 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 <laijs@cn.fujitsu.com>
-LKML-Reference: <4B8CE06A.9090207@cn.fujitsu.com>
-Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- 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))
-                       ;
-