Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
bootmem: Move node allocation macros back to !HAVE_ARCH_BOOTMEM_NODE
These got unintentionally moved, put them back as x86 provides its own
versions.
Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Johannes Weiner
and committed by
Linus Torvalds
c6af5e9f
9b813616
+4
-5
include/linux/bootmem.h
+4
-5
include/linux/bootmem.h
···
103
103
__alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
104
104
#define alloc_bootmem_low_pages(x) \
105
105
__alloc_bootmem_low(x, PAGE_SIZE, 0)
106
-
#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
107
-
108
-
extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,
109
-
int flags);
110
-
111
106
#define alloc_bootmem_node(pgdat, x) \
112
107
__alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
113
108
#define alloc_bootmem_pages_node(pgdat, x) \
114
109
__alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
115
110
#define alloc_bootmem_low_pages_node(pgdat, x) \
116
111
__alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)
112
+
#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
113
+
114
+
extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,
115
+
int flags);
117
116
118
117
extern void *alloc_bootmem_section(unsigned long size,
119
118
unsigned long section_nr);