From owner-svn-src-head@freebsd.org  Thu Mar  9 18:37:18 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D260DD05772;
 Thu,  9 Mar 2017 18:37:18 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 9EECF1E2;
 Thu,  9 Mar 2017 18:37:18 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v29IbHbC092621;
 Thu, 9 Mar 2017 18:37:17 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v29IbHw7092620;
 Thu, 9 Mar 2017 18:37:17 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201703091837.v29IbHw7092620@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Thu, 9 Mar 2017 18:37:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314971 - head/sys/compat/linuxkpi/common/include/linux
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Mar 2017 18:37:18 -0000

Author: hselasky
Date: Thu Mar  9 18:37:17 2017
New Revision: 314971
URL: https://svnweb.freebsd.org/changeset/base/314971

Log:
  Fix implementation of the DECLARE_WORK() macro in the LinuxKPI to fully
  initialize the declared work structure and not only the function callback
  pointer.
  
  MFC after:		1 week
  Sponsored by:		Mellanox Technologies

Modified:
  head/sys/compat/linuxkpi/common/include/linux/workqueue.h

Modified: head/sys/compat/linuxkpi/common/include/linux/workqueue.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/workqueue.h	Thu Mar  9 18:33:40 2017	(r314970)
+++ head/sys/compat/linuxkpi/common/include/linux/workqueue.h	Thu Mar  9 18:37:17 2017	(r314971)
@@ -72,8 +72,13 @@ struct work_struct {
 	atomic_t state;
 };
 
-#define	DECLARE_WORK(name, fn) \
-	struct work_struct name = { .func = (fn) }
+#define	DECLARE_WORK(name, fn)						\
+	struct work_struct name;					\
+	static void name##_init(void *arg)				\
+	{								\
+		INIT_WORK(&name, fn);					\
+	}								\
+	SYSINIT(name, SI_SUB_LOCK, SI_ORDER_SECOND, name##_init, NULL)
 
 struct delayed_work {
 	struct work_struct work;