From owner-svn-src-stable-10@FreeBSD.ORG  Fri Dec 12 07:59:07 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0003456F;
 Fri, 12 Dec 2014 07:59:06 +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 DEDABF7F;
 Fri, 12 Dec 2014 07:59:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBC7x6Y2091813;
 Fri, 12 Dec 2014 07:59:06 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBC7x6FZ091812;
 Fri, 12 Dec 2014 07:59:06 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201412120759.sBC7x6FZ091812@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 12 Dec 2014 07:59:06 +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: r275724 - stable/10/sys/ofed/include/linux
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-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Dec 2014 07:59:07 -0000

Author: hselasky
Date: Fri Dec 12 07:59:05 2014
New Revision: 275724
URL: https://svnweb.freebsd.org/changeset/base/275724

Log:
  MFC r275636:
  Move OFED init a bit earlier so that PXE boot works.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/10/sys/ofed/include/linux/module.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ofed/include/linux/module.h
==============================================================================
--- stable/10/sys/ofed/include/linux/module.h	Fri Dec 12 07:42:06 2014	(r275723)
+++ stable/10/sys/ofed/include/linux/module.h	Fri Dec 12 07:59:05 2014	(r275724)
@@ -49,9 +49,9 @@
 #define	EXPORT_SYMBOL_GPL(name)
 
 /* OFED pre-module initialization */
-#define	SI_SUB_OFED_PREINIT	(SI_SUB_KTHREAD_INIT - 2)
+#define	SI_SUB_OFED_PREINIT	(SI_SUB_ROOT_CONF - 2)
 /* OFED default module initialization */
-#define	SI_SUB_OFED_MODINIT	(SI_SUB_KTHREAD_INIT - 1)
+#define	SI_SUB_OFED_MODINIT	(SI_SUB_ROOT_CONF - 1)
 
 #include <sys/linker.h>