Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753961AbbFDPj2 (ORCPT ); Thu, 4 Jun 2015 11:39:28 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:34647 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753817AbbFDPjU (ORCPT ); Thu, 4 Jun 2015 11:39:20 -0400 From: Frederic Weisbecker To: Peter Zijlstra Cc: LKML , Frederic Weisbecker , Ingo Molnar , Fengguang Wu , Steven Rostedt Subject: [PATCH 3/3] preempt: Reorganize a bit the notrace declensions Date: Thu, 4 Jun 2015 17:39:09 +0200 Message-Id: <1433432349-1021-4-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433432349-1021-1-git-send-email-fweisbec@gmail.com> References: <1433432349-1021-1-git-send-email-fweisbec@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2018 Lines: 86 preempt.h has two seperate "#ifdef CONFIG_PREEMPT" sections: one to define preempt_enable() and another to define preempt_enable_notrace(). Lets gather both. Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Fengguang Wu Cc: Steven Rostedt Signed-off-by: Frederic Weisbecker --- include/linux/preempt.h | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 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,20 +175,34 @@ 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_enable_notrace() \ +do { \ + barrier(); \ + __preempt_count_dec(); \ +} while (0) + #define preempt_check_resched() do { } while (0) -#endif +#endif /* CONFIG_PREEMPT */ #define preempt_disable_notrace() \ do { \ @@ -202,22 +216,6 @@ do { \ __preempt_count_dec(); \ } while (0) -#ifdef CONFIG_PREEMPT - -#define preempt_enable_notrace() \ -do { \ - barrier(); \ - if (unlikely(__preempt_count_dec_and_test())) \ - __preempt_schedule_notrace(); \ -} while (0) -#else -#define preempt_enable_notrace() \ -do { \ - barrier(); \ - __preempt_count_dec(); \ -} while (0) -#endif - #else /* !CONFIG_PREEMPT_COUNT */ /* -- 2.1.4 -- 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/