summaryrefslogtreecommitdiff
path: root/include/linux/vmalloc.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-11 18:08:53 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-11 18:08:53 -0800
commitf95e6dae6522e0c403bef92405a3577ebd8baee9 (patch)
tree40c9f91e77cba0fddd1c019ae317f5768c267740 /include/linux/vmalloc.h
parentf741676a0eea898c7fd2169df9cfcf65a3f76bd1 (diff)
parentaae7d141676c5d83dbc97732f1cf48839f404774 (diff)
Merge http://lia64.bkbits.net/linux-ia64-release-2.6.11
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux/vmalloc.h')
-rw-r--r--include/linux/vmalloc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 8c68717810c3..9af7ad38c08d 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -8,6 +8,7 @@
#define VM_IOREMAP 0x00000001 /* ioremap() and friends */
#define VM_ALLOC 0x00000002 /* vmalloc() */
#define VM_MAP 0x00000004 /* vmap()ed pages */
+/* bits [20..32] reserved for arch specific ioremap internals */
struct vm_struct {
void *addr;