git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.28-rc2' into tracing/urgent
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
entry_32.S
diff --git
a/arch/x86/kernel/entry_32.S
b/arch/x86/kernel/entry_32.S
index
008cc17
..
28b597e
100644
(file)
--- a/
arch/x86/kernel/entry_32.S
+++ b/
arch/x86/kernel/entry_32.S
@@
-1024,7
+1024,7
@@
ENTRY(machine_check)
RING0_INT_FRAME
pushl $0
CFI_ADJUST_CFA_OFFSET 4
- pushl
$do_machine_check
+ pushl
machine_check_vector
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC