Re: Mainline patch-3.14.4-5.xz

[Clark Williams <williams@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1427 bytes --]

On Sun, 01 Jun 2014 03:27:14 +0400
Pavel Vasilyev <pavel@pavlinux.ru> wrote:

> Vanila patch:
> 
> --- a/include/linux/thread_info.h
> +++ b/include/linux/thread_info.h
> @@ -118,8 +118,6 @@ static inline __deprecated void set_need_resched(void)
>            */
>   }
> 
> -#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
> -
>   #if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK
>   /*
>    * An arch can define its own version of set_restore_sigmask() to get the
> 
> RT Code (same file):
> 
> 
> #ifdef CONFIG_PREEMPT_LAZY
> #define tif_need_resched() (test_thread_flag(TIF_NEED_RESCHED) || \
>                  test_thread_flag(TIF_NEED_RESCHED_LAZY))
> #define tif_need_resched_now() (test_thread_flag(TIF_NEED_RESCHED))
> #define tif_need_resched_lazy() (test_thread_flag(TIF_NEED_RESCHED_LAZY))
> 
> #else
> #define tif_need_resched() (test_thread_flag(TIF_NEED_RESCHED))
> #define tif_need_resched_now() (test_thread_flag(TIF_NEED_RESCHED))
> #define tif_need_resched_lazy() (0)
> 
> #endif
> 
> 1 out of 1 hunk ignored -- saving rejects to file include/linux/thread_info.h.rej
> 
> 
> What to do? :)
> 
I thought I was the only one to do crazy rebasing like this :)

I kept the #ifdef CONFIG_PREEMPT_LAZY block (the RT code) in
include/linux/thread_info.h and removed the definition of
tif_need_resched() in include/linux/preempt.h.

Clark

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]