From 4f4ad12aa3b887f697df6871b59c7fbe553788f5 Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Fri, 25 Jul 2008 15:48:04 +0200 Subject: [PATCH] --- yaml --- r: 106119 b: refs/heads/master c: c6af5e9f8a57467df2e55e428316a43480174521 h: refs/heads/master i: 106117: 7249cd073ec2b300acb6eb937266aa1b58d6cbeb 106115: 756de85f9c61861b7fc9eb7f463183d64dd2b081 106111: 36bd3dbdd185b324c0e5352c76c1aa55641c7815 v: v3 --- [refs] | 2 +- trunk/include/linux/bootmem.h | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 842d31fad376..aaed5f7e42a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b81361631bbb1d85c99ddec677d42afe516737b +refs/heads/master: c6af5e9f8a57467df2e55e428316a43480174521 diff --git a/trunk/include/linux/bootmem.h b/trunk/include/linux/bootmem.h index 4ddf2922fc8d..652470b687c9 100644 --- a/trunk/include/linux/bootmem.h +++ b/trunk/include/linux/bootmem.h @@ -103,17 +103,16 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) #define alloc_bootmem_low_pages(x) \ __alloc_bootmem_low(x, PAGE_SIZE, 0) -#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ - -extern int reserve_bootmem_generic(unsigned long addr, unsigned long size, - int flags); - #define alloc_bootmem_node(pgdat, x) \ __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) #define alloc_bootmem_pages_node(pgdat, x) \ __alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) #define alloc_bootmem_low_pages_node(pgdat, x) \ __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0) +#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ + +extern int reserve_bootmem_generic(unsigned long addr, unsigned long size, + int flags); extern void *alloc_bootmem_section(unsigned long size, unsigned long section_nr);