03.06.2014 02:07, Clark Williams пишет:
On Tue, 03 Jun 2014 02:02:34 +0400
Pavel Vasilyev <pavel@xxxxxxxxxxx> 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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
