Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 12 May 2003 11:25:29 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 31021 for review
Message-ID:  <200305121825.h4CIPT0l016837@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
http://perforce.freebsd.org/chv.cgi?CH=31021

Change 31021 by peter@peter_daintree on 2003/05/12 11:24:54

	IFC @31020

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#27 integrate
.. //depot/projects/hammer/sys/amd64/include/ucontext.h#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#3 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#10 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#7 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#27 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.572 2003/05/12 02:37:29 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.573 2003/05/12 18:23:04 peter Exp $
  */
 
 #include "opt_atalk.h"

==== //depot/projects/hammer/sys/amd64/include/ucontext.h#8 (text+ko) ====

@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.11 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.12 2003/05/12 18:23:04 peter Exp $
  */
 
 #ifndef _MACHINE_UCONTEXT_H_

==== //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.6 2003/04/29 18:50:34 njl Exp $
+ *	$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.7 2003/05/12 16:54:55 njl Exp $
  */
 
 /*
@@ -175,7 +175,8 @@
     /* Try to get the _BBN object of the root, otherwise assume it is 0 */
     bus = 0;
     if (root == curr) {
-        if (ACPI_FAILURE(acpi_EvaluateInteger(root, "_BBN", &bus)))
+        if (ACPI_FAILURE(acpi_EvaluateInteger(root, "_BBN", &bus)) &&
+          bootverbose)
             printf("acpi_bus_number: root bus has no _BBN, assuming 0\n");
 	return (bus);
     }
@@ -234,7 +235,8 @@
     /* Try to read _BBN for bus number if we're at the root */
     bus = 0;
     if (rhandle == chandle) {
-        if (ACPI_FAILURE(acpi_EvaluateInteger(rhandle, "_BBN", &bus)))
+        if (ACPI_FAILURE(acpi_EvaluateInteger(rhandle, "_BBN", &bus)) &&
+          bootverbose)
             printf("AcpiOsDerivePciId: root bus has no _BBN, assuming 0\n");
     }
     /*

==== //depot/projects/hammer/sys/dev/ata/ata-chipset.c#10 (text+ko) ====

@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.25 2003/05/10 14:49:19 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.26 2003/05/12 16:43:13 sos Exp $
  */
 #include "opt_ata.h"
 #include <sys/param.h>
@@ -516,15 +516,15 @@
     if (!error) {
 	if (mode >= ATA_UDMA0) {
 	    ATA_OUTL(ch->r_io[ATA_BMCMD_PORT].res,
-		     0x24 + (devno << 3), udmatiming[mode % ATA_MODE_MASK]);
+		     0x24 + (devno << 3), udmatiming[mode & ATA_MODE_MASK]);
 	}
 	else if (mode >= ATA_WDMA0) {
 	    ATA_OUTL(ch->r_io[ATA_BMCMD_PORT].res,
-		     0x24 + (devno << 3), dmatiming[mode % ATA_MODE_MASK]);
+		     0x24 + (devno << 3), dmatiming[mode & ATA_MODE_MASK]);
 	}
 	else {
 	    ATA_OUTL(ch->r_io[ATA_BMCMD_PORT].res,
-		     0x20 + (devno << 3), piotiming[mode % ATA_MODE_MASK]);
+		     0x20 + (devno << 3), piotiming[mode & ATA_MODE_MASK]);
 	}
 	atadev->mode = mode;
     }

==== //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#7 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.33 2003/04/06 21:35:45 mux Exp $
+ * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.34 2003/05/12 18:15:33 mux Exp $
  */
 
 #define FXP_VENDORID_INTEL	0x8086
@@ -362,7 +362,7 @@
 	u_int8_t rfax_csum_sts;
 	u_int8_t rfax_zerocopy_sts;
 	u_int8_t rfax_pad[8];
-};
+} __packed;
 #define FXP_RFAX_LEN 16
 
 #define FXP_RFA_STATUS_RCOL	0x0001	/* receive collision */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305121825.h4CIPT0l016837>