diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-09 06:30:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-09 06:30:57 -0400 |
| commit | afa3536be88b435a057cb727b48fd3d760a497d2 (patch) | |
| tree | 8562d3c8327286746ae835ef8eb39d4494a1054d /arch/tile/include | |
| parent | 35a9ad8af0bb0fa3525e6d0d20e32551d226f38e (diff) | |
| parent | 9b01f5bf3999a3db5b1bbd9fdfd80d8d304e94ee (diff) | |
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/tile/include')
| -rw-r--r-- | arch/tile/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 0aa5675e7025..e6462b8a6284 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild | |||
| @@ -17,6 +17,7 @@ generic-y += ioctl.h | |||
| 17 | generic-y += ioctls.h | 17 | generic-y += ioctls.h |
| 18 | generic-y += ipcbuf.h | 18 | generic-y += ipcbuf.h |
| 19 | generic-y += irq_regs.h | 19 | generic-y += irq_regs.h |
| 20 | generic-y += irq_work.h | ||
| 20 | generic-y += local.h | 21 | generic-y += local.h |
| 21 | generic-y += local64.h | 22 | generic-y += local64.h |
| 22 | generic-y += mcs_spinlock.h | 23 | generic-y += mcs_spinlock.h |