diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-19 10:31:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-19 10:31:36 -0700 |
| commit | 598a0c7d0932e385486b173768f03d95bf5507c8 (patch) | |
| tree | d528410bffc0297c205b55dbb2b4a012243089d7 /kernel/kexec.c | |
| parent | 7a5e87867e9fe043c3067a864124caf2b8e7fb99 (diff) | |
| parent | 3577af70a2ce4853d58e57d832e687d739281479 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Two kernel side fixes: a kprobes fix and a perf_remove_from_context()
fix (which does not yet fix the migration bug which is WIP)"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Fix a race condition in perf_remove_from_context()
kprobes/x86: Free 'optinsn' cache when range check fails
Diffstat (limited to 'kernel/kexec.c')
0 files changed, 0 insertions, 0 deletions