From ad947283206e9c1ceeda29aab8ffc82cf451dae1 Mon Sep 17 00:00:00 2001 From: Suresh Siddha Date: Tue, 16 Nov 2010 13:23:50 -0800 Subject: [PATCH] --- yaml --- r: 223434 b: refs/heads/master c: 53dde5f385bc56e312f78b7cb25ffaf8efd4735d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/bootmem.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0e2740c76c59..866853b170ac 100644 --- 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 index 266ab9291232..499dfe982a0e 100644 --- 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) \