PERFORCE change 97490 for review

[Kip Macy]

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

Change 97490 by kmacy at 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,