Commit 609b5297 authored Mar 05, 2008 by Jan Beulich Committed by Ingo Molnar Mar 07, 2008

x86: fix merge mistake in i387.c



convert_fxsr_to_user() in 2.6.24's i387_32.c did this, and
convert_to_fxsr() also does the inverse, so I assume it's an oversight
that it is no longer being done.

[ mingo@elte.hu:

  we encode it this way because there's no space for the 'FPU Last
  Instruction Opcode' (->fop) field in the legacy user_i387_ia32_struct
  that PTRACE_GETFPREGS/PTRACE_SETFPREGS uses.

  it's probably pure legacy - i'd be surprised if any user-space relied on
  the FPU Last Opcode in any way. But indeed we used to do it previously
  so the most conservative thing is to preserve that piece of information.
]

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent e40cd10c

arch/x86/kernel/i387.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -261,7 +261,7 @@ static void convert_from_fxsr(struct user_i387_ia32_struct *env,
		}
		#else
		env->fip = fxsave->fip;
		env->fcs = fxsave->fcs;
		env->fcs = (u16) fxsave->fcs \| ((u32) fxsave->fop << 16);
		env->foo = fxsave->foo;
		env->fos = fxsave->fos;
		#endif

Admin message