projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm/nobootmem.c: remove duplicate macro ARCH_LOW_ADDRESS_LIMIT statements
[cascardo/linux.git]
/
include
/
linux
/
bootmem.h
diff --git
a/include/linux/bootmem.h
b/include/linux/bootmem.h
index
f9be326
..
962164d
100644
(file)
--- a/
include/linux/bootmem.h
+++ b/
include/linux/bootmem.h
@@
-7,6
+7,7
@@
#include <linux/mmzone.h>
#include <linux/mm_types.h>
#include <asm/dma.h>
#include <linux/mmzone.h>
#include <linux/mm_types.h>
#include <asm/dma.h>
+#include <asm/processor.h>
/*
* simple boot-time physical memory area allocator.
/*
* simple boot-time physical memory area allocator.
@@
-119,6
+120,10
@@
extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
#define BOOTMEM_LOW_LIMIT __pa(MAX_DMA_ADDRESS)
#endif
#define BOOTMEM_LOW_LIMIT __pa(MAX_DMA_ADDRESS)
#endif
+#ifndef ARCH_LOW_ADDRESS_LIMIT
+#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL
+#endif
+
#define alloc_bootmem(x) \
__alloc_bootmem(x, SMP_CACHE_BYTES, BOOTMEM_LOW_LIMIT)
#define alloc_bootmem_align(x, align) \
#define alloc_bootmem(x) \
__alloc_bootmem(x, SMP_CACHE_BYTES, BOOTMEM_LOW_LIMIT)
#define alloc_bootmem_align(x, align) \
@@
-180,10
+185,6
@@
static inline void * __init memblock_virt_alloc_nopanic(
NUMA_NO_NODE);
}
NUMA_NO_NODE);
}
-#ifndef ARCH_LOW_ADDRESS_LIMIT
-#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL
-#endif
-
static inline void * __init memblock_virt_alloc_low(
phys_addr_t size, phys_addr_t align)
{
static inline void * __init memblock_virt_alloc_low(
phys_addr_t size, phys_addr_t align)
{