• Linus Torvalds's avatar
    Merge branch 'sched-core-for-linus' of... · dcbf77b9
    Linus Torvalds authored
    Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
      sched: Fix SD_POWERSAVING_BALANCE|SD_PREFER_LOCAL vs SD_WAKE_AFFINE
      sched: Stop buddies from hogging the system
      sched: Add new wakeup preemption mode: WAKEUP_RUNNING
      sched: Fix TASK_WAKING & loadaverage breakage
      sched: Disable wakeup balancing
      sched: Rename flags to wake_flags
      sched: Clean up the load_idx selection in select_task_rq_fair
      sched: Optimize cgroup vs wakeup a bit
      sched: x86: Name old_perf in a unique way
      sched: Implement a gentler fair-sleepers feature
      sched: Add SD_PREFER_LOCAL
      sched: Add a few SYNC hint knobs to play with
      sched: Fix sync wakeups again
      sched: Add WF_FORK
      sched: Rename sync arguments
      sched: Rename select_task_rq() argument
      sched: Feature to disable APERF/MPERF cpu_power
      x86: sched: Provide arch implementations using aperf/mperf
      x86: Add generic aperf/mperf code
      x86: Move APERF/MPERF into a X86_FEATURE
      ...
    
    Fix up trivial conflict in arch/x86/include/asm/processor.h due to
    nearby addition of amd_get_nb_id() declaration from the EDAC merge.
    dcbf77b9
sched.c 266 KB