---

yaml --- r: 6873 b: refs/heads/master c: fd195c4 h: refs/heads/master i: 6871: f23f207 v: v3
git-mirror · Sep 5, 2005 · 0d3e914 · 0d3e914
1 parent b92f006
commit 0d3e914
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b4ee40ebbbaf3f8c775b023d89ceedda1167d79
+refs/heads/master: fd195c49fb17a21e232f50bddb2267150053cf34
diff --git a/trunk/include/linux/vmalloc.h b/trunk/include/linux/vmalloc.h
@@ -10,6 +10,14 @@
 #define VM_MAP		0x00000004	/* vmap()ed pages */
 /* bits [20..32] reserved for arch specific ioremap internals */
 
+/*
+ * Maximum alignment for ioremap() regions.
+ * Can be overriden by arch-specific value.
+ */
+#ifndef IOREMAP_MAX_ORDER
+#define IOREMAP_MAX_ORDER	(7 + PAGE_SHIFT)	/* 128 pages */
+#endif
+
 struct vm_struct {
 	void			*addr;
 	unsigned long		size;

diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
@@ -158,8 +158,6 @@ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
 	return err;
 }
 
-#define IOREMAP_MAX_ORDER	(7 + PAGE_SHIFT)	/* 128 pages */
-
 struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
 				unsigned long start, unsigned long end)
 {