From 728ec271c19d4169629a5473ee8a2a3dbad4a78f Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 17 May 2003 00:30:51 +0000
Subject: [PATCH] Fix a bug in the AMD64 trampoline.  I misunderstood the
 implicit 32->64 bit zero extend.  This changes a movl to an orq.

Approved by:	re (amd64 bits)
---
 sys/boot/i386/libi386/amd64_tramp.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/boot/i386/libi386/amd64_tramp.S b/sys/boot/i386/libi386/amd64_tramp.S
index 012512d8c8a..ff12c661d94 100644
--- a/sys/boot/i386/libi386/amd64_tramp.S
+++ b/sys/boot/i386/libi386/amd64_tramp.S
@@ -108,6 +108,6 @@ longmode:
 	/* We're still running V=P, jump to entry point */
 	movl	%esi, %eax
 	salq	$32, %rax
-	movl	%edi, %eax
+	orq	%rdi, %rax
 	pushq	%rax
 	ret