diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 20 | ||||
| -rw-r--r-- | init/calibrate.c | 18 | ||||
| -rw-r--r-- | init/main.c | 8 |
3 files changed, 35 insertions, 11 deletions
diff --git a/init/Kconfig b/init/Kconfig index 2d9b83104dcf..0486e886586a 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1251,6 +1251,12 @@ config HOTPLUG config HAVE_PCSPKR_PLATFORM bool +config PANIC_TIMEOUT + int "Default panic timeout" + default 0 + help + Set default panic timeout. + menuconfig EXPERT bool "Configure standard kernel features (expert users)" # Unhide debug options, to make the on-by-default options visible @@ -1480,6 +1486,20 @@ config PERF_EVENTS Say Y if unsure. +config PERF_ANDROID_BACKTRACE + default n + bool "Backtracing support for the Perf tool on Android" + depends on PERF_EVENTS + help + This config changes default function stack format that Perf + profiler uses for backtracing. With this config enabled Perf + profiler will use stack format of the Android OS for its + operation. + + Say Y only if this kernel will be used with Android OS. + + Say N if unsure. + config DEBUG_PERF_USE_VMALLOC default n bool "Debug: use vmalloc to back perf mmap() buffers" diff --git a/init/calibrate.c b/init/calibrate.c index fda0a7b0f06c..282a92ae45c6 100644 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -95,7 +95,7 @@ static unsigned long __cpuinit calibrate_delay_direct(void) * >= 12.5% apart, redo calibration. */ if (start >= post_end) - printk(KERN_NOTICE "calibrate_delay_direct() ignoring " + pr_info("calibrate_delay_direct() ignoring " "timer_rate as we had a TSC wrap around" " start=%lu >=post_end=%lu\n", start, post_end); @@ -134,15 +134,13 @@ static unsigned long __cpuinit calibrate_delay_direct(void) good_timer_count = 0; if ((measured_times[max] - estimate) < (estimate - measured_times[min])) { - printk(KERN_NOTICE "calibrate_delay_direct() dropping " - "min bogoMips estimate %d = %lu\n", - min, measured_times[min]); + pr_info("%s() dropping min delay estimate %d = %lu\n", + __func__, min, measured_times[min]); measured_times[min] = 0; min = max; } else { - printk(KERN_NOTICE "calibrate_delay_direct() dropping " - "max bogoMips estimate %d = %lu\n", - max, measured_times[max]); + pr_info("%s() dropping max delay estimate %d = %lu\n", + __func__, max, measured_times[max]); measured_times[max] = 0; max = min; } @@ -160,7 +158,7 @@ static unsigned long __cpuinit calibrate_delay_direct(void) } - printk(KERN_NOTICE "calibrate_delay_direct() failed to get a good " + pr_info("calibrate_delay_direct() failed to get a good " "estimate for loops_per_jiffy.\nProbably due to long platform " "interrupts. Consider using \"lpj=\" boot option.\n"); return 0; @@ -292,9 +290,7 @@ void __cpuinit calibrate_delay(void) } per_cpu(cpu_loops_per_jiffy, this_cpu) = lpj; if (!printed) - pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n", - lpj/(500000/HZ), - (lpj/(5000/HZ)) % 100, lpj); + pr_cont("lpj=%lu\n", lpj); loops_per_jiffy = lpj; printed = true; diff --git a/init/main.c b/init/main.c index e83ac04fda97..81e989809ae3 100644 --- a/init/main.c +++ b/init/main.c @@ -76,6 +76,7 @@ #include <linux/elevator.h> #include <linux/random.h> +#include <linux/pasr.h> #include <asm/io.h> #include <asm/bugs.h> #include <asm/setup.h> @@ -500,6 +501,9 @@ asmlinkage void __init start_kernel(void) page_address_init(); pr_notice("%s", linux_banner); setup_arch(&command_line); +#ifdef CONFIG_PASR + early_pasr_setup(); +#endif mm_init_owner(&init_mm, &init_task); mm_init_cpumask(&init_mm); setup_command_line(command_line); @@ -564,6 +568,10 @@ asmlinkage void __init start_kernel(void) kmem_cache_init_late(); +#ifdef CONFIG_PASR + late_pasr_setup(); +#endif + /* * HACK ALERT! This is early. We're enabling the console before * we've done PCI setups etc, and console_init() must be aware of |