Commit f78f7ed7 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc: Fix _ALIGN_* errors due to type difference. 



This avoid errors like

        unsigned int usize = 1 << 30;
        int size = 1 << 30;
        unsigned long addr = 64UL << 30 ;

        value = _ALIGN_DOWN(addr, usize); -> 0
        value = _ALIGN_DOWN(addr, size);  -> 0x1000000000

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 1b70386c

arch/powerpc/boot/page.h

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#define PAGE_MASK	(~(PAGE_SIZE-1))



/* align addr on a size boundary - adjust address up/down if needed */

#define _ALIGN_UP(addr,size)	(((addr)+((size)-1))&(~((size)-1)))

#define _ALIGN_DOWN(addr,size)	((addr)&(~((size)-1)))

#define _ALIGN_UP(addr, size)	(((addr)+((size)-1))&(~((typeof(addr))(size)-1)))

#define _ALIGN_DOWN(addr, size)	((addr)&(~((typeof(addr))(size)-1)))



/* align addr on a size boundary - adjust address up if needed */

#define _ALIGN(addr,size)     _ALIGN_UP(addr,size)

arch/powerpc/include/asm/page.h

+3 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#ifndef __ASSEMBLY__

#include <linux/types.h>

#include <linux/kernel.h>

#else

#include <asm/types.h>

#endif
@@ -241,8 +242,8 @@ extern long long virt_phys_offset; 
#endif



/* align addr on a size boundary - adjust address up/down if needed */

#define _ALIGN_UP(addr,size)	(((addr)+((size)-1))&(~((size)-1)))

#define _ALIGN_DOWN(addr,size)	((addr)&(~((size)-1)))

#define _ALIGN_UP(addr, size)   __ALIGN_KERNEL(addr, size)

#define _ALIGN_DOWN(addr, size)	((addr)&(~((typeof(addr))(size)-1)))



/* align addr on a size boundary - adjust address up if needed */

#define _ALIGN(addr,size)     _ALIGN_UP(addr,size)

CRA Git | Maintained and supported by SUSTech CRA and CCSE