Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

[pandora-kernel.git] / kernel / sched_features.h

diff --git a/kernel/sched_features.h b/kernel/sched_features.h
index 1cb7c47..83c66e8 100644 (file)
--- a/kernel/sched_features.h
+++ b/kernel/sched_features.h
@@ -16,20 +16,6 @@ SCHED_FEAT(START_DEBIT, 1)
  */
 SCHED_FEAT(WAKEUP_PREEMPT, 1)
 
-/*
- * When converting the wakeup granularity to virtual time, do it such
- * that heavier tasks preempting a lighter task have an edge.
- */
-SCHED_FEAT(ASYM_GRAN, 1)
-
-/*
- * Use the SYNC wakeup hint, pipes and the likes use this to indicate
- * the remote end is likely to consume the data we just wrote, and
- * therefore has cache benefit from being placed on the same cpu, see
- * also AFFINE_WAKEUPS.
- */
-SCHED_FEAT(SYNC_WAKEUPS, 1)
-
 /*
  * Based on load and program behaviour, see if it makes sense to place
  * a newly woken task on the same cpu as the task that woke it --