From owner-p4-projects Sun Jan 5 18:28:21 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B0E337B405; Sun, 5 Jan 2003 18:28:18 -0800 (PST) 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 01CF437B401 for ; Sun, 5 Jan 2003 18:28:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 558C943EB2 for ; Sun, 5 Jan 2003 18:28:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h062SHfh005553 for ; Sun, 5 Jan 2003 18:28:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h062SGXI005550 for perforce@freebsd.org; Sun, 5 Jan 2003 18:28:16 -0800 (PST) Date: Sun, 5 Jan 2003 18:28:16 -0800 (PST) Message-Id: <200301060228.h062SGXI005550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 23242 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23242 Change 23242 by marcel@marcel_vaio on 2003/01/05 18:27:23 IFC @23240 Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#24 integrate .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#20 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#17 integrate Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#24 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.31 2003/01/06 01:39:24 marcel Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.33 2003/01/06 02:09:08 marcel Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -123,21 +123,19 @@ intrcnt[INTRCNT_CLOCK]++; #endif critical_enter(); + /* Rearm so we get the next clock interrupt */ + ia64_set_itm(ia64_get_itc() + itm_reload); #ifdef SMP clks[PCPU_GET(cpuid)]++; /* Only the BSP runs the real clock */ if (PCPU_GET(cpuid) == 0) { #endif - /* XXX don't reload ITM based on ITC. */ - ia64_set_itm(ia64_get_itc() + itm_reload); hardclock((struct clockframe *)framep); /* divide hz (1024) by 8 to get stathz (128) */ if ((++schedclk2 & 0x7) == 0) statclock((struct clockframe *)framep); #ifdef SMP } else { - /* XXX don't reload ITM based on ITC. */ - ia64_set_itm(ia64_get_itc() + itm_reload); mtx_lock_spin(&sched_lock); hardclock_process(curthread, TRAPF_USERMODE(framep)); if ((schedclk2 & 0x7) == 0) ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#20 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/sapic.c,v 1.11 2003/01/05 22:14:30 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/sapic.c,v 1.12 2003/01/06 02:09:08 marcel Exp $ */ #include "opt_ddb.h" ==== //depot/projects/ia64/sys/pci/if_xl.c#17 (text+ko) ==== @@ -101,7 +101,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.117 2003/01/06 00:46:03 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.118 2003/01/06 01:55:12 silby Exp $"); #include #include @@ -1307,7 +1307,7 @@ sc->xl_flags = 0; if (pci_get_device(dev) == TC_DEVICEID_HURRICANE_555) - sc->xl_flags |= XL_FLAG_EEPROM_OFFSET | XL_FLAG_PHYOK; + sc->xl_flags |= XL_FLAG_EEPROM_OFFSET_30 | XL_FLAG_PHYOK; if (pci_get_device(dev) == TC_DEVICEID_HURRICANE_556 || pci_get_device(dev) == TC_DEVICEID_HURRICANE_556B) sc->xl_flags |= XL_FLAG_FUNCREG | XL_FLAG_PHYOK | To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message