From owner-p4-projects@FreeBSD.ORG Sat May 20 05:13:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 811BF16A424; Sat, 20 May 2006 05:13:07 +0000 (UTC) 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 21B3A16A41F for ; Sat, 20 May 2006 05:13:07 +0000 (UTC) (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 C8D8043D46 for ; Sat, 20 May 2006 05:13:06 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4K5CYZj007225 for ; Sat, 20 May 2006 05:12:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4K5CYae007222 for perforce@freebsd.org; Sat, 20 May 2006 05:12:34 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 May 2006 05:12:34 GMT Message-Id: <200605200512.k4K5CYae007222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 97490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 May 2006 05:13:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=97490 Change 97490 by kmacy@kmacy:freebsd7_xen3 on 2006/05/20 05:11:54 fix compile errors caused by integrate Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#13 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#6 edit .. //depot/projects/xen3/src/sys/i386/i386/io_apic.c#5 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#13 (text+ko) ==== @@ -1283,22 +1283,23 @@ return (error); } -SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, +u_long bootdev; /* not a struct cdev *- encoding is different */ +SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev, + CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in struct cdev *format)"); + + +SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); -SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set, +SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, CTLFLAG_RW, &disable_rtc_set, 0, ""); -SYSCTL_STRUCT(_machdep, CPU_BOOTINFO, bootinfo, +SYSCTL_STRUCT(_machdep, OID_AUTO, bootinfo, CTLFLAG_RD, &bootinfo, bootinfo, ""); -SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock, +SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, CTLFLAG_RW, &wall_cmos_clock, 0, ""); -u_long bootdev; /* not a struct cdev *- encoding is different */ -SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev, - CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in struct cdev *format)"); - /* * Initialize 386 and configure to run kernel */ ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#6 (text+ko) ==== @@ -2888,9 +2888,7 @@ * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; @@ -2907,11 +2905,6 @@ sched_pin(); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else ==== //depot/projects/xen3/src/sys/i386/i386/io_apic.c#5 (text+ko) ==== @@ -145,9 +145,6 @@ extern int running_xen; -static int bsp_id, current_cluster, logical_clusters, next_ioapic_base; -static u_int next_id, program_logical_dest; - SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options"); static int enable_extint; SYSCTL_INT(_hw_apic, OID_AUTO, enable_extint, CTLFLAG_RDTUN, &enable_extint, 0,