diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 11:46:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 11:46:00 -0800 |
| commit | f89db789de2157441d3b5e879a742437ed69cbbc (patch) | |
| tree | ab768dbb16c3c5c078d9721fee28d1b2b2508392 /arch/x86/kernel/cpu/mcheck/therm_throt.c | |
| parent | 65314ed08e9c4a94ba85f7d52a7ad324050b152e (diff) | |
| parent | 8312593a55941a0fae2b09731a4f91d87bd796db (diff) | |
| download | linux-f89db789de2157441d3b5e879a742437ed69cbbc.tar.gz linux-f89db789de2157441d3b5e879a742437ed69cbbc.tar.xz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Two documentation updates, plus a debugging annotation fix"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/crash: Update the stale comment in reserve_crashkernel()
x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers
Documentation, x86, resctrl: Recommend locking for resctrlfs
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/therm_throt.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/therm_throt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index 85469f84c921..d7cc190ae457 100644 --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c @@ -396,14 +396,16 @@ static inline void __smp_thermal_interrupt(void) smp_thermal_vector(); } -asmlinkage __visible void smp_thermal_interrupt(struct pt_regs *regs) +asmlinkage __visible void __irq_entry +smp_thermal_interrupt(struct pt_regs *regs) { entering_irq(); __smp_thermal_interrupt(); exiting_ack_irq(); } -asmlinkage __visible void smp_trace_thermal_interrupt(struct pt_regs *regs) +asmlinkage __visible void __irq_entry +smp_trace_thermal_interrupt(struct pt_regs *regs) { entering_irq(); trace_thermal_apic_entry(THERMAL_APIC_VECTOR); |