| Message ID | 20190805124301.12887-2-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86/boot: Cleanup | expand |
On Mon, Aug 05, 2019 at 01:42:58PM +0100, Andrew Cooper wrote: > There is nothing interesting for assembly code in msr.h > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> If those are the only assembly files including msr.h, could you also get rid of the assembly guard in msr.h? Thanks, Roger.
On 06.08.2019 16:39, Roger Pau Monné wrote: > On Mon, Aug 05, 2019 at 01:42:58PM +0100, Andrew Cooper wrote: >> There is nothing interesting for assembly code in msr.h >> >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > > Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> Acked-by: Jan Beulich <jbeulich@suse.com>
On 06/08/2019 15:39, Roger Pau Monné wrote: > On Mon, Aug 05, 2019 at 01:42:58PM +0100, Andrew Cooper wrote: >> There is nothing interesting for assembly code in msr.h >> >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> > > If those are the only assembly files including msr.h, could you also > get rid of the assembly guard in msr.h? The build seems happy with the guards removed. I'll fold those two hunks. ~Andrew
diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index d78bed394a..ab2d52a79d 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -6,7 +6,7 @@ #include <asm/fixmap.h> #include <asm/page.h> #include <asm/processor.h> -#include <asm/msr.h> +#include <asm/msr-index.h> #include <asm/cpufeature.h> #include <public/elfnote.h> diff --git a/xen/arch/x86/x86_64/kexec_reloc.S b/xen/arch/x86/x86_64/kexec_reloc.S index 4d527dbfce..5bf61d5c2d 100644 --- a/xen/arch/x86/x86_64/kexec_reloc.S +++ b/xen/arch/x86/x86_64/kexec_reloc.S @@ -16,7 +16,7 @@ #include <xen/kimage.h> #include <asm/asm_defns.h> -#include <asm/msr.h> +#include <asm/msr-index.h> #include <asm/page.h> #include <asm/machine_kexec.h>
There is nothing interesting for assembly code in msr.h 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> --- xen/arch/x86/boot/head.S | 2 +- xen/arch/x86/x86_64/kexec_reloc.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)