aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/entry_64.S
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-08-21 05:27:00 -0400
committerIngo Molnar <mingo@kernel.org>2012-08-21 05:27:00 -0400
commitbcada3d4b8c96b8792c2306f363992ca5ab9da42 (patch)
treee420679a5db6ea4e1694eef57f9abb6acac8d4d3 /arch/x86/kernel/entry_64.S
parent26198c21d1b286a084fe5d514a30bc7e6c712a34 (diff)
parent000078bc3ee69efb1124b8478c7527389a826074 (diff)
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: * Fix include order for bison/flex-generated C files, from Ben Hutchings * Build fixes and documentation corrections from David Ahern * Group parsing support, from Jiri Olsa * UI/gtk refactorings and improvements from Namhyung Kim * NULL deref fix for perf script, from Namhyung Kim * Assorted cleanups from Robert Richter * Let O= makes handle relative paths, from Steven Rostedt * perf script python fixes, from Feng Tang. * Improve 'perf lock' error message when the needed tracepoints are not present, from David Ahern. * Initial bash completion support, from Frederic Weisbecker * Allow building without libelf, from Namhyung Kim. * Support DWARF CFI based unwind to have callchains when %bp based unwinding is not possible, from Jiri Olsa. * Symbol resolution fixes, while fixing support PPC64 files with an .opt ELF section was the end goal, several fixes for code that handles all architectures and cleanups are included, from Cody Schafer. * Add a description for the JIT interface, from Andi Kleen. * Assorted fixes for Documentation and build in 32 bit, from Robert Richter * Add support for non-tracepoint events in perf script python, from Feng Tang * Cache the libtraceevent event_format associated to each evsel early, so that we avoid relookups, i.e. calling pevent_find_event repeatedly when processing tracepoint events. [ This is to reduce the surface contact with libtraceevents and make clear what is that the perf tools needs from that lib: so far parsing the common and per event fields. ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
-rw-r--r--arch/x86/kernel/entry_64.S18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 459d4a0dca8d..b7a81dcb7366 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1124,24 +1124,6 @@ apicinterrupt LOCAL_TIMER_VECTOR \
1124apicinterrupt X86_PLATFORM_IPI_VECTOR \ 1124apicinterrupt X86_PLATFORM_IPI_VECTOR \
1125 x86_platform_ipi smp_x86_platform_ipi 1125 x86_platform_ipi smp_x86_platform_ipi
1126 1126
1127#ifdef CONFIG_SMP
1128 ALIGN
1129 INTR_FRAME
1130.irp idx,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, \
1131 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31
1132.if NUM_INVALIDATE_TLB_VECTORS > \idx
1133ENTRY(invalidate_interrupt\idx)
1134 pushq_cfi $~(INVALIDATE_TLB_VECTOR_START+\idx)
1135 jmp .Lcommon_invalidate_interrupt0
1136 CFI_ADJUST_CFA_OFFSET -8
1137END(invalidate_interrupt\idx)
1138.endif
1139.endr
1140 CFI_ENDPROC
1141apicinterrupt INVALIDATE_TLB_VECTOR_START, \
1142 invalidate_interrupt0, smp_invalidate_interrupt
1143#endif
1144
1145apicinterrupt THRESHOLD_APIC_VECTOR \ 1127apicinterrupt THRESHOLD_APIC_VECTOR \
1146 threshold_interrupt smp_threshold_interrupt 1128 threshold_interrupt smp_threshold_interrupt
1147apicinterrupt THERMAL_APIC_VECTOR \ 1129apicinterrupt THERMAL_APIC_VECTOR \