LU-10964 build: armv7 client build fixes

[fs/lustre-release.git] / lnet / selftest / module.c

diff --git a/lnet/selftest/module.c b/lnet/selftest/module.c
index 2d616e9..be5e37c 100644 (file)
--- a/lnet/selftest/module.c
+++ b/lnet/selftest/module.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -87,12 +87,12 @@ lnet_selftest_exit(void)
 void
 lnet_selftest_structure_assertion(void)
 {
-        CLASSERT(sizeof(srpc_msg_t) == 160);
-        CLASSERT(sizeof(srpc_test_reqst_t) == 70);
-        CLASSERT(offsetof(srpc_msg_t, msg_body.tes_reqst.tsr_concur) == 72);
-        CLASSERT(offsetof(srpc_msg_t, msg_body.tes_reqst.tsr_ndest) == 78);
-        CLASSERT(sizeof(srpc_stat_reply_t) == 136);
-        CLASSERT(sizeof(srpc_stat_reqst_t) == 28);
+       CLASSERT(sizeof(struct srpc_msg) == 160);
+       CLASSERT(sizeof(struct srpc_test_reqst) == 70);
+       CLASSERT(offsetof(struct srpc_msg, msg_body.tes_reqst.tsr_concur) == 72);
+       CLASSERT(offsetof(struct srpc_msg, msg_body.tes_reqst.tsr_ndest) == 78);
+       CLASSERT(sizeof(struct srpc_stat_reply) == 136);
+       CLASSERT(sizeof(struct srpc_stat_reqst) == 28);
 }
 
 static int __init
@@ -124,8 +124,8 @@ lnet_selftest_init(void)
                rc = cfs_wi_sched_create("lst_t", lnet_cpt_table(), i,
                                         nthrs, &lst_sched_test[i]);
                if (rc != 0) {
-                       CERROR("Failed to create CPT affinity WI scheduler "
-                              "%d for LST\n", i);
+                       CERROR("Failed to create CPU partition affinity WI "
+                              "scheduler %d for LST\n", i);
                        goto error;
                }
        }