linux-kernel - linux-next: manual merge of the scsi-post-merge tree with Linus' 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]

Message-Id: <20120220155024.f627530239322e4ee92c9b9d@canb.auug.org.au>
Date:	Mon, 20 Feb 2012 15:50:24 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Linus <torvalds@...ux-foundation.org>
Subject: linux-next: manual merge of the scsi-post-merge tree with Linus'
 tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/x86/kernel/process_32.c between commit 34ddc81a230b ("i387:
re-introduce FPU state preloading at context switch time") from Linus'
tree and commit "x86: use this_cpu_xxx to replace percpu_xxx funcs" from
the akpm 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_32.c
index 80bfe1a,6acfb80..0000000
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@@ -358,9 -377,7 +358,9 @@@ __switch_to(struct task_struct *prev_p
  	if (prev->gs | next->gs)
  		lazy_load_gs(next->gs);
  
 +	switch_fpu_finish(next_p, fpu);
 +
- 	percpu_write(current_task, next_p);
+ 	__this_cpu_write(current_task, next_p);
  
  	return prev_p;
  }

Content of type "application/pgp-signature" skipped