diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-28 12:28:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-28 12:28:06 -0800 |
| commit | f6170f0afbe23ad82b4a1195168949c31e3a2527 (patch) | |
| tree | a589c1f05cdbc6ab6f8fef8cdcad9b8dc1a8ddf3 /include | |
| parent | 6da49d1abd2c2b70063f3606e3974c13d22497a1 (diff) | |
| parent | 248ed51048c40d36728e70914e38bffd7821da57 (diff) | |
| download | linux-f6170f0afbe23ad82b4a1195168949c31e3a2527.tar.bz2 | |
Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull misc x86 updates from Ingo Molnar:
"Misc changes:
- Enhance #GP fault printouts by distinguishing between canonical and
non-canonical address faults, and also add KASAN fault decoding.
- Fix/enhance the x86 NMI handler by putting the duration check into
a direct function call instead of an irq_work which we know to be
broken in some cases.
- Clean up do_general_protection() a bit"
* 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/nmi: Remove irq_work from the long duration NMI handler
x86/traps: Cleanup do_general_protection()
x86/kasan: Print original address on #GP
x86/dumpstack: Introduce die_addr() for die() with #GP fault address
x86/traps: Print address on #GP
x86/insn-eval: Add support for 64-bit kernel mode
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kasan.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/kasan.h b/include/linux/kasan.h index e18fe54969e9..5cde9e7c2664 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -228,4 +228,10 @@ static inline void kasan_release_vmalloc(unsigned long start, unsigned long free_region_end) {} #endif +#ifdef CONFIG_KASAN_INLINE +void kasan_non_canonical_hook(unsigned long addr); +#else /* CONFIG_KASAN_INLINE */ +static inline void kasan_non_canonical_hook(unsigned long addr) { } +#endif /* CONFIG_KASAN_INLINE */ + #endif /* LINUX_KASAN_H */ |