diff options
| author |   H. Peter Anvin <hpa@linux.intel.com> | 2012-09-21 17:18:44 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-09-21 17:18:44 -0700 |
| commit | 49b8c695e331c9685e6ffdbf34872509d77c8459 (patch) | |
| tree | d4afdfae0115b2ab56687d23d6329d6ad934788f /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | x86-32, smap: Add STAC/CLAC instructions to 32-bit kernel entry (diff) | |
| parent | x86, kvm: fix kvm's usage of kernel_fpu_begin/end() (diff) | |
| download | linux-dev-49b8c695e331c9685e6ffdbf34872509d77c8459.tar.xz linux-dev-49b8c695e331c9685e6ffdbf34872509d77c8459.zip | |
Merge branch 'x86/fpu' into x86/smap
Reason for merge:
x86/fpu changed the structure of some of the code that x86/smap
changes; mostly fpu-internal.h but also minor changes to the
signal code.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Resolved Conflicts:
arch/x86/ia32/ia32_signal.c
arch/x86/include/asm/fpu-internal.h
arch/x86/kernel/signal.c
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions