[linux-yocto] [v4.19 rt branch] x86: Drop the duplicate define of TIF_NEED_RESCHED_LAZY
Bruce Ashfield
bruce.ashfield at gmail.com
Thu Mar 28 06:45:38 PDT 2019
Thanks Kevin,
This is now merged.
Bruce
On Thu, Mar 28, 2019 at 2:28 AM Kevin Hao <kexin.hao at windriver.com> wrote:
>
> The two merge commits 107b161b1cbaf ("Merge branch 'v4.19/standard/base'
> into v4.19/standard/preempt-rt/base") and dc37b7080cd55 ("Merge tag
> 'v4.19.8' into linux-4.19.y-rt") almost have the same content, but
> introduce two define of TIF_NEED_RESCHED_LAZY for x86 arch. Drop one of
> them to fix the build warning.
>
> Signed-off-by: Kevin Hao <kexin.hao at windriver.com>
> ---
> arch/x86/include/asm/thread_info.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
> index 70b08abcd6d0..dc267291f131 100644
> --- a/arch/x86/include/asm/thread_info.h
> +++ b/arch/x86/include/asm/thread_info.h
> @@ -95,7 +95,6 @@ struct thread_info {
> #define TIF_USER_RETURN_NOTIFY 11 /* notify kernel of userspace return */
> #define TIF_UPROBE 12 /* breakpointed or singlestepping */
> #define TIF_PATCH_PENDING 13 /* pending live patching update */
> -#define TIF_NEED_RESCHED_LAZY 14 /* lazy rescheduling necessary */
> #define TIF_NOCPUID 15 /* CPUID is not accessible in userland */
> #define TIF_NOTSC 16 /* TSC is not accessible in userland */
> #define TIF_IA32 17 /* IA32 compatibility process */
> @@ -126,7 +125,6 @@ struct thread_info {
> #define _TIF_USER_RETURN_NOTIFY (1 << TIF_USER_RETURN_NOTIFY)
> #define _TIF_UPROBE (1 << TIF_UPROBE)
> #define _TIF_PATCH_PENDING (1 << TIF_PATCH_PENDING)
> -#define _TIF_NEED_RESCHED_LAZY (1 << TIF_NEED_RESCHED_LAZY)
> #define _TIF_NOCPUID (1 << TIF_NOCPUID)
> #define _TIF_NOTSC (1 << TIF_NOTSC)
> #define _TIF_IA32 (1 << TIF_IA32)
> --
> 2.14.4
>
> --
> _______________________________________________
> linux-yocto mailing list
> linux-yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/linux-yocto
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
More information about the linux-yocto
mailing list