Merge branch '6.11/prjc' into 6.11/main

Resolve build failure with CONFIG_OSNOISE_TRACER=y Fixes torvalds#363
3003n · Nov 16, 2024 · 513f290 · 513f290
2 parents c9a9b55 + 1463b60
commit 513f290
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
@@ -1665,6 +1665,9 @@ static void osnoise_sleep(bool skip_period)
  */
 static inline int osnoise_migration_pending(void)
 {
+#ifdef CONFIG_SCHED_ALT
+	return 0;
+#else
 	if (!current->migration_pending)
 		return 0;
 
@@ -1686,6 +1689,7 @@ static inline int osnoise_migration_pending(void)
 	mutex_unlock(&interface_lock);
 
 	return 1;
+#endif
 }
 
 /*