From owner-svn-src-stable@FreeBSD.ORG  Sun Feb  9 13:56:38 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@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 86E636C0;
 Sun,  9 Feb 2014 13:56:38 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 711AB17B0;
 Sun,  9 Feb 2014 13:56:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19DucHc044167;
 Sun, 9 Feb 2014 13:56:38 GMT (envelope-from dumbbell@svn.freebsd.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19DucdZ044165;
 Sun, 9 Feb 2014 13:56:38 GMT (envelope-from dumbbell@svn.freebsd.org)
Message-Id: <201402091356.s19DucdZ044165@svn.freebsd.org>
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Sun, 9 Feb 2014 13:56:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r261653 - in stable/9/sys/dev/drm2: . i915
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Feb 2014 13:56:38 -0000

Author: dumbbell
Date: Sun Feb  9 13:56:37 2014
New Revision: 261653
URL: http://svnweb.freebsd.org/changeset/base/261653

Log:
  MFC r254818:
  
  drm: Move definition of EREMOTEIO to drmP.h
  
  It will be used by both i915 and radeon drivers.
  
  Add ERESTARTSYS definition at the same time.

Modified:
  stable/9/sys/dev/drm2/drmP.h
  stable/9/sys/dev/drm2/i915/intel_dp.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/drm2/drmP.h
==============================================================================
--- stable/9/sys/dev/drm2/drmP.h	Sun Feb  9 13:50:08 2014	(r261652)
+++ stable/9/sys/dev/drm2/drmP.h	Sun Feb  9 13:56:37 2014	(r261653)
@@ -1405,5 +1405,10 @@ do {									\
 #define	KTR_DRM		KTR_DEV
 #define	KTR_DRM_REG	KTR_SPARE3
 
+/* Error codes conversion from Linux to FreeBSD. */
+/* XXXKIB what is the right code for EREMOTEIO on FreeBSD? */
+#define	EREMOTEIO	ENXIO
+#define	ERESTARTSYS	ERESTART
+
 #endif /* __KERNEL__ */
 #endif /* _DRM_P_H_ */

Modified: stable/9/sys/dev/drm2/i915/intel_dp.c
==============================================================================
--- stable/9/sys/dev/drm2/i915/intel_dp.c	Sun Feb  9 13:50:08 2014	(r261652)
+++ stable/9/sys/dev/drm2/i915/intel_dp.c	Sun Feb  9 13:56:37 2014	(r261653)
@@ -43,9 +43,6 @@ __FBSDID("$FreeBSD$");
 
 #define DP_LINK_CONFIGURATION_SIZE	9
 
-/* XXXKIB what is the right code for the FreeBSD ? */
-#define EREMOTEIO	ENXIO
-
 struct intel_dp {
 	struct intel_encoder base;
 	uint32_t output_reg;