diff options
| author | Joe Perches <joe@perches.com> | 2021-07-13 20:49:15 +0300 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2021-07-19 14:17:20 +0300 |
| commit | e98b461bb057aaea6fa766260788c08825213837 (patch) | |
| tree | ba6b9fe3963836807fe8a4dc22dfcb798b5f169f /arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | |
| parent | 14d72af7ab00d9c2eb5b473b4fdf3b751b8cf8e2 (diff) | |
| download | linux-e98b461bb057aaea6fa766260788c08825213837.tar.xz | |
MIPS: octeon: Remove vestiges of CONFIG_CAVIUM_RESERVE32
The config option CAVIUM_RESERVE32 is not used.
Remove the dead code controlled by it.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c')
| -rw-r--r-- | arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c index 3839feba68f2..fb42e8e21ea0 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c +++ b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c @@ -57,27 +57,14 @@ EXPORT_SYMBOL_GPL(__cvmx_cmd_queue_state_ptr); static cvmx_cmd_queue_result_t __cvmx_cmd_queue_init_state_ptr(void) { char *alloc_name = "cvmx_cmd_queues"; -#if defined(CONFIG_CAVIUM_RESERVE32) && CONFIG_CAVIUM_RESERVE32 - extern uint64_t octeon_reserve32_memory; -#endif if (likely(__cvmx_cmd_queue_state_ptr)) return CVMX_CMD_QUEUE_SUCCESS; -#if defined(CONFIG_CAVIUM_RESERVE32) && CONFIG_CAVIUM_RESERVE32 - if (octeon_reserve32_memory) - __cvmx_cmd_queue_state_ptr = - cvmx_bootmem_alloc_named_range(sizeof(*__cvmx_cmd_queue_state_ptr), - octeon_reserve32_memory, - octeon_reserve32_memory + - (CONFIG_CAVIUM_RESERVE32 << - 20) - 1, 128, alloc_name); - else -#endif - __cvmx_cmd_queue_state_ptr = - cvmx_bootmem_alloc_named(sizeof(*__cvmx_cmd_queue_state_ptr), - 128, - alloc_name); + __cvmx_cmd_queue_state_ptr = + cvmx_bootmem_alloc_named(sizeof(*__cvmx_cmd_queue_state_ptr), + 128, + alloc_name); if (__cvmx_cmd_queue_state_ptr) memset(__cvmx_cmd_queue_state_ptr, 0, sizeof(*__cvmx_cmd_queue_state_ptr)); |