|
@@ -587,6 +587,19 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align,
|
|
|
return ___alloc_bootmem(size, align, goal, 0);
|
|
|
}
|
|
|
|
|
|
+static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata,
|
|
|
+ unsigned long size, unsigned long align,
|
|
|
+ unsigned long goal, unsigned long limit)
|
|
|
+{
|
|
|
+ void *ptr;
|
|
|
+
|
|
|
+ ptr = alloc_bootmem_core(bdata, size, align, goal, limit);
|
|
|
+ if (ptr)
|
|
|
+ return ptr;
|
|
|
+
|
|
|
+ return ___alloc_bootmem(size, align, goal, limit);
|
|
|
+}
|
|
|
+
|
|
|
/**
|
|
|
* __alloc_bootmem_node - allocate boot memory from a specific node
|
|
|
* @pgdat: node to allocate from
|
|
@@ -605,13 +618,7 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align,
|
|
|
void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
|
|
|
unsigned long align, unsigned long goal)
|
|
|
{
|
|
|
- void *ptr;
|
|
|
-
|
|
|
- ptr = alloc_bootmem_core(pgdat->bdata, size, align, goal, 0);
|
|
|
- if (ptr)
|
|
|
- return ptr;
|
|
|
-
|
|
|
- return __alloc_bootmem(size, align, goal);
|
|
|
+ return ___alloc_bootmem_node(pgdat->bdata, size, align, goal, 0);
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_SPARSEMEM
|
|
@@ -705,6 +712,6 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align,
|
|
|
void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size,
|
|
|
unsigned long align, unsigned long goal)
|
|
|
{
|
|
|
- return alloc_bootmem_core(pgdat->bdata, size, align, goal,
|
|
|
- ARCH_LOW_ADDRESS_LIMIT);
|
|
|
+ return ___alloc_bootmem_node(pgdat->bdata, size, align,
|
|
|
+ goal, ARCH_LOW_ADDRESS_LIMIT);
|
|
|
}
|