Merge commit 'v2.6.28-rc2' into tracing/urgent

This commit is contained in:
Ingo Molnar
2008-10-27 10:50:54 +01:00
1977 changed files with 98217 additions and 26454 deletions

View File

@@ -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