From owner-svn-src-projects@FreeBSD.ORG Mon Mar 14 23:54:19 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 756851065676; Mon, 14 Mar 2011 23:54:19 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4B7738FC12; Mon, 14 Mar 2011 23:54:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2ENsJ5D015419; Mon, 14 Mar 2011 23:54:19 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2ENsJ4x015415; Mon, 14 Mar 2011 23:54:19 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201103142354.p2ENsJ4x015415@svn.freebsd.org> From: Jeff Roberson Date: Mon, 14 Mar 2011 23:54:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219655 - in projects/ofed/head/sys/ofed/drivers: infiniband/hw/mlx4 net/mlx4 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 14 Mar 2011 23:54:19 -0000 Author: jeff Date: Mon Mar 14 23:54:19 2011 New Revision: 219655 URL: http://svn.freebsd.org/changeset/base/219655 Log: - Putting my module defines in SI_SUB_KLD made them sensitive to link order. Move them all the way down to SI_SUB_SMP. The module handlers don't do anything anyway. Modified: projects/ofed/head/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/ofed/head/sys/ofed/drivers/net/mlx4/en_main.c projects/ofed/head/sys/ofed/drivers/net/mlx4/main.c Modified: projects/ofed/head/sys/ofed/drivers/infiniband/hw/mlx4/main.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/hw/mlx4/main.c Mon Mar 14 23:49:41 2011 (r219654) +++ projects/ofed/head/sys/ofed/drivers/infiniband/hw/mlx4/main.c Mon Mar 14 23:54:19 2011 (r219655) @@ -1576,5 +1576,5 @@ static moduledata_t mlx4ib_mod = { .name = "mlx4ib", .evhand = mlx4ib_evhand, }; -DECLARE_MODULE(mlx4ib, mlx4ib_mod, SI_SUB_KLD, SI_ORDER_ANY); +DECLARE_MODULE(mlx4ib, mlx4ib_mod, SI_SUB_SMP, SI_ORDER_ANY); MODULE_DEPEND(mlx4ib, mlx4, 1, 1, 1); Modified: projects/ofed/head/sys/ofed/drivers/net/mlx4/en_main.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/net/mlx4/en_main.c Mon Mar 14 23:49:41 2011 (r219654) +++ projects/ofed/head/sys/ofed/drivers/net/mlx4/en_main.c Mon Mar 14 23:54:19 2011 (r219655) @@ -380,5 +380,5 @@ static moduledata_t mlxen_mod = { .name = "mlxen", .evhand = mlxen_evhand, }; -DECLARE_MODULE(mlxen, mlxen_mod, SI_SUB_KLD, SI_ORDER_ANY); +DECLARE_MODULE(mlxen, mlxen_mod, SI_SUB_SMP, SI_ORDER_ANY); MODULE_DEPEND(mlxen, mlx4, 1, 1, 1); Modified: projects/ofed/head/sys/ofed/drivers/net/mlx4/main.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/net/mlx4/main.c Mon Mar 14 23:49:41 2011 (r219654) +++ projects/ofed/head/sys/ofed/drivers/net/mlx4/main.c Mon Mar 14 23:54:19 2011 (r219655) @@ -1701,4 +1701,4 @@ static moduledata_t mlx4_mod = { .evhand = mlx4_evhand, }; MODULE_VERSION(mlx4, 1); -DECLARE_MODULE(mlx4, mlx4_mod, SI_SUB_KLD, SI_ORDER_ANY); +DECLARE_MODULE(mlx4, mlx4_mod, SI_SUB_SMP, SI_ORDER_ANY);