Messages in this thread | | | Date | Mon, 20 Feb 2012 15:50:24 +1100 | From | Stephen Rothwell <> | 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@canb.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; } [unhandled content-type:application/pgp-signature] | |