Unverified Commit 5f35b33a authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Paul Burton
Browse files

MIPS: OCTEON: make cvmx_bootmem_alloc_range static 



Make cvmx_bootmem_alloc_range() static, it's not used outside the file.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/21195/
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@linux-mips.org
parent 18304463

arch/mips/cavium-octeon/executive/cvmx-bootmem.c

+15 −2
Original line number Diff line number Diff line
@@ -122,7 +122,20 @@ static uint64_t cvmx_bootmem_phy_get_next(uint64_t addr) 
	return cvmx_read64_uint64((addr + NEXT_OFFSET) | (1ull << 63));

}



void *cvmx_bootmem_alloc_range(uint64_t size, uint64_t alignment,

/**

 * Allocate a block of memory from the free list that was

 * passed to the application by the bootloader within a specified

 * address range. This is an allocate-only algorithm, so

 * freeing memory is not possible. Allocation will fail if

 * memory cannot be allocated in the requested range.

 *

 * @size:      Size in bytes of block to allocate

 * @min_addr:  defines the minimum address of the range

 * @max_addr:  defines the maximum address of the range

 * @alignment: Alignment required - must be power of 2

 * Returns pointer to block of memory, NULL on error

 */

static void *cvmx_bootmem_alloc_range(uint64_t size, uint64_t alignment,

				      uint64_t min_addr, uint64_t max_addr)

{

	int64_t address;

arch/mips/include/asm/octeon/cvmx-bootmem.h

+0 −16
Original line number Diff line number Diff line
@@ -173,22 +173,6 @@ extern void *cvmx_bootmem_alloc(uint64_t size, uint64_t alignment); 
extern void *cvmx_bootmem_alloc_address(uint64_t size, uint64_t address,

					uint64_t alignment);



/**

 * Allocate a block of memory from the free list that was

 * passed to the application by the bootloader within a specified

 * address range. This is an allocate-only algorithm, so

 * freeing memory is not possible. Allocation will fail if

 * memory cannot be allocated in the requested range.

 *

 * @size:      Size in bytes of block to allocate

 * @min_addr:  defines the minimum address of the range

 * @max_addr:  defines the maximum address of the range

 * @alignment: Alignment required - must be power of 2

 * Returns pointer to block of memory, NULL on error

 */

extern void *cvmx_bootmem_alloc_range(uint64_t size, uint64_t alignment,

				      uint64_t min_addr, uint64_t max_addr);



/**

 * Frees a previously allocated named bootmem block.

 *