---

yaml --- r: 223434 b: refs/heads/master c: 53dde5f h: refs/heads/master v: v3
git-mirror · Dec 14, 2010 · ad94728 · ad94728
1 parent de47864
commit ad94728
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de2a8cf98ecdde25231d6c5e7901e2cffaf32af9
+refs/heads/master: 53dde5f385bc56e312f78b7cb25ffaf8efd4735d
diff --git a/trunk/include/linux/bootmem.h b/trunk/include/linux/bootmem.h
@@ -105,6 +105,8 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
 
 #define alloc_bootmem(x) \
 	__alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
+#define alloc_bootmem_align(x, align) \
+	__alloc_bootmem(x, align, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_nopanic(x) \
 	__alloc_bootmem_nopanic(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_pages(x) \