Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-block.git] / include / linux / ioport.h

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index a02b290ca08a29676c9c1e5ca7e0c2feb062ffce..5b6a7121c9f09376bb3c780051cda4891c6c98c8 100644 (file)
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -12,6 +12,7 @@
 #ifndef __ASSEMBLY__
 #include <linux/compiler.h>
 #include <linux/types.h>
+#include <linux/bits.h>
 /*
  * Resources are tree-like, allowing
  * nesting etc..
@@ -132,6 +133,15 @@ enum {
        IORES_DESC_PERSISTENT_MEMORY            = 4,
        IORES_DESC_PERSISTENT_MEMORY_LEGACY     = 5,
        IORES_DESC_DEVICE_PRIVATE_MEMORY        = 6,
+       IORES_DESC_RESERVED                     = 7,
+};
+
+/*
+ * Flags controlling ioremap() behavior.
+ */
+enum {
+       IORES_MAP_SYSTEM_RAM            = BIT(0),
+       IORES_MAP_ENCRYPTED             = BIT(1),
 };
 
 /* helpers to define resources */