svn commit: r337913 - in head/sys: dev/ipmi modules/ipmi

[Doug Ambrisko]

Author: ambrisko
Date: Thu Aug 16 15:59:02 2018
New Revision: 337913
URL: https://svnweb.freebsd.org/changeset/base/337913

Log:
  Fix a module Makefile error on amd64 so the IPMI HW interfaces are built.
  When the module is being unloaded and no HW interfaces were created don't
  clean up.  This was exposed by the amd64 module build issue.

Modified:
  head/sys/dev/ipmi/ipmi.c
  head/sys/modules/ipmi/Makefile

Modified: head/sys/dev/ipmi/ipmi.c
==============================================================================
--- head/sys/dev/ipmi/ipmi.c	Thu Aug 16 15:54:12 2018	(r337912)
+++ head/sys/dev/ipmi/ipmi.c	Thu Aug 16 15:59:02 2018	(r337913)
@@ -1053,6 +1053,8 @@ ipmi_unload(void *arg)
 	int		count;
 	int		i;
 
+	if (ipmi_devclass == NULL)
+		return;
 	if (devclass_get_devices(ipmi_devclass, &devs, &count) != 0)
 		return;
 	for (i = 0; i < count; i++)

Modified: head/sys/modules/ipmi/Makefile
==============================================================================
--- head/sys/modules/ipmi/Makefile	Thu Aug 16 15:54:12 2018	(r337912)
+++ head/sys/modules/ipmi/Makefile	Thu Aug 16 15:59:02 2018	(r337913)
@@ -7,7 +7,7 @@
 KMOD=	ipmi
 SRCS=	ipmi.c
 SRCS+=	bus_if.h device_if.h
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "i386"
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	ipmi_kcs.c ipmi_smic.c ipmi_smbios.c ipmi_ssif.c
 SRCS+=	ipmi_acpi.c ipmi_isa.c ipmi_pci.c ipmi_smbus.c
 SRCS+=	opt_acpi.h