PERFORCE change 109167 for review

[John Birrell]

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

Change 109167 by jb at jb_freebsd8 on 2006/11/03 23:25:46

	Reset to match current.

Affected files ...

.. //depot/projects/dtrace/src/sys/i386/include/apicvar.h#6 edit
.. //depot/projects/dtrace/src/sys/kern/sched_core.c#5 edit
.. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#11 edit
.. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcib_subr.h#4 edit
.. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC.hints#4 edit
.. //depot/projects/dtrace/src/sys/sun4v/conf/MAC#4 edit

Differences ...

==== //depot/projects/dtrace/src/sys/i386/include/apicvar.h#6 (text+ko) ====

@@ -176,6 +176,7 @@
 u_int	apic_alloc_vector(u_int irq);
 void	apic_enable_vector(u_int vector);
 void	apic_free_vector(u_int vector, u_int irq);
+u_int	apic_idt_to_irq(u_int vector);
 void	apic_register_enumerator(struct apic_enumerator *enumerator);
 void	*ioapic_create(uintptr_t addr, int32_t id, int intbase);
 int	ioapic_disable_pin(void *cookie, u_int pin);

==== //depot/projects/dtrace/src/sys/kern/sched_core.c#5 (text+ko) ====

@@ -1403,7 +1403,6 @@
 #endif
 }
 
-/* XXXX gone */
 void
 sched_userret(struct thread *td)
 {

==== //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#11 (text+ko) ====

@@ -1906,7 +1906,7 @@
  	 * components in it. If so just link td->td_proc here.
 	 */
 #ifdef KSE
-	proc_linkup(&proc0, &thread0);
+	proc_linkup(&proc0, &ksegrp0, &thread0);
 #else
 	proc_linkup(&proc0, &thread0);
 #endif

==== //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcib_subr.h#4 (text+ko) ====

@@ -42,5 +42,6 @@
 void ofw_pcib_gen_setup(device_t);
 pcib_route_interrupt_t ofw_pcib_gen_route_interrupt;
 ofw_bus_get_node_t ofw_pcib_gen_get_node;
+ofw_pci_adjust_busrange_t ofw_pcib_gen_adjust_busrange;
 
 #endif /* !_SPARC64_PCI_OFW_PCI_SUBR_H */

==== //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC.hints#4 (text+ko) ====

@@ -1,1 +1,1 @@
-# $FreeBSD: src/sys/sparc64/conf/GENERIC.hints,v 1.1 2001/08/14 03:27:02 jake Exp $
+# $FreeBSD: src/sys/sun4v/conf/GENERIC.hints,v 1.1 2006/10/05 06:14:25 kmacy Exp $

==== //depot/projects/dtrace/src/sys/sun4v/conf/MAC#4 (text+ko) ====

@@ -8,7 +8,7 @@
 #
 # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html 
 #
-# $FreeBSD: src/sys/sparc64/conf/MAC,v 1.1 2005/09/18 03:15:36 csjp Exp $
+# $FreeBSD: src/sys/sun4v/conf/MAC,v 1.1 2006/10/05 06:14:25 kmacy Exp $
 
 include 	GENERIC
 ident 		MAC