Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Octeon: Rename upper case variables at setup time.

Rename upper case variables.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: David Daney <david.daney@cavium.com>
Cc: Sivasubramanian Palanisamy <sivasubramanian.palanisamy@nokia.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13352/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Aaro Koskinen and committed by
Ralf Baechle
fd6ecf42 4c0f5a71

+19 -19
+19 -19
arch/mips/cavium-octeon/setup.c
··· 65 65 extern void pci_console_init(const char *arg); 66 66 #endif 67 67 68 - static unsigned long long MAX_MEMORY = ULLONG_MAX; 68 + static unsigned long long max_memory = ULLONG_MAX; 69 + static unsigned long long reserve_low_mem; 69 70 70 71 DEFINE_SEMAPHORE(octeon_bootbus_sem); 71 72 EXPORT_SYMBOL(octeon_bootbus_sem); ··· 76 75 struct cvmx_bootinfo *octeon_bootinfo; 77 76 EXPORT_SYMBOL(octeon_bootinfo); 78 77 79 - static unsigned long long RESERVE_LOW_MEM = 0ull; 80 78 #ifdef CONFIG_KEXEC 81 79 #ifdef CONFIG_SMP 82 80 /* ··· 125 125 bootmem_desc->major_version = CVMX_BOOTMEM_DESC_MAJ_VER; 126 126 bootmem_desc->minor_version = CVMX_BOOTMEM_DESC_MIN_VER; 127 127 128 - addr = (OCTEON_DDR0_BASE + RESERVE_LOW_MEM + low_reserved_bytes); 128 + addr = (OCTEON_DDR0_BASE + reserve_low_mem + low_reserved_bytes); 129 129 bootmem_desc->head_addr = 0; 130 130 131 131 if (mem_size <= OCTEON_DDR0_SIZE) { 132 132 __cvmx_bootmem_phy_free(addr, 133 - mem_size - RESERVE_LOW_MEM - 133 + mem_size - reserve_low_mem - 134 134 low_reserved_bytes, 0); 135 135 return; 136 136 } 137 137 138 138 __cvmx_bootmem_phy_free(addr, 139 - OCTEON_DDR0_SIZE - RESERVE_LOW_MEM - 139 + OCTEON_DDR0_SIZE - reserve_low_mem - 140 140 low_reserved_bytes, 0); 141 141 142 142 mem_size -= OCTEON_DDR0_SIZE; ··· 846 846 847 847 /* Default to 64MB in the simulator to speed things up */ 848 848 if (octeon_is_simulation()) 849 - MAX_MEMORY = 64ull << 20; 849 + max_memory = 64ull << 20; 850 850 851 851 arg = strstr(arcs_cmdline, "mem="); 852 852 if (arg) { 853 - MAX_MEMORY = memparse(arg + 4, &p); 854 - if (MAX_MEMORY == 0) 855 - MAX_MEMORY = 32ull << 30; 853 + max_memory = memparse(arg + 4, &p); 854 + if (max_memory == 0) 855 + max_memory = 32ull << 30; 856 856 if (*p == '@') 857 - RESERVE_LOW_MEM = memparse(p + 1, &p); 857 + reserve_low_mem = memparse(p + 1, &p); 858 858 } 859 859 860 860 arcs_cmdline[0] = 0; ··· 864 864 cvmx_phys_to_ptr(octeon_boot_desc_ptr->argv[i]); 865 865 if ((strncmp(arg, "MEM=", 4) == 0) || 866 866 (strncmp(arg, "mem=", 4) == 0)) { 867 - MAX_MEMORY = memparse(arg + 4, &p); 868 - if (MAX_MEMORY == 0) 869 - MAX_MEMORY = 32ull << 30; 867 + max_memory = memparse(arg + 4, &p); 868 + if (max_memory == 0) 869 + max_memory = 32ull << 30; 870 870 if (*p == '@') 871 - RESERVE_LOW_MEM = memparse(p + 1, &p); 871 + reserve_low_mem = memparse(p + 1, &p); 872 872 #ifdef CONFIG_KEXEC 873 873 } else if (strncmp(arg, "crashkernel=", 12) == 0) { 874 874 crashk_size = memparse(arg+12, &p); ··· 957 957 * to consistently work. 958 958 */ 959 959 mem_alloc_size = 4 << 20; 960 - if (mem_alloc_size > MAX_MEMORY) 961 - mem_alloc_size = MAX_MEMORY; 960 + if (mem_alloc_size > max_memory) 961 + mem_alloc_size = max_memory; 962 962 963 963 /* Crashkernel ignores bootmem list. It relies on mem=X@Y option */ 964 964 #ifdef CONFIG_CRASH_DUMP 965 - add_memory_region(RESERVE_LOW_MEM, MAX_MEMORY, BOOT_MEM_RAM); 966 - total += MAX_MEMORY; 965 + add_memory_region(reserve_low_mem, max_memory, BOOT_MEM_RAM); 966 + total += max_memory; 967 967 #else 968 968 #ifdef CONFIG_KEXEC 969 969 if (crashk_size > 0) { ··· 978 978 */ 979 979 cvmx_bootmem_lock(); 980 980 while ((boot_mem_map.nr_map < BOOT_MEM_MAP_MAX) 981 - && (total < MAX_MEMORY)) { 981 + && (total < max_memory)) { 982 982 memory = cvmx_bootmem_phy_alloc(mem_alloc_size, 983 983 __pa_symbol(&_end), -1, 984 984 0x100000,