All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	alan@lxorguk.ukuu.org.uk,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Steven Rostedt <rostedt@goodmis.org>
Subject: [ 20/22] ftrace: Clear bits properly in reset_iter_read()
Date: Fri, 14 Dec 2012 14:26:05 -0800	[thread overview]
Message-ID: <20121214222254.459419060@linuxfoundation.org> (raw)
In-Reply-To: <20121214222249.889051473@linuxfoundation.org>

3.0-stable review patch.  If anyone has any objections, please let me know.

------------------

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)



  parent reply	other threads:[~2012-12-14 22:28 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-14 22:25 [ 00/22] 3.0.57-stable review Greg Kroah-Hartman
2012-12-14 22:25 ` [ 01/22] ARM: 7566/1: vfp: fix save and restore when running on pre-VFPv3 and CONFIG_VFPv3 set Greg Kroah-Hartman
2012-12-14 22:25 ` [ 02/22] powerpc/ptrace: Fix build with gcc 4.6 Greg Kroah-Hartman
2012-12-14 22:25 ` [ 03/22] workqueue: convert BUG_ON()s in __queue_delayed_work() to WARN_ON_ONCE()s Greg Kroah-Hartman
2012-12-14 22:25 ` [ 04/22] mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls Greg Kroah-Hartman
2012-12-14 22:25 ` [ 05/22] x86,AMD: Power driver support for AMDs family 16h processors Greg Kroah-Hartman
2012-12-14 22:25 ` [ 06/22] telephony: ijx: buffer overflow in ixj_write_cid() Greg Kroah-Hartman
2012-12-14 22:25 ` [ 07/22] tmpfs: fix shared mempolicy leak Greg Kroah-Hartman
2012-12-14 22:25 ` [ 08/22] x86: hpet: Fix masking of MSI interrupts Greg Kroah-Hartman
2012-12-14 22:25 ` [ 09/22] USB: add new zte 3g-dongles pid to option.c Greg Kroah-Hartman
2012-12-14 22:25 ` [ 10/22] USB: option: blacklist network interface on Huawei E173 Greg Kroah-Hartman
2012-12-14 22:25 ` [ 11/22] USB: ftdi_sio: Add support for Newport AGILIS motor drivers Greg Kroah-Hartman
2012-12-14 22:25 ` [ 12/22] usb: ftdi_sio: fixup BeagleBone A5+ quirk Greg Kroah-Hartman
2012-12-14 22:25 ` [ 13/22] USB: cp210x: add Virtenio Preon32 device id Greg Kroah-Hartman
2012-12-14 22:25 ` [ 14/22] USB: mark uas driver as BROKEN Greg Kroah-Hartman
2012-12-14 22:26 ` [ 15/22] ACPI / battery: Correct battery capacity values on Thinkpads Greg Kroah-Hartman
2012-12-14 22:26 ` [ 16/22] ACPI / PNP: Do not crash due to stale pointer use during system resume Greg Kroah-Hartman
2012-12-14 22:26 ` [ 17/22] ACPI / video: ignore BIOS initial backlight value for HP Folio 13-2000 Greg Kroah-Hartman
2012-12-14 22:26 ` [ 18/22] USB: OHCI: workaround for hardware bug: retired TDs not added to the Done Queue Greg Kroah-Hartman
2012-12-14 22:26 ` [ 19/22] xhci: Extend Fresco Logic MSI quirk Greg Kroah-Hartman
2012-12-14 22:26 ` Greg Kroah-Hartman [this message]
2012-12-14 22:26 ` [ 21/22] powerpc: Update DSCR on all CPUs when writing sysfs dscr_default Greg Kroah-Hartman
2012-12-14 22:26 ` [ 22/22] powerpc: Keep thread.dscr and thread.dscr_inherit in sync Greg Kroah-Hartman
2012-12-15 14:25 ` [ 00/22] 3.0.57-stable review Shuah Khan
2012-12-15 20:49   ` Shuah Khan
2012-12-16  8:32 ` Nikola Ciprich
2012-12-16 13:52 ` Satoru Takeuchi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121214222254.459419060@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=dan.carpenter@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.