--- grub-0.97/stage2/asm.S.vanilla	2013-03-05 17:39:21.235769104 +0100
+++ grub-0.97/stage2/asm.S	2013-03-05 17:40:12.415767335 +0100
@@ -1997,9 +1997,9 @@
 	mov	$0x2BADB002, %eax
 
 	mov	%rsi, %rbx
-	and	$0xffffffff, %rsi
+	and	$0xffffffff, %esi
 
-	and	$0xffffffff, %rdi
+	and	$0xffffffff, %edi
 	call	*%rdi
 	/* NOTREACHED */
 	call	EXT_C(stop)