Skip to contentSkip to conversation

fix IPMI compile with new ACPI

PATCH In review Adrian Bunk 2 participants 2 messages Jun 21, 2003 – Jun 22, 2003 IPMI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix IPMI compile with new ACPI

The patch below fixes the compilation of ipmi_kcs_intf.c in 2.4.22-pre1.

The changes are:
- remove two now unneeded includes (since the files moved there was a compile error, but they are indirectly included via linux/acpi.h)
- remove unneeded COMPILER_DEPENDENT_UINT64; besides that it's unneeded it was wrong on 32 bit architectures
- s/acpi_table_header/struct acpi_table_header/

-ac contains a similar patch that differs because it also adds #include's for acpi/acpi.h and acpi/actypes.h (indirectly included via linux/acpi.h).

cu
Adrian

drivers/char/ipmi/ipmi_kcs_intf.c renamed from drivers/char/ipmi/ipmi_kcs_intf.c.old +1 -5
@@ -1031,10 +1031,6 @@
    from Hewlett-Packard simple bmc.c, a GPL KCS driver. */
 
 #include <linux/acpi.h>
-/* A real hack, but everything's not there yet in 2.4. */
-#define COMPILER_DEPENDENT_UINT64 unsigned long
-#include <../drivers/acpi/include/acpi.h>
-#include <../drivers/acpi/include/actypes.h>
 
 struct SPMITable {
 	s8	Signature[4];
@@ -1059,7 +1055,7 @@
 static unsigned long acpi_find_bmc(void)
 {
 	acpi_status       status;
-	acpi_table_header *spmi;
+	struct acpi_table_header *spmi;
 	static unsigned long io_base = 0;
 
 	if (io_base != 0)
#1 lore raw

Cool, they've fixed the ACPI stuff. It looks good, please apply.

-Corey

Quoted 42 lines · Adrian Bunk

The patch below fixes the compilation of ipmi_kcs_intf.c in 2.4.22-pre1.

The changes are:
- remove two now unneeded includes (since the files moved there was a compile error, but they are indirectly included via linux/acpi.h)
- remove unneeded COMPILER_DEPENDENT_UINT64; besides that it's unneeded it was wrong on 32 bit architectures
- s/acpi_table_header/struct acpi_table_header/

-ac contains a similar patch that differs because it also adds #include's for acpi/acpi.h and acpi/actypes.h (indirectly included via linux/acpi.h).

cu
Adrian

drivers/char/ipmi/ipmi_kcs_intf.c renamed from drivers/char/ipmi/ipmi_kcs_intf.c.old +1 -5
@@ -1031,10 +1031,6 @@
   from Hewlett-Packard simple bmc.c, a GPL KCS driver. */
 
 #include <linux/acpi.h>
-/* A real hack, but everything's not there yet in 2.4. */
-#define COMPILER_DEPENDENT_UINT64 unsigned long
-#include <../drivers/acpi/include/acpi.h>
-#include <../drivers/acpi/include/actypes.h>
 
 struct SPMITable {
 	s8	Signature[4];
@@ -1059,7 +1055,7 @@
 static unsigned long acpi_find_bmc(void)
 {
 	acpi_status       status;
-	acpi_table_header *spmi;
+	struct acpi_table_header *spmi;
 	static unsigned long io_base = 0;
 
 	if (io_base != 0)