From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Dec 2012 02:18:58 +0000 (-0800)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=da830e589a45f0c42eef6f3cbd07275f8893f181;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "These are late-v3.7 pending fixes for tracing."

Fix up trivial conflict in kernel/trace/ring_buffer.c: the NULL pointer
fix clashed with the change of type of the 'ret' variable.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ring-buffer: Fix race between integrity check and readers
  ring-buffer: Fix NULL pointer if rb_set_head_page() fails
  ftrace: Clear bits properly in reset_iter_read()
---

da830e589a45f0c42eef6f3cbd07275f8893f181
diff --cc kernel/trace/ring_buffer.c
index 3c7834c24e54,4cb5e5147165..ce8514feedcd
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@@ -2937,7 -2936,7 +2939,7 @@@ u64 ring_buffer_oldest_event_ts(struct 
  	unsigned long flags;
  	struct ring_buffer_per_cpu *cpu_buffer;
  	struct buffer_page *bpage;
- 	u64 ret;
 -	unsigned long ret = 0;
++	u64 ret = 0;
  
  	if (!cpumask_test_cpu(cpu, buffer->cpumask))
  		return 0;