From owner-svn-src-all@freebsd.org Sat Dec 23 19:39:43 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A674E971DC; Sat, 23 Dec 2017 19:39:43 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-io0-f171.google.com (mail-io0-f171.google.com [209.85.223.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0BAD2720E1; Sat, 23 Dec 2017 19:39:42 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-io0-f171.google.com with SMTP id e204so27705381iof.12; Sat, 23 Dec 2017 11:39:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=cSfEk825NIfso5YgqFDDTER4+nIOedCRbicoP9rEbeE=; b=oW/GLuLDz8ONDejAhmKB3hQBkP7coQ7NQE10kPfH9g4SkrJHmrEXca1BQRZWZfn1Cu ixOJ2PiB6dmcLZFGpIF1/qm4yjBMT4d2FfQoF09v6VFe4Zb5RnTdif6/3p2fCqr3iEVa wUdrzWfFU3vHaiovH5xG2KrcoAdVFk/F2hG0s/UyWuke4ZD89yFOUUKGqMsx/RrrH2Ik kra9XS7MCphJj/Cq7mHxNSlRdSA4Y0CRmBJ1pSHQ2emnGkKw0GDrBEMrmTr/HIUKaO2k xCjg+dcekyoiIqs28tsuG/GKjjWkrtkAtsy1BliyZE4CqizP0zPGXaGT8S9B1YJzp6AQ 0+7w== X-Gm-Message-State: AKGB3mIrbknhxdDvzUWsfY7CEqMNT/0AeODdTJ7jGwi+AcOSAFFTL8Of 0OIFtOt7KvQeh7+EmqUucmu8eS5Q X-Google-Smtp-Source: ACJfBosXIih7hbzhXhxzriLpk5IqTQDzhAFnAKZiBImtRcnMoTfNZhfBBcObnut/0m15UWlN+s3L8A== X-Received: by 10.107.111.13 with SMTP id k13mr5616481ioc.109.1514056491905; Sat, 23 Dec 2017 11:14:51 -0800 (PST) Received: from mail-it0-f47.google.com (mail-it0-f47.google.com. [209.85.214.47]) by smtp.gmail.com with ESMTPSA id q132sm13578646iod.26.2017.12.23.11.14.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Dec 2017 11:14:51 -0800 (PST) Received: by mail-it0-f47.google.com with SMTP id b5so17520639itc.3; Sat, 23 Dec 2017 11:14:51 -0800 (PST) X-Received: by 10.36.192.2 with SMTP id u2mr22973431itf.119.1514056491645; Sat, 23 Dec 2017 11:14:51 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.2.15.193 with HTTP; Sat, 23 Dec 2017 11:14:51 -0800 (PST) In-Reply-To: <201712221659.vBMGxoUH038447@repo.freebsd.org> References: <201712221659.vBMGxoUH038447@repo.freebsd.org> From: Conrad Meyer Date: Sat, 23 Dec 2017 11:14:51 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r327084 - head/sys/dev/pccard To: Warner Losh Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 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: Sat, 23 Dec 2017 19:39:43 -0000 On Fri, Dec 22, 2017 at 8:59 AM, Warner Losh wrote: > ... > New Revision: 327084 > > PC Card PNP tables are terminated by a NULL sentinel. This shouldn't > be recorded in the linker hints, so subtract one to omit it. > ============================================================================== > --- head/sys/dev/pccard/pccardvar.h Fri Dec 22 16:27:29 2017 (r327083) > +++ head/sys/dev/pccard/pccardvar.h Fri Dec 22 16:59:50 2017 (r327084) > @@ -95,7 +95,7 @@ struct pccard_product { > */ > #define PCCARD_PNP_DESCR "D:#;V32:manufacturer;V32:product;Z:cisvendor;Z:cisproduct;" > #define PCCARD_PNP_INFO(t) \ > - MODULE_PNP_INFO(PCCARD_PNP_DESCR, pccard, t, t, sizeof(t[0]), sizeof(t) / sizeof(t[0])); \ > + MODULE_PNP_INFO(PCCARD_PNP_DESCR, pccard, t, t, sizeof(t[0]), sizeof(t) / sizeof(t[0]) - 1); \ Perhaps more clearly, this could be: MODULE_PNP_INFO(PCCARD_PNP_DESCR, pccard, t, t, sizeof(t[0]), nitems(t) - 1)