Merge tag 'regmap-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / x86 / include / asm / bug.h

diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h
index facba9b..fb34ff6 100644 (file)
--- a/arch/x86/include/asm/bug.h
+++ b/arch/x86/include/asm/bug.h
@@ -70,14 +70,17 @@ do {                                                                        \
 #define HAVE_ARCH_BUG
 #define BUG()                                                  \
 do {                                                           \
+       instrumentation_begin();                                \
        _BUG_FLAGS(ASM_UD2, 0);                                 \
        unreachable();                                          \
 } while (0)
 
 #define __WARN_FLAGS(flags)                                    \
 do {                                                           \
+       instrumentation_begin();                                \
        _BUG_FLAGS(ASM_UD2, BUGFLAG_WARNING|(flags));           \
        annotate_reachable();                                   \
+       instrumentation_end();                                  \
 } while (0)
 
 #include <asm-generic/bug.h>