Skip to contentSkip to conversation

sched: Clean up topology.h

tip:sched/balancing tip-bot for Ingo Molnar 1 participant 1 message Sep 4, 2009 x86

lore
Share & tools
lore
#0 lore raw
Commit-ID:  47734f89be0614b5acbd6a532390f9c72f019648
Gitweb:     http://git.kernel.org/tip/47734f89be0614b5acbd6a532390f9c72f019648
Author:     Ingo Molnar <[email protected]>
AuthorDate: Fri, 4 Sep 2009 11:21:24 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 4 Sep 2009 11:52:53 +0200

sched: Clean up topology.h

Re-organize the flag settings so that it's visible at a glance which sched-domains flags are set and which not.

With the new balancer code we'll need to re-tune these details anyway, so make it cleaner to make fewer mistakes down the road ;-)

Cc: Peter Zijlstra <[email protected]>
Cc: Andreas Herrmann <[email protected]>
Cc: Andreas Herrmann <[email protected]>
Cc: Gautham R Shenoy <[email protected]>
Cc: Balbir Singh <[email protected]>
LKML-Reference: <new-submission>

---
 arch/x86/include/asm/topology.h |   47 +++++++-----
 include/linux/topology.h        |  169 +++++++++++++++++++++++----------------
 2 files changed, 129 insertions(+), 87 deletions(-)
arch/x86/include/asm/topology.h +28 -19
index 066ef59..be29eb8 100644
@@ -129,25 +129,34 @@ extern unsigned long node_remap_size[];
 #endif
 
 /* sched_domains SD_NODE_INIT for NUMA machines */
-#define SD_NODE_INIT (struct sched_domain) {		\
-	.min_interval		= 8,			\
-	.max_interval		= 32,			\
-	.busy_factor		= 32,			\
-	.imbalance_pct		= 125,			\
-	.cache_nice_tries	= SD_CACHE_NICE_TRIES,	\
-	.busy_idx		= 3,			\
-	.idle_idx		= SD_IDLE_IDX,		\
-	.newidle_idx		= SD_NEWIDLE_IDX,	\
-	.wake_idx		= 1,			\
-	.forkexec_idx		= SD_FORKEXEC_IDX,	\
-	.flags			= SD_LOAD_BALANCE	\
-				| SD_BALANCE_EXEC	\
-				| SD_BALANCE_FORK	\
-				| SD_WAKE_AFFINE	\
-				| SD_WAKE_BALANCE	\
-				| SD_SERIALIZE,		\
-	.last_balance		= jiffies,		\
-	.balance_interval	= 1,			\
+#define SD_NODE_INIT (struct sched_domain) {				\
+	.min_interval		= 8,					\
+	.max_interval		= 32,					\
+	.busy_factor		= 32,					\
+	.imbalance_pct		= 125,					\
+	.cache_nice_tries	= SD_CACHE_NICE_TRIES,			\
+	.busy_idx		= 3,					\
+	.idle_idx		= SD_IDLE_IDX,				\
+	.newidle_idx		= SD_NEWIDLE_IDX,			\
+	.wake_idx		= 1,					\
+	.forkexec_idx		= SD_FORKEXEC_IDX,			\
+									\
+	.flags			= 1*SD_LOAD_BALANCE			\
+				| 0*SD_BALANCE_NEWIDLE			\
+				| 1*SD_BALANCE_EXEC			\
+				| 1*SD_BALANCE_FORK			\
+				| 0*SD_WAKE_IDLE			\
+				| 1*SD_WAKE_AFFINE			\
+				| 1*SD_WAKE_BALANCE			\
+				| 0*SD_SHARE_CPUPOWER			\
+				| 0*SD_POWERSAVINGS_BALANCE		\
+				| 0*SD_SHARE_PKG_RESOURCES		\
+				| 1*SD_SERIALIZE			\
+				| 0*SD_WAKE_IDLE_FAR			\
+				| 0*SD_PREFER_SIBLING			\
+				,					\
+	.last_balance		= jiffies,				\
+	.balance_interval	= 1,					\
 }
 
 #ifdef CONFIG_X86_64_ACPI_NUMA
include/linux/topology.h +101 -68

191 lines not on this page · raw message