diff --git a/[refs] b/[refs] index f0cfa3455fe8..715e298eea7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 024742861124ef26dae4cfc620250f8f47ac934a +refs/heads/master: f7436a9da902922a48cccc208099763b87d6171f diff --git a/trunk/arch/x86/realmode/rm/trampoline_32.S b/trunk/arch/x86/realmode/rm/trampoline_32.S index 18cb7fc9fad4..1f9e3316f73d 100644 --- a/trunk/arch/x86/realmode/rm/trampoline_32.S +++ b/trunk/arch/x86/realmode/rm/trampoline_32.S @@ -68,7 +68,7 @@ trampoline_data: .data .globl startup_32_smp, boot_gdt, trampoline_status - + .balign 4 boot_gdt_descr: .word __BOOT_DS + 7 # gdt limit boot_gdt: