Skip to contentSkip to conversation

x86/linkage: Fix typo of BUILD_VDSO in asm/linkage.h

PATCH Applied Jinghao Jia 3 participants 3 messages Aug 8, 2023 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/linkage: Fix typo of BUILD_VDSO in asm/linkage.h

The BUILD_VDSO macro was incorrectly spelled as BULID_VDSO in asm/linkage.h. This causes the !defined(BULID_VDSO) directive to always evaluate to true.

Correct the spelling to BUILD_VDSO.

Fixes bea75b33895f ("x86/Kconfig: Introduce function padding")
---
 arch/x86/include/asm/linkage.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/linkage.h +1 -1
index 0953aa32a324..97a3de7892d3 100644
@@ -21,7 +21,7 @@
 #define FUNCTION_PADDING
 #endif
 
-#if (CONFIG_FUNCTION_ALIGNMENT > 8) && !defined(__DISABLE_EXPORTS) && !defined(BULID_VDSO)
+#if (CONFIG_FUNCTION_ALIGNMENT > 8) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
 # define __FUNC_ALIGN		__ALIGN; FUNCTION_PADDING
 #else
 # define __FUNC_ALIGN		__ALIGN
Signature · 1 line
2.41.0
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Jinghao Jia

The BUILD_VDSO macro was incorrectly spelled as BULID_VDSO in asm/linkage.h. This causes the !defined(BULID_VDSO) directive to always evaluate to true.

Correct the spelling to BUILD_VDSO.

Fixes bea75b33895f ("x86/Kconfig: Introduce function padding")

Thanks.

Quoted 17 lines
---
 arch/x86/include/asm/linkage.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/linkage.h +1 -1
index 0953aa32a324..97a3de7892d3 100644
@@ -21,7 +21,7 @@
 #define FUNCTION_PADDING
 #endif
 
-#if (CONFIG_FUNCTION_ALIGNMENT > 8) && !defined(__DISABLE_EXPORTS) && !defined(BULID_VDSO)
+#if (CONFIG_FUNCTION_ALIGNMENT > 8) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
 # define __FUNC_ALIGN		__ALIGN; FUNCTION_PADDING
 #else
 # define __FUNC_ALIGN		__ALIGN
Signature · 1 line
~Randy
merge bot Applied
#2 lore raw
In reply to Jinghao Jia
The following commit has been merged into the x86/urgent branch of tip:

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     7324f74d39531262b8e362f228b46512e6bee632
Gitweb:        https://git.kernel.org/tip/7324f74d39531262b8e362f228b46512e6bee632
Author:        Jinghao Jia <[email protected]>
AuthorDate:    Tue, 08 Aug 2023 14:23:53 -04:00
Committer:     Borislav Petkov (AMD) <[email protected]>
CommitterDate: Tue, 08 Aug 2023 23:13:17 +02:00

x86/linkage: Fix typo of BUILD_VDSO in asm/linkage.h

The BUILD_VDSO macro was incorrectly spelled as BULID_VDSO in asm/linkage.h. This causes the !defined(BULID_VDSO) directive to always evaluate to true.

Correct the spelling to BUILD_VDSO.

---
 arch/x86/include/asm/linkage.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/linkage.h +1 -1
index 0953aa3..97a3de7 100644
@@ -21,7 +21,7 @@
 #define FUNCTION_PADDING
 #endif
 
-#if (CONFIG_FUNCTION_ALIGNMENT > 8) && !defined(__DISABLE_EXPORTS) && !defined(BULID_VDSO)
+#if (CONFIG_FUNCTION_ALIGNMENT > 8) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
 # define __FUNC_ALIGN		__ALIGN; FUNCTION_PADDING
 #else
 # define __FUNC_ALIGN		__ALIGN