From 81b0534930073069a17b0223ada8664446fd9528 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Thu, 7 Apr 2011 14:09:53 +0200
Subject: [PATCH] --- yaml --- r: 245555 b: refs/heads/master c:
 3859173d43658d51a749bc0201b943922577d39c h: refs/heads/master i:   245553:
 a7de04577da80109748d376467c293b55691bd0d   245551:
 c73f8481113614be601e50f3a06f1f64616e844a v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/sched.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fd64c2b8e289..ef3aa8553fd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6c75f2f8d988ecfecf971f98f1cb6fc4de522fe
+refs/heads/master: 3859173d43658d51a749bc0201b943922577d39c
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 020b79d6c486..5a9168b01db8 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -897,12 +897,20 @@ static inline struct cpumask *sched_group_cpus(struct sched_group *sg)
 
 enum sched_domain_level {
 	SD_LV_NONE = 0,
+#ifdef CONFIG_SCHED_SMT
 	SD_LV_SIBLING,
+#endif
+#ifdef CONFIG_SCHED_MC
 	SD_LV_MC,
+#endif
+#ifdef CONFIG_SCHED_BOOK
 	SD_LV_BOOK,
+#endif
 	SD_LV_CPU,
+#ifdef CONFIG_NUMA
 	SD_LV_NODE,
 	SD_LV_ALLNODES,
+#endif
 	SD_LV_MAX
 };