From owner-svn-src-stable-10@FreeBSD.ORG Thu Jul 24 15:18:20 2014 Return-Path: Delivered-To: svn-src-stable-10@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 ESMTPS id AA183A52; Thu, 24 Jul 2014 15:18:20 +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 96A072A5F; Thu, 24 Jul 2014 15:18:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6OFIKt7092384; Thu, 24 Jul 2014 15:18:20 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6OFIKoX092382; Thu, 24 Jul 2014 15:18:20 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201407241518.s6OFIKoX092382@svn.freebsd.org> From: Ed Maste Date: Thu, 24 Jul 2014 15:18:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r269064 - in stable/10/sys/dev: drm2/i915 vt X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jul 2014 15:18:20 -0000 Author: emaste Date: Thu Jul 24 15:18:19 2014 New Revision: 269064 URL: http://svnweb.freebsd.org/changeset/base/269064 Log: MFC r268947: Hide syscons-specific workaround under DEV_SC Modified: stable/10/sys/dev/drm2/i915/intel_fb.c stable/10/sys/dev/vt/vt_core.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/drm2/i915/intel_fb.c ============================================================================== --- stable/10/sys/dev/drm2/i915/intel_fb.c Thu Jul 24 15:16:03 2014 (r269063) +++ stable/10/sys/dev/drm2/i915/intel_fb.c Thu Jul 24 15:18:19 2014 (r269064) @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_syscons.h" #include #include #include @@ -216,7 +217,9 @@ static void intel_fbdev_destroy(struct d } } +#ifdef DEV_SC extern int sc_txtmouse_no_retrace_wait; +#endif int intel_fbdev_init(struct drm_device *dev) { @@ -240,7 +243,9 @@ int intel_fbdev_init(struct drm_device * drm_fb_helper_single_add_all_connectors(&ifbdev->helper); drm_fb_helper_initial_config(&ifbdev->helper, 32); +#ifdef DEV_SC sc_txtmouse_no_retrace_wait = 1; +#endif return 0; } Modified: stable/10/sys/dev/vt/vt_core.c ============================================================================== --- stable/10/sys/dev/vt/vt_core.c Thu Jul 24 15:16:03 2014 (r269063) +++ stable/10/sys/dev/vt/vt_core.c Thu Jul 24 15:18:19 2014 (r269064) @@ -111,9 +111,6 @@ const struct terminal_class vt_termclass #define VT_UNIT(vw) ((vw)->vw_device->vd_unit * VT_MAXWINDOWS + \ (vw)->vw_number) -/* XXX while syscons is here. */ -int sc_txtmouse_no_retrace_wait; - static SYSCTL_NODE(_kern, OID_AUTO, vt, CTLFLAG_RD, 0, "vt(9) parameters"); VT_SYSCTL_INT(enable_altgr, 1, "Enable AltGr key (Do not assume R.Alt as Alt)"); VT_SYSCTL_INT(debug, 0, "vt(9) debug level");