Re: [Xen-devel] [PATCH 2/4] x86/boot: Early data should live in init.data

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 25.04.14 at 21:50, <andrew.cooper3@xxxxxxxxxx> wrote:
> --- a/xen/arch/x86/boot/cmdline.S
> +++ b/xen/arch/x86/boot/cmdline.S
> @@ -329,6 +329,8 @@ cmdline_parse_early:
>          popa
>          ret
>  
> +        .pushsection .init.data, "aw", @progbits
> +
>  .Lvga_text_modes: /* rows, mode_number */
>          .word   25,VIDEO_80x25
>          .word   50,VIDEO_80x50
> @@ -361,3 +363,5 @@ cmdline_parse_early:
>          .asciz  "no"
>  .Ledd_opt:
>          .asciz  "edd"
> +
> +        .popsection

Did you not mean .init.rodata, "a", @progbits here?

> --- a/xen/arch/x86/boot/head.S
> +++ b/xen/arch/x86/boot/head.S
> @@ -32,11 +32,17 @@ ENTRY(start)
>          /* Checksum: must be the negated sum of the first two fields. */
>          .long   -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
>  
> -        .section .init.text, "ax"
> +        .section .init.data, "aw", @progbits
> +
> +gdt_boot_descr:
> +        .word   6*8-1
> +        .long   sym_phys(trampoline_gdt)

While at it, how about putting this on a 2 mod 4 boundary?

>  .Lbad_cpu_msg: .asciz "ERR: Not a 64-bit CPU!"
>  .Lbad_ldr_msg: .asciz "ERR: Not a Multiboot bootloader!"
>  
> +        .section .init.text, "ax"
> +

@progbits above calls for @progbits here too.

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel