Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xen/pvh: Annotate data appropriately

Use the new SYM_DATA_START_LOCAL, and SYM_DATA_END* macros to get:

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>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Andy Shevchenko <andy@infradead.org>
Cc: Darren Hart <dvhart@infradead.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: linux-arch@vger.kernel.org
Cc: platform-driver-x86@vger.kernel.org
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Cc: xen-devel@lists.xenproject.org
Link: https://lkml.kernel.org/r/20191011115108.12392-15-jslaby@suse.cz

authored by

Jiri Slaby and committed by
Borislav Petkov
1de5bdce 773a37b1

+7 -7
+7 -7
arch/x86/platform/pvh/head.S
··· 150 150 151 151 .section ".init.data","aw" 152 152 .balign 8 153 - gdt: 153 + SYM_DATA_START_LOCAL(gdt) 154 154 .word gdt_end - gdt_start 155 155 .long _pa(gdt_start) 156 156 .word 0 157 - gdt_start: 157 + SYM_DATA_END(gdt) 158 + SYM_DATA_START_LOCAL(gdt_start) 158 159 .quad 0x0000000000000000 /* NULL descriptor */ 159 160 #ifdef CONFIG_X86_64 160 161 .quad GDT_ENTRY(0xa09a, 0, 0xfffff) /* PVH_CS_SEL */ ··· 164 163 #endif 165 164 .quad GDT_ENTRY(0xc092, 0, 0xfffff) /* PVH_DS_SEL */ 166 165 .quad GDT_ENTRY(0x4090, 0, 0x18) /* PVH_CANARY_SEL */ 167 - gdt_end: 166 + SYM_DATA_END_LABEL(gdt_start, SYM_L_LOCAL, gdt_end) 168 167 169 168 .balign 16 170 - canary: 171 - .fill 48, 1, 0 169 + SYM_DATA_LOCAL(canary, .fill 48, 1, 0) 172 170 173 - early_stack: 171 + SYM_DATA_START_LOCAL(early_stack) 174 172 .fill BOOT_STACK_SIZE, 1, 0 175 - early_stack_end: 173 + SYM_DATA_END_LABEL(early_stack, SYM_L_LOCAL, early_stack_end) 176 174 177 175 ELFNOTE(Xen, XEN_ELFNOTE_PHYS32_ENTRY, 178 176 _ASM_PTR (pvh_start_xen - __START_KERNEL_map))