diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-03 17:45:29 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-03 17:45:29 (GMT) |
| commit | ea98af133f8dac1aa4ec093f69e1165a5db2d1ad (patch) | |
| tree | 19e104c66878c8de139a7445daa64b24ede7e6b3 /arch/m68k/include/asm/irqflags.h | |
| parent | 7e75224188460ef2e6a6096e912aa4682ab76486 (diff) | |
| parent | 55490050df0f5d82ce070be11351c65f7696101c (diff) | |
| download | linux-fsl-qoriq-ea98af133f8dac1aa4ec093f69e1165a5db2d1ad.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
"Summary:
- Kill harmless warning messages when running a multi-platform kernel
on Atari
- Correct virt/phys mixups that didn't actually hurt due to identity
mappings"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls
m68k: Ignore disabled HSYNC interrupt on Atari for irqs_disabled()
Diffstat (limited to 'arch/m68k/include/asm/irqflags.h')
| -rw-r--r-- | arch/m68k/include/asm/irqflags.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/irqflags.h b/arch/m68k/include/asm/irqflags.h index 7ef4115..5053092 100644 --- a/arch/m68k/include/asm/irqflags.h +++ b/arch/m68k/include/asm/irqflags.h @@ -67,6 +67,10 @@ static inline void arch_local_irq_restore(unsigned long flags) static inline bool arch_irqs_disabled_flags(unsigned long flags) { + if (MACH_IS_ATARI) { + /* Ignore HSYNC = ipl 2 on Atari */ + return (flags & ~(ALLOWINT | 0x200)) != 0; + } return (flags & ~ALLOWINT) != 0; } |