Commit e96d904e authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Replace _ALIGN_DOWN() by ALIGN_DOWN() 



_ALIGN_DOWN() is specific to powerpc
ALIGN_DOWN() is generic and does the same

Replace _ALIGN_DOWN() by ALIGN_DOWN()

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Reviewed-by: default avatarJoel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/3911a86d6b5bfa7ad88cd7c82416fbe6bb47e793.1587407777.git.christophe.leroy@c-s.fr
parent 7bfc3c84

arch/powerpc/include/asm/book3s/32/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot); 
#endif



#ifdef CONFIG_KASAN_VMALLOC

#define VMALLOC_END	_ALIGN_DOWN(ioremap_bot, PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)

#define VMALLOC_END	ALIGN_DOWN(ioremap_bot, PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)

#else

#define VMALLOC_END	ioremap_bot

#endif

arch/powerpc/include/asm/nohash/32/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot); 
#endif



#ifdef CONFIG_KASAN_VMALLOC

#define VMALLOC_END	_ALIGN_DOWN(ioremap_bot, PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)

#define VMALLOC_END	ALIGN_DOWN(ioremap_bot, PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT)

#else

#define VMALLOC_END	ioremap_bot

#endif

arch/powerpc/kernel/pci_64.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int pcibios_map_phb_io_space(struct pci_controller *hose) 
	unsigned long size_page;

	unsigned long io_virt_offset;



	phys_page = _ALIGN_DOWN(hose->io_base_phys, PAGE_SIZE);

	phys_page = ALIGN_DOWN(hose->io_base_phys, PAGE_SIZE);

	size_page = _ALIGN_UP(hose->pci_io_size, PAGE_SIZE);



	/* Make sure IO area address is clear */

arch/powerpc/kernel/prom.c

+3 −3
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static inline int overlaps_initrd(unsigned long start, unsigned long size) 
	if (!initrd_start)

		return 0;



	return	(start + size) > _ALIGN_DOWN(initrd_start, PAGE_SIZE) &&

	return	(start + size) > ALIGN_DOWN(initrd_start, PAGE_SIZE) &&

			start <= _ALIGN_UP(initrd_end, PAGE_SIZE);

#else

	return 0;
@@ -623,9 +623,9 @@ static void __init early_reserve_mem(void) 
#ifdef CONFIG_BLK_DEV_INITRD

	/* Then reserve the initrd, if any */

	if (initrd_start && (initrd_end > initrd_start)) {

		memblock_reserve(_ALIGN_DOWN(__pa(initrd_start), PAGE_SIZE),

		memblock_reserve(ALIGN_DOWN(__pa(initrd_start), PAGE_SIZE),

			_ALIGN_UP(initrd_end, PAGE_SIZE) -

			_ALIGN_DOWN(initrd_start, PAGE_SIZE));

			ALIGN_DOWN(initrd_start, PAGE_SIZE));

	}

#endif /* CONFIG_BLK_DEV_INITRD */

arch/powerpc/kernel/prom_init.c

+4 −4
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ static unsigned long __init alloc_down(unsigned long size, unsigned long align, 


	if (highmem) {

		/* Carve out storage for the TCE table. */

		addr = _ALIGN_DOWN(alloc_top_high - size, align);

		addr = ALIGN_DOWN(alloc_top_high - size, align);

		if (addr <= alloc_bottom)

			return 0;

		/* Will we bump into the RMO ? If yes, check out that we
@@ -1518,9 +1518,9 @@ static unsigned long __init alloc_down(unsigned long size, unsigned long align, 
		goto bail;

	}



	base = _ALIGN_DOWN(alloc_top - size, align);

	base = ALIGN_DOWN(alloc_top - size, align);

	for (; base > alloc_bottom;

	     base = _ALIGN_DOWN(base - 0x100000, align))  {

	     base = ALIGN_DOWN(base - 0x100000, align))  {

		prom_debug("    trying: 0x%lx\n\r", base);

		addr = (unsigned long)prom_claim(base, size, 0);

		if (addr != PROM_ERROR && addr != 0)
@@ -1586,7 +1586,7 @@ static void __init reserve_mem(u64 base, u64 size) 
	 * have our terminator with "size" set to 0 since we are

	 * dumb and just copy this entire array to the boot params

	 */

	base = _ALIGN_DOWN(base, PAGE_SIZE);

	base = ALIGN_DOWN(base, PAGE_SIZE);

	top = _ALIGN_UP(top, PAGE_SIZE);

	size = top - base;