| Message ID | 20171002091246.28432-13-jslaby@suse.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/02/2017 05:12 AM, Jiri Slaby wrote: > Use the new SYM_DATA_START_LOCAL, and SYM_DATA_END* macros: > 0000 8 OBJECT LOCAL DEFAULT 6 gdt > 0008 32 OBJECT LOCAL DEFAULT 6 gdt_start > 0028 0 OBJECT LOCAL DEFAULT 6 gdt_end > 0028 256 OBJECT LOCAL DEFAULT 6 early_stack > 0128 0 OBJECT LOCAL DEFAULT 6 early_stack > > Signed-off-by: Jiri Slaby <jslaby@suse.cz> > Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> > Cc: Juergen Gross <jgross@suse.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: "H. Peter Anvin" <hpa@zytor.com> > Cc: x86@kernel.org > Cc: xen-devel@lists.xenproject.org > --- Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
diff --git a/arch/x86/xen/xen-pvh.S b/arch/x86/xen/xen-pvh.S index e1a5fbeae08d..1b78837bad06 100644 --- a/arch/x86/xen/xen-pvh.S +++ b/arch/x86/xen/xen-pvh.S @@ -137,11 +137,12 @@ END(pvh_start_xen) .section ".init.data","aw" .balign 8 -gdt: +SYM_DATA_START_LOCAL(gdt) .word gdt_end - gdt_start .long _pa(gdt_start) .word 0 -gdt_start: +SYM_DATA_END(gdt) +SYM_DATA_START_LOCAL(gdt_start) .quad 0x0000000000000000 /* NULL descriptor */ .quad 0x0000000000000000 /* reserved */ #ifdef CONFIG_X86_64 @@ -150,12 +151,12 @@ gdt_start: .quad GDT_ENTRY(0xc09a, 0, 0xfffff) /* __KERNEL_CS */ #endif .quad GDT_ENTRY(0xc092, 0, 0xfffff) /* __KERNEL_DS */ -gdt_end: +SYM_DATA_END_LABEL(gdt_start, SYM_V_LOCAL, gdt_end) .balign 4 -early_stack: +SYM_DATA_START_LOCAL(early_stack) .fill 256, 1, 0 -early_stack_end: +SYM_DATA_END_LABEL(early_stack, SYM_V_LOCAL, early_stack_end) ELFNOTE(Xen, XEN_ELFNOTE_PHYS32_ENTRY, _ASM_PTR (pvh_start_xen - __START_KERNEL_map))
Use the new SYM_DATA_START_LOCAL, and SYM_DATA_END* macros: 0000 8 OBJECT LOCAL DEFAULT 6 gdt 0008 32 OBJECT LOCAL DEFAULT 6 gdt_start 0028 0 OBJECT LOCAL DEFAULT 6 gdt_end 0028 256 OBJECT LOCAL DEFAULT 6 early_stack 0128 0 OBJECT LOCAL DEFAULT 6 early_stack Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Juergen Gross <jgross@suse.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: x86@kernel.org Cc: xen-devel@lists.xenproject.org --- arch/x86/xen/xen-pvh.S | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)