[Xen-changelog] [xen master] x86/boot: Align e820 and video data in the boot trampoline

[patchbot@xxxxxxx]

commit 5d8f8fa902685f4cceaf9e2b75da3c846956c2cd
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Thu Aug 11 16:32:10 2016 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Aug 12 13:51:43 2016 +0100

    x86/boot: Align e820 and video data in the boot trampoline
    
    The undefined behaviour sanitiser in Clang 3.8 identifies that these are all
    misaigned when used in __start_xen().
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/boot/mem.S   | 1 +
 xen/arch/x86/boot/video.S | 1 +
 2 files changed, 2 insertions(+)

diff --git a/xen/arch/x86/boot/mem.S b/xen/arch/x86/boot/mem.S
index 820aea9..602ab2c 100644
--- a/xen/arch/x86/boot/mem.S
+++ b/xen/arch/x86/boot/mem.S
@@ -67,6 +67,7 @@ get_memory_map:
 
         ret
 
+        .align  4
 GLOBAL(e820map)
         .fill   E820MAX*20,1,0
 GLOBAL(e820nr)
diff --git a/xen/arch/x86/boot/video.S b/xen/arch/x86/boot/video.S
index b238bf3..2aafbeb 100644
--- a/xen/arch/x86/boot/video.S
+++ b/xen/arch/x86/boot/video.S
@@ -994,6 +994,7 @@ force_size:     .word   0       # Use this size instead of 
the one in BIOS vars
 vesa_size:      .word   0,0,0   # width x depth x height
 
 /* If we don't run at all, assume basic video mode 3 at 80x25. */
+        .align  2
 GLOBAL(boot_vid_mode)
         .word   VIDEO_80x25
 GLOBAL(boot_vid_info)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog