The patch titled
ACPI: Export acpi_check_resource_conflict() (update #2)
has been added to the -mm tree. Its filename is
export-acpi_check_resource_conflict-update.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ACPI: Export acpi_check_resource_conflict() (update #2)
From: Jean Delvare <jdelvare@xxxxxxx>
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>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/acpi.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff -puN include/linux/acpi.h~export-acpi_check_resource_conflict-update include/linux/acpi.h
--- a/include/linux/acpi.h~export-acpi_check_resource_conflict-update
+++ a/include/linux/acpi.h
@@ -25,8 +25,8 @@
#ifndef _LINUX_ACPI_H
#define _LINUX_ACPI_H
+#include <linux/ioport.h> /* for struct resource */
-#include <linux/ioport.h>
#ifdef CONFIG_ACPI
#ifndef _LINUX
@@ -215,6 +215,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)
{
@@ -227,8 +232,5 @@ static inline int acpi_check_mem_region(
return 0;
}
-static inline int acpi_check_resource_conflict(struct resource *res)
-{ return 0; }
-
#endif /* CONFIG_ACPI */
#endif /*_LINUX_ACPI_H*/
_
Patches currently in -mm which might be from jdelvare@xxxxxxx are
acpi-cleanup-linux-acpih.patch
export-acpi_check_resource_conflict.patch
export-acpi_check_resource_conflict-update.patch
check-for-acpi-resource-conflicts-in-i2c-bus-drivers.patch
check-for-acpi-resource-conflicts-in-hwmon-drivers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
