Signed-off-by: Maxime Coquelin maxime.coquelin@stericsson.com --- init/main.c | 8 ++++++++ 1 file changed, 8 insertions(+), 0 deletions(-)
diff --git a/init/main.c b/init/main.c index 9fd91c3..5e0aeb7 100644 --- a/init/main.c +++ b/init/main.c @@ -69,6 +69,7 @@ #include <linux/slab.h> #include <linux/perf_event.h> #include <linux/boottime.h> +#include <linux/pasr.h>
#include <asm/io.h> #include <asm/bugs.h> @@ -487,6 +488,9 @@ asmlinkage void __init start_kernel(void) page_address_init(); printk(KERN_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); @@ -555,6 +559,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