[lkml]   [2012]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-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
Stephen Rothwell

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)

+ switch_fpu_finish(next_p, fpu);
- percpu_write(current_task, next_p);
+ __this_cpu_write(current_task, next_p);

return prev_p;
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-02-20 05:53    [W:0.019 / U:0.220 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site