summaryrefslogtreecommitdiffstats
path: root/arch/x86
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2014-06-144-27/+87
|\
| * x86/vdso: Fix vdso_installAndy Lutomirski2014-06-131-11/+11
| * x86/vdso: Hack to keep 64-bit Go programs workingAndy Lutomirski2014-06-133-13/+60
| * x86/vdso: Add PUT_LE to store little-endian valuesAndy Lutomirski2014-06-131-3/+16
| * x86, vdso: Remove one final use of htole16()H. Peter Anvin2014-06-111-1/+1
* | Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-06-134-24/+46
|\ \
| * | x86/irq: Fix fixup_irqs() error handlingPrarit Bhargava2014-04-162-14/+27
| * | Merge branch 'x86/apic' into x86/irq, to consolidate branches.Ingo Molnar2014-04-161-2/+2
| |\ \
| * | | x86, irq, pic: Probe for legacy PIC and set legacy_pic appropriatelyK. Y. Srinivasan2014-04-142-10/+19
* | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2014-06-1326-467/+559
|\ \ \ \
| * \ \ \ Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare...Ingo Molnar2014-06-0635-65/+157
| |\ \ \ \
| * \ \ \ \ Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/...Ingo Molnar2014-06-052-20/+19Star
| |\ \ \ \ \
| | * | | | | uprobes/x86: Rename arch_uprobe->def to ->defparam, minor comment updatesOleg Nesterov2014-06-052-20/+19Star
| * | | | | | perf/x86: Add conditional branch filtering supportAnshuman Khandual2014-06-051-0/+5
| * | | | | | perf/x86: Use common PMU interrupt disabled codeVince Weaver2014-06-051-9/+9
| * | | | | | Merge branch 'perf/kprobes' into perf/coreIngo Molnar2014-06-0522-174/+195
| |\ \ \ \ \ \
| | * | | | | | kprobes, x86: Use NOKPROBE_SYMBOL() instead of __kprobes annotationMasami Hiramatsu2014-04-2412-69/+122
| | * | | | | | kprobes, x86: Allow kprobes on text_poke/hw_breakpointMasami Hiramatsu2014-04-242-5/+3Star
| | * | | | | | kprobes/x86: Allow probe on some kprobe preparation functionsMasami Hiramatsu2014-04-243-23/+23
| | * | | | | | kprobes, x86: Call exception_enter after kprobes handledMasami Hiramatsu2014-04-241-3/+2Star
| | * | | | | | kprobes/x86: Call exception handlers directly from do_int3/do_debugMasami Hiramatsu2014-04-243-21/+15Star
| | * | | | | | kprobes, x86: Prohibit probing on thunk functions and restoreMasami Hiramatsu2014-04-242-1/+5
| | * | | | | | kprobes, x86: Prohibit probing on native_set_debugreg()/load_idt()Masami Hiramatsu2014-04-241-1/+3
| | * | | | | | kprobes, x86: Prohibit probing on debug_stack_*()Masami Hiramatsu2014-04-241-0/+4
| | * | | | | | kprobes: Introduce NOKPROBE_SYMBOL() macro to maintain kprobes blacklistMasami Hiramatsu2014-04-242-0/+11
| | * | | | | | kprobes: Prohibit probing on .entry.text codeMasami Hiramatsu2014-04-243-53/+8Star
| | * | | | | | kprobes/x86: Allow to handle reentered kprobe on single-steppingMasami Hiramatsu2014-04-241-1/+2
| * | | | | | | Merge branch 'perf/uprobes' into perf/coreIngo Molnar2014-06-055-283/+351
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | uprobes/x86: Fix the wrong ->si_addr when xol triggers a trapOleg Nesterov2014-05-141-3/+4
| | * | | | | | x86/traps: Kill DO_ERROR_INFO()Oleg Nesterov2014-05-141-15/+9Star
| | * | | | | | x86/traps: Shift fill_trap_info() from DO_ERROR_INFO() to do_error_trap()Oleg Nesterov2014-05-141-9/+12
| | * | | | | | x86/traps: Introduce fill_trap_info(), simplify DO_ERROR_INFO()Oleg Nesterov2014-05-141-15/+38
| | * | | | | | x86/traps: Introduce do_error_trap()Oleg Nesterov2014-05-141-21/+17Star
| | * | | | | | x86/traps: Use SEND_SIG_PRIV instead of force_sig()Oleg Nesterov2014-05-141-6/+3Star
| | * | | | | | x86/traps: Make math_error() staticOleg Nesterov2014-05-142-2/+1Star
| | * | | | | | uprobes/x86: Fix scratch register selection for rip-relative fixupsDenys Vlasenko2014-05-141-51/+125
| | * | | | | | uprobes/x86: Simplify rip-relative handlingDenys Vlasenko2014-05-142-44/+30Star
| | * | | | | | uprobes/x86: Simplify riprel_{pre,post}_xol() and make them similarOleg Nesterov2014-04-301-16/+14Star
| | * | | | | | uprobes/x86: Kill the "autask" arg of riprel_pre_xol()Oleg Nesterov2014-04-301-9/+9
| | * | | | | | uprobes/x86: Rename *riprel* helpers to make the naming consistentOleg Nesterov2014-04-301-13/+11Star
| | * | | | | | uprobes/x86: Cleanup the usage of UPROBE_FIX_IP/UPROBE_FIX_CALLOleg Nesterov2014-04-301-16/+11Star
| | * | | | | | uprobes/x86: Kill adjust_ret_addr(), simplify UPROBE_FIX_CALL logicOleg Nesterov2014-04-302-21/+4Star
| | * | | | | | uprobes/x86: Introduce push_ret_address()Oleg Nesterov2014-04-301-3/+12
| | * | | | | | uprobes/x86: Cleanup the usage of arch_uprobe->def.fixups, make it u8Oleg Nesterov2014-04-302-8/+8
| | * | | | | | uprobes/x86: Move default_xol_ops's data into arch_uprobe->defOleg Nesterov2014-04-302-27/+28
| | * | | | | | uprobes/x86: Move UPROBE_FIX_SETF logic from arch_uprobe_post_xol() to defaul...Oleg Nesterov2014-04-301-8/+12
| | * | | | | | uprobes/x86: Don't use arch_uprobe_abort_xol() in arch_uprobe_post_xol()Oleg Nesterov2014-04-301-8/+9
| | * | | | | | uprobes/x86: Introduce uprobe_xol_ops->abort() and default_abort_op()Oleg Nesterov2014-04-301-3/+11
| | * | | | | | uprobes/x86: Don't change the task's state if ->pre_xol() failsOleg Nesterov2014-04-301-2/+6
| | * | | | | | uprobes/x86: Fix is_64bit_mm() with CONFIG_X86_X32Oleg Nesterov2014-04-302-4/+5