linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / bootmem.h

diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 1021f50..993da8c 100644 (file)
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -38,14 +38,12 @@ 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);
 extern unsigned long __init init_bootmem (unsigned long addr, unsigned long memend);
 extern void __init free_bootmem (unsigned long addr, unsigned long size);
 extern void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal);
-extern void * __init __alloc_bootmem_nopanic (unsigned long size, unsigned long align, unsigned long goal);
 extern void * __init __alloc_bootmem_low(unsigned long size,
                                         unsigned long align,
                                         unsigned long goal);
@@ -53,9 +51,6 @@ 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) \
@@ -91,8 +86,8 @@ static inline void *alloc_remap(int nid, unsigned long size)
 }
 #endif
 
-extern unsigned long __meminitdata nr_kernel_pages;
-extern unsigned long nr_all_pages;
+extern unsigned long __initdata nr_kernel_pages;
+extern unsigned long __initdata nr_all_pages;
 
 extern void *__init alloc_large_system_hash(const char *tablename,
                                            unsigned long bucketsize,