From owner-svn-src-all@FreeBSD.ORG Tue Jun 17 09:33:23 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 39ADED16; Tue, 17 Jun 2014 09:33:23 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 26FAC2922; Tue, 17 Jun 2014 09:33:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5H9XNOJ072272; Tue, 17 Jun 2014 09:33:23 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5H9XNGG072271; Tue, 17 Jun 2014 09:33:23 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201406170933.s5H9XNGG072271@svn.freebsd.org> From: Konstantin Belousov Date: Tue, 17 Jun 2014 09:33:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267575 - head/sys/x86/x86 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2014 09:33:23 -0000 Author: kib Date: Tue Jun 17 09:33:22 2014 New Revision: 267575 URL: http://svnweb.freebsd.org/changeset/base/267575 Log: Do not reference native_lapic_ipi_*() functions in the UP build. The functions' definitions are protected by #ifdef SMP. Keeping apic_ops.ipi_*() methods NULL would allow to catch the use on UP machines. Reviewed by: royger Sponsored by: The FreeBSD Foundation Modified: head/sys/x86/x86/local_apic.c Modified: head/sys/x86/x86/local_apic.c ============================================================================== --- head/sys/x86/x86/local_apic.c Tue Jun 17 09:02:10 2014 (r267574) +++ head/sys/x86/x86/local_apic.c Tue Jun 17 09:33:22 2014 (r267575) @@ -230,9 +230,11 @@ struct apic_ops apic_ops = { .disable_pmc = native_lapic_disable_pmc, .reenable_pmc = native_lapic_reenable_pmc, .enable_cmc = native_lapic_enable_cmc, +#ifdef SMP .ipi_raw = native_lapic_ipi_raw, .ipi_vectored = native_lapic_ipi_vectored, .ipi_wait = native_lapic_ipi_wait, +#endif .set_lvt_mask = native_lapic_set_lvt_mask, .set_lvt_mode = native_lapic_set_lvt_mode, .set_lvt_polarity = native_lapic_set_lvt_polarity,