From: Pavel Vasilyev <pavel@pavlinux.ru>
To: Clark Williams <williams@redhat.com>
Cc: RT <linux-rt-users@vger.kernel.org>
Subject: Re: Mainline patch-3.14.4-5.xz
Date: Tue, 03 Jun 2014 04:04:00 +0400 [thread overview]
Message-ID: <538D10F0.1090203@pavlinux.ru> (raw)
In-Reply-To: <20140602170751.172fa3db@sluggy>
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
prev parent reply other threads:[~2014-06-03 0:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=538D10F0.1090203@pavlinux.ru \
--to=pavel@pavlinux.ru \
--cc=linux-rt-users@vger.kernel.org \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).