diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/boot/pm.c | 4 | ||||
| -rw-r--r-- | arch/x86/boot/pmjump.S | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/boot/pm.c b/arch/x86/boot/pm.c index 09fb342cc62..b23cbdc7d54 100644 --- a/arch/x86/boot/pm.c +++ b/arch/x86/boot/pm.c @@ -121,6 +121,10 @@ static void setup_gdt(void) [GDT_ENTRY_BOOT_CS] = GDT_ENTRY(0xc09b, 0, 0xfffff), /* DS: data, read/write, 4 GB, base 0 */ [GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff), + /* TSS: 32-bit tss, 104 bytes, base 4096 */ + /* We only have a TSS here to keep Intel VT happy; + we don't actually use it for anything. */ + [GDT_ENTRY_BOOT_TSS] = GDT_ENTRY(0x0089, 4096, 103), }; /* Xen HVM incorrectly stores a pointer to the gdt_ptr, instead of the gdt_ptr contents. Thus, make it static so it will diff --git a/arch/x86/boot/pmjump.S b/arch/x86/boot/pmjump.S index ef0da1f2c7f..f7153d0d476 100644 --- a/arch/x86/boot/pmjump.S +++ b/arch/x86/boot/pmjump.S @@ -36,6 +36,7 @@ protected_mode_jump: addl %ebx, 2f movw $__BOOT_DS, %cx + movw $__BOOT_TSS, %di movl %cr0, %edx orb $1, %dl # Protected mode (PE) bit @@ -63,6 +64,9 @@ in_pm32: # a valid stack if some debugging hack wants to use it. addl %ebx, %esp + # Set up TR to make Intel VT happy + ltr %di + # Clear registers to allow for future extensions to the # 32-bit boot protocol xorl %ecx, %ecx @@ -71,6 +75,9 @@ in_pm32: xorl %ebp, %ebp xorl %edi, %edi + # Set up LDTR to make Intel VT happy + lldt %cx + jmpl *%eax # Jump to the 32-bit entrypoint .size in_pm32, .-in_pm32 |