linux-kernel - linux-next: manual merge of the percpu tree with the tip tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 5 Jan 2011 13:54:16 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>, Rusty Russell <rusty@...tcorp.com.au>,
	Christoph Lameter <cl@...ux-foundation.org>,
	Ingo Molnar <mingo@...e.hu>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thomas Renninger <trenn@...e.de>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: manual merge of the percpu tree with the tip tree

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/x86/kernel/process.c between commit
25e41933b58777f2d020c3b0186b430ea004ec28 ("perf: Clean up power events by
introducing new, more generic ones") from the tip tree and commit
7b543a5334ff4ea2e3ad3b777fc23cdb8072a988 ("x86: Replace uses of
current_cpu_data with this_cpu ops") from the percpu tree.

Just context changes.  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.c
index c852041,dae1c07..0000000
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@ -444,9 -444,8 +444,9 @@@ EXPORT_SYMBOL_GPL(cpu_idle_wait)
  void mwait_idle_with_hints(unsigned long ax, unsigned long cx)
  {
  	trace_power_start(POWER_CSTATE, (ax>>4)+1, smp_processor_id());
 +	trace_cpu_idle((ax>>4)+1, smp_processor_id());
  	if (!need_resched()) {
- 		if (cpu_has(&current_cpu_data, X86_FEATURE_CLFLUSH_MONITOR))
+ 		if (cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLUSH_MONITOR))
  			clflush((void *)&current_thread_info()->flags);
  
  		__monitor((void *)&current_thread_info()->flags, 0, 0);
@@@ -461,8 -460,7 +461,8 @@@ static void mwait_idle(void
  {
  	if (!need_resched()) {
  		trace_power_start(POWER_CSTATE, 1, smp_processor_id());
 +		trace_cpu_idle(1, smp_processor_id());
- 		if (cpu_has(&current_cpu_data, X86_FEATURE_CLFLUSH_MONITOR))
+ 		if (cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLUSH_MONITOR))
  			clflush((void *)&current_thread_info()->flags);
  
  		__monitor((void *)&current_thread_info()->flags, 0, 0);
--
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/