Merge branch 'master'

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 993da8cc97..de3eb8d8ae 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -38,6 +38,7 @@ typedef struct bootmem_data {
         unsigned long last_pos;
         unsigned long last_success;     /* Previous allocation point.  To speed
                                          * up searching */
+        struct list_head list;
 } bootmem_data_t;
 
 extern unsigned long __init bootmem_bootmap_pages (unsigned long);
@@ -51,6 +52,9 @@ extern void * __init __alloc_bootmem_low_node(pg_data_t *pgdat,
                                               unsigned long size,
                                               unsigned long align,
                                               unsigned long goal);
+extern void * __init __alloc_bootmem_core(struct bootmem_data *bdata,
+                unsigned long size, unsigned long align, unsigned long goal,
+                unsigned long limit);
 #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
 extern void __init reserve_bootmem (unsigned long addr, unsigned long size);
 #define alloc_bootmem(x) \