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

Commit 67549d46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fixes from Ingo Molnar:
 "A Kconfig fix, a build fix and a membarrier bug fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  membarrier: Disable preemption when calling smp_call_function_many()
  sched/isolation: Make CONFIG_CPU_ISOLATION=y depend on SMP or COMPILE_TEST
  ia64, sched/cputime: Fix build error if CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
parents 02776b9b 54167607

arch/ia64/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void vtime_flush(struct task_struct *tsk) 
	}



	if (ti->softirq_time) {

		delta = cycle_to_nsec(ti->softirq_time));

		delta = cycle_to_nsec(ti->softirq_time);

		account_system_index_time(tsk, delta, CPUTIME_SOFTIRQ);

	}

init/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ endmenu # "CPU/Task time and stats accounting" 


config CPU_ISOLATION

	bool "CPU isolation"

	depends on SMP || COMPILE_TEST

	default y

	help

	  Make sure that CPUs running critical tasks are not disturbed by

kernel/sched/membarrier.c

+2 −0
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ static int membarrier_private_expedited(void) 
		rcu_read_unlock();

	}

	if (!fallback) {

		preempt_disable();

		smp_call_function_many(tmpmask, ipi_mb, NULL, 1);

		preempt_enable();

		free_cpumask_var(tmpmask);

	}

	cpus_read_unlock();