Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler changes from Ingo Molnar:
 "The biggest change is the cleanup/simplification of the load-balancer:
  instead of the current practice of architectures twiddling scheduler
  internal data structures and providing the scheduler domains in
  colorfully inconsistent ways, we now have generic scheduler code in
  kernel/sched/core.c:sched_init_numa() that looks at the architecture's
  node_distance() parameters and (while not fully trusting it) deducts a
  NUMA topology from it.

  This inevitably changes balancing behavior - hopefully for the better.

  There are various smaller optimizations, cleanups and fixlets as well"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Taint kernel with TAINT_WARN after sleep-in-atomic bug
  sched: Remove stale power aware scheduling remnants and dysfunctional knobs
  sched/debug: Fix printing large integers on 32-bit platforms
  sched/fair: Improve the ->group_imb logic
  sched/nohz: Fix rq->cpu_load[] calculations
  sched/numa: Don't scale the imbalance
  sched/fair: Revert sched-domain iteration breakage
  sched/x86: Rewrite set_cpu_sibling_map()
  sched/numa: Fix the new NUMA topology bits
  sched/numa: Rewrite the CONFIG_NUMA sched domain support
  sched/fair: Propagate 'struct lb_env' usage into find_busiest_group
  sched/fair: Add some serialization to the sched_domain load-balance walk
  sched/fair: Let minimally loaded cpu balance the group
  sched: Change rq->nr_running to unsigned int
  x86/numa: Check for nonsensical topologies on real hw as well
  x86/numa: Hard partition cpu topology masks on node boundaries
  x86/numa: Allow specifying node_distance() for numa=fake
  x86/sched: Make mwait_usable() heed to "idle=" kernel parameters properly
  sched: Update documentation and comments
  sched_rt: Avoid unnecessary dequeue and enqueue of pushable tasks in set_cpus_allowed_rt()

1 files changed, 0 insertions, 25 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index e7be75b96e4b..5dab36448b44 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -9,31 +9,6 @@ Description:
 
                 /sys/devices/system/cpu/cpu#/
 
-What:           /sys/devices/system/cpu/sched_mc_power_savings
-                /sys/devices/system/cpu/sched_smt_power_savings
-Date:           June 2006
-Contact:        Linux kernel mailing list <linux-kernel@vger.kernel.org>
-Description:    Discover and adjust the kernel's multi-core scheduler support.
-
-                Possible values are:
-
-                0 - No power saving load balance (default value)
-                1 - Fill one thread/core/package first for long running threads
-                2 - Also bias task wakeups to semi-idle cpu package for power
-                    savings
-
-                sched_mc_power_savings is dependent upon SCHED_MC, which is
-                itself architecture dependent.
-
-                sched_smt_power_savings is dependent upon SCHED_SMT, which
-                is itself architecture dependent.
-
-                The two files are independent of each other. It is possible
-                that one file may be present without the other.
-
-                Introduced by git commit 5c45bf27.
-
-
 What:           /sys/devices/system/cpu/kernel_max
                 /sys/devices/system/cpu/offline
                 /sys/devices/system/cpu/online