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

Commit 2d0aae41 authored by Tejun Heo's avatar Tejun Heo
Browse files

bootmem: reorder interface functions and add a missing one 



Impact: cleanup and addition of missing interface wrapper

The interface functions in bootmem.h was ordered in not so orderly
manner.  Reorder them such that

* functions allocating the same area group together -
  ie. alloc_bootmem group and alloc_bootmem_low group.

* functions w/o node parameter come before the ones w/ node parameter.

* nopanic variants are immediately below their panicky counterparts.

While at it, add alloc_bootmem_pages_node_nopanic() which was missing.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Johannes Weiner <hannes@saeurebad.de>
parent c1329375

include/linux/bootmem.h

+17 −13
Original line number Diff line number Diff line
@@ -65,20 +65,18 @@ extern void free_bootmem(unsigned long addr, unsigned long size); 
#define BOOTMEM_DEFAULT		0

#define BOOTMEM_EXCLUSIVE	(1<<0)



extern int reserve_bootmem_node(pg_data_t *pgdat,

				 unsigned long physaddr,

extern int reserve_bootmem(unsigned long addr,

			   unsigned long size,

			   int flags);

extern int reserve_bootmem(unsigned long addr,

extern int reserve_bootmem_node(pg_data_t *pgdat,

				unsigned long physaddr,

				unsigned long size,

				int flags);

extern void *__alloc_bootmem_nopanic(unsigned long size,

			     unsigned long align,

			     unsigned long goal);



extern void *__alloc_bootmem(unsigned long size,

			     unsigned long align,

			     unsigned long goal);

extern void *__alloc_bootmem_low(unsigned long size,

extern void *__alloc_bootmem_nopanic(unsigned long size,

				     unsigned long align,

				     unsigned long goal);

extern void *__alloc_bootmem_node(pg_data_t *pgdat,
@@ -89,6 +87,9 @@ extern void *__alloc_bootmem_node_nopanic(pg_data_t *pgdat, 
				  unsigned long size,

				  unsigned long align,

				  unsigned long goal);

extern void *__alloc_bootmem_low(unsigned long size,

				 unsigned long align,

				 unsigned long goal);

extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,

				      unsigned long size,

				      unsigned long align,
@@ -98,18 +99,21 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, 
	__alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_nopanic(x) \

	__alloc_bootmem_nopanic(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low(x) \

	__alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)

#define alloc_bootmem_pages(x) \

	__alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_pages_nopanic(x) \

	__alloc_bootmem_nopanic(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low_pages(x) \

	__alloc_bootmem_low(x, PAGE_SIZE, 0)

#define alloc_bootmem_node(pgdat, x) \

	__alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_pages_node(pgdat, x) \

	__alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_pages_node_nopanic(pgdat, x) \

	__alloc_bootmem_node_nopanic(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))



#define alloc_bootmem_low(x) \

	__alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)

#define alloc_bootmem_low_pages(x) \

	__alloc_bootmem_low(x, PAGE_SIZE, 0)

#define alloc_bootmem_low_pages_node(pgdat, x) \

	__alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)