From 7a76d0e82dbde7d62385db7265427f2284530eaf Mon Sep 17 00:00:00 2001
From: Andreas Abel <abel@cs.uni-saarland.de>
Date: Fri, 26 Nov 2021 02:10:05 +0100
Subject: [PATCH] fix warnings

---
 common/nanoBench.c | 24 ++++++++++++------------
 common/nanoBench.h |  3 +--
 kernel/Makefile    |  6 +++---
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/common/nanoBench.c b/common/nanoBench.c
index a891d50..d2c5ae5 100644
--- a/common/nanoBench.c
+++ b/common/nanoBench.c
@@ -182,7 +182,7 @@ void parse_counter_configs() {
         char* tok = buf;
 
         char* evt_num = strsep(&tok, ".");
-        nb_strtoul(evt_num, 16, &(pfc_configs[n_pfc_configs].evt_num));
+        pfc_configs[n_pfc_configs].evt_num = strtoul(evt_num, NULL, 16);
 
         if (!tok) {
             print_error("invalid configuration: %s\n", config_str);
@@ -190,7 +190,7 @@ void parse_counter_configs() {
         }
 
         char* umask = strsep(&tok, ".");
-        nb_strtoul(umask, 16, &(pfc_configs[n_pfc_configs].umask));
+        pfc_configs[n_pfc_configs].umask = strtoul(umask, NULL, 16);
 
         char* ce;
         while ((ce = strsep(&tok, ".")) != NULL) {
@@ -204,22 +204,22 @@ void parse_counter_configs() {
                 pfc_configs[n_pfc_configs].taken_alone = true;
             } else if (!strncmp(ce, "CTR=", 4)) {
                 unsigned long counter;
-                nb_strtoul(ce+4, 0, &counter);
+                counter = strtoul(ce+4, NULL, 0);
                 if (counter > n_programmable_counters) {
                     print_error("invalid counter: %s\n", ce);
                     continue;
                 }
                 pfc_configs[n_pfc_configs].ctr = counter;
             } else if (!strncmp(ce, "CMSK=", 5)) {
-                nb_strtoul(ce+5, 0, &(pfc_configs[n_pfc_configs].cmask));
+                pfc_configs[n_pfc_configs].cmask = strtoul(ce+5, NULL, 0);
             } else if (!strncmp(ce, "MSR_3F6H=", 9)) {
-                nb_strtoul(ce+9, 0, &(pfc_configs[n_pfc_configs].msr_3f6h));
+                pfc_configs[n_pfc_configs].msr_3f6h = strtoul(ce+9, NULL, 0);
             } else if (!strncmp(ce, "MSR_PF=", 7)) {
-                nb_strtoul(ce+7, 0, &(pfc_configs[n_pfc_configs].msr_pf));
+                pfc_configs[n_pfc_configs].msr_pf = strtoul(ce+7, NULL, 0);
             } else if (!strncmp(ce, "MSR_RSP0=", 9)) {
-                nb_strtoul(ce+9, 0, &(pfc_configs[n_pfc_configs].msr_rsp0));
+                pfc_configs[n_pfc_configs].msr_rsp0 = strtoul(ce+9, NULL, 0);
             } else if (!strncmp(ce, "MSR_RSP1=", 9)) {
-                nb_strtoul(ce+9, 0, &(pfc_configs[n_pfc_configs].msr_rsp1));
+                pfc_configs[n_pfc_configs].msr_rsp1 = strtoul(ce+9, NULL, 0);
             }
         }
         n_pfc_configs++;
@@ -249,7 +249,7 @@ void parse_msr_configs() {
         }
 
         strreplace(rdmsr_str, 'h', '\0'); strreplace(rdmsr_str, 'H', '\0');
-        nb_strtoul(rdmsr_str+4, 16, &(msr_configs[n_msr_configs].rdmsr));
+        msr_configs[n_msr_configs].rdmsr = strtoul(rdmsr_str+4, NULL, 16);
 
         size_t n_wrmsr = 0;
         char* tok = wrmsr_str;
@@ -263,9 +263,9 @@ void parse_msr_configs() {
             char* msr_str = strsep(&ce, "=")+4;
             pr_debug("msr_str: %s", msr_str);
             strreplace(msr_str, 'h', '\0'); strreplace(msr_str, 'H', '\0');
-            nb_strtoul(msr_str, 16, &(msr_configs[n_msr_configs].wrmsr[n_wrmsr]));
+            msr_configs[n_msr_configs].wrmsr[n_wrmsr] = strtoul(msr_str, NULL, 16);
             strreplace(ce, 'h', '\0'); strreplace(ce, 'H', '\0');
-            nb_strtoul(ce, 0, &(msr_configs[n_msr_configs].wrmsr_val[n_wrmsr]));
+            msr_configs[n_msr_configs].wrmsr_val[n_wrmsr] = strtoul(ce, NULL, 0);
             n_wrmsr++;
         }
         msr_configs[n_msr_configs].n_wrmsr = n_wrmsr;
@@ -287,7 +287,7 @@ uint64_t read_value_from_cmd(char* cmd) {
     pclose(fp);
 
     uint64_t val;
-    nb_strtoul(buf, 0, &val);
+    val = strtoul(buf, NULL, 0);
     return val;
 }
 #endif
diff --git a/common/nanoBench.h b/common/nanoBench.h
index 5a02e46..331edec 100644
--- a/common/nanoBench.h
+++ b/common/nanoBench.h
@@ -31,13 +31,12 @@
     #define print_error(...) pr_debug(__VA_ARGS__)
     #define print_verbose(...) if (verbose) pr_debug(__VA_ARGS__)
     #define print_user_verbose(...) pr_debug(__VA_ARGS__)
-    #define nb_strtoul(s, base, res) kstrtoul(s, base, res)
+    #define strtoul(s, base, res) simple_strtoul(s, base, res)
     #define qsort(base, n, size, comp) sort(base, n, size, comp, NULL)
 #else
     #define print_error(...) fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n");
     #define print_verbose(...) if (verbose) printf(__VA_ARGS__);
     #define print_user_verbose(...) if (verbose) printf(__VA_ARGS__);
-    #define nb_strtoul(s, base, res) *res = strtoul(s, NULL, base)
     #define max(a,b) (((a) > (b)) ? (a) : (b))
     #define min(a,b) (((a) < (b)) ? (a) : (b))
 #endif
diff --git a/kernel/Makefile b/kernel/Makefile
index 07b503d..f3d48d1 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -20,11 +20,11 @@ CFLAGS_nanoBench.o := -DDEBUG
 
 ccflags-y+=-std=gnu99 -Wno-declaration-after-statement -DDEBUG
 
-all: 
-	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
+OBJECT_FILES_NON_STANDARD := y
 
+all:
+	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
 
 clean:
 	rm -f ../common/*.o ../common/*.ur-safe
 	rm -rf *.o *.ko *.mod.c .tmp_versions modules.order Module.symvers
-