From: Pavel Vasilyev <pavel@pavlinux.ru>
To: RT <linux-rt-users@vger.kernel.org>
Subject: Mainline patch-3.14.4-5.xz
Date: Sun, 01 Jun 2014 03:27:14 +0400 [thread overview]
Message-ID: <538A6552.3050501@pavlinux.ru> (raw)
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.
next reply other threads:[~2014-05-31 23:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-31 23:27 Pavel Vasilyev [this message]
2014-06-02 16:46 ` Mainline patch-3.14.4-5.xz 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
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=538A6552.3050501@pavlinux.ru \
--to=pavel@pavlinux.ru \
--cc=linux-rt-users@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.