From: pjkirner Date: Mon, 10 Oct 2005 13:53:54 +0000 (+0000) Subject: * weak alias doesn't seem to be working especially on the XT3 Catamount buid system... X-Git-Tag: v1_7_100~1^25~6^2~105 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=39df0d6b818d6629325e1dcb0a347a25446a9470;p=fs%2Flustre-release.git * weak alias doesn't seem to be working especially on the XT3 Catamount buid system. Go to a more explict registration based on #ifdefs. --- diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index 7cf45e9..abc0782 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -1095,6 +1095,14 @@ lnet_startup_lndnis (void) return -ENETDOWN; } +#ifndef __KERNEL__ +# if LNET_SINGLE_THREADED +extern lnd_t the_ptllnd; +# else +extern lnd_t the_tcplnd; +# endif +#endif + int LNetInit(void) { @@ -1121,9 +1129,9 @@ LNetInit(void) /* Register all LNDs that have been loaded * NB the order here determines default 'networks=' order */ # if LNET_SINGLE_THREADED - LNET_REGISTER_LND_IF_PRESENT(the_ptllnd); + lnet_register_lnd(&the_ptllnd); # else - LNET_REGISTER_LND_IF_PRESENT(the_tcplnd); + lnet_register_lnd(&the_tcplnd); # endif #endif lnet_register_lnd(&the_lolnd);