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

Commit de0c276b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of... 

Merge branches 'core-locking-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull trivial fix branches from Ingo Molnar.

Cleanup in __get_key_name, and a timer comment fixlet.

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lockdep: Use KSYM_NAME_LEN'ed buffer for __get_key_name()

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timers, sched: Correct the comments for tick_sched_timer()
parents 608ff1a2 99fb4a12 351f181f

kernel/lockdep_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v) 


static void print_name(struct seq_file *m, struct lock_class *class)

{

	char str[128];

	char str[KSYM_NAME_LEN];

	const char *name = class->name;



	if (!name) {

kernel/time/tick-sched.c

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ void tick_check_idle(int cpu) 
#ifdef CONFIG_HIGH_RES_TIMERS

/*

 * We rearm the timer until we get disabled by the idle code.

 * Called with interrupts disabled and timer->base->cpu_base->lock held.

 * Called with interrupts disabled.

 */

static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer)

{