From 89a922221d8d0388621b6b7263c5682c18b6ff97 Mon Sep 17 00:00:00 2001
From: Maciej Szwed <maciej.szwed@intel.com>
Date: Wed, 13 Jan 2021 15:04:52 +0100
Subject: [PATCH] event: Fix SPDK_SCHEDULER_REGISTER macro

Signed-off-by: Maciej Szwed <maciej.szwed@intel.com>
Change-Id: I1b7d00f7ae2675e316eb64323966f8696357e7c4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5897
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
---
 include/spdk_internal/event.h | 4 ++--
 lib/event/gscheduler.c        | 2 +-
 lib/event/scheduler_static.c  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/spdk_internal/event.h b/include/spdk_internal/event.h
index 431ac6415..5e9f8bf8c 100644
--- a/include/spdk_internal/event.h
+++ b/include/spdk_internal/event.h
@@ -329,9 +329,9 @@ void _spdk_scheduler_period_set(uint64_t period);
  * Macro used to register new reactor balancer.
  */
 #define SPDK_SCHEDULER_REGISTER(scheduler) \
-static void __attribute__((constructor)) _spdk_scheduler_register_##name(void) \
+static void __attribute__((constructor)) _spdk_scheduler_register_ ## scheduler (void) \
 { \
-	_spdk_scheduler_list_add(scheduler); \
+	_spdk_scheduler_list_add(&scheduler); \
 } \
 
 /**
diff --git a/lib/event/gscheduler.c b/lib/event/gscheduler.c
index 110baa37a..4f46d304c 100644
--- a/lib/event/gscheduler.c
+++ b/lib/event/gscheduler.c
@@ -164,4 +164,4 @@ static struct spdk_scheduler gscheduler = {
 	.balance = balance,
 };
 
-SPDK_SCHEDULER_REGISTER(&gscheduler);
+SPDK_SCHEDULER_REGISTER(gscheduler);
diff --git a/lib/event/scheduler_static.c b/lib/event/scheduler_static.c
index 493808bcc..c585a444a 100644
--- a/lib/event/scheduler_static.c
+++ b/lib/event/scheduler_static.c
@@ -45,4 +45,4 @@ static struct spdk_scheduler scheduler = {
 	.deinit = NULL,
 	.balance = NULL,
 };
-SPDK_SCHEDULER_REGISTER(&scheduler);
+SPDK_SCHEDULER_REGISTER(scheduler);