diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 14:28:55 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 14:28:55 +0900 |
| commit | 11db81a59d0b2e563e30512cd76f23d0db384780 (patch) | |
| tree | 35a84e91c71cf0fcbffa3c5c8af36547a203a867 /arch/microblaze/kernel/timer.c | |
| parent | 0993537bff42edfbea7649975196cd2552c4b936 (diff) | |
| parent | 63d7bd1b171d5e7190c50dd3e48b1c561d7803d8 (diff) | |
Merge tag 'microblaze-3.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
- Get rid of NO_MMU Kconfig
- mmap2 fixups
- Some minor cleanups
* tag 'microblaze-3.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Remove incorrect file path
microblaze: Fix bug with mmap2 syscall MB implementation
microblaze: Use predefined SYSCALL_DEFINE macro
microblaze: Remove deprecated IRQF_DISABLED
microblaze: Calculate kernel pad automatically
microblaze: Remove unused NO_MMU Kconfig parameter
Diffstat (limited to 'arch/microblaze/kernel/timer.c')
| -rw-r--r-- | arch/microblaze/kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index e4b3f33ef34c..d7abb71abf61 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -148,7 +148,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id) static struct irqaction timer_irqaction = { .handler = timer_interrupt, - .flags = IRQF_DISABLED | IRQF_TIMER, + .flags = IRQF_TIMER, .name = "timer", .dev_id = &clockevent_xilinx_timer, }; |