diff options
Diffstat (limited to 'include/linux/bootmem.h')
| -rw-r--r-- | include/linux/bootmem.h | 104 |
1 files changed, 60 insertions, 44 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 22866fa2d960..31e9abb6d977 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
| @@ -4,11 +4,8 @@ | |||
| 4 | #ifndef _LINUX_BOOTMEM_H | 4 | #ifndef _LINUX_BOOTMEM_H |
| 5 | #define _LINUX_BOOTMEM_H | 5 | #define _LINUX_BOOTMEM_H |
| 6 | 6 | ||
| 7 | #include <asm/pgtable.h> | ||
| 8 | #include <asm/dma.h> | ||
| 9 | #include <linux/cache.h> | ||
| 10 | #include <linux/init.h> | ||
| 11 | #include <linux/mmzone.h> | 7 | #include <linux/mmzone.h> |
| 8 | #include <asm/dma.h> | ||
| 12 | 9 | ||
| 13 | /* | 10 | /* |
| 14 | * simple boot-time physical memory area allocator. | 11 | * simple boot-time physical memory area allocator. |
| @@ -41,45 +38,64 @@ typedef struct bootmem_data { | |||
| 41 | struct list_head list; | 38 | struct list_head list; |
| 42 | } bootmem_data_t; | 39 | } bootmem_data_t; |
| 43 | 40 | ||
| 44 | extern unsigned long __init bootmem_bootmap_pages (unsigned long); | 41 | extern unsigned long bootmem_bootmap_pages(unsigned long); |
| 45 | extern unsigned long __init init_bootmem (unsigned long addr, unsigned long memend); | 42 | extern unsigned long init_bootmem(unsigned long addr, unsigned long memend); |
| 46 | extern void __init free_bootmem (unsigned long addr, unsigned long size); | 43 | extern void free_bootmem(unsigned long addr, unsigned long size); |
| 47 | extern void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal); | 44 | extern void *__alloc_bootmem(unsigned long size, |
| 48 | extern void * __init __alloc_bootmem_nopanic (unsigned long size, unsigned long align, unsigned long goal); | 45 | unsigned long align, |
| 49 | extern void * __init __alloc_bootmem_low(unsigned long size, | 46 | unsigned long goal); |
| 50 | unsigned long align, | 47 | extern void *__alloc_bootmem_nopanic(unsigned long size, |
| 51 | unsigned long goal); | 48 | unsigned long align, |
| 52 | extern void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, | 49 | unsigned long goal); |
| 53 | unsigned long size, | 50 | extern void *__alloc_bootmem_low(unsigned long size, |
| 54 | unsigned long align, | 51 | unsigned long align, |
| 55 | unsigned long goal); | 52 | unsigned long goal); |
| 56 | extern void * __init __alloc_bootmem_core(struct bootmem_data *bdata, | 53 | extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, |
| 57 | unsigned long size, unsigned long align, unsigned long goal, | 54 | unsigned long size, |
| 58 | unsigned long limit); | 55 | unsigned long align, |
| 56 | unsigned long goal); | ||
| 57 | extern void *__alloc_bootmem_core(struct bootmem_data *bdata, | ||
| 58 | unsigned long size, | ||
| 59 | unsigned long align, | ||
| 60 | unsigned long goal, | ||
| 61 | unsigned long limit); | ||
| 62 | |||
| 59 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE | 63 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE |
| 60 | extern void __init reserve_bootmem (unsigned long addr, unsigned long size); | 64 | extern void reserve_bootmem(unsigned long addr, unsigned long size); |
| 61 | #define alloc_bootmem(x) \ | 65 | #define alloc_bootmem(x) \ |
| 62 | __alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) | 66 | __alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) |
| 63 | #define alloc_bootmem_low(x) \ | 67 | #define alloc_bootmem_low(x) \ |
| 64 | __alloc_bootmem_low((x), SMP_CACHE_BYTES, 0) | 68 | __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0) |
| 65 | #define alloc_bootmem_pages(x) \ | 69 | #define alloc_bootmem_pages(x) \ |
| 66 | __alloc_bootmem((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) | 70 | __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) |
| 67 | #define alloc_bootmem_low_pages(x) \ | 71 | #define alloc_bootmem_low_pages(x) \ |
| 68 | __alloc_bootmem_low((x), PAGE_SIZE, 0) | 72 | __alloc_bootmem_low(x, PAGE_SIZE, 0) |
| 69 | #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ | 73 | #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ |
| 70 | extern unsigned long __init free_all_bootmem (void); | 74 | |
| 71 | extern void * __init __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal); | 75 | extern unsigned long free_all_bootmem(void); |
| 72 | extern unsigned long __init init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn); | 76 | extern unsigned long free_all_bootmem_node(pg_data_t *pgdat); |
| 73 | extern void __init reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size); | 77 | extern void *__alloc_bootmem_node(pg_data_t *pgdat, |
| 74 | extern void __init free_bootmem_node (pg_data_t *pgdat, unsigned long addr, unsigned long size); | 78 | unsigned long size, |
| 75 | extern unsigned long __init free_all_bootmem_node (pg_data_t *pgdat); | 79 | unsigned long align, |
| 80 | unsigned long goal); | ||
| 81 | extern unsigned long init_bootmem_node(pg_data_t *pgdat, | ||
| 82 | unsigned long freepfn, | ||
| 83 | unsigned long startpfn, | ||
| 84 | unsigned long endpfn); | ||
| 85 | extern void reserve_bootmem_node(pg_data_t *pgdat, | ||
| 86 | unsigned long physaddr, | ||
| 87 | unsigned long size); | ||
| 88 | extern void free_bootmem_node(pg_data_t *pgdat, | ||
| 89 | unsigned long addr, | ||
| 90 | unsigned long size); | ||
| 91 | |||
| 76 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE | 92 | #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE |
| 77 | #define alloc_bootmem_node(pgdat, x) \ | 93 | #define alloc_bootmem_node(pgdat, x) \ |
| 78 | __alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) | 94 | __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) |
| 79 | #define alloc_bootmem_pages_node(pgdat, x) \ | 95 | #define alloc_bootmem_pages_node(pgdat, x) \ |
| 80 | __alloc_bootmem_node((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) | 96 | __alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) |
| 81 | #define alloc_bootmem_low_pages_node(pgdat, x) \ | 97 | #define alloc_bootmem_low_pages_node(pgdat, x) \ |
| 82 | __alloc_bootmem_low_node((pgdat), (x), PAGE_SIZE, 0) | 98 | __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0) |
| 83 | #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ | 99 | #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ |
| 84 | 100 | ||
| 85 | #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP | 101 | #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP |
| @@ -89,19 +105,19 @@ static inline void *alloc_remap(int nid, unsigned long size) | |||
| 89 | { | 105 | { |
| 90 | return NULL; | 106 | return NULL; |
| 91 | } | 107 | } |
| 92 | #endif | 108 | #endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */ |
| 93 | 109 | ||
| 94 | extern unsigned long nr_kernel_pages; | 110 | extern unsigned long __meminitdata nr_kernel_pages; |
| 95 | extern unsigned long nr_all_pages; | 111 | extern unsigned long nr_all_pages; |
| 96 | 112 | ||
| 97 | extern void *__init alloc_large_system_hash(const char *tablename, | 113 | extern void *alloc_large_system_hash(const char *tablename, |
| 98 | unsigned long bucketsize, | 114 | unsigned long bucketsize, |
| 99 | unsigned long numentries, | 115 | unsigned long numentries, |
| 100 | int scale, | 116 | int scale, |
| 101 | int flags, | 117 | int flags, |
| 102 | unsigned int *_hash_shift, | 118 | unsigned int *_hash_shift, |
| 103 | unsigned int *_hash_mask, | 119 | unsigned int *_hash_mask, |
| 104 | unsigned long limit); | 120 | unsigned long limit); |
| 105 | 121 | ||
| 106 | #define HASH_HIGHMEM 0x00000001 /* Consider highmem? */ | 122 | #define HASH_HIGHMEM 0x00000001 /* Consider highmem? */ |
| 107 | #define HASH_EARLY 0x00000002 /* Allocating during early boot? */ | 123 | #define HASH_EARLY 0x00000002 /* Allocating during early boot? */ |
| @@ -114,7 +130,7 @@ extern void *__init alloc_large_system_hash(const char *tablename, | |||
| 114 | #else | 130 | #else |
| 115 | #define HASHDIST_DEFAULT 0 | 131 | #define HASHDIST_DEFAULT 0 |
| 116 | #endif | 132 | #endif |
| 117 | extern int __initdata hashdist; /* Distribute hashes across NUMA nodes? */ | 133 | extern int hashdist; /* Distribute hashes across NUMA nodes? */ |
| 118 | 134 | ||
| 119 | 135 | ||
| 120 | #endif /* _LINUX_BOOTMEM_H */ | 136 | #endif /* _LINUX_BOOTMEM_H */ |
