Re: [PATCH] x86 pci acpi: fix type mismatch

From: Jesse Barnes
Date: Wed Jun 01 2011 - 14:51:41 EST


On Sat, 14 May 2011 19:27:33 +0200
NÃmeth MÃrton <nm127@xxxxxxxxxxx> wrote:

> From: MÃrton NÃmeth <nm127@xxxxxxxxxxx>
>
> The flags field of struct resource from linux/ioport.h is "unsigned long". Change
> the "type" parameter of coalesce_windows() function to match that field. This fixes
> the following warning messages when compiling with "make C=1 W=1 bzImage modules":
>
> arch/x86/pci/acpi.c: In function âcoalesce_windowsâ:
> arch/x86/pci/acpi.c:198: warning: conversion to âlong unsigned intâ from âintâ may change the sign of the result
> arch/x86/pci/acpi.c:203: warning: conversion to âlong unsigned intâ from âintâ may change the sign of the result
>
> Signed-off-by: MÃrton NÃmeth <nm127@xxxxxxxxxxx>
> ---
> --- linux-2.6.39-rc6/arch/x86/pci/acpi.c.orig 2011-05-04 04:59:13.000000000 +0200
> +++ linux-2.6.39-rc6/arch/x86/pci/acpi.c 2011-05-14 19:12:42.000000000 +0200
> @@ -188,7 +188,7 @@ static bool resource_contains(struct res
> return false;
> }
>
> -static void coalesce_windows(struct pci_root_info *info, int type)
> +static void coalesce_windows(struct pci_root_info *info, unsigned long type)
> {
> int i, j;
> struct resource *res1, *res2;

Applied to my for-linus tree, thanks.

--
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/