From 228ea23b7cf5f0f8d35749dc86f7bc611a13e9b2 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 18 Apr 2012 17:16:47 -0700 Subject: [PATCH] --- yaml --- r: 305433 b: refs/heads/master c: 84f4fc524eed040660bd4ebc8cba259d8afe8461 h: refs/heads/master i: 305431: 6db9ce0073137be94ef878d4bc5c5d49bdfc44b2 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/segment.h | 2 ++ trunk/arch/x86/kernel/head_64.S | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a689c4409db7..6bcb883b6f6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46326013e34eb5c178a91f06c1f2e99e79eed924 +refs/heads/master: 84f4fc524eed040660bd4ebc8cba259d8afe8461 diff --git a/trunk/arch/x86/include/asm/segment.h b/trunk/arch/x86/include/asm/segment.h index 165466233ab0..58c1e6cd91b6 100644 --- a/trunk/arch/x86/include/asm/segment.h +++ b/trunk/arch/x86/include/asm/segment.h @@ -205,6 +205,8 @@ #define IDT_ENTRIES 256 #define NUM_EXCEPTION_VECTORS 32 +/* Bitmask of exception vectors which push an error code on the stack */ +#define EXCEPTION_ERRCODE_MASK 0x00027d00 #define GDT_SIZE (GDT_ENTRIES * 8) #define GDT_ENTRY_TLS_ENTRIES 3 #define TLS_SIZE (GDT_ENTRY_TLS_ENTRIES * 8) diff --git a/trunk/arch/x86/kernel/head_64.S b/trunk/arch/x86/kernel/head_64.S index 40f4eb3766d1..adf52e85d551 100644 --- a/trunk/arch/x86/kernel/head_64.S +++ b/trunk/arch/x86/kernel/head_64.S @@ -295,7 +295,7 @@ ENTRY(early_idt_handler) ja 0f movl $1,%eax salq %cl,%rax - testl $0x27d00,%eax + testl $EXCEPTION_ERRCODE_MASK,%eax je 0f popq %r8 # get error code 0: movq 0(%rsp),%rcx # get ip