git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5feedfd)
i386: convert hardware exception 18 to an interrupt gate
authorAlexander van Heukelum <heukelum@fastmail.fm>
Tue, 9 Sep 2008 19:56:11 +0000 (21:56 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 13 Oct 2008 08:20:38 +0000 (10:20 +0200)
Handle machine check exception with interrupt initially off.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/entry_32.S patch | blob | history
arch/x86/kernel/traps_32.c patch | blob | history

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 5a88585..c5fe01b 100644 (file)
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1019,7 +1019,7 @@ ENTRY(machine_check)
        RING0_INT_FRAME
        pushl $0
        CFI_ADJUST_CFA_OFFSET 4
-       pushl machine_check_vector
+       pushl $do_machine_check
        CFI_ADJUST_CFA_OFFSET 4
        jmp error_code
        CFI_ENDPROC
diff --cc arch/x86/kernel/traps_32.c
Simple merge
Pandora Kernel Repository