diff options
| author | Linus Torvalds | 2014-10-09 12:30:57 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-10-09 12:30:57 +0200 |
| commit | afa3536be88b435a057cb727b48fd3d760a497d2 (patch) | |
| tree | 8562d3c8327286746ae835ef8eb39d4494a1054d /arch/score | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next (diff) | |
| parent | nohz: nohz full depends on irq work self IPI support (diff) | |
| download | kernel-qcow2-linux-afa3536be88b435a057cb727b48fd3d760a497d2.tar.gz kernel-qcow2-linux-afa3536be88b435a057cb727b48fd3d760a497d2.tar.xz kernel-qcow2-linux-afa3536be88b435a057cb727b48fd3d760a497d2.zip | |
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
Diffstat (limited to 'arch/score')
| -rw-r--r-- | arch/score/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index d26c48fc93c9..3fe5681744f1 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -6,6 +6,7 @@ generic-y += barrier.h generic-y += clkdev.h generic-y += cputime.h generic-y += hash.h +generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += preempt.h generic-y += scatterlist.h |