Skip to content

Commit a61efbb

Browse files
pvts-matPlaidCat
authored andcommitted
x86: Fix misspelled Kconfig symbols
jira VULN-772 cve-pre CVE-2024-25744 commit-author Lukas Bulwahn <lukas.bulwahn@gmail.com> commit 6bf8a55 Fix misspelled Kconfig symbols as detected by scripts/checkkconfigsymbols.py. [ bp: Combine into a single patch. ] Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20210803113531.30720-7-lukas.bulwahn@gmail.com (cherry picked from commit 6bf8a55) Signed-off-by: Marcin Wcisło <marcin.wcislo@conclusive.pl>
1 parent b4f997e commit a61efbb

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

arch/x86/include/asm/ia32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm);
6868

6969
#endif
7070

71-
#endif /* !CONFIG_IA32_SUPPORT */
71+
#endif /* CONFIG_IA32_EMULATION */
7272

7373
#endif /* _ASM_X86_IA32_H */

arch/x86/include/asm/irq_stack.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
* the output constraints to make the compiler aware that R11 cannot be
6060
* reused after the asm() statement.
6161
*
62-
* For builds with CONFIG_UNWIND_FRAME_POINTER ASM_CALL_CONSTRAINT is
62+
* For builds with CONFIG_UNWINDER_FRAME_POINTER, ASM_CALL_CONSTRAINT is
6363
* required as well as this prevents certain creative GCC variants from
6464
* misplacing the ASM code.
6565
*

arch/x86/include/asm/page_32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static inline void copy_page(void *to, void *from)
4343
{
4444
memcpy(to, from, PAGE_SIZE);
4545
}
46-
#endif /* CONFIG_X86_3DNOW */
46+
#endif /* CONFIG_X86_USE_3DNOW */
4747
#endif /* !__ASSEMBLY__ */
4848

4949
#endif /* _ASM_X86_PAGE_32_H */

arch/x86/include/asm/uaccess.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ do { \
379379
: [umem] "m" (__m(addr)), \
380380
"0" (err))
381381

382-
#endif // CONFIG_CC_ASM_GOTO_OUTPUT
382+
#endif // CONFIG_CC_HAS_ASM_GOTO_OUTPUT
383383

384384
#ifdef CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT
385385
#define __try_cmpxchg_user_asm(itype, ltype, _ptr, _pold, _new, label) ({ \

0 commit comments

Comments
 (0)