From owner-svn-src-all@freebsd.org Wed Jul 10 17:22:00 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8DA8B15DD809; Wed, 10 Jul 2019 17:22:00 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F64C968DE; Wed, 10 Jul 2019 17:22:00 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00CA61A379; Wed, 10 Jul 2019 17:22:00 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6AHLxLP005785; Wed, 10 Jul 2019 17:21:59 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6AHLxKH005783; Wed, 10 Jul 2019 17:21:59 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201907101721.x6AHLxKH005783@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 10 Jul 2019 17:21:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r349889 - head/sys/mips/ingenic X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/mips/ingenic X-SVN-Commit-Revision: 349889 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2F64C968DE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.95)[-0.949,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jul 2019 17:22:00 -0000 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 #include #include +#include #include #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 #include #include +#include +#include #include #include