Merge tag 'drm-misc-next-fixes-2020-08-05' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 85568bb..e2157ca 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -680,10 +680,12 @@ device_initcall(register_warn_debugfs);
  * Called when gcc's -fstack-protector feature is used, and
  * gcc detects corruption of the on-stack canary value
  */
-__visible void __stack_chk_fail(void)
+__visible noinstr void __stack_chk_fail(void)
 {
+       instrumentation_begin();
        panic("stack-protector: Kernel stack is corrupted in: %pB",
                __builtin_return_address(0));
+       instrumentation_end();
 }
 EXPORT_SYMBOL(__stack_chk_fail);