diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-19 19:46:52 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-19 19:46:52 +0000 |
| commit | 828aac2ee239dca9c1856c4856a57912e6a487c4 (patch) | |
| tree | 44de8a7d318bbcef29da00992ebfa7356f470af7 /arch/arm/mach-at91 | |
| parent | 6fd7c7fe72a46dfd227fe8db0c7b6863af90a982 (diff) | |
| parent | 7971db5a4b4176ad5df590fce07a962c643a2740 (diff) | |
| download | op-kernel-dev-828aac2ee239dca9c1856c4856a57912e6a487c4.zip op-kernel-dev-828aac2ee239dca9c1856c4856a57912e6a487c4.tar.gz | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200_time.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c index a72e798..d140eae 100644 --- a/arch/arm/mach-at91/at91rm9200_time.c +++ b/arch/arm/mach-at91/at91rm9200_time.c @@ -141,6 +141,15 @@ clkevt32k_next_event(unsigned long delta, struct clock_event_device *dev) /* Use "raw" primitives so we behave correctly on RT kernels. */ raw_local_irq_save(flags); + /* + * According to Thomas Gleixner irqs are already disabled here. Simply + * removing raw_local_irq_save above (and the matching + * raw_local_irq_restore) was not accepted. See + * http://thread.gmane.org/gmane.linux.ports.arm.kernel/41174 + * So for now (2008-11-20) just warn once if irqs were not disabled ... + */ + WARN_ON_ONCE(!raw_irqs_disabled_flags(flags)); + /* The alarm IRQ uses absolute time (now+delta), not the relative * time (delta) in our calling convention. Like all clockevents * using such "match" hardware, we have a race to defend against. |
