diff --git a/[refs] b/[refs] index bc3158681922..155f66c02d70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aef9cb05247df3d7615773737beb4f83d78577bb +refs/heads/master: d192c47f25daa98996c7eae543d8a27e41247ec2 diff --git a/trunk/kernel/time/tick-common.c b/trunk/kernel/time/tick-common.c index 83c4417b6a3c..af39cf1cfa50 100644 --- a/trunk/kernel/time/tick-common.c +++ b/trunk/kernel/time/tick-common.c @@ -34,7 +34,7 @@ DEFINE_PER_CPU(struct tick_device, tick_cpu_device); ktime_t tick_next_period; ktime_t tick_period; int tick_do_timer_cpu __read_mostly = TICK_DO_TIMER_BOOT; -DEFINE_SPINLOCK(tick_device_lock); +static DEFINE_SPINLOCK(tick_device_lock); /* * Debugging: see timer_list.c diff --git a/trunk/kernel/time/tick-internal.h b/trunk/kernel/time/tick-internal.h index b1c05bf75ee0..290eefbc1f60 100644 --- a/trunk/kernel/time/tick-internal.h +++ b/trunk/kernel/time/tick-internal.h @@ -6,7 +6,6 @@ #define TICK_DO_TIMER_BOOT -2 DECLARE_PER_CPU(struct tick_device, tick_cpu_device); -extern spinlock_t tick_device_lock; extern ktime_t tick_next_period; extern ktime_t tick_period; extern int tick_do_timer_cpu __read_mostly;