diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-02 15:20:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-02 15:20:19 +1100 |
| commit | 5d52b5988db455b31a3c48dd7da1993020a551f1 (patch) | |
| tree | f67d6264f48acf813ad6b50ed827681616347e66 /init | |
| parent | 02a3186c32bbc3ad1e8d3c7c5542902f5da6a541 (diff) | |
| parent | f8f190330cd56f06ffe1f036b7dcddbb35691d5c (diff) | |
Merge remote branch 'tip/auto-latest'
Conflicts:
arch/x86/kernel/kgdb.c
kernel/Makefile
kernel/irq/chip.c
kernel/printk.c
scripts/recordmcount.pl
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 10 | ||||
| -rw-r--r-- | init/calibrate.c | 24 |
2 files changed, 25 insertions, 9 deletions
diff --git a/init/Kconfig b/init/Kconfig index 75cbc579c314..bafb8bfc6134 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -338,6 +338,15 @@ config TREE_PREEMPT_RCU is also required. It also scales down nicely to smaller systems. +config TINY_RCU + bool "UP-only small-memory-footprint RCU" + depends on !SMP + help + This option selects the RCU implementation that is + designed for UP systems from which real-time response + is not required. This option greatly reduces the + memory footprint of RCU. + endchoice config RCU_TRACE @@ -1229,3 +1238,4 @@ source "block/Kconfig" config PREEMPT_NOTIFIERS bool +source "kernel/Kconfig.locks" diff --git a/init/calibrate.c b/init/calibrate.c index a379c9061199..6eb48e53d61c 100644 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -123,23 +123,26 @@ void __cpuinit calibrate_delay(void) { unsigned long ticks, loopbit; int lps_precision = LPS_PREC; + static bool printed; if (preset_lpj) { loops_per_jiffy = preset_lpj; - printk(KERN_INFO - "Calibrating delay loop (skipped) preset value.. "); - } else if ((smp_processor_id() == 0) && lpj_fine) { + if (!printed) + pr_info("Calibrating delay loop (skipped) " + "preset value.. "); + } else if ((!printed) && lpj_fine) { loops_per_jiffy = lpj_fine; - printk(KERN_INFO - "Calibrating delay loop (skipped), " + pr_info("Calibrating delay loop (skipped), " "value calculated using timer frequency.. "); } else if ((loops_per_jiffy = calibrate_delay_direct()) != 0) { - printk(KERN_INFO - "Calibrating delay using timer specific routine.. "); + if (!printed) + pr_info("Calibrating delay using timer " + "specific routine.. "); } else { loops_per_jiffy = (1<<12); - printk(KERN_INFO "Calibrating delay loop... "); + if (!printed) + pr_info("Calibrating delay loop... "); while ((loops_per_jiffy <<= 1) != 0) { /* wait for "start of" clock tick */ ticks = jiffies; @@ -170,7 +173,10 @@ void __cpuinit calibrate_delay(void) loops_per_jiffy &= ~loopbit; } } - printk(KERN_CONT "%lu.%02lu BogoMIPS (lpj=%lu)\n", + if (!printed) + pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n", loops_per_jiffy/(500000/HZ), (loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy); + + printed = true; } |