projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[linux-block.git]
/
mm
/
sparse-vmemmap.c
diff --git
a/mm/sparse-vmemmap.c
b/mm/sparse-vmemmap.c
index 8301293331a27963b8a83bb190a6a7a905bcb74d..7fec057967966c27fdedf3ccffc082ce12eb7ef7 100644
(file)
--- a/
mm/sparse-vmemmap.c
+++ b/
mm/sparse-vmemmap.c
@@
-20,7
+20,7
@@
*/
#include <linux/mm.h>
#include <linux/mmzone.h>
*/
#include <linux/mm.h>
#include <linux/mmzone.h>
-#include <linux/
bootmem
.h>
+#include <linux/
memblock
.h>
#include <linux/memremap.h>
#include <linux/highmem.h>
#include <linux/slab.h>
#include <linux/memremap.h>
#include <linux/highmem.h>
#include <linux/slab.h>
@@
-42,8
+42,8
@@
static void * __ref __earlyonly_bootmem_alloc(int node,
unsigned long align,
unsigned long goal)
{
unsigned long align,
unsigned long goal)
{
- return memblock_
virt_
alloc_try_nid_raw(size, align, goal,
-
BOOTMEM
_ALLOC_ACCESSIBLE, node);
+ return memblock_alloc_try_nid_raw(size, align, goal,
+
MEMBLOCK
_ALLOC_ACCESSIBLE, node);
}
void * __meminit vmemmap_alloc_block(unsigned long size, int node)
}
void * __meminit vmemmap_alloc_block(unsigned long size, int node)