From 0fcf9378b524ded3ad260f3b655671c541e5a0b2 Mon Sep 17 00:00:00 2001
From: Mr NeilBrown <neilb@suse.de>
Date: Wed, 26 Feb 2020 07:59:56 +1100
Subject: [PATCH] LU-13258 libcfs: fixes for cfs_arch_init()

The introduction of cfs_arch_init() brought two problems.

1/ wait_bit_init() wasn't known due to a missing include file.
2/ cfs_arch_init() was not marked __init, but it called
   a function (wait_bit_init) that was.

This patch fixes both of these.

Fixes: 3453c95f513c ("LU-13258 libcfs: make apply_workqueue_attrs() available for Lustre")
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I6f19e11e68f52ca8071332364d369ed3a717d5c9
Reviewed-on: https://review.whamcloud.com/37727
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---
 libcfs/libcfs/linux/linux-prim.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libcfs/libcfs/linux/linux-prim.c b/libcfs/libcfs/linux/linux-prim.c
index 8a1c50a..a8ca37e 100644
--- a/libcfs/libcfs/linux/linux-prim.c
+++ b/libcfs/libcfs/linux/linux-prim.c
@@ -49,6 +49,7 @@
 #endif
 
 #include <libcfs/linux/linux-time.h>
+#include <libcfs/linux/linux-wait.h>
 
 #ifndef HAVE_KTIME_GET_TS64
 void ktime_get_ts64(struct timespec64 *ts)
@@ -116,7 +117,7 @@ EXPORT_SYMBOL_GPL(cfs_apply_workqueue_attrs);
 
 struct kmem_cache (*cfs_radix_tree_node_cachep);
 
-void cfs_arch_init(void)
+void __init cfs_arch_init(void)
 {
 #ifndef HAVE_WAIT_VAR_EVENT
 	wait_bit_init();
-- 
1.8.3.1