linux-kernel - [PATCH] intel_th: msu: fix unused variables

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20190507135233.31836-1-anders.roxell@linaro.org>
Date:   Tue,  7 May 2019 15:52:33 +0200
From:   Anders Roxell <anders.roxell@...aro.org>
To:     alexander.shishkin@...ux.intel.com
Cc:     linux-kernel@...r.kernel.org,
        Anders Roxell <anders.roxell@...aro.org>
Subject: [PATCH] intel_th: msu: fix unused variables

When building and CONFIG_X86 isn't set the compiler rightly complains
about an unused varable 'i', see the warning below:

../drivers/hwtracing/intel_th/msu.c: In function ‘msc_buffer_win_alloc’:
../drivers/hwtracing/intel_th/msu.c:783:21: warning: unused variable ‘i’ [-Wunused-variable]
  int ret = -ENOMEM, i;
                     ^
../drivers/hwtracing/intel_th/msu.c: In function ‘msc_buffer_win_free’:
../drivers/hwtracing/intel_th/msu.c:863:6: warning: unused variable ‘i’ [-Wunused-variable]
  int i;
      ^

Rework so that an else part is added where empty functions are created
for set_memory_uc() and set_memory_wb(), in that way we could remove
'#ifdef CONFIG_X86' in function msc_buffer_win_alloc() and
msc_buffer_win_free().

Fixes: ba39bd830605 ("intel_th: msu: Switch over to scatterlist")
Signed-off-by: Anders Roxell <anders.roxell@...aro.org>
---
 drivers/hwtracing/intel_th/msu.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index 81bb54fa3ce8..5e839d52df87 100644
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -21,6 +21,11 @@
 
 #ifdef CONFIG_X86
 #include <asm/set_memory.h>
+#else
+static void set_memory_uc(unsigned long addr, int numpages)
+{}
+static void set_memory_wb(unsigned long addr, int numpages)
+{}
 #endif
 
 #include "intel_th.h"
@@ -811,11 +816,9 @@ static int msc_buffer_win_alloc(struct msc *msc, unsigned int nr_blocks)
 	if (ret < 0)
 		goto err_nomem;
 
-#ifdef CONFIG_X86
 	for (i = 0; i < ret; i++)
 		/* Set the page as uncached */
 		set_memory_uc((unsigned long)msc_win_block(win, i), 1);
-#endif
 
 	win->nr_blocks = ret;
 
@@ -870,11 +873,9 @@ static void msc_buffer_win_free(struct msc *msc, struct msc_window *win)
 		msc->base_addr = 0;
 	}
 
-#ifdef CONFIG_X86
 	for (i = 0; i < win->nr_blocks; i++)
 		/* Reset the page to write-back */
 		set_memory_wb((unsigned long)msc_win_block(win, i), 1);
-#endif
 
 	__msc_buffer_win_free(msc, win);
 
-- 
2.20.1