Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6af5e9f authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

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: default avatarJohannes Weiner <hannes@saeurebad.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9b813616

include/linux/bootmem.h

+4 −5
Original line number Original line Diff line number Diff line
@@ -103,17 +103,16 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, 
	__alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

	__alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low_pages(x) \

#define alloc_bootmem_low_pages(x) \

	__alloc_bootmem_low(x, PAGE_SIZE, 0)

	__alloc_bootmem_low(x, PAGE_SIZE, 0)

#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */



extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,

				   int flags);



#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, __pa(MAX_DMA_ADDRESS))

#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, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low_pages_node(pgdat, x) \

#define alloc_bootmem_low_pages_node(pgdat, x) \

	__alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)

	__alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)

#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */



extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,

				   int flags);





extern void *alloc_bootmem_section(unsigned long size,

extern void *alloc_bootmem_section(unsigned long size,

				   unsigned long section_nr);

				   unsigned long section_nr);