Skip to content

Commit

Permalink
x86/PCI/ACPI: fix type mismatch
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Jesse Barnes <[email protected]>
  • Loading branch information
nmarci1 authored and jbarnes993 committed Jun 1, 2011
1 parent 3f37d62 commit 6e33a85
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/pci/acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ static bool resource_contains(struct resource *res, resource_size_t point)
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;
Expand Down

0 comments on commit 6e33a85

Please sign in to comment.