diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:31:52 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:31:52 -0400 |
commit | 0d5959723e1db3fd7323c198a50c16cecf96c7a9 (patch) | |
tree | 802b623fff261ebcbbddadf84af5524398364a18 /arch/x86/kernel/entry_64.S | |
parent | 62fdac5913f71f8f200bd2c9bd59a02e9a1498e9 (diff) | |
parent | 512626a04e72aca60effe111fa0333ed0b195d21 (diff) |
Merge branch 'linus' into x86/mce3
Conflicts:
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/irq.c
Merge reason: Resolve the conflicts above.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
-rw-r--r-- | arch/x86/kernel/entry_64.S | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 4234b1235652..de74f0a3e0ed 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -147,27 +147,14 @@ END(ftrace_graph_caller) | |||
147 | GLOBAL(return_to_handler) | 147 | GLOBAL(return_to_handler) |
148 | subq $80, %rsp | 148 | subq $80, %rsp |
149 | 149 | ||
150 | /* Save the return values */ | ||
150 | movq %rax, (%rsp) | 151 | movq %rax, (%rsp) |
151 | movq %rcx, 8(%rsp) | 152 | movq %rdx, 8(%rsp) |
152 | movq %rdx, 16(%rsp) | ||
153 | movq %rsi, 24(%rsp) | ||
154 | movq %rdi, 32(%rsp) | ||
155 | movq %r8, 40(%rsp) | ||
156 | movq %r9, 48(%rsp) | ||
157 | movq %r10, 56(%rsp) | ||
158 | movq %r11, 64(%rsp) | ||
159 | 153 | ||
160 | call ftrace_return_to_handler | 154 | call ftrace_return_to_handler |
161 | 155 | ||
162 | movq %rax, 72(%rsp) | 156 | movq %rax, 72(%rsp) |
163 | movq 64(%rsp), %r11 | 157 | movq 8(%rsp), %rdx |
164 | movq 56(%rsp), %r10 | ||
165 | movq 48(%rsp), %r9 | ||
166 | movq 40(%rsp), %r8 | ||
167 | movq 32(%rsp), %rdi | ||
168 | movq 24(%rsp), %rsi | ||
169 | movq 16(%rsp), %rdx | ||
170 | movq 8(%rsp), %rcx | ||
171 | movq (%rsp), %rax | 158 | movq (%rsp), %rax |
172 | addq $72, %rsp | 159 | addq $72, %rsp |
173 | retq | 160 | retq |
@@ -1032,6 +1019,11 @@ apicinterrupt ERROR_APIC_VECTOR \ | |||
1032 | apicinterrupt SPURIOUS_APIC_VECTOR \ | 1019 | apicinterrupt SPURIOUS_APIC_VECTOR \ |
1033 | spurious_interrupt smp_spurious_interrupt | 1020 | spurious_interrupt smp_spurious_interrupt |
1034 | 1021 | ||
1022 | #ifdef CONFIG_PERF_COUNTERS | ||
1023 | apicinterrupt LOCAL_PENDING_VECTOR \ | ||
1024 | perf_pending_interrupt smp_perf_pending_interrupt | ||
1025 | #endif | ||
1026 | |||
1035 | /* | 1027 | /* |
1036 | * Exception entry points. | 1028 | * Exception entry points. |
1037 | */ | 1029 | */ |
@@ -1386,6 +1378,11 @@ END(xen_failsafe_callback) | |||
1386 | paranoidzeroentry_ist debug do_debug DEBUG_STACK | 1378 | paranoidzeroentry_ist debug do_debug DEBUG_STACK |
1387 | paranoidzeroentry_ist int3 do_int3 DEBUG_STACK | 1379 | paranoidzeroentry_ist int3 do_int3 DEBUG_STACK |
1388 | paranoiderrorentry stack_segment do_stack_segment | 1380 | paranoiderrorentry stack_segment do_stack_segment |
1381 | #ifdef CONFIG_XEN | ||
1382 | zeroentry xen_debug do_debug | ||
1383 | zeroentry xen_int3 do_int3 | ||
1384 | errorentry xen_stack_segment do_stack_segment | ||
1385 | #endif | ||
1389 | errorentry general_protection do_general_protection | 1386 | errorentry general_protection do_general_protection |
1390 | errorentry page_fault do_page_fault | 1387 | errorentry page_fault do_page_fault |
1391 | #ifdef CONFIG_X86_MCE | 1388 | #ifdef CONFIG_X86_MCE |