aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/processor.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-04-01 16:59:53 -0400
committerLen Brown <len.brown@intel.com>2011-05-29 03:38:57 -0400
commit02c68a02018669d1817c43c42de800975cbec467 (patch)
tree9e02b7913f650492fcdbb78cd6e8d3ff3160e43c /arch/x86/include/asm/processor.h
parent333c5ae9948194428fe6c5ef5c088304fc98263b (diff)
x86 idle: clarify AMD erratum 400 workaround
The workaround for AMD erratum 400 uses the term "c1e" falsely suggesting: 1. Intel C1E is somehow involved 2. All AMD processors with C1E are involved Use the string "amd_c1e" instead of simply "c1e" to clarify that this workaround is specific to AMD's version of C1E. Use the string "e400" to clarify that the workaround is specific to AMD processors with Erratum 400. This patch is text-substitution only, with no functional change. cc: x86@kernel.org Acked-by: Borislav Petkov <borislav.petkov@amd.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/include/asm/processor.h')
-rw-r--r--arch/x86/include/asm/processor.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 45636cefa186..b9c03fb3369a 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -758,10 +758,10 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx)
758extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx); 758extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);
759 759
760extern void select_idle_routine(const struct cpuinfo_x86 *c); 760extern void select_idle_routine(const struct cpuinfo_x86 *c);
761extern void init_c1e_mask(void); 761extern void init_amd_e400_c1e_mask(void);
762 762
763extern unsigned long boot_option_idle_override; 763extern unsigned long boot_option_idle_override;
764extern bool c1e_detected; 764extern bool amd_e400_c1e_detected;
765 765
766enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_NOMWAIT, 766enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_NOMWAIT,
767 IDLE_POLL, IDLE_FORCE_MWAIT}; 767 IDLE_POLL, IDLE_FORCE_MWAIT};