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

Commit d7dc899a authored by Stefan Agner's avatar Stefan Agner Committed by Linus Torvalds
Browse files

treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX 

With PHYS_ADDR_MAX there is now a type safe variant for all bits set.
Make use of it.

Patch created using a semantic patch as follows:

// <smpl>
@@
typedef phys_addr_t;
@@
-(phys_addr_t)ULLONG_MAX
+PHYS_ADDR_MAX
// </smpl>

Link: http://lkml.kernel.org/r/20180419214204.19322-1-stefan@agner.ch


Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>	[arm64]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0825a6f9

arch/arm64/mm/init.c

+3 −3
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static void __init arm64_memory_present(void) 
}

#endif



static phys_addr_t memory_limit = (phys_addr_t)ULLONG_MAX;

static phys_addr_t memory_limit = PHYS_ADDR_MAX;



/*

 * Limit the memory size that was specified via FDT.
@@ -401,7 +401,7 @@ void __init arm64_memblock_init(void) 
	 * high up in memory, add back the kernel region that must be accessible

	 * via the linear mapping.

	 */

	if (memory_limit != (phys_addr_t)ULLONG_MAX) {

	if (memory_limit != PHYS_ADDR_MAX) {

		memblock_mem_limit_remove_map(memory_limit);

		memblock_add(__pa_symbol(_text), (u64)(_end - _text));

	}
@@ -666,7 +666,7 @@ __setup("keepinitrd", keepinitrd_setup); 
 */

static int dump_mem_limit(struct notifier_block *self, unsigned long v, void *p)

{

	if (memory_limit != (phys_addr_t)ULLONG_MAX) {

	if (memory_limit != PHYS_ADDR_MAX) {

		pr_emerg("Memory Limit: %llu MB\n", memory_limit >> 20);

	} else {

		pr_emerg("Memory Limit: none\n");

arch/mips/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void __init add_memory_region(phys_addr_t start, phys_addr_t size, long type) 
	 * If the region reaches the top of the physical address space, adjust

	 * the size slightly so that (start + size) doesn't overflow

	 */

	if (start + size - 1 == (phys_addr_t)ULLONG_MAX)

	if (start + size - 1 == PHYS_ADDR_MAX)

		--size;



	/* Sanity check */
@@ -376,7 +376,7 @@ static void __init bootmem_init(void) 
	unsigned long reserved_end;

	unsigned long mapstart = ~0UL;

	unsigned long bootmap_size;

	phys_addr_t ramstart = (phys_addr_t)ULLONG_MAX;

	phys_addr_t ramstart = PHYS_ADDR_MAX;

	bool bootmap_valid = false;

	int i;

arch/powerpc/mm/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ void __init mem_topology_setup(void) 
	/* Place all memblock_regions in the same node and merge contiguous

	 * memblock_regions

	 */

	memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0);

	memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);

}



void __init initmem_init(void)

arch/sparc/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -1620,7 +1620,7 @@ static void __init bootmem_init_nonnuma(void) 
	       (top_of_ram - total_ram) >> 20);



	init_node_masks_nonnuma();

	memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0);

	memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);

	allocate_node_data(0);

	node_set_online(0);

}

arch/x86/mm/init_32.c

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ void __init initmem_init(void) 
	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE - 1) + 1;

#endif



	memblock_set_node(0, (phys_addr_t)ULLONG_MAX, &memblock.memory, 0);

	memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);

	sparse_memory_present_with_active_regions(0);



#ifdef CONFIG_FLATMEM