Re: 2.6.12-rc5-git3 fails compile -- acpi_boot_table_init

[Steven Cole]

Linus Torvalds wrote:
> On Sat, 28 May 2005, Alexander Nyberg wrote:
>
> > This is a neverending story
> >
> > linux/acpi.h contains empty declarations for acpi_boot_init() &
> > acpi_boot_table_init() but they are nested inside #ifdef CONFIG_ACPI.
> >
> > So we'll have to #ifdef in arch/i386/kernel/setup.c: setup_arch()
>
>
> Wouldn't it be much nicer to just fix <linux/acpi.h> instead? Or, if you
> really prefer this, then you should remove the now useless code from
> acpi.h. In either case, this patch looks wrong.
>
> 		Linus

Andrew provided a patch to fix this in include/linux/acpi.h back in
early April: http://marc.theaimsgroup.com/?l=linux-kernel&m=111275175906204&w=2

I had to fix up one reject, but it still fixes the no ACPI build for me, with
the current HEAD=5e485b7975472ba4a408523deb6541e70c451842.

Here's the patch.  Since akpm is the real author, he should sign off too.

Signed-off-by: Steven Cole <elenstev@xxxxxxxxxxx>

Steven

include/linux/acpi.h: needs update
Index: include/linux/acpi.h
===================================================================
--- 3ac19ebb77c3cd8a1df31b7170c6eaf9e1afb1a4/include/linux/acpi.h  (mode:100644)
+++ uncommitted/include/linux/acpi.h  (mode:100644)
@@ -415,16 +415,6 @@

 #define acpi_mp_config	0

-static inline int acpi_boot_init(void)
-{
-	return 0;
-}
-
-static inline int acpi_boot_table_init(void)
-{
-	return 0;
-}
-
 #endif 	/*!CONFIG_ACPI_BOOT*/

 unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
@@ -535,5 +525,17 @@

 extern int pnpacpi_disabled;

+ #else	/* CONFIG_ACPI */
+
+ static inline int acpi_boot_init(void)
+ {
+ 	return 0;
+ }
+
+ static inline int acpi_boot_table_init(void)
+ {
+ 	return 0;
+ }
+
 #endif	/* CONFIG_ACPI */
 #endif	/*_LINUX_ACPI_H*/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/