From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752264Ab2KLQX0 (ORCPT ); Mon, 12 Nov 2012 11:23:26 -0500 Received: from merlin.infradead.org ([205.233.59.134]:37059 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751339Ab2KLQXZ (ORCPT ); Mon, 12 Nov 2012 11:23:25 -0500 Message-Id: <20121112161215.390936462@chello.nl> User-Agent: quilt/0.48-1 Date: Mon, 12 Nov 2012 17:04:52 +0100 From: Peter Zijlstra To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Paul Turner , Lee Schermerhorn , Christoph Lameter , Rik van Riel , Mel Gorman , Andrew Morton , Andrea Arcangeli , Linus Torvalds , Peter Zijlstra , Ingo Molnar , Thomas Gleixner Subject: [PATCH 1/8] sched, numa, mm: Introduce sched_feat_numa() References: <20121112160451.189715188@chello.nl> Content-Disposition: inline; filename=0001-sched-numa-mm-Introduce-sched_feat_numa.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid a few #ifdef's later on. Signed-off-by: Peter Zijlstra Cc: Paul Turner Cc: Lee Schermerhorn Cc: Christoph Lameter Cc: Rik van Riel Cc: Mel Gorman Cc: Andrew Morton Cc: Linus Torvalds Signed-off-by: Ingo Molnar --- kernel/sched/sched.h | 6 ++++++ 1 file changed, 6 insertions(+) Index: linux/kernel/sched/sched.h =================================================================== --- linux.orig/kernel/sched/sched.h +++ linux/kernel/sched/sched.h @@ -663,6 +663,12 @@ extern struct static_key sched_feat_keys #define sched_feat(x) (sysctl_sched_features & (1UL << __SCHED_FEAT_##x)) #endif /* SCHED_DEBUG && HAVE_JUMP_LABEL */ +#ifdef CONFIG_SCHED_NUMA +#define sched_feat_numa(x) sched_feat(x) +#else +#define sched_feat_numa(x) (0) +#endif + static inline u64 global_rt_period(void) { return (u64)sysctl_sched_rt_period * NSEC_PER_USEC;