diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 10:25:09 +1100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 10:25:09 +1100 |
commit | fbdde7bd274d74729954190f99afcb1e3d9bbfba (patch) | |
tree | a72dadd4a8b4957a4e21bf7ae38a763a71d6e274 /kernel/printk.c | |
parent | e1a9c9872dd004617555dff079b357a6ffd945e9 (diff) | |
parent | c4772d99300a9fc13c86aaa370e630c5973664f6 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
debug: turn ignore_loglevel into an early param
sched: remove unused params
sched: let +nice tasks have smaller impact
sched: fix high wake up latencies with FAIR_USER_SCHED
RCU: add help text for "RCU implementation type"
Diffstat (limited to 'kernel/printk.c')
-rw-r--r-- | kernel/printk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 58bbec68411..29ae1e99cde 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -455,10 +455,10 @@ static int __init ignore_loglevel_setup(char *str) ignore_loglevel = 1; printk(KERN_INFO "debug: ignoring loglevel setting.\n"); - return 1; + return 0; } -__setup("ignore_loglevel", ignore_loglevel_setup); +early_param("ignore_loglevel", ignore_loglevel_setup); /* * Write out chars from start to end - 1 inclusive |