From owner-svn-src-head@freebsd.org  Tue Apr  7 22:23:24 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 027DB27FEF4;
 Tue,  7 Apr 2020 22:23:24 +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 48xhkg64ZGz4KWt;
 Tue,  7 Apr 2020 22:23:23 +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 CB96F19049;
 Tue,  7 Apr 2020 22:23:23 +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 037MNNDw059908;
 Tue, 7 Apr 2020 22:23:23 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 037MNN7g059905;
 Tue, 7 Apr 2020 22:23:23 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <202004072223.037MNN7g059905@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 7 Apr 2020 22:23:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r359718 - in head/sys: cam cam/ata cam/mmc geom
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: in head/sys: cam cam/ata cam/mmc geom
X-SVN-Commit-Revision: 359718
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Apr 2020 22:23:24 -0000

Author: imp
Date: Tue Apr  7 22:23:22 2020
New Revision: 359718
URL: https://svnweb.freebsd.org/changeset/base/359718

Log:
  Now that we don't have special-case geom hacking defined in md_var.h, stop
  including it. sparc64 was the last straggler here, but these weren't removed at
  the time.

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/cam_xpt.c
  head/sys/cam/mmc/mmc_da.c
  head/sys/geom/geom_disk.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Tue Apr  7 20:26:42 2020	(r359717)
+++ head/sys/cam/ata/ata_da.c	Tue Apr  7 22:23:22 2020	(r359718)
@@ -70,8 +70,6 @@ __FBSDID("$FreeBSD$");
 
 #include <cam/ata/ata_all.h>
 
-#include <machine/md_var.h>	/* geometry translation */
-
 #ifdef _KERNEL
 
 #define ATA_MAX_28BIT_LBA               268435455UL

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Tue Apr  7 20:26:42 2020	(r359717)
+++ head/sys/cam/cam_xpt.c	Tue Apr  7 22:23:22 2020	(r359718)
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_message.h>
 #include <cam/scsi/scsi_pass.h>
 
-#include <machine/md_var.h>	/* geometry translation */
 #include <machine/stdarg.h>	/* for xpt_print below */
 
 #include "opt_cam.h"

Modified: head/sys/cam/mmc/mmc_da.c
==============================================================================
--- head/sys/cam/mmc/mmc_da.c	Tue Apr  7 20:26:42 2020	(r359717)
+++ head/sys/cam/mmc/mmc_da.c	Tue Apr  7 22:23:22 2020	(r359718)
@@ -77,8 +77,6 @@ __FBSDID("$FreeBSD$");
 
 #include <cam/mmc/mmc_all.h>
 
-#include <machine/md_var.h>	/* geometry translation */
-
 #ifdef _KERNEL
 
 typedef enum {

Modified: head/sys/geom/geom_disk.c
==============================================================================
--- head/sys/geom/geom_disk.c	Tue Apr  7 20:26:42 2020	(r359717)
+++ head/sys/geom/geom_disk.c	Tue Apr  7 22:23:22 2020	(r359718)
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/sbuf.h>
 #include <sys/devicestat.h>
-#include <machine/md_var.h>
 
 #include <sys/lock.h>
 #include <sys/mutex.h>