Commit afa3536b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fixes from Ingo Molnar:
 "Main changes:

  - Fix the deadlock reported by Dave Jones et al
  - Clean up and fix nohz_full interaction with arch abilities
  - nohz init code consolidation/cleanup"

* 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  nohz: nohz full depends on irq work self IPI support
  nohz: Consolidate nohz full init code
  arm64: Tell irq work about self IPI support
  arm: Tell irq work about self IPI support
  x86: Tell irq work about self IPI support
  irq_work: Force raised irq work to run on irq work interrupt
  irq_work: Introduce arch_irq_work_has_interrupt()
  nohz: Move nohz full init call to tick init
parents 35a9ad8a 9b01f5bf

arch/alpha/include/asm/Kbuild

+1 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ generic-y += clkdev.h 
generic-y += cputime.h

generic-y += cputime.h

generic-y += exec.h

generic-y += exec.h

generic-y += hash.h

generic-y += hash.h

generic-y += irq_work.h

generic-y += mcs_spinlock.h

generic-y += mcs_spinlock.h

generic-y += preempt.h

generic-y += preempt.h

generic-y += scatterlist.h

generic-y += scatterlist.h

arch/arc/include/asm/Kbuild

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ generic-y += ioctl.h 
generic-y += ioctls.h

generic-y += ioctls.h

generic-y += ipcbuf.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

generic-y += irq_regs.h

generic-y += irq_work.h

generic-y += kmap_types.h

generic-y += kmap_types.h

generic-y += kvm_para.h

generic-y += kvm_para.h

generic-y += local.h

generic-y += local.h

arch/arm/include/asm/irq_work.h

0 → 100644
+11 −0
Original line number Original line Diff line number Diff line 
#ifndef __ASM_ARM_IRQ_WORK_H

#define __ASM_ARM_IRQ_WORK_H



#include <asm/smp_plat.h>



static inline bool arch_irq_work_has_interrupt(void)

{

	return is_smp();

}



#endif /* _ASM_ARM_IRQ_WORK_H */

arch/arm/kernel/smp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -499,7 +499,7 @@ void arch_send_call_function_single_ipi(int cpu) 
#ifdef CONFIG_IRQ_WORK

#ifdef CONFIG_IRQ_WORK

void arch_irq_work_raise(void)

void arch_irq_work_raise(void)

{

{

	if (is_smp())

	if (arch_irq_work_has_interrupt())

		smp_cross_call(cpumask_of(smp_processor_id()), IPI_IRQ_WORK);

		smp_cross_call(cpumask_of(smp_processor_id()), IPI_IRQ_WORK);

}

}

#endif

#endif

arch/arm64/include/asm/Kbuild

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,8 +9,8 @@ generic-y += current.h 
generic-y += delay.h

generic-y += delay.h

generic-y += div64.h

generic-y += div64.h

generic-y += dma.h

generic-y += dma.h

generic-y += emergency-restart.h

generic-y += early_ioremap.h

generic-y += early_ioremap.h

generic-y += emergency-restart.h

generic-y += errno.h

generic-y += errno.h

generic-y += ftrace.h

generic-y += ftrace.h

generic-y += hash.h

generic-y += hash.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE