From bb30416452a783b963d1774bcd2388fd35960e87 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 21 Dec 2023 21:01:51 -0500 Subject: [PATCH] Cleanup: combine ifdefs for arm thumb2 Those two ifdefs can be combined into a single preprocessor conditional with a &&. Signed-off-by: Mathieu Desnoyers Change-Id: Icc2c11f1fd033af475cf69f14140dd710417cf10 --- include/wrapper/kallsyms.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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; } -- 2.34.1