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

powerpc: Replace _ALIGN_UP() by ALIGN() 



_ALIGN_UP() is specific to powerpc
ALIGN() is generic and does the same

Replace _ALIGN_UP() by ALIGN()

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/8a6d7e45f7904c73a0af539642d3962e2a3c7268.1587407777.git.christophe.leroy@c-s.fr
parent e96d904e

arch/powerpc/include/asm/iommu.h

+2 −2
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ 
#define IOMMU_PAGE_SHIFT_4K      12

#define IOMMU_PAGE_SIZE_4K       (ASM_CONST(1) << IOMMU_PAGE_SHIFT_4K)

#define IOMMU_PAGE_MASK_4K       (~((1 << IOMMU_PAGE_SHIFT_4K) - 1))

#define IOMMU_PAGE_ALIGN_4K(addr) _ALIGN_UP(addr, IOMMU_PAGE_SIZE_4K)

#define IOMMU_PAGE_ALIGN_4K(addr) ALIGN(addr, IOMMU_PAGE_SIZE_4K)



#define IOMMU_PAGE_SIZE(tblptr) (ASM_CONST(1) << (tblptr)->it_page_shift)

#define IOMMU_PAGE_MASK(tblptr) (~((1 << (tblptr)->it_page_shift) - 1))

#define IOMMU_PAGE_ALIGN(addr, tblptr) _ALIGN_UP(addr, IOMMU_PAGE_SIZE(tblptr))

#define IOMMU_PAGE_ALIGN(addr, tblptr) ALIGN(addr, IOMMU_PAGE_SIZE(tblptr))



/* Boot time flags */

extern int iommu_is_off;

arch/powerpc/kernel/head_booke.h

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ struct exception_regs { 
};



/* ensure this structure is always sized to a multiple of the stack alignment */

#define STACK_EXC_LVL_FRAME_SIZE	_ALIGN_UP(sizeof (struct exception_regs), 16)

#define STACK_EXC_LVL_FRAME_SIZE	ALIGN(sizeof (struct exception_regs), 16)



#endif /* __ASSEMBLY__ */

#endif /* __HEAD_BOOKE_H__ */

arch/powerpc/kernel/nvram_64.c

+2 −2
Original line number Diff line number Diff line
@@ -854,8 +854,8 @@ loff_t __init nvram_create_partition(const char *name, int sig, 
	BUILD_BUG_ON(NVRAM_BLOCK_LEN != 16);



	/* Convert sizes from bytes to blocks */

	req_size = _ALIGN_UP(req_size, NVRAM_BLOCK_LEN) / NVRAM_BLOCK_LEN;

	min_size = _ALIGN_UP(min_size, NVRAM_BLOCK_LEN) / NVRAM_BLOCK_LEN;

	req_size = ALIGN(req_size, NVRAM_BLOCK_LEN) / NVRAM_BLOCK_LEN;

	min_size = ALIGN(min_size, NVRAM_BLOCK_LEN) / NVRAM_BLOCK_LEN;



	/* If no minimum size specified, make it the same as the

	 * requested size

arch/powerpc/kernel/pci_64.c

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



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

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

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



	/* Make sure IO area address is clear */

	hose->io_base_alloc = NULL;

arch/powerpc/kernel/prom.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static inline int overlaps_initrd(unsigned long start, unsigned long size) 
		return 0;



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

			start <= _ALIGN_UP(initrd_end, PAGE_SIZE);

			start <= ALIGN(initrd_end, PAGE_SIZE);

#else

	return 0;

#endif
@@ -624,7 +624,7 @@ static void __init early_reserve_mem(void) 
	/* Then reserve the initrd, if any */

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

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

			_ALIGN_UP(initrd_end, PAGE_SIZE) -

			ALIGN(initrd_end, PAGE_SIZE) -

			ALIGN_DOWN(initrd_start, PAGE_SIZE));

	}

#endif /* CONFIG_BLK_DEV_INITRD */