Pull define-node-cleanup into release branch

[linux-2.6-omap-h63xx.git] / include / asm-ia64 / sn / io.h

diff --git a/include/asm-ia64/sn/io.h b/include/asm-ia64/sn/io.h
index ac30c747c5ab64116ae3136ffab500a316d4ee16..41c73a73562844f0a4d8e601d6e737cece6b35e0 100644 (file)
--- a/include/asm-ia64/sn/io.h
+++ b/include/asm-ia64/sn/io.h
@@ -35,6 +35,15 @@ extern void sn_dma_flush(unsigned long);
 #define __sn_readl_relaxed ___sn_readl_relaxed
 #define __sn_readq_relaxed ___sn_readq_relaxed
 
+/*
+ * Convenience macros for setting/clearing bits using the above accessors
+ */
+
+#define __sn_setq_relaxed(addr, val) \
+       writeq((__sn_readq_relaxed(addr) | (val)), (addr))
+#define __sn_clrq_relaxed(addr, val) \
+       writeq((__sn_readq_relaxed(addr) & ~(val)), (addr))
+
 /*
  * The following routines are SN Platform specific, called when
  * a reference is made to inX/outX set macros.  SN Platform