From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 22 Dec 2023 02:01:51 +0000 (-0500)
Subject: Cleanup: combine ifdefs for arm thumb2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=bb30416452a783b963d1774bcd2388fd35960e87;p=lttng-modules.git

Cleanup: combine ifdefs for arm thumb2

Those two ifdefs can be combined into a single preprocessor conditional
with a &&.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Icc2c11f1fd033af475cf69f14140dd710417cf10
---

diff --git a/include/wrapper/kallsyms.h b/include/wrapper/kallsyms.h
index 0aac5a2d..fe2daefb 100644
--- a/include/wrapper/kallsyms.h
+++ b/include/wrapper/kallsyms.h
@@ -54,11 +54,9 @@ unsigned long kallsyms_lookup_funcptr(const char *name)
 	unsigned long addr;
 
 	addr = wrapper_kallsyms_lookup_name(name);
-#ifdef CONFIG_ARM
-#ifdef CONFIG_THUMB2_KERNEL
+#if defined(CONFIG_ARM) && defined(CONFIG_THUMB2_KERNEL)
 	if (addr)
 		addr |= 1; /* set bit 0 in address for thumb mode */
-#endif
 #endif
 	return addr;
 }