From owner-p4-projects@FreeBSD.ORG  Thu Feb 23 05:49:16 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0103D16A423; Thu, 23 Feb 2006 05:49:15 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CE4E916A420
	for <perforce@freebsd.org>; Thu, 23 Feb 2006 05:49:15 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9FFD443D46
	for <perforce@freebsd.org>; Thu, 23 Feb 2006 05:49:15 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1N5nFmF024836
	for <perforce@freebsd.org>; Thu, 23 Feb 2006 05:49:15 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1N5nFlK024833
	for perforce@freebsd.org; Thu, 23 Feb 2006 05:49:15 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 23 Feb 2006 05:49:15 GMT
Message-Id: <200602230549.k1N5nFlK024833@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92251 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Feb 2006 05:49:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=92251

Change 92251 by kmacy@kmacy:freebsd7_xen3 on 2006/02/23 05:48:15

	apply fix submitted by Tim Kuik to xenbus_client.t
	apply fix for problem discovered by Arun Sharma

Affected files ...

.. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_client.c#3 edit
.. //depot/projects/xen3/src/sys/i386/i386/sys_machdep.c#4 edit

Differences ...

==== //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_client.c#3 (text+ko) ====

@@ -218,7 +218,7 @@
 int xenbus_grant_ring(struct xenbus_device *dev, unsigned long ring_mfn)
 {
 	int err = gnttab_grant_foreign_access(dev->otherend_id, ring_mfn, 0);
-	if (err != 0)
+	if (err < 0)
 		xenbus_dev_fatal(dev, err, "granting access to ring page");
 	return err;
 }

==== //depot/projects/xen3/src/sys/i386/i386/sys_machdep.c#4 (text+ko) ====

@@ -183,7 +183,7 @@
 #ifndef XEN
 			PCPU_GET(fsgs_gdt)[0] = sd;
 #else
-			sd.sd_lolimit = 0x0;	/* < 4GB limit */
+			sd.sd_lolimit = 0xc3f0;	/* < 4GB limit */
 			HYPERVISOR_update_descriptor(vtomach(&PCPU_GET(fsgs_gdt)[1]), 
 						     *(uint64_t *)&sd);
 #endif
@@ -220,7 +220,7 @@
 #ifndef XEN
 			PCPU_GET(fsgs_gdt)[1] = sd;
 #else
-			sd.sd_lolimit = 0x0;	/* 4GB limit, wraps around */
+			sd.sd_lolimit = 0xc3f0;	/* 4GB limit, wraps around */
 			HYPERVISOR_update_descriptor(vtomach(&PCPU_GET(fsgs_gdt)[1]), 
 						     *(uint64_t *)&sd);
 #endif