From owner-svn-src-projects@FreeBSD.ORG Wed Oct 2 23:36:59 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 192D5D3; Wed, 2 Oct 2013 23:36:59 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E052822E9; Wed, 2 Oct 2013 23:36:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r92NawpN080987; Wed, 2 Oct 2013 23:36:58 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r92Nawmm080980; Wed, 2 Oct 2013 23:36:58 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201310022336.r92Nawmm080980@svn.freebsd.org> From: "Cherry G. Mathew" Date: Wed, 2 Oct 2013 23:36:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256011 - in projects/amd64_xen_pv/sys: amd64/xen conf dev/xen/timer x86/xen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Oct 2013 23:36:59 -0000 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);