Hi Kamalesh,
Le mardi 06 novembre 2007, Kamalesh Babulal a écrit :
Odd. Thanks for reporting.
There's an #else after that, and the functions are defined as inlines
doing nothing in the non-ACPI case. The code looks OK to me, but I can
reproduce the problem on x86_64 with CONFIG_ACPI=n.
Aha, I see it now, there are nested #ifdef CONFIG_ACPI in acpi.h,
so the inner one is a no-op (and its #else counterpart is never
evaluated.) That's pretty confusing, I'll send a patch fixing this.
In the meantime, here's a quick fix so that you can go on testing
the mm snapshot. Apply this at the top of the series:
Fix the <linux/acpi.h> breakage for CONFIG_ACPI=n.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
include/linux/acpi.h | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
--- linux-2.6.24-rc1.orig/include/linux/acpi.h 2007-11-07 12:45:47.000000000 +0100
+++ linux-2.6.24-rc1/include/linux/acpi.h 2007-11-07 13:23:06.000000000 +0100
@@ -26,6 +26,7 @@
#define _LINUX_ACPI_H
+#include <linux/ioport.h>
#ifdef CONFIG_ACPI
#ifndef _LINUX
@@ -134,17 +135,6 @@ int acpi_check_mem_region(resource_size_
#define acpi_mp_config 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)
-{ return 0; }
-
-static inline int acpi_check_mem_region(resource_size_t start,
- resource_size_t n, const char *name)
-{ return 0; }
-
#endif /* !CONFIG_ACPI */
int acpi_register_gsi (u32 gsi, int triggering, int polarity);
@@ -239,5 +229,16 @@ 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)
+{ return 0; }
+
+static inline int acpi_check_mem_region(resource_size_t start,
+ resource_size_t n, const char *name)
+{ return 0; }
+
#endif /* CONFIG_ACPI */
#endif /*_LINUX_ACPI_H*/
--
Jean Delvare
Suse L3
-
