* Mainline patch-3.14.4-5.xz
@ 2014-05-31 23:27 Pavel Vasilyev
2014-06-02 16:46 ` Clark Williams
0 siblings, 1 reply; 6+ messages in thread
From: Pavel Vasilyev @ 2014-05-31 23:27 UTC (permalink / raw)
To: RT
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? :)
--
Pavel.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Mainline patch-3.14.4-5.xz
2014-05-31 23:27 Mainline patch-3.14.4-5.xz Pavel Vasilyev
@ 2014-06-02 16:46 ` Clark Williams
2014-06-02 22:02 ` Pavel Vasilyev
0 siblings, 1 reply; 6+ messages in thread
From: Clark Williams @ 2014-06-02 16:46 UTC (permalink / raw)
To: pavel; +Cc: RT
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Mainline patch-3.14.4-5.xz
2014-06-02 16:46 ` Clark Williams
@ 2014-06-02 22:02 ` Pavel Vasilyev
2014-06-02 22:07 ` Clark Williams
0 siblings, 1 reply; 6+ messages in thread
From: Pavel Vasilyev @ 2014-06-02 22:02 UTC (permalink / raw)
To: Clark Williams; +Cc: RT
02.06.2014 20:46, Clark Williams пишет:
>>
>> 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.
Code migrate from <linux/thread_info.h> to <linux/preempt.h>
https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=78
https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=82
Link: http://marc.info/?l=linux-kernel&m=139705352130896
--
Pavel.
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Mainline patch-3.14.4-5.xz
2014-06-02 22:02 ` Pavel Vasilyev
@ 2014-06-02 22:07 ` Clark Williams
2014-06-02 22:13 ` Pavel Vasilyev
2014-06-03 0:04 ` Pavel Vasilyev
0 siblings, 2 replies; 6+ messages in thread
From: Clark Williams @ 2014-06-02 22:07 UTC (permalink / raw)
To: Pavel Vasilyev; +Cc: RT
[-- Attachment #1: Type: text/plain, Size: 885 bytes --]
On Tue, 03 Jun 2014 02:02:34 +0400
Pavel Vasilyev <pavel@pavlinux.ru> wrote:
> 02.06.2014 20:46, Clark Williams пишет:
> >>
> >> 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.
>
> Code migrate from <linux/thread_info.h> to <linux/preempt.h>
>
> https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=78
>
> https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=82
>
> Link: http://marc.info/?l=linux-kernel&m=139705352130896
>
Yes, I saw that right *after* I replied to your email :)
I'm on my second try now...
Clark
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Mainline patch-3.14.4-5.xz
2014-06-02 22:07 ` Clark Williams
@ 2014-06-02 22:13 ` Pavel Vasilyev
2014-06-03 0:04 ` Pavel Vasilyev
1 sibling, 0 replies; 6+ messages in thread
From: Pavel Vasilyev @ 2014-06-02 22:13 UTC (permalink / raw)
To: Clark Williams; +Cc: RT
03.06.2014 02:07, Clark Williams пишет:
> On Tue, 03 Jun 2014 02:02:34 +0400
> Pavel Vasilyev <pavel@pavlinux.ru> wrote:
>
>> 02.06.2014 20:46, Clark Williams пишет:
>>>>
>>>> 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.
>>
>> Code migrate from <linux/thread_info.h> to <linux/preempt.h>
>>
>> https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=78
>>
>> https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=82
>>
>> Link: http://marc.info/?l=linux-kernel&m=139705352130896
>>
>
> Yes, I saw that right *after* I replied to your email :)
>
> I'm on my second try now...
I think need edit changes in our preempt-lazy-support.patch
--
Pavel.
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Mainline patch-3.14.4-5.xz
2014-06-02 22:07 ` Clark Williams
2014-06-02 22:13 ` Pavel Vasilyev
@ 2014-06-03 0:04 ` Pavel Vasilyev
1 sibling, 0 replies; 6+ messages in thread
From: Pavel Vasilyev @ 2014-06-03 0:04 UTC (permalink / raw)
To: Clark Williams; +Cc: RT
03.06.2014 02:07, Clark Williams пишет:
> On Tue, 03 Jun 2014 02:02:34 +0400
> Pavel Vasilyev <pavel@pavlinux.ru> wrote:
>
>> 02.06.2014 20:46, Clark Williams пишет:
>>>>
>>>> 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.
>>
>> Code migrate from <linux/thread_info.h> to <linux/preempt.h>
>>
>> https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=78
>>
>> https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=82
>>
>> Link: http://marc.info/?l=linux-kernel&m=139705352130896
>>
>
> Yes, I saw that right *after* I replied to your email :)
>
> I'm on my second try now...
I think need edit changes in our preempt-lazy-support.patch
something like this:
--- include/linux/preempt.h 2014-06-03 02:19:59.471929000 +0400
+++ include/linux/preempt.h 2014-06-03 02:18:11.994929000 +0400
@@ -15,7 +15,18 @@
*/
#define PREEMPT_NEED_RESCHED 0x80000000
-#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
+#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
#include <asm/preempt.h>
--
Pavel.
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-06-03 0:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-31 23:27 Mainline patch-3.14.4-5.xz Pavel Vasilyev
2014-06-02 16:46 ` Clark Williams
2014-06-02 22:02 ` Pavel Vasilyev
2014-06-02 22:07 ` Clark Williams
2014-06-02 22:13 ` Pavel Vasilyev
2014-06-03 0:04 ` Pavel Vasilyev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).