Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a334fe43 authored by Brian Gerst's avatar Brian Gerst Committed by H. Peter Anvin
Browse files

x86-32, fpu: Remove math_emulate stub 



check_fpu() in bugs.c halts boot if no FPU is found and math emulation
isn't enabled.  Therefore this stub will never be used.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Acked-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
LKML-Reference: <1283563039-3466-9-git-send-email-brgerst@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 82024135

arch/x86/kernel/traps.c

+6 −17
Original line number Diff line number Diff line
@@ -776,21 +776,10 @@ asmlinkage void math_state_restore(void) 
}

EXPORT_SYMBOL_GPL(math_state_restore);



#ifndef CONFIG_MATH_EMULATION

void math_emulate(struct math_emu_info *info)

{

	printk(KERN_EMERG

		"math-emulation not enabled and no coprocessor found.\n");

	printk(KERN_EMERG "killing %s.\n", current->comm);

	force_sig(SIGFPE, current);

	schedule();

}

#endif /* CONFIG_MATH_EMULATION */



dotraplinkage void __kprobes

do_device_not_available(struct pt_regs *regs, long error_code)

{

#ifdef CONFIG_X86_32

#ifdef CONFIG_MATH_EMULATION

	if (read_cr0() & X86_CR0_EM) {

		struct math_emu_info info = { };
@@ -798,12 +787,12 @@ do_device_not_available(struct pt_regs *regs, long error_code) 


		info.regs = regs;

		math_emulate(&info);

	} else {

		return;

	}

#endif

	math_state_restore(); /* interrupts still off */

#ifdef CONFIG_X86_32

	conditional_sti(regs);

	}

#else

	math_state_restore();

#endif

}