Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932630AbbFGRty (ORCPT ); Sun, 7 Jun 2015 13:49:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57710 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752991AbbFGRti (ORCPT ); Sun, 7 Jun 2015 13:49:38 -0400 Date: Sun, 7 Jun 2015 10:47:03 -0700 From: tip-bot for Frederic Weisbecker Message-ID: Cc: fengguang.wu@intel.com, torvalds@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, rostedt@goodmis.org, tglx@linutronix.de, hpa@zytor.com, fweisbec@gmail.com, peterz@infradead.org Reply-To: peterz@infradead.org, tglx@linutronix.de, rostedt@goodmis.org, akpm@linux-foundation.org, fweisbec@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, torvalds@linux-foundation.org, fengguang.wu@intel.com In-Reply-To: <1433432349-1021-4-git-send-email-fweisbec@gmail.com> References: <1433432349-1021-4-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] preempt: Reorganize the notrace definitions a bit Git-Commit-ID: 9a92e3dc6ad02208a014d0d8404ebbd697e3d5ef X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2890 Lines: 102 Commit-ID: 9a92e3dc6ad02208a014d0d8404ebbd697e3d5ef Gitweb: http://git.kernel.org/tip/9a92e3dc6ad02208a014d0d8404ebbd697e3d5ef Author: Frederic Weisbecker AuthorDate: Thu, 4 Jun 2015 17:39:09 +0200 Committer: Ingo Molnar CommitDate: Sun, 7 Jun 2015 15:57:43 +0200 preempt: Reorganize the notrace definitions a bit preempt.h has two seperate "#ifdef CONFIG_PREEMPT" sections: one to define preempt_enable() and another to define preempt_enable_notrace(). Lets gather both. Signed-off-by: Frederic Weisbecker Signed-off-by: Peter Zijlstra (Intel) Cc: Andrew Morton Cc: Fengguang Wu Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1433432349-1021-4-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- include/linux/preempt.h | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 7686dd6..0f1534a 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -175,48 +175,46 @@ do { \ __preempt_schedule(); \ } while (0) +#define preempt_enable_notrace() \ +do { \ + barrier(); \ + if (unlikely(__preempt_count_dec_and_test())) \ + __preempt_schedule_notrace(); \ +} while (0) + #define preempt_check_resched() \ do { \ if (should_resched()) \ __preempt_schedule(); \ } while (0) -#else +#else /* !CONFIG_PREEMPT */ #define preempt_enable() \ do { \ barrier(); \ preempt_count_dec(); \ } while (0) -#define preempt_check_resched() do { } while (0) -#endif - -#define preempt_disable_notrace() \ -do { \ - __preempt_count_inc(); \ - barrier(); \ -} while (0) -#define preempt_enable_no_resched_notrace() \ +#define preempt_enable_notrace() \ do { \ barrier(); \ __preempt_count_dec(); \ } while (0) -#ifdef CONFIG_PREEMPT +#define preempt_check_resched() do { } while (0) +#endif /* CONFIG_PREEMPT */ -#define preempt_enable_notrace() \ +#define preempt_disable_notrace() \ do { \ + __preempt_count_inc(); \ barrier(); \ - if (unlikely(__preempt_count_dec_and_test())) \ - __preempt_schedule_notrace(); \ } while (0) -#else -#define preempt_enable_notrace() \ + +#define preempt_enable_no_resched_notrace() \ do { \ barrier(); \ __preempt_count_dec(); \ } while (0) -#endif #else /* !CONFIG_PREEMPT_COUNT */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/