Russell, On Friday 13 December 2013 07:38 PM, Santosh Shilimkar wrote: > Building ARM with NO_BOOTMEM generates below warning. > > mm/nobootmem.c: In function _____free_pages_memory___: > mm/nobootmem.c:88:11: warning: comparison of distinct pointer types lacks a > cast > > order = min(MAX_ORDER - 1UL, __ffs(start)); > > ARM's __ffs() differs from other architectures in that it ends up being > an int, whereas almost everyone else is unsigned long. > > So fix ARMs __ffs() to conform to other architectures. Suggested by > Russell King <li...@arm.linux.org.uk> > > Some more details in below thread - > https://lkml.org/lkml/2013/12/9/807 > > Cc: Andrew Morton <a...@linux-foundation.org> > Cc: Russell King <li...@arm.linux.org.uk> > Signed-off-by: Santosh Shilimkar <santosh.shilim...@ti.com> > --- Is this patch inline with what we discussed off-list ? If you ack it, it can go into the Andrews tree to kill that one last warning with the memblock series. Thanks
> arch/arm/include/asm/bitops.h | 23 +++++++++++++++++++---- > 1 file changed, 19 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h > index e691ec9..5f41d81 100644 > --- a/arch/arm/include/asm/bitops.h > +++ b/arch/arm/include/asm/bitops.h > @@ -270,10 +270,25 @@ static inline int fls(int x) > return ret; > } > > -#define __fls(x) (fls(x) - 1) > -#define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); }) > -#define __ffs(x) (ffs(x) - 1) > -#define ffz(x) __ffs( ~(x) ) > +static inline unsigned long __fls(unsigned long x) > +{ > + return fls(x) - 1; > +} > + > +static inline int ffs(int x) > +{ > + return fls(x & -x); > +} > + > +static inline unsigned long __ffs(unsigned long x) > +{ > + return ffs(x) - 1; > +} > + > +static inline unsigned long ffz(unsigned long x) > +{ > + return __ffs(~x); > +} > > #endif > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/