lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 27 Sep 2011 16:04:11 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Len Brown <len.brown@...el.com>, Frederic Weisbecker <fweisbec@...il.com> Subject: linux-next: manual merge of the rcu tree with Linus' tree Hi Paul, Today's linux-next merge of the rcu tree got a conflict in arch/x86/kernel/process_64.c between commit a0bfa1373859 ("cpuidle: stop depending on pm_idle") from Linus' tree and commit 18349ca4b42e ("x86: Enter rcu extended qs after idle notifier call") from the rcu tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@...b.auug.org.au diff --cc arch/x86/kernel/process_64.c index f693e44,dee2e6c..0000000 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@@ -137,8 -136,12 +137,14 @@@ void cpu_idle(void enter_idle(); /* Don't trace irqs off for idle */ stop_critical_timings(); - if (cpuidle_idle_call()) + - /* enter_idle() needs rcu for notifiers */ - rcu_enter_nohz(); - pm_idle(); - rcu_exit_nohz(); ++ if (cpuidle_idle_call()) { ++ /* enter_idle() needs rcu for notifiers */ ++ rcu_enter_nohz(); + pm_idle(); ++ rcu_exit_nohz(); ++ } + start_critical_timings(); /* In many cases the interrupt that ended idle -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists