svn commit: r230853 - in stable/8/sys: conf sun4v/include
Marius Strobl
marius at FreeBSD.org
Tue Jan 31 23:24:47 UTC 2012
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_ */
More information about the svn-src-stable-8
mailing list