diff options
author | 2012-05-18 09:42:20 -0700 | |
---|---|---|
committer | 2012-05-18 09:42:20 -0700 | |
commit | 3d9944978e0bb6c98b901949cb7a22256e48b23d (patch) | |
tree | ea068a5eaca4d5ae5c02afcf903665a1f4cfb65b /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
parent | x86/mce: Only restart instruction after machine check recovery if it is safe (diff) | |
download | wireguard-linux-3d9944978e0bb6c98b901949cb7a22256e48b23d.tar.xz wireguard-linux-3d9944978e0bb6c98b901949cb7a22256e48b23d.zip |
Merge tag 'linus-mce-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull a machine check recovery fix from Tony Luck.
I really don't like how the MCE code does some of the things it does,
but this does seem to be an improvement.
* tag 'linus-mce-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
x86/mce: Only restart instruction after machine check recovery if it is safe
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions