svn commit: r256011 - in projects/amd64_xen_pv/sys: amd64/xen conf dev/xen/timer x86/xen

[Cherry G. Mathew]

Author: cherry
Date: Wed Oct  2 23:36:57 2013
New Revision: 256011
URL: http://svnweb.freebsd.org/changeset/base/256011

Log:
  Remove redundant MD file/functions after the unified clock code import.
  
  Approved by: gibbs(implicit)

Deleted:
  projects/amd64_xen_pv/sys/amd64/xen/xen_clock_util.c
Modified:
  projects/amd64_xen_pv/sys/conf/files.amd64
  projects/amd64_xen_pv/sys/dev/xen/timer/timer.c
  projects/amd64_xen_pv/sys/x86/xen/xen_intr.c

Modified: projects/amd64_xen_pv/sys/conf/files.amd64
==============================================================================
--- projects/amd64_xen_pv/sys/conf/files.amd64	Wed Oct  2 22:45:12 2013	(r256010)
+++ projects/amd64_xen_pv/sys/conf/files.amd64	Wed Oct  2 23:36:57 2013	(r256011)
@@ -147,7 +147,6 @@ amd64/amd64/uma_machdep.c	optional	nativ
 amd64/amd64/vm_machdep.c	standard
 amd64/pci/pci_cfgreg.c		optional	pci
 amd64/xen/clock.c		optional xen
-amd64/xen/xen_clock_util.c	optional xen
 cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S	optional zfs compile-with "${ZFS_S}"
 crypto/aesni/aeskeys_amd64.S	optional aesni
 crypto/aesni/aesni.c		optional aesni

Modified: projects/amd64_xen_pv/sys/dev/xen/timer/timer.c
==============================================================================
--- projects/amd64_xen_pv/sys/dev/xen/timer/timer.c	Wed Oct  2 22:45:12 2013	(r256010)
+++ projects/amd64_xen_pv/sys/dev/xen/timer/timer.c	Wed Oct  2 23:36:57 2013	(r256011)
@@ -471,6 +471,7 @@ xentimer_attach(device_t dev)
 		error = xen_intr_bind_virq(dev, VIRQ_TIMER, i, xentimer_intr,
 		    NULL, sc, INTR_TYPE_CLK, &pcpu->irq_handle);
 		if (error) {
+		  panic(__func__);
 			device_printf(dev, "Error %d binding VIRQ_TIMER "
 			    "to VCPU %d\n", error, i);
 			return (error);

Modified: projects/amd64_xen_pv/sys/x86/xen/xen_intr.c
==============================================================================
--- projects/amd64_xen_pv/sys/x86/xen/xen_intr.c	Wed Oct  2 22:45:12 2013	(r256010)
+++ projects/amd64_xen_pv/sys/x86/xen/xen_intr.c	Wed Oct  2 23:36:57 2013	(r256011)
@@ -1073,6 +1073,7 @@ xen_intr_bind_virq(device_t dev, u_int v
 
 	isrc = NULL;
 	error = HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq, &bind_virq);
+		panic(__func__);
 	if (error != 0) {
 		/*
 		 * XXX Trap Hypercall error code Linuxisms in
@@ -1083,7 +1084,6 @@ xen_intr_bind_virq(device_t dev, u_int v
 
 	error = xen_intr_bind_isrc(&isrc, bind_virq.port, EVTCHN_TYPE_VIRQ, dev,
 				 filter, handler, arg, flags, port_handlep);
-
 #ifdef SMP
 	if (error == 0)
 		error = intr_event_bind(isrc->xi_intsrc.is_event, cpu);