Commit 6e33a852 authored May 14, 2011 by Márton Németh Committed by Jesse Barnes Jun 01, 2011

x86/PCI/ACPI: fix type mismatch

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@freemail.hu>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

parent 3f37d622

arch/x86/pci/acpi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message