From f925854002d28f6f23bdd827bee698a2443817e8 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 27 Jan 2004 23:54:26 -0800 Subject: [PATCH] [PATCH] Fix kernel_flag again From: Christoph Hellwig Put kernel_flag back to where it used to be, near its comment and its EXPORT_SYMBOL. --- kernel/sched.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/sched.c b/kernel/sched.c index 574327cd2e48..141e0c348758 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -124,9 +124,6 @@ (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)) * \ @@ -2859,7 +2856,6 @@ __init int migration_init(void) #endif -#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT) /* * The 'big kernel lock' * @@ -2869,10 +2865,11 @@ __init int migration_init(void) * been migrated to a proper locking design yet. * * Don't use in new code. + * + * Note: spinlock debugging needs this even on !CONFIG_SMP. */ - +spinlock_t kernel_flag __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED; EXPORT_SYMBOL(kernel_flag); -#endif static void kstat_init_cpu(int cpu) { -- 2.39.5