From owner-freebsd-current@freebsd.org Sat Aug 24 23:09:41 2019 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3E566CE086 for ; Sat, 24 Aug 2019 23:09:41 +0000 (UTC) (envelope-from imb@protected-networks.net) Received: from mail.protected-networks.net (mail.protected-networks.net [202.12.127.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.protected-networks.net", Issuer "Protected Networks CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 46GDVr37XXz4Gkb for ; Sat, 24 Aug 2019 23:09:40 +0000 (UTC) (envelope-from imb@protected-networks.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= protected-networks.net; h=content-transfer-encoding :content-language:content-type:content-type:in-reply-to :mime-version:user-agent:date:date:message-id:from:from :references:subject:subject; s=201508; t=1566688177; bh=Rf0ykx07 +4YXxMKBExzHw0naKIKcr4rclWm0eCYyuQA=; b=U2RvN60onwlKD+AzmwHZyomJ TEzX/27K1i7z0njMb3hV1IGTOFL8bWF6NfvkfJ2jZYlA+JSLMWIdtU75KzuKSfPj HnrsOTLhnwvtCDqeZhUnJRWXhtIZjYS6RDhztudgogXJekzzdPZMa3mQg0SdrwiB XgxGZYlSUSPy5f8/k0U= Received: from toshi.auburn.protected-networks.net (toshi.auburn.protected-networks.net [192.168.1.10]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: imb@mail.protected-networks.net) by mail.protected-networks.net (Postfix) with ESMTPSA id D06A92805B for ; Sat, 24 Aug 2019 19:09:37 -0400 (EDT) Subject: Re: SVN r351457 breaks drm-current To: freebsd-current@freebsd.org References: <1ed2692e-9964-58f7-5af9-08fadf65dec7@protected-networks.net> <20190824180440.GD71821@kib.kiev.ua> From: Michael Butler Message-ID: <9dd5585d-3305-31fd-7f0c-826567fe5a12@protected-networks.net> Date: Sat, 24 Aug 2019 19:09:37 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.0 MIME-Version: 1.0 In-Reply-To: <20190824180440.GD71821@kib.kiev.ua> Content-Type: text/plain; charset=windows-1252 Content-Language: en-NZ Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 46GDVr37XXz4Gkb X-Spamd-Bar: ------- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=protected-networks.net header.s=201508 header.b=U2RvN60o; dmarc=none; spf=pass (mx1.freebsd.org: domain of imb@protected-networks.net designates 202.12.127.228 as permitted sender) smtp.mailfrom=imb@protected-networks.net X-Spamd-Result: default: False [-7.21 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[protected-networks.net:s=201508]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+mx:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; DMARC_NA(0.00)[protected-networks.net]; DKIM_TRACE(0.00)[protected-networks.net:+]; NEURAL_HAM_SHORT(-0.99)[-0.988,0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; IP_SCORE(-3.72)[ip: (-9.78), ipnet: 202.12.127.0/24(-4.89), asn: 5716(-3.86), country: US(-0.05)]; ASN(0.00)[asn:5716, ipnet:202.12.127.0/24, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Aug 2019 23:09:41 -0000 On 2019-08-24 14:04, Konstantin Belousov wrote: > On Sat, Aug 24, 2019 at 11:02:20AM -0600, Warner Losh wrote: >> forward declaring struct pcpu; in md_var.h "fixes" this, but I'm not sure >> that's the right fix. > More correct way to fix it is to include sys/pcpu.h before machine/md_var.h, > same as all in-tree consumers of the header do, apparently. > > But another question is why the driver needs md_var.h, there are no > externally usable definitions there. There are uses of other variables from machine/md_var.h, notably cpu_feature, in linux_compat.c. Including sys/pcpu.h allows the build to continue .. as in .. *** linuxkpi/gplv2/src/linux_compat.c~ Wed Aug 7 14:36:56 2019 --- linuxkpi/gplv2/src/linux_compat.c Sat Aug 24 18:58:08 2019 *************** *** 2,7 **** --- 2,8 ---- #include #if defined(__i386__) || defined(__amd64__) #include + #include #include #endif #include Locally, I've put this patch into graphics/drm-current-kmod/files so I don't trip over it on subsequent builds, Michael