diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9030f3abd9691f0ea27ec0f92ec8fbb0c895df38..063cd120b459339443db7b003df5cd22140316c6 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1013,7 +1013,7 @@ struct task_struct {
 	struct held_lock		held_locks[MAX_LOCK_DEPTH];
 #endif
 
-#ifdef CONFIG_UBSAN
+#if defined(CONFIG_UBSAN) && !defined(CONFIG_UBSAN_TRAP)
 	unsigned int			in_ubsan;
 #endif