---

yaml --- r: 312444 b: refs/heads/master c: 9751d76 h: refs/heads/master v: v3
git-mirror · Jun 21, 2012 · 37d0c6c · 37d0c6c
1 parent e9099bb
commit 37d0c6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b1b712f050eaf0ac576591281446dc960c0afc5
+refs/heads/master: 9751d7627582fc1cc64625d63bde9528c14f1544
diff --git a/trunk/arch/x86/realmode/rm/reboot.S b/trunk/arch/x86/realmode/rm/reboot.S
@@ -22,14 +22,18 @@
 ENTRY(machine_real_restart_asm)
 
 #ifdef CONFIG_X86_64
+	/* Switch to trampoline GDT as it is guaranteed < 4 GiB */
+	movl	$__KERNEL_DS, %eax
+	movl	%eax, %ds
+	lgdtl	pa_tr_gdt
 
 	/* Disable paging to drop us out of long mode */
 	movl	%cr0, %eax
 	andl	$~X86_CR0_PG, %eax
 	movl	%eax, %cr0
-	jmp	1f	/* "A branch" may be needed here, assume near is OK */
+	ljmpl	$__KERNEL32_CS, $pa_machine_real_restart_paging_off
 
-1:
+GLOBAL(machine_real_restart_paging_off)
 	xorl	%eax, %eax
 	xorl	%edx, %edx
 	movl	$MSR_EFER, %ecx