From owner-svn-src-all@FreeBSD.ORG Tue Jan 31 23:24:47 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 924F7106566C; Tue, 31 Jan 2012 23:24:47 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2C67F8FC14; Tue, 31 Jan 2012 23:24:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0VNOlsE060008; Tue, 31 Jan 2012 23:24:47 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0VNOkZF060005; Tue, 31 Jan 2012 23:24:46 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201201312324.q0VNOkZF060005@svn.freebsd.org> From: Marius Strobl Date: Tue, 31 Jan 2012 23:24:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230853 - in stable/8/sys: conf sun4v/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 31 Jan 2012 23:24:47 -0000 Author: marius Date: Tue Jan 31 23:24:46 2012 New Revision: 230853 URL: http://svn.freebsd.org/changeset/base/230853 Log: - Hook up VTOC8 geometry adjustments. - Remove some unused externs. This is a direct commit to stable/8 in order to unbreak the build with r230666 in place. Modified: stable/8/sys/conf/files.sun4v stable/8/sys/sun4v/include/md_var.h Modified: stable/8/sys/conf/files.sun4v ============================================================================== --- stable/8/sys/conf/files.sun4v Tue Jan 31 23:20:17 2012 (r230852) +++ stable/8/sys/conf/files.sun4v Tue Jan 31 23:24:46 2012 (r230853) @@ -39,8 +39,10 @@ sparc64/ebus/ebus.c optional ebus sparc64/isa/isa.c optional isa sparc64/isa/isa_dma.c optional isa sparc64/isa/ofw_isa.c optional ebus | isa +sparc64/sparc64/ata_machdep.c optional ada | atadisk | da sparc64/sparc64/autoconf.c standard sun4v/sun4v/bus_machdep.c standard +sparc64/sparc64/cam_machdep.c optional scbus sun4v/sun4v/clock.c standard sparc64/sparc64/db_disasm.c optional ddb sun4v/sun4v/db_interface.c optional ddb Modified: stable/8/sys/sun4v/include/md_var.h ============================================================================== --- stable/8/sys/sun4v/include/md_var.h Tue Jan 31 23:20:17 2012 (r230852) +++ stable/8/sys/sun4v/include/md_var.h Tue Jan 31 23:24:46 2012 (r230853) @@ -54,10 +54,15 @@ struct md_utrap *utrap_alloc(void); void utrap_free(struct md_utrap *ut); struct md_utrap *utrap_hold(struct md_utrap *ut); - -extern cpu_block_copy_t *cpu_block_copy; -extern cpu_block_zero_t *cpu_block_zero; - - +/* + * Given that the VTOC8 disk label only uses 16-bit fields for cylinders, + * heads and sectors we might need to adjust the geometry of large disks. + */ +struct ccb_calc_geometry; +int scsi_da_bios_params(struct ccb_calc_geometry *ccg); +struct disk; +void sparc64_ata_disk_firmware_geom_adjust(struct disk *disk); +#define ata_disk_firmware_geom_adjust(disk) \ + sparc64_ata_disk_firmware_geom_adjust(disk) #endif /* !_MACHINE_MD_VAR_H_ */