diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-04 01:52:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-04 01:52:50 -0400 |
| commit | 0eef331a3d0ee970dcbebd1bd5fcb57ca33ece01 (patch) | |
| tree | 8db40eb8e8fc2aff33c6f673aebfcf848b268acf /arch/sparc/mm | |
| parent | ee73887e92a69ae0a5cda21c68ea75a27804c944 (diff) | |
sparc64: Use 'ILOG2_4MB' instead of constant '22'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm')
| -rw-r--r-- | arch/sparc/mm/init_64.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index eafbc65c9c47..ed3c969a5f4c 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
| @@ -588,7 +588,7 @@ static void __init remap_kernel(void) | |||
| 588 | int i, tlb_ent = sparc64_highest_locked_tlbent(); | 588 | int i, tlb_ent = sparc64_highest_locked_tlbent(); |
| 589 | 589 | ||
| 590 | tte_vaddr = (unsigned long) KERNBASE; | 590 | tte_vaddr = (unsigned long) KERNBASE; |
| 591 | phys_page = (prom_boot_mapping_phys_low >> 22UL) << 22UL; | 591 | phys_page = (prom_boot_mapping_phys_low >> ILOG2_4MB) << ILOG2_4MB; |
| 592 | tte_data = kern_large_tte(phys_page); | 592 | tte_data = kern_large_tte(phys_page); |
| 593 | 593 | ||
| 594 | kern_locked_tte_data = tte_data; | 594 | kern_locked_tte_data = tte_data; |
| @@ -1881,7 +1881,7 @@ void __init paging_init(void) | |||
| 1881 | 1881 | ||
| 1882 | BUILD_BUG_ON(NR_CPUS > 4096); | 1882 | BUILD_BUG_ON(NR_CPUS > 4096); |
| 1883 | 1883 | ||
| 1884 | kern_base = (prom_boot_mapping_phys_low >> 22UL) << 22UL; | 1884 | kern_base = (prom_boot_mapping_phys_low >> ILOG2_4MB) << ILOG2_4MB; |
| 1885 | kern_size = (unsigned long)&_end - (unsigned long)KERNBASE; | 1885 | kern_size = (unsigned long)&_end - (unsigned long)KERNBASE; |
| 1886 | 1886 | ||
| 1887 | /* Invalidate both kernel TSBs. */ | 1887 | /* Invalidate both kernel TSBs. */ |
| @@ -1937,7 +1937,7 @@ void __init paging_init(void) | |||
| 1937 | shift = kern_base + PAGE_OFFSET - ((unsigned long)KERNBASE); | 1937 | shift = kern_base + PAGE_OFFSET - ((unsigned long)KERNBASE); |
| 1938 | 1938 | ||
| 1939 | real_end = (unsigned long)_end; | 1939 | real_end = (unsigned long)_end; |
| 1940 | num_kernel_image_mappings = DIV_ROUND_UP(real_end - KERNBASE, 1 << 22); | 1940 | num_kernel_image_mappings = DIV_ROUND_UP(real_end - KERNBASE, 1 << ILOG2_4MB); |
| 1941 | printk("Kernel: Using %d locked TLB entries for main kernel image.\n", | 1941 | printk("Kernel: Using %d locked TLB entries for main kernel image.\n", |
| 1942 | num_kernel_image_mappings); | 1942 | num_kernel_image_mappings); |
| 1943 | 1943 | ||
| @@ -2094,7 +2094,7 @@ static void __init setup_valid_addr_bitmap_from_pavail(unsigned long *bitmap) | |||
| 2094 | 2094 | ||
| 2095 | if (new_start <= old_start && | 2095 | if (new_start <= old_start && |
| 2096 | new_end >= (old_start + PAGE_SIZE)) { | 2096 | new_end >= (old_start + PAGE_SIZE)) { |
| 2097 | set_bit(old_start >> 22, bitmap); | 2097 | set_bit(old_start >> ILOG2_4MB, bitmap); |
| 2098 | goto do_next_page; | 2098 | goto do_next_page; |
| 2099 | } | 2099 | } |
| 2100 | } | 2100 | } |
| @@ -2143,7 +2143,7 @@ void __init mem_init(void) | |||
| 2143 | addr = PAGE_OFFSET + kern_base; | 2143 | addr = PAGE_OFFSET + kern_base; |
| 2144 | last = PAGE_ALIGN(kern_size) + addr; | 2144 | last = PAGE_ALIGN(kern_size) + addr; |
| 2145 | while (addr < last) { | 2145 | while (addr < last) { |
| 2146 | set_bit(__pa(addr) >> 22, sparc64_valid_addr_bitmap); | 2146 | set_bit(__pa(addr) >> ILOG2_4MB, sparc64_valid_addr_bitmap); |
| 2147 | addr += PAGE_SIZE; | 2147 | addr += PAGE_SIZE; |
| 2148 | } | 2148 | } |
| 2149 | 2149 | ||
| @@ -2267,7 +2267,7 @@ int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend, | |||
| 2267 | void *block; | 2267 | void *block; |
| 2268 | 2268 | ||
| 2269 | if (!(*vmem_pp & _PAGE_VALID)) { | 2269 | if (!(*vmem_pp & _PAGE_VALID)) { |
| 2270 | block = vmemmap_alloc_block(1UL << 22, node); | 2270 | block = vmemmap_alloc_block(1UL << ILOG2_4MB, node); |
| 2271 | if (!block) | 2271 | if (!block) |
| 2272 | return -ENOMEM; | 2272 | return -ENOMEM; |
| 2273 | 2273 | ||
