Merge branches 'fixes' and 'misc' into for-linus

2014-01-28 21:38:48 +00:00
parent 54c0a4b461 d326b65c57 c5ca95b507
commit f5137a45c2
6 changed files with 48 additions and 3 deletions
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -37,6 +37,12 @@
 #define isa_page_to_bus page_to_phys
 #define isa_bus_to_virt phys_to_virt

+/*
+ * Atomic MMIO-wide IO modify
+ */
+extern void atomic_io_modify(void __iomem *reg, u32 mask, u32 set);
+extern void atomic_io_modify_relaxed(void __iomem *reg, u32 mask, u32 set);
+
 /*
 * Generic IO read/write.  These perform native-endian accesses.  Note
 * that some architectures will want to re-define __raw_{read,write}w.