diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-20 11:48:44 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-20 11:48:44 +0300 |
| commit | 2eb0fc9bfe7485fec16030b85ff586e7aaea2b6f (patch) | |
| tree | b804e48f8aba794030f3610199b0f20140e6c6a8 /arch/x86/include | |
| parent | d0fabd1cb8b70073a0f44f1cf8b663b5e7241c74 (diff) | |
| parent | 41f1830f5a7af77cf5c86359aba3cbd706687e52 (diff) | |
| download | linux-2eb0fc9bfe7485fec16030b85ff586e7aaea2b6f.tar.xz | |
Merge tag 'v4.12-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/extable.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/extable.h b/arch/x86/include/asm/extable.h index b8ad261d11dc..c66d19e3c23e 100644 --- a/arch/x86/include/asm/extable.h +++ b/arch/x86/include/asm/extable.h @@ -29,6 +29,7 @@ struct pt_regs; } while (0) extern int fixup_exception(struct pt_regs *regs, int trapnr); +extern int fixup_bug(struct pt_regs *regs, int trapnr); extern bool ex_has_fault_handler(unsigned long ip); extern void early_fixup_exception(struct pt_regs *regs, int trapnr); |