x86_64: reduce ifdeffery near errata #93 code
PATCH 1/1 x86_64: reduce ifdeffery near errata #93 code
Signed-off-by Alexey Dobriyan <[email protected]>
---
arch/x86/mm/fault.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
arch/x86/mm/fault.c +5 -8
@@ -303,14 +303,6 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address) }#endif -#ifdef CONFIG_X86_64 -static const char errata93_warning[] = -KERN_ERR "******* Your BIOS seems to not contain a fix for K8 errata #93\n" -KERN_ERR "******* Working around it, but it may cause SEGVs or burn power.\n" -KERN_ERR "******* Please consider a BIOS update.\n" -KERN_ERR "******* Disabling USB legacy in the BIOS may also help.\n" ; -#endif -/* Workaround for K8 erratum #93 & buggy BIOS. BIOS SMM functions are required to use a specific workaround to avoid corruption of the 64bit RIP register on C stepping K8.
@@ -323,6 +315,11 @@ KERN_ERR "******* Disabling USB legacy in the BIOS may also help.\n";static int is_errata93 (struct pt_regs *regs,unsigned long address) {#ifdef CONFIG_X86_64 +static const char errata93_warning[] = +KERN_ERR "******* Your BIOS seems to not contain a fix for K8 errata #93\n" +KERN_ERR "******* Working around it, but it may cause SEGVs or burn power.\n" +KERN_ERR "******* Please consider a BIOS update.\n" +KERN_ERR "******* Disabling USB legacy in the BIOS may also help.\n" ;static int warned;if (address != regs->ip)return 0 ;