diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 01:23:59 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 01:23:59 -0400 |
commit | 6da49a292534d31ca391928ea97f8225774dc1e0 (patch) | |
tree | 060c5f5f40dceb10d4528763bc7fc1ccc88210d9 /init | |
parent | 17bdc6c0e979ae61879806e4dd93ec3b169d0931 (diff) | |
parent | ca56a95eedcc95f8fea7b49c87565cd961d74fe2 (diff) |
Merge remote branch 'origin/master' into next
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 10 | ||||
-rw-r--r-- | init/calibrate.c | 17 | ||||
-rw-r--r-- | init/main.c | 1 |
3 files changed, 18 insertions, 10 deletions
diff --git a/init/Kconfig b/init/Kconfig index ebafac4231ee..412c21b00d51 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -19,7 +19,6 @@ config DEFCONFIG_LIST | |||
19 | config CONSTRUCTORS | 19 | config CONSTRUCTORS |
20 | bool | 20 | bool |
21 | depends on !UML | 21 | depends on !UML |
22 | default y | ||
23 | 22 | ||
24 | config HAVE_IRQ_WORK | 23 | config HAVE_IRQ_WORK |
25 | bool | 24 | bool |
@@ -204,6 +203,15 @@ config KERNEL_LZO | |||
204 | 203 | ||
205 | endchoice | 204 | endchoice |
206 | 205 | ||
206 | config DEFAULT_HOSTNAME | ||
207 | string "Default hostname" | ||
208 | default "(none)" | ||
209 | help | ||
210 | This option determines the default system hostname before userspace | ||
211 | calls sethostname(2). The kernel traditionally uses "(none)" here, | ||
212 | but you may wish to use a different default here to make a minimal | ||
213 | system more usable with less configuration. | ||
214 | |||
207 | config SWAP | 215 | config SWAP |
208 | bool "Support for paging of anonymous memory (swap)" | 216 | bool "Support for paging of anonymous memory (swap)" |
209 | depends on MMU && BLOCK | 217 | depends on MMU && BLOCK |
diff --git a/init/calibrate.c b/init/calibrate.c index cfd7000c9d71..aae2f40fea4c 100644 --- a/init/calibrate.c +++ b/init/calibrate.c | |||
@@ -93,9 +93,6 @@ static unsigned long __cpuinit calibrate_delay_direct(void) | |||
93 | * If the upper limit and lower limit of the timer_rate is | 93 | * If the upper limit and lower limit of the timer_rate is |
94 | * >= 12.5% apart, redo calibration. | 94 | * >= 12.5% apart, redo calibration. |
95 | */ | 95 | */ |
96 | printk(KERN_DEBUG "calibrate_delay_direct() timer_rate_max=%lu " | ||
97 | "timer_rate_min=%lu pre_start=%lu pre_end=%lu\n", | ||
98 | timer_rate_max, timer_rate_min, pre_start, pre_end); | ||
99 | if (start >= post_end) | 96 | if (start >= post_end) |
100 | printk(KERN_NOTICE "calibrate_delay_direct() ignoring " | 97 | printk(KERN_NOTICE "calibrate_delay_direct() ignoring " |
101 | "timer_rate as we had a TSC wrap around" | 98 | "timer_rate as we had a TSC wrap around" |
@@ -248,30 +245,32 @@ recalibrate: | |||
248 | 245 | ||
249 | void __cpuinit calibrate_delay(void) | 246 | void __cpuinit calibrate_delay(void) |
250 | { | 247 | { |
248 | unsigned long lpj; | ||
251 | static bool printed; | 249 | static bool printed; |
252 | 250 | ||
253 | if (preset_lpj) { | 251 | if (preset_lpj) { |
254 | loops_per_jiffy = preset_lpj; | 252 | lpj = preset_lpj; |
255 | if (!printed) | 253 | if (!printed) |
256 | pr_info("Calibrating delay loop (skipped) " | 254 | pr_info("Calibrating delay loop (skipped) " |
257 | "preset value.. "); | 255 | "preset value.. "); |
258 | } else if ((!printed) && lpj_fine) { | 256 | } else if ((!printed) && lpj_fine) { |
259 | loops_per_jiffy = lpj_fine; | 257 | lpj = lpj_fine; |
260 | pr_info("Calibrating delay loop (skipped), " | 258 | pr_info("Calibrating delay loop (skipped), " |
261 | "value calculated using timer frequency.. "); | 259 | "value calculated using timer frequency.. "); |
262 | } else if ((loops_per_jiffy = calibrate_delay_direct()) != 0) { | 260 | } else if ((lpj = calibrate_delay_direct()) != 0) { |
263 | if (!printed) | 261 | if (!printed) |
264 | pr_info("Calibrating delay using timer " | 262 | pr_info("Calibrating delay using timer " |
265 | "specific routine.. "); | 263 | "specific routine.. "); |
266 | } else { | 264 | } else { |
267 | if (!printed) | 265 | if (!printed) |
268 | pr_info("Calibrating delay loop... "); | 266 | pr_info("Calibrating delay loop... "); |
269 | loops_per_jiffy = calibrate_delay_converge(); | 267 | lpj = calibrate_delay_converge(); |
270 | } | 268 | } |
271 | if (!printed) | 269 | if (!printed) |
272 | pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n", | 270 | pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n", |
273 | loops_per_jiffy/(500000/HZ), | 271 | lpj/(500000/HZ), |
274 | (loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy); | 272 | (lpj/(5000/HZ)) % 100, lpj); |
275 | 273 | ||
274 | loops_per_jiffy = lpj; | ||
276 | printed = true; | 275 | printed = true; |
277 | } | 276 | } |
diff --git a/init/main.c b/init/main.c index cafba67c13bf..d7211faed2ad 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -542,6 +542,7 @@ asmlinkage void __init start_kernel(void) | |||
542 | timekeeping_init(); | 542 | timekeeping_init(); |
543 | time_init(); | 543 | time_init(); |
544 | profile_init(); | 544 | profile_init(); |
545 | call_function_init(); | ||
545 | if (!irqs_disabled()) | 546 | if (!irqs_disabled()) |
546 | printk(KERN_CRIT "start_kernel(): bug: interrupts were " | 547 | printk(KERN_CRIT "start_kernel(): bug: interrupts were " |
547 | "enabled early\n"); | 548 | "enabled early\n"); |