From cc1c895a5b495a9191f09d89153d183fa84e0fc5 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sun, 4 Nov 2007 17:54:31 -0800 Subject: [PATCH] --- yaml --- r: 73117 b: refs/heads/master c: 9f259cc59ba45b8db401d60be9700e275676fb15 h: refs/heads/master i: 73115: 438d89a67cd4ea21d19414d89d49a1acacb6d712 v: v3 --- [refs] | 2 +- trunk/arch/x86/boot/pmjump.S | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index be7a3a8d91fb..185f422c1066 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ed192906a2144ebc8ca2925a85d27b9c5355668 +refs/heads/master: 9f259cc59ba45b8db401d60be9700e275676fb15 diff --git a/trunk/arch/x86/boot/pmjump.S b/trunk/arch/x86/boot/pmjump.S index 26baeab3a4d4..fa6bed1fac14 100644 --- a/trunk/arch/x86/boot/pmjump.S +++ b/trunk/arch/x86/boot/pmjump.S @@ -28,11 +28,13 @@ * void protected_mode_jump(u32 entrypoint, u32 bootparams); */ protected_mode_jump: - xorl %ebx, %ebx # Flag to indicate this is a boot movl %edx, %esi # Pointer to boot_params table movl %eax, 2f # Patch ljmpl instruction movw $__BOOT_DS, %cx + xorl %ebx, %ebx # Per the 32-bit boot protocol + xorl %ebp, %ebp # Per the 32-bit boot protocol + xorl %edi, %edi # Per the 32-bit boot protocol movl %cr0, %edx orb $1, %dl # Protected mode (PE) bit