diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 18:49:12 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 18:49:12 +0900 |
| commit | edf9364d3f924aff6f77176b8e52a4b68e5c30d6 (patch) | |
| tree | 5e412c4a86fab4420bf9affbf3cd19cfaecbe8a7 /arch/x86/include/asm/extable.h | |
| parent | 4f51d57f3ff0f30bd805ff5bd04587a6145e1f73 (diff) | |
| parent | d9ee35acfabbc909c3be4360cd5655a006628b2e (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"Two fixlets for x86:
- Handle WARN_ONs proper with the new UD based WARN implementation
- Disable 1G mappings when 2M mappings are disabled by kmemleak or
debug_pagealloc. Otherwise 1G mappings might still be used,
confusing the debug mechanisms"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm: Disable 1GB direct mappings when disabling 2MB mappings
x86/debug: Handle early WARN_ONs proper
Diffstat (limited to 'arch/x86/include/asm/extable.h')
| -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); |