From patchwork Wed Nov 11 14:22:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 59337 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nABEMJcZ019288 for ; Wed, 11 Nov 2009 14:22:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755695AbZKKOWN (ORCPT ); Wed, 11 Nov 2009 09:22:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756348AbZKKOWN (ORCPT ); Wed, 11 Nov 2009 09:22:13 -0500 Received: from poutre.nerim.net ([62.4.16.124]:56905 "EHLO poutre.nerim.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755695AbZKKOWM (ORCPT ); Wed, 11 Nov 2009 09:22:12 -0500 Received: from localhost (localhost [127.0.0.1]) by poutre.nerim.net (Postfix) with ESMTP id 1755339DEC5; Wed, 11 Nov 2009 15:22:15 +0100 (CET) X-Virus-Scanned: amavisd-new at nerim.net Received: from poutre.nerim.net ([127.0.0.1]) by localhost (poutre.nerim.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zCM10JaXfJaC; Wed, 11 Nov 2009 15:22:14 +0100 (CET) Received: from hyperion.delvare (jdelvare.pck.nerim.net [62.212.121.182]) by poutre.nerim.net (Postfix) with ESMTP id 1806F39DEC4; Wed, 11 Nov 2009 15:22:14 +0100 (CET) Date: Wed, 11 Nov 2009 15:22:15 +0100 From: Jean Delvare To: linux-acpi@vger.kernel.org Cc: Len Brown Subject: [PATCH] acpi_check_resource_conflict doesn't change the resource Message-ID: <20091111152215.66617c8f@hyperion.delvare> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; i586-suse-linux-gnu) Mime-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org --- linux-2.6.32-rc6.orig/drivers/acpi/osl.c 2009-09-28 10:28:34.000000000 +0200 +++ linux-2.6.32-rc6/drivers/acpi/osl.c 2009-11-11 15:13:30.000000000 +0100 @@ -1118,7 +1118,7 @@ __setup("acpi_enforce_resources=", acpi_ /* Check for resource conflicts between ACPI OperationRegions and native * drivers */ -int acpi_check_resource_conflict(struct resource *res) +int acpi_check_resource_conflict(const struct resource *res) { struct acpi_res_list *res_list_elem; int ioport; --- linux-2.6.32-rc6.orig/include/linux/acpi.h 2009-09-28 10:29:17.000000000 +0200 +++ linux-2.6.32-rc6/include/linux/acpi.h 2009-11-11 15:13:09.000000000 +0100 @@ -240,7 +240,7 @@ extern int pnpacpi_disabled; #define PXM_INVAL (-1) #define NID_INVAL (-1) -int acpi_check_resource_conflict(struct resource *res); +int acpi_check_resource_conflict(const struct resource *res); int acpi_check_region(resource_size_t start, resource_size_t n, const char *name);