projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm, page_alloc: pull no_progress_loops update to should_reclaim_retry()
[cascardo/linux.git]
/
mm
/
bootmem.c
diff --git
a/mm/bootmem.c
b/mm/bootmem.c
index
0aa7dda
..
a869f84
100644
(file)
--- a/
mm/bootmem.c
+++ b/
mm/bootmem.c
@@
-11,15
+11,12
@@
#include <linux/init.h>
#include <linux/pfn.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/pfn.h>
#include <linux/slab.h>
-#include <linux/bootmem.h>
#include <linux/export.h>
#include <linux/kmemleak.h>
#include <linux/range.h>
#include <linux/export.h>
#include <linux/kmemleak.h>
#include <linux/range.h>
-#include <linux/memblock.h>
#include <linux/bug.h>
#include <linux/io.h>
#include <linux/bug.h>
#include <linux/io.h>
-
-#include <asm/processor.h>
+#include <linux/bootmem.h>
#include "internal.h"
#include "internal.h"
@@
-712,7
+709,7
@@
void * __init ___alloc_bootmem_node_nopanic(pg_data_t *pgdat,
void *ptr;
if (WARN_ON_ONCE(slab_is_available()))
void *ptr;
if (WARN_ON_ONCE(slab_is_available()))
- return kzalloc
(size, GFP_NOWAIT
);
+ return kzalloc
_node(size, GFP_NOWAIT, pgdat->node_id
);
again:
/* do not panic in alloc_bootmem_bdata() */
again:
/* do not panic in alloc_bootmem_bdata() */
@@
-738,9
+735,6
@@
again:
void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size,
unsigned long align, unsigned long goal)
{
void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size,
unsigned long align, unsigned long goal)
{
- if (WARN_ON_ONCE(slab_is_available()))
- return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);
-
return ___alloc_bootmem_node_nopanic(pgdat, size, align, goal, 0);
}
return ___alloc_bootmem_node_nopanic(pgdat, size, align, goal, 0);
}
@@
-812,10
+806,6
@@
void * __init __alloc_bootmem_node_high(pg_data_t *pgdat, unsigned long size,
}
}
-#ifndef ARCH_LOW_ADDRESS_LIMIT
-#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL
-#endif
-
/**
* __alloc_bootmem_low - allocate low boot memory
* @size: size of the request in bytes
/**
* __alloc_bootmem_low - allocate low boot memory
* @size: size of the request in bytes