From c2212991a3da718fb93a5e9ac01147daa8ab8ebe Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@stericsson.com>
Date: Thu, 4 Apr 2013 11:17:03 +0530
Subject: PASR: Call PASR initialization

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 | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'init/main.c')

diff --git a/init/main.c b/init/main.c
index 9484f4ba88d0..6965555f4367 100644
--- a/init/main.c
+++ b/init/main.c
@@ -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
-- 
cgit v1.2.3