git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
include
/
linux
/
bootmem.h
diff --git
a/include/linux/bootmem.h
b/include/linux/bootmem.h
index
01eca17
..
ab344a5
100644
(file)
--- a/
include/linux/bootmem.h
+++ b/
include/linux/bootmem.h
@@
-99,24
+99,31
@@
extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
unsigned long align,
unsigned long goal);
unsigned long align,
unsigned long goal);
+#ifdef CONFIG_NO_BOOTMEM
+/* We are using top down, so it is safe to use 0 here */
+#define BOOTMEM_LOW_LIMIT 0
+#else
+#define BOOTMEM_LOW_LIMIT __pa(MAX_DMA_ADDRESS)
+#endif
+
#define alloc_bootmem(x) \
#define alloc_bootmem(x) \
- __alloc_bootmem(x, SMP_CACHE_BYTES,
__pa(MAX_DMA_ADDRESS)
)
+ __alloc_bootmem(x, SMP_CACHE_BYTES,
BOOTMEM_LOW_LIMIT
)
#define alloc_bootmem_align(x, align) \
#define alloc_bootmem_align(x, align) \
- __alloc_bootmem(x, align,
__pa(MAX_DMA_ADDRESS)
)
+ __alloc_bootmem(x, align,
BOOTMEM_LOW_LIMIT
)
#define alloc_bootmem_nopanic(x) \
#define alloc_bootmem_nopanic(x) \
- __alloc_bootmem_nopanic(x, SMP_CACHE_BYTES,
__pa(MAX_DMA_ADDRESS)
)
+ __alloc_bootmem_nopanic(x, SMP_CACHE_BYTES,
BOOTMEM_LOW_LIMIT
)
#define alloc_bootmem_pages(x) \
#define alloc_bootmem_pages(x) \
- __alloc_bootmem(x, PAGE_SIZE,
__pa(MAX_DMA_ADDRESS)
)
+ __alloc_bootmem(x, PAGE_SIZE,
BOOTMEM_LOW_LIMIT
)
#define alloc_bootmem_pages_nopanic(x) \
#define alloc_bootmem_pages_nopanic(x) \
- __alloc_bootmem_nopanic(x, PAGE_SIZE,
__pa(MAX_DMA_ADDRESS)
)
+ __alloc_bootmem_nopanic(x, PAGE_SIZE,
BOOTMEM_LOW_LIMIT
)
#define alloc_bootmem_node(pgdat, x) \
#define alloc_bootmem_node(pgdat, x) \
- __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES,
__pa(MAX_DMA_ADDRESS)
)
+ __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES,
BOOTMEM_LOW_LIMIT
)
#define alloc_bootmem_node_nopanic(pgdat, x) \
#define alloc_bootmem_node_nopanic(pgdat, x) \
- __alloc_bootmem_node_nopanic(pgdat, x, SMP_CACHE_BYTES,
__pa(MAX_DMA_ADDRESS)
)
+ __alloc_bootmem_node_nopanic(pgdat, x, SMP_CACHE_BYTES,
BOOTMEM_LOW_LIMIT
)
#define alloc_bootmem_pages_node(pgdat, x) \
#define alloc_bootmem_pages_node(pgdat, x) \
- __alloc_bootmem_node(pgdat, x, PAGE_SIZE,
__pa(MAX_DMA_ADDRESS)
)
+ __alloc_bootmem_node(pgdat, x, PAGE_SIZE,
BOOTMEM_LOW_LIMIT
)
#define alloc_bootmem_pages_node_nopanic(pgdat, x) \
#define alloc_bootmem_pages_node_nopanic(pgdat, x) \
- __alloc_bootmem_node_nopanic(pgdat, x, PAGE_SIZE,
__pa(MAX_DMA_ADDRESS)
)
+ __alloc_bootmem_node_nopanic(pgdat, x, PAGE_SIZE,
BOOTMEM_LOW_LIMIT
)
#define alloc_bootmem_low(x) \
__alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
#define alloc_bootmem_low(x) \
__alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)