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

Commit 55835eb6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'timers/locking'

parents 83a06bf5 f266a511

arch/x86/include/asm/mmu_context.h

+3 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
	unsigned cpu = smp_processor_id();



	if (likely(prev != next)) {

		/* stop flush ipis for the previous mm */

		cpumask_clear_cpu(cpu, mm_cpumask(prev));

#ifdef CONFIG_SMP

		percpu_write(cpu_tlbstate.state, TLBSTATE_OK);

		percpu_write(cpu_tlbstate.active_mm, next);
@@ -47,6 +45,9 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
		/* Re-load page tables */

		load_cr3(next->pgd);



		/* stop flush ipis for the previous mm */

		cpumask_clear_cpu(cpu, mm_cpumask(prev));



		/*

		 * load the LDT, if the LDT is different:

		 */

kernel/timer.c

+5 −1
Original line number Diff line number Diff line
@@ -969,10 +969,14 @@ EXPORT_SYMBOL(try_to_del_timer_sync); 
int del_timer_sync(struct timer_list *timer)

{

#ifdef CONFIG_LOCKDEP

	unsigned long flags;



	raw_local_irq_save(flags);

	local_bh_disable();

	lock_map_acquire(&timer->lockdep_map);

	lock_map_release(&timer->lockdep_map);

	local_bh_enable();

	_local_bh_enable();

	raw_local_irq_restore(flags);

#endif

	/*

	 * don't use it in hardirq context, because it