Export acpi_check_resource_conflict(), sometimes drivers already have
a struct resource at hand so no need to use the wrappers to build a new
one.
Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
---
Resending, I had forgotten to "quilt refresh". Sorry for the noise.
A missing include was causing warnings with CONFIG_ACPI=n.
drivers/acpi/osl.c | 3 ++-
include/linux/acpi.h | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
--- linux-2.6.24-rc2.orig/drivers/acpi/osl.c 2007-11-07 19:30:53.000000000 +0100
+++ linux-2.6.24-rc2/drivers/acpi/osl.c 2007-11-07 19:31:58.000000000 +0100
@@ -1097,7 +1097,7 @@ __setup("acpi_enforce_resources=", acpi_
/* Check for resource conflicts between ACPI OperationRegions and native
* drivers */
-static int acpi_check_resource_conflict(struct resource *res)
+int acpi_check_resource_conflict(struct resource *res)
{
struct acpi_res_list *res_list_elem;
int ioport;
@@ -1147,6 +1147,7 @@ static int acpi_check_resource_conflict(
}
return 0;
}
+EXPORT_SYMBOL(acpi_check_resource_conflict);
int acpi_check_region(resource_size_t start, resource_size_t n,
const char *name)
--- linux-2.6.24-rc2.orig/include/linux/acpi.h 2007-11-07 19:30:53.000000000 +0100
+++ linux-2.6.24-rc2/include/linux/acpi.h 2007-11-07 19:36:59.000000000 +0100
@@ -25,6 +25,7 @@
#ifndef _LINUX_ACPI_H
#define _LINUX_ACPI_H
+#include <linux/ioport.h> /* for struct resource */
#ifdef CONFIG_ACPI
@@ -195,6 +196,8 @@ extern int pnpacpi_disabled;
#define PXM_INVAL (-1)
#define NID_INVAL (-1)
+int acpi_check_resource_conflict(struct resource *res);
+
int acpi_check_region(resource_size_t start, resource_size_t n,
const char *name);
@@ -213,6 +216,11 @@ static inline int acpi_boot_table_init(v
return 0;
}
+static inline int acpi_check_resource_conflict(struct resource *res)
+{
+ return 0;
+}
+
static inline int acpi_check_region(resource_size_t start, resource_size_t n,
const char *name)
{
--
Jean Delvare
Suse L3
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
