From b849fbdff3035ae02601abb4ac8f3f32eac81d38 Mon Sep 17 00:00:00 2001 From: Tim Wickberg <tim@schedmd.com> Date: Mon, 29 Apr 2019 17:05:40 -0600 Subject: [PATCH] Move idle_node_bitmap weak symbol into job_test.c. --- src/plugins/select/cons_tres/job_test.c | 2 ++ src/plugins/select/cons_tres/select_cons_tres.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/select/cons_tres/job_test.c b/src/plugins/select/cons_tres/job_test.c index cc8a7ee2607..7c439e7b6da 100644 --- a/src/plugins/select/cons_tres/job_test.c +++ b/src/plugins/select/cons_tres/job_test.c @@ -48,9 +48,11 @@ */ #if defined (__APPLE__) extern slurmctld_config_t slurmctld_config __attribute__((weak_import)); +extern bitstr_t *idle_node_bitmap __attribute__((weak_import)); extern struct node_record *node_record_table_ptr __attribute__((weak_import)); #else slurmctld_config_t slurmctld_config; +bitstr_t *idle_node_bitmap; struct node_record *node_record_table_ptr; #endif diff --git a/src/plugins/select/cons_tres/select_cons_tres.c b/src/plugins/select/cons_tres/select_cons_tres.c index b43c77433f7..3e43fa4b11b 100644 --- a/src/plugins/select/cons_tres/select_cons_tres.c +++ b/src/plugins/select/cons_tres/select_cons_tres.c @@ -68,7 +68,6 @@ extern time_t last_node_update __attribute__((weak_import)); extern struct switch_record *switch_record_table __attribute__((weak_import)); extern int switch_record_cnt __attribute__((weak_import)); extern bitstr_t *avail_node_bitmap __attribute__((weak_import)); -extern bitstr_t *idle_node_bitmap __attribute__((weak_import)); extern uint16_t *cr_node_num_cores __attribute__((weak_import)); extern uint32_t *cr_node_cores_offset __attribute__((weak_import)); extern int slurmctld_tres_cnt __attribute__((weak_import)); @@ -83,7 +82,6 @@ time_t last_node_update; struct switch_record *switch_record_table; int switch_record_cnt; bitstr_t *avail_node_bitmap; -bitstr_t *idle_node_bitmap; uint16_t *cr_node_num_cores; uint32_t *cr_node_cores_offset; int slurmctld_tres_cnt = 0; -- GitLab