From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pavel Vasilyev Subject: Re: Mainline patch-3.14.4-5.xz Date: Tue, 03 Jun 2014 04:04:00 +0400 Message-ID: <538D10F0.1090203@pavlinux.ru> References: <538A6552.3050501@pavlinux.ru> <20140602114658.3c81b2f8@sluggy> <538CF47A.3070207@pavlinux.ru> <20140602170751.172fa3db@sluggy> Reply-To: pavel@pavlinux.ru Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: RT To: Clark Williams Return-path: Received: from imp01.mtu.ru ([62.5.255.10]:53687 "EHLO imp01.mtu.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751966AbaFCAFP (ORCPT ); Mon, 2 Jun 2014 20:05:15 -0400 In-Reply-To: <20140602170751.172fa3db@sluggy> Sender: linux-rt-users-owner@vger.kernel.org List-ID: 03.06.2014 02:07, Clark Williams =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > On Tue, 03 Jun 2014 02:02:34 +0400 > Pavel Vasilyev wrote: > >> 02.06.2014 20:46, Clark Williams =D0=BF=D0=B8=D1=88=D0=B5=D1=82: >>>> >>>> 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 to >> >> https://www.kernel.org/diff/diffview.cgi?file=3D%2Fpub%2Flinux%2Fker= nel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=3D78 >> >> https://www.kernel.org/diff/diffview.cgi?file=3D%2Fpub%2Flinux%2Fker= nel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=3D82 >> >> Link: http://marc.info/?l=3Dlinux-kernel&m=3D139705352130896 >> > > 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_LAZ= Y)) + +#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 --=20 Pavel. -- To unsubscribe from this list: send the line "unsubscribe linux-rt-user= s" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html