From: Paul Gortmaker <pa...@kernel.org> This reverts commit f259af26ee04f11cb2c3af0a6873a6bcb67dd338.
This (5/5) is a part of a fix from the v6.6.7 content. However during repeated boot testing on qemu-x86 (32 and 64) with NFS root it hangs during the verbose printk of the PCI register layout map. The v6.6.6 and the v6.6.7 with 5 reverts does not have this issue. Note that NFS root seems to be key for some reason. https://bugzilla.yoctoproject.org/show_bug.cgi?id=15463 Signed-off-by: Paul Gortmaker <pa...@kernel.org> --- arch/x86/entry/common.c | 4 ---- arch/x86/include/asm/ia32.h | 16 +--------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 4cec38985414..93c60c0c9d4a 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -96,10 +96,6 @@ static __always_inline int syscall_32_enter(struct pt_regs *regs) return (int)regs->orig_ax; } -#ifdef CONFIG_IA32_EMULATION -bool __ia32_enabled __ro_after_init = true; -#endif - /* * Invoke a 32-bit syscall. Called with IRQs on in CONTEXT_KERNEL. */ diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h index 5a2ae24b1204..fada857f0a1e 100644 --- a/arch/x86/include/asm/ia32.h +++ b/arch/x86/include/asm/ia32.h @@ -68,20 +68,6 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm); #endif -extern bool __ia32_enabled; - -static inline bool ia32_enabled(void) -{ - return __ia32_enabled; -} - -#else /* !CONFIG_IA32_EMULATION */ - -static inline bool ia32_enabled(void) -{ - return IS_ENABLED(CONFIG_X86_32); -} - -#endif +#endif /* CONFIG_IA32_EMULATION */ #endif /* _ASM_X86_IA32_H */ -- 2.44.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13841): https://lists.yoctoproject.org/g/linux-yocto/message/13841 Mute This Topic: https://lists.yoctoproject.org/mt/105625704/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
