3.0-stable patches

added patches:
	ftrace-clear-bits-properly-in-reset_iter_read.patch

diff --git a/queue-3.0/ftrace-clear-bits-properly-in-reset_iter_read.patch b/queue-3.0/ftrace-clear-bits-properly-in-reset_iter_read.patch
new file mode 100644 (file)
index 0000000..c909565
--- /dev/null
+++ b/queue-3.0/ftrace-clear-bits-properly-in-reset_iter_read.patch
@@ -0,0 +1,35 @@
+From 70f77b3f7ec010ff9624c1f2e39a81babc9e2429 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Sat, 9 Jun 2012 19:10:27 +0300
+Subject: ftrace: Clear bits properly in reset_iter_read()
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit 70f77b3f7ec010ff9624c1f2e39a81babc9e2429 upstream.
+
+There is a typo here where '&' is used instead of '|' and it turns the
+statement into a noop.  The original code is equivalent to:
+
+       iter->flags &= ~((1 << 2) & (1 << 4));
+
+Link: http://lkml.kernel.org/r/20120609161027.GD6488@elgon.mountain
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/trace/ftrace.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/trace/ftrace.c
++++ b/kernel/trace/ftrace.c
+@@ -2058,7 +2058,7 @@ static void reset_iter_read(struct ftrac
+ {
+       iter->pos = 0;
+       iter->func_pos = 0;
+-      iter->flags &= ~(FTRACE_ITER_PRINTALL & FTRACE_ITER_HASH);
++      iter->flags &= ~(FTRACE_ITER_PRINTALL | FTRACE_ITER_HASH);
+ }
+ 
+ static void *t_start(struct seq_file *m, loff_t *pos)

diff --git a/queue-3.0/series b/queue-3.0/series
index e34d0b6e3cc9ce3f60ecc6983032b4d6c40ca962..e4afca292ba9a49e12a3a23d71c23fd532c23081 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -17,3 +17,4 @@ acpi-pnp-do-not-crash-due-to-stale-pointer-use-during-system-resume.patch
 acpi-video-ignore-bios-initial-backlight-value-for-hp-folio-13-2000.patch
 usb-ohci-workaround-for-hardware-bug-retired-tds-not-added-to-the-done-queue.patch
 xhci-extend-fresco-logic-msi-quirk.patch
+ftrace-clear-bits-properly-in-reset_iter_read.patch