Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc7ccfc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-core-for-linus' of... 

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: (24 commits)
  sched: Cleanup duplicate local variable in [enqueue|dequeue]_task_fair
  sched: Replace use of entity_key()
  sched: Separate group-scheduling code more clearly
  sched: Reorder root_domain to remove 64 bit alignment padding
  sched: Do not attempt to destroy uninitialized rt_bandwidth
  sched: Remove unused function cpu_cfs_rq()
  sched: Fix (harmless) typo 'CONFG_FAIR_GROUP_SCHED'
  sched, cgroup: Optimize load_balance_fair()
  sched: Don't update shares twice on on_rq parent
  sched: update correct entity's runtime in check_preempt_wakeup()
  xtensa: Use generic config PREEMPT definition
  h8300: Use generic config PREEMPT definition
  m32r: Use generic PREEMPT config
  sched: Skip autogroup when looking for all rt sched groups
  sched: Simplify mutex_spin_on_owner()
  sched: Remove rcu_read_lock() from wake_affine()
  sched: Generalize sleep inside spinlock detection
  sched: Make sleeping inside spinlock detection working in !CONFIG_PREEMPT
  sched: Isolate preempt counting in its own config option
  sched: Remove pointless in_atomic() definition check
  ...
parents 4d4abdcb 0f317143

Documentation/DocBook/kernel-hacking.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ cond_resched(); /* Will sleep */ 


  <para>

   You should always compile your kernel

   <symbol>CONFIG_DEBUG_SPINLOCK_SLEEP</symbol> on, and it will warn

   <symbol>CONFIG_DEBUG_ATOMIC_SLEEP</symbol> on, and it will warn

   you if you break these rules.  If you <emphasis>do</emphasis> break

   the rules, you will eventually lock up your box.

  </para>

Documentation/SubmitChecklist

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ kernel patches. 


12: Has been tested with CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT,

    CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES,

    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_SPINLOCK_SLEEP all simultaneously

    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP all simultaneously

    enabled.



13: Has been build- and runtime tested with and without CONFIG_SMP and

Documentation/development-process/4.Coding

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ testing purposes. In particular, you should turn on: 
 - DEBUG_SLAB can find a variety of memory allocation and use errors; it

   should be used on most development kernels.



 - DEBUG_SPINLOCK, DEBUG_SPINLOCK_SLEEP, and DEBUG_MUTEXES will find a

 - DEBUG_SPINLOCK, DEBUG_ATOMIC_SLEEP, and DEBUG_MUTEXES will find a

   number of common locking errors.



There are quite a few other debugging options, some of which will be

Documentation/ja_JP/SubmitChecklist

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ Linux カーネルパッチ投稿者向けチェックリスト 


12: CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT, CONFIG_DEBUG_SLAB,

    CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES, CONFIG_DEBUG_SPINLOCK,

    CONFIG_DEBUG_SPINLOCK_SLEEP これら全てを同時に有効にして動作確認を

    CONFIG_DEBUG_ATOMIC_SLEEP これら全てを同時に有効にして動作確認を

    行ってください。



13: CONFIG_SMP, CONFIG_PREEMPT を有効にした場合と無効にした場合の両方で

Documentation/zh_CN/SubmitChecklist

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ Linux 


12：已经通过CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT,

    CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES,

    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_SPINLOCK_SLEEP测试，并且同时都

    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP测试，并且同时都

    使能。



13：已经都构建并且使用或者不使用 CONFIG_SMP 和 CONFIG_PREEMPT测试执行时间。