Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54365524 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate hrtimer base locks 



Teach special (recursive) locking code to the lock validator.  Has no effect
on non-lockdep kernels.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fcb99371

include/linux/hrtimer.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ struct hrtimer_base { 
	ktime_t			(*get_softirq_time)(void);

	struct hrtimer		*curr_timer;

	ktime_t			softirq_time;

	struct lock_class_key lock_key;

};



/*

kernel/hrtimer.c

+3 −1
Original line number Diff line number Diff line
@@ -782,8 +782,10 @@ static void __devinit init_hrtimers_cpu(int cpu) 
	struct hrtimer_base *base = per_cpu(hrtimer_bases, cpu);

	int i;



	for (i = 0; i < MAX_HRTIMER_BASES; i++, base++)

	for (i = 0; i < MAX_HRTIMER_BASES; i++, base++) {

		spin_lock_init(&base->lock);

		lockdep_set_class(&base->lock, &base->lock_key);

	}

}



#ifdef CONFIG_HOTPLUG_CPU