Date: Wed, 10 Jul 2019 17:21:59 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r349889 - head/sys/mips/ingenic Message-ID: <201907101721.x6AHLxKH005783@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Jul 10 17:21:59 2019 New Revision: 349889 URL: https://svnweb.freebsd.org/changeset/base/349889 Log: Fix compile errors with the CI20 Fix mutex includes and fix a typo. The CI20 kernel is not built as part of universe. PR: 239115 Submitted by: Kai Nacke Modified: head/sys/mips/ingenic/jz4780_machdep.c head/sys/mips/ingenic/jz4780_mmc.c head/sys/mips/ingenic/jz4780_smb.c Modified: head/sys/mips/ingenic/jz4780_machdep.c ============================================================================== --- head/sys/mips/ingenic/jz4780_machdep.c Wed Jul 10 14:46:18 2019 (r349888) +++ head/sys/mips/ingenic/jz4780_machdep.c Wed Jul 10 17:21:59 2019 (r349889) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include <sys/boot.h> #include <sys/cons.h> #include <sys/kdb.h> +#include <sys/mutex.h> #include <sys/reboot.h> #ifdef FDT Modified: head/sys/mips/ingenic/jz4780_mmc.c ============================================================================== --- head/sys/mips/ingenic/jz4780_mmc.c Wed Jul 10 14:46:18 2019 (r349888) +++ head/sys/mips/ingenic/jz4780_mmc.c Wed Jul 10 17:21:59 2019 (r349889) @@ -775,7 +775,7 @@ jz4780_mmc_read_ivar(device_t bus, device_t child, int *(int *)result = sc->sc_host.ios.power_mode; break; case MMCBR_IVAR_RETUNE_REQ: - *(int *)result = return_req_none; + *(int *)result = retune_req_none; break; case MMCBR_IVAR_VDD: *(int *)result = sc->sc_host.ios.vdd; Modified: head/sys/mips/ingenic/jz4780_smb.c ============================================================================== --- head/sys/mips/ingenic/jz4780_smb.c Wed Jul 10 14:46:18 2019 (r349888) +++ head/sys/mips/ingenic/jz4780_smb.c Wed Jul 10 17:21:59 2019 (r349889) @@ -39,6 +39,8 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <sys/kernel.h> #include <sys/module.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <sys/time.h> #include <machine/bus.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907101721.x6AHLxKH005783>