| Message ID | 20191023135812.21348-2-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Unbreak evaluate_nospec() and livepatching | expand |
On 23.10.2019 15:58, Andrew Cooper wrote: > The include of asm/cpuid.h in spec_ctrl.c was an artefact of an older version > of c/s 3860d5534df, and is not used in its current incarnation. > > Fix a typo in a comment. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Jan Beulich <jbeulich@suse.com>
On 23.10.19 15:58, Andrew Cooper wrote: > The include of asm/cpuid.h in spec_ctrl.c was an artefact of an older version > of c/s 3860d5534df, and is not used in its current incarnation. > > Fix a typo in a comment. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Release-acked-by: Juergen Gross <jgross@suse.com> Juergen
diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 731d5a767b..ee5439a371 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -21,7 +21,6 @@ #include <xen/lib.h> #include <xen/warning.h> -#include <asm/cpuid.h> #include <asm/microcode.h> #include <asm/msr.h> #include <asm/processor.h> diff --git a/xen/include/asm-x86/nospec.h b/xen/include/asm-x86/nospec.h index 2aa47b3455..427b5ff9df 100644 --- a/xen/include/asm-x86/nospec.h +++ b/xen/include/asm-x86/nospec.h @@ -15,7 +15,7 @@ static always_inline bool barrier_nospec_true(void) return true; } -/* Allow to protect evaluation of conditionasl with respect to speculation */ +/* Allow to protect evaluation of conditionals with respect to speculation */ static always_inline bool evaluate_nospec(bool condition) { return condition ? barrier_nospec_true() : !barrier_nospec_true();
The include of asm/cpuid.h in spec_ctrl.c was an artefact of an older version of c/s 3860d5534df, and is not used in its current incarnation. Fix a typo in a comment. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Wei Liu <wl@xen.org> CC: Roger Pau Monné <roger.pau@citrix.com> CC: Juergen Gross <jgross@suse.com> v3: * New --- xen/arch/x86/spec_ctrl.c | 1 - xen/include/asm-x86/nospec.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)