diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 08:25:10 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 08:25:10 +0100 |
| commit | 7971e23a66c94f1b9bd2d64a3e86dfbfa8c60121 (patch) | |
| tree | 20ff577e437ac6c361335151ce6b4c59bc72de02 /drivers/net/macvlan.c | |
| parent | Merge tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba... (diff) | |
| parent | x86, trace: Change user|kernel_page_fault to page_fault_user|kernel (diff) | |
| download | linux-7971e23a66c94f1b9bd2d64a3e86dfbfa8c60121.tar.xz linux-7971e23a66c94f1b9bd2d64a3e86dfbfa8c60121.zip | |
Merge branch 'x86-trace-for-linus' of git://git.kernel.org/pub/scm/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()
Diffstat (limited to 'drivers/net/macvlan.c')
0 files changed, 0 insertions, 0 deletions