[PATCH] Fix CONFIG_DEBUG_SPINLOCK on UP

The spinlock debugging feature is supposed to work even on uniprocessor
kernels.  So we need to instantiate kernel_flag regardless of CONFIG_SMP.

diff --git a/kernel/sched.c b/kernel/sched.c
index d233ad6a44fe04ce115d878ef48b348b5a2a8cfb..574327cd2e4828cc0183cf1a28a2a47a1df9563e 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -124,6 +124,9 @@
        (NS_TO_JIFFIES((p)->sleep_avg) * MAX_BONUS / \
                MAX_SLEEP_AVG)
 
+/* spinlock debugging needs this, even on !CONFIG_SMP */
+spinlock_t kernel_flag __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
+
 #ifdef CONFIG_SMP
 #define TIMESLICE_GRANULARITY(p)       (MIN_TIMESLICE * \
                (1 << (((MAX_BONUS - CURRENT_BONUS(p)) ? : 1) - 1)) * \
@@ -2867,7 +2870,6 @@ __init int migration_init(void)
  *
  * Don't use in new code.
  */
-spinlock_t kernel_flag __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
 
 EXPORT_SYMBOL(kernel_flag);
 #endif