diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 13:53:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 13:53:50 -0500 |
| commit | f21f237cf55494c3a4209de323281a3b0528da10 (patch) | |
| tree | 40ebad408aebbc5bf4e54bd51a7c0077ad04508b /arch/cris/include/asm/ptrace.h | |
| parent | 2f96cb57cde9957bac0991c712068d29364b2ac9 (diff) | |
| parent | 5d5254f0d3b9bebc47d97e357374c0ad0c291a7d (diff) | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
timers: handle HRTIMER_CB_IRQSAFE_UNLOCKED correctly from softirq context
nohz: disable tick_nohz_kick_tick() for now
irq: call __irq_enter() before calling the tick_idle_check
x86: HPET: enter hpet_interrupt_handler with interrupts disabled
x86: HPET: read from HPET_Tn_CMP() not HPET_T0_CMP
x86: HPET: convert WARN_ON to WARN_ON_ONCE
Diffstat (limited to 'arch/cris/include/asm/ptrace.h')
0 files changed, 0 insertions, 0 deletions