diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-07-01 13:20:51 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-07-01 13:20:51 +0200 |
commit | 1ecc818c51b1f6886825dae3885792d5e49ec798 (patch) | |
tree | 2179ae53fa86ea6a42d01ff4efc1a3f6a32e76f2 /Documentation/DocBook | |
parent | 1c09ab0d257317f97e8629a3d0c8713d6dd9de4c (diff) | |
parent | d902db1eb60387040fe541573083e47469db50ac (diff) | |
download | op-kernel-dev-1ecc818c51b1f6886825dae3885792d5e49ec798.zip op-kernel-dev-1ecc818c51b1f6886825dae3885792d5e49ec798.tar.gz |
Merge branch 'sched/core-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into sched/core
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/kernel-hacking.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl index 7b3f493..07a9c48 100644 --- a/Documentation/DocBook/kernel-hacking.tmpl +++ b/Documentation/DocBook/kernel-hacking.tmpl @@ -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> |