PASR: Call PASR initialization
Maxime Coquelin [Thu, 4 Apr 2013 05:47:03 +0000 (10:47 +0530)]
Bug 1201663
Bug 1033159

Change-Id: Ie4a9cfd6632c40a91fed15fd617c0982a130a0af
Signed-off-by: Maxime Coquelin <maxime.coquelin@stericsson.com>
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Reviewed-on: http://git-master/r/216387
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

init/main.c

index 9484f4b..6965555 100644 (file)
@@ -75,6 +75,7 @@
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
 
+#include <linux/pasr.h>
 #include <asm/io.h>
 #include <asm/bugs.h>
 #include <asm/setup.h>
@@ -499,6 +500,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);
@@ -563,6 +567,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