Re: unable to build i386 ALL kernel, errors in smbus_acpi.c (ACPI_SMBUS_COMPONENT undeclared)

[Paul Goyette <paul%whooppee.com@localhost>]

Please try the attached patch...

On Wed, 3 Mar 2010, Greg A. Woods wrote:

> In trying to eek out other possible errors (after encountering the
> LOCKDEBUG problems with i386 MONOLITHIC), I thought I'd try the i386 ALL
> kernel, and here's what I get now:
>
> /rest/work/woods/m-NetBSD-current/sys/dev/acpi/smbus_acpi.c: In function 
> 'acpi_smbus_match':
> /rest/work/woods/m-NetBSD-current/sys/dev/acpi/smbus_acpi.c:169: error: 
> 'ACPI_SMBUS_COMPONENT' undeclared (first use in this function)
> /rest/work/woods/m-NetBSD-current/sys/dev/acpi/smbus_acpi.c:169: error: (Each 
> undeclared identifier is reported only once
> /rest/work/woods/m-NetBSD-current/sys/dev/acpi/smbus_acpi.c:169: error: for 
> each function it appears in.)
> /rest/work/woods/m-NetBSD-current/sys/dev/acpi/smbus_acpi.c: In function 
> 'acpi_smbus_attach':
> /rest/work/woods/m-NetBSD-current/sys/dev/acpi/smbus_acpi.c:218: error: 
> 'ACPI_SMBUS_COMPONENT' undeclared (first use in this function)
> /rest/work/woods/m-NetBSD-current/sys/dev/acpi/smbus_acpi.c: In function 
> 'acpi_smbus_exec':
> /rest/work/woods/m-NetBSD-current/sys/dev/acpi/smbus_acpi.c:425: error: 
> 'ACPI_SMBUS_COMPONENT' undeclared (first use in this function)
> /rest/work/woods/m-NetBSD-current/sys/dev/acpi/smbus_acpi.c: In function 
> 'acpi_smbus_alerts':
> /rest/work/woods/m-NetBSD-current/sys/dev/acpi/smbus_acpi.c:470: error: 
> 'ACPI_SMBUS_COMPONENT' undeclared (first use in this function)
>
> --
>                                                 Greg A. Woods
>                                                 Planix, Inc.
>
> <woods%planix.com@localhost>       +1 416 218 0099        http://www.planix.com/

-------------------------------------------------------------------------
|   Paul Goyette   | PGP DSS Key fingerprint: |  E-mail addresses:      |
| Customer Service | FA29 0E3B 35AF E8AE 6651 |  paul at whooppee.com   |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------

Index: smbus_acpi.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/smbus_acpi.c,v
retrieving revision 1.3
diff -u -p -r1.3 smbus_acpi.c
--- smbus_acpi.c        1 Mar 2010 13:16:21 -0000       1.3
+++ smbus_acpi.c        4 Mar 2010 02:00:57 -0000
@@ -55,7 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c
 
 #include <dev/i2c/i2cvar.h>
 
-#define _COMPONENT          ACPI_SMBUS_COMPONENT
 ACPI_MODULE_NAME            ("acpi_smbus")
 
 /*
@@ -166,7 +165,7 @@ acpi_smbus_match(device_t parent, cfdata
        }
 done:
        if (smi_buf.Pointer != NULL)
-               ACPI_FREE(smi_buf.Pointer);
+               AcpiOsFree(smi_buf.Pointer);
 
        return r;
 }
@@ -215,7 +214,7 @@ acpi_smbus_attach(device_t parent, devic
                }
        }
        if (smi_buf.Pointer != NULL)
-               ACPI_FREE(smi_buf.Pointer);
+               AcpiOsFree(smi_buf.Pointer);
 
        /* Install notify handler if possible */
        rv = AcpiInstallNotifyHandler(sc->sc_devnode->ad_handle,
@@ -422,7 +421,7 @@ acpi_smbus_exec(void *cookie, i2c_op_t o
                }
        }
        if (smbuf.Pointer)
-               ACPI_FREE(smbuf.Pointer);
+               AcpiOsFree(smbuf.Pointer);
 
        return r;
 }
@@ -467,7 +466,7 @@ acpi_smbus_alerts(struct acpi_smbus_soft
                }
 done:
                if (alert.Pointer != NULL)
-                       ACPI_FREE(alert.Pointer);
+                       AcpiOsFree(alert.Pointer);
        } while (status == 0);
 }