diff options
| author | Anton Blanchard <anton@samba.org> | 2014-09-17 14:15:37 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-09 23:59:27 +0100 |
| commit | 6e4c632cdff7bf0238a2543dfe98bd1ad40313c2 (patch) | |
| tree | b394ab195c02c0bc76f22c5223a36fb55d3f8797 /arch/powerpc/sysdev | |
| parent | powerpc: Move sparse_init() into initmem_init (diff) | |
| download | linux-6e4c632cdff7bf0238a2543dfe98bd1ad40313c2.tar.xz linux-6e4c632cdff7bf0238a2543dfe98bd1ad40313c2.zip | |
powerpc: make __ffs return unsigned long
I'm seeing a build warning in mm/nobootmem.c after removing
bootmem:
mm/nobootmem.c: In function '__free_pages_memory':
include/linux/kernel.h:713:17: warning: comparison of distinct pointer types lacks a cast [enabled by default]
(void) (&_min1 == &_min2); \
^
mm/nobootmem.c:90:11: note: in expansion of macro 'min'
order = min(MAX_ORDER - 1UL, __ffs(start));
^
The rest of the worlds seems to define __ffs as returning unsigned long,
so lets do that.
Signed-off-by: Anton Blanchard <anton@samba.org>
Tested-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 65d2ed4549e6..d8484d7cffaa 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -152,7 +152,7 @@ static int setup_one_atmu(struct ccsr_pci __iomem *pci, flags |= 0x10000000; /* enable relaxed ordering */ for (i = 0; size > 0; i++) { - unsigned int bits = min(ilog2(size), + unsigned int bits = min_t(u32, ilog2(size), __ffs(pci_addr | phys_addr)); if (index + i >= 5) |