diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 18:17:07 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 18:17:07 +0900 |
| commit | 0a759b2466d19c619257fec36f988f93424cf3ae (patch) | |
| tree | 910e531540bda17c484b53b89fb2f1d6dd41a454 /arch/m68k/platform/coldfire/sltimers.c | |
| parent | 78d4a42069b4815040a857a4e9bb0e4fb0aa1dc8 (diff) | |
| parent | 77a42796786c2ea2d3a67262fb5f1f707c3e0594 (diff) | |
| download | op-kernel-dev-0a759b2466d19c619257fec36f988f93424cf3ae.zip op-kernel-dev-0a759b2466d19c619257fec36f988f93424cf3ae.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
"Summary:
- __put_user_unaligned may/will be used by btrfs
- m68k part of a global cleanup"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Remove deprecated IRQF_DISABLED
m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned()
Diffstat (limited to 'arch/m68k/platform/coldfire/sltimers.c')
| -rw-r--r-- | arch/m68k/platform/coldfire/sltimers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/platform/coldfire/sltimers.c index bb5a25a..831a08c 100644 --- a/arch/m68k/platform/coldfire/sltimers.c +++ b/arch/m68k/platform/coldfire/sltimers.c @@ -51,7 +51,7 @@ irqreturn_t mcfslt_profile_tick(int irq, void *dummy) static struct irqaction mcfslt_profile_irq = { .name = "profile timer", - .flags = IRQF_DISABLED | IRQF_TIMER, + .flags = IRQF_TIMER, .handler = mcfslt_profile_tick, }; @@ -93,7 +93,7 @@ static irqreturn_t mcfslt_tick(int irq, void *dummy) static struct irqaction mcfslt_timer_irq = { .name = "timer", - .flags = IRQF_DISABLED | IRQF_TIMER, + .flags = IRQF_TIMER, .handler = mcfslt_tick, }; |
