From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Nov 2013 07:25:10 +0000 (+0900)
Subject: Merge branch 'x86-trace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~13286
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7971e23a66c94f1b9bd2d64a3e86dfbfa8c60121;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'x86-trace-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86/trace changes from Ingo Molnar:
 "This adds page fault tracepoints which have zero runtime cost in the
  disabled case via IDT trickery (no NOPs in the page fault hotpath)"

* 'x86-trace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, trace: Change user|kernel_page_fault to page_fault_user|kernel
  x86, trace: Add page fault tracepoints
  x86, trace: Delete __trace_alloc_intr_gate()
  x86, trace: Register exception handler to trace IDT
  x86, trace: Remove __alloc_intr_gate()
---

7971e23a66c94f1b9bd2d64a3e86dfbfa8c60121