From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Dec 2014 22:01:11 +0000 (-0800)
Subject: Merge tag 'trace-fixes-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted... 
X-Git-Tag: v3.19-rc1~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52bb452558a426ba265a19e6eadc66cf95613014;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'trace-fixes-v3.18' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Here's two fixes:

  1) Discovered by Fengguang Wu's tests.  I changed the parameters to
     the function graph x86 prepare_ftrace_return call but forgot to
     update the call from entry_32 (i386 version).  This patch corrects
     that.

  2) I was tracing some code and found that the sched_switch tracepoint
     was showing tasks in the INTERRUPTIBLE state as RUNNING.  This was
     due to the updates to convert preempt_count into a per_cpu
     variable.  The tracepoint logic was made to use the tasks
     saved_preempt_count which could hold a stale "PREEMPT_ACTIVE",
     instead of using the current preempt_count() call"

* tag 'trace-fixes-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/sched: Check preempt_count() for current when reading task->state
  ftrace/x86: Update i386 call to prepare_ftrace_return()
---

52bb452558a426ba265a19e6eadc66cf95613014