|
@@ -65,22 +65,20 @@ extern void free_bootmem(unsigned long addr, unsigned long size);
|
|
|
#define BOOTMEM_DEFAULT 0
|
|
|
#define BOOTMEM_EXCLUSIVE (1<<0)
|
|
|
|
|
|
-extern int reserve_bootmem_node(pg_data_t *pgdat,
|
|
|
- unsigned long physaddr,
|
|
|
- unsigned long size,
|
|
|
- int flags);
|
|
|
extern int reserve_bootmem(unsigned long addr,
|
|
|
unsigned long size,
|
|
|
int flags);
|
|
|
-extern void *__alloc_bootmem_nopanic(unsigned long size,
|
|
|
+extern int reserve_bootmem_node(pg_data_t *pgdat,
|
|
|
+ unsigned long physaddr,
|
|
|
+ unsigned long size,
|
|
|
+ int flags);
|
|
|
+
|
|
|
+extern void *__alloc_bootmem(unsigned long size,
|
|
|
unsigned long align,
|
|
|
unsigned long goal);
|
|
|
-extern void *__alloc_bootmem(unsigned long size,
|
|
|
+extern void *__alloc_bootmem_nopanic(unsigned long size,
|
|
|
unsigned long align,
|
|
|
unsigned long goal);
|
|
|
-extern void *__alloc_bootmem_low(unsigned long size,
|
|
|
- unsigned long align,
|
|
|
- unsigned long goal);
|
|
|
extern void *__alloc_bootmem_node(pg_data_t *pgdat,
|
|
|
unsigned long size,
|
|
|
unsigned long align,
|
|
@@ -89,6 +87,9 @@ extern void *__alloc_bootmem_node_nopanic(pg_data_t *pgdat,
|
|
|
unsigned long size,
|
|
|
unsigned long align,
|
|
|
unsigned long goal);
|
|
|
+extern void *__alloc_bootmem_low(unsigned long size,
|
|
|
+ unsigned long align,
|
|
|
+ unsigned long goal);
|
|
|
extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
|
|
|
unsigned long size,
|
|
|
unsigned long align,
|
|
@@ -98,18 +99,21 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
|
|
|
__alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
|
|
|
#define alloc_bootmem_nopanic(x) \
|
|
|
__alloc_bootmem_nopanic(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
|
|
|
-#define alloc_bootmem_low(x) \
|
|
|
- __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
|
|
|
#define alloc_bootmem_pages(x) \
|
|
|
__alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
|
|
|
#define alloc_bootmem_pages_nopanic(x) \
|
|
|
__alloc_bootmem_nopanic(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
|
|
|
-#define alloc_bootmem_low_pages(x) \
|
|
|
- __alloc_bootmem_low(x, PAGE_SIZE, 0)
|
|
|
#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_pages_node_nopanic(pgdat, x) \
|
|
|
+ __alloc_bootmem_node_nopanic(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
|
|
|
+
|
|
|
+#define alloc_bootmem_low(x) \
|
|
|
+ __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
|
|
|
+#define alloc_bootmem_low_pages(x) \
|
|
|
+ __alloc_bootmem_low(x, PAGE_SIZE, 0)
|
|
|
#define alloc_bootmem_low_pages_node(pgdat, x) \
|
|
|
__alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)
|
|
|
|