Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/x86/kernel/process_32.c between commit 304bceda6a18 ("x86, fpu: use
non-lazy fpu restore for processors supporting xsave") from the tip tree
and commits 450ca1f882ab ("x86: get rid of TIF_IRET hackery") and
5daca7153d68 ("x86, um/x86: switch to generic sys_execve and
kernel_execve") from the signal tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
diff --cc arch/x86/kernel/process_32.c
index b9ff83c,9e84b4f..0000000
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@@ -190,6 -190,16 +190,12 @@@ start_thread(struct pt_regs *regs, unsi
regs->cs = __USER_CS;
regs->ip = new_ip;
regs->sp = new_sp;
+ regs->flags = X86_EFLAGS_IF;
+ /*
- * Free the old FP and other extended state
- */
- free_thread_xstate(current);
- /*
+ * force it to the iret return path by making it look as if there was
+ * some work pending.
+ */
+ set_thread_flag(TIF_NOTIFY_RESUME);
}
EXPORT_SYMBOL_GPL(start_thread);
pgpAlvagdtlVP.pgp
Description: PGP signature
