---

yaml --- r: 35923 b: refs/heads/master c: 26374c7 h: refs/heads/master i: 35921: 7c06247 35919: 392e53a v: v3
git-mirror · Sep 26, 2006 · 56c5ee3 · 56c5ee3
1 parent 215e5f0
commit 56c5ee3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0136611c62e8650e354b95c76dff6d2ce6030eff
+refs/heads/master: 26374c7b7dca1ff90607c83d9b82e917119f0456
diff --git a/trunk/arch/x86_64/kernel/head.S b/trunk/arch/x86_64/kernel/head.S
@@ -185,12 +185,15 @@ startup_64:
 
 	/* Finally jump to run C code and to be on real kernel address
 	 * Since we are running on identity-mapped space we have to jump
-	 * to the full 64bit address , this is only possible as indirect
-	 * jump
+	 * to the full 64bit address, this is only possible as indirect
+	 * jump.  In addition we need to ensure %cs is set so we make this
+	 * a far return.
 	 */
 	movq	initial_code(%rip),%rax
-	pushq	$0		# fake return address
-	jmp	*%rax
+	pushq	$0		# fake return address to stop unwinder
+	pushq	$__KERNEL_CS	# set correct cs
+	pushq	%rax		# target address in negative space
+	lretq
 
 	/* SMP bootup changes these two */
 	.align	8