From f1b529457b083b0bf3a6fd25466054f76c873470 Mon Sep 17 00:00:00 2001
From: Gavin Shan <shangw@linux.vnet.ibm.com>
Date: Fri, 7 Sep 2012 22:44:04 +0000
Subject: [PATCH] --- yaml --- r: 330278 b: refs/heads/master c:
 3ea1ae989a9ddcfe15b80dc8cea5c4d38a13b9ab h: refs/heads/master v: v3

---
 [refs]                                             |  2 +-
 trunk/arch/powerpc/platforms/pseries/eeh_dev.c     |  2 ++
 trunk/arch/powerpc/platforms/pseries/eeh_pseries.c | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e4add88758b2..bb7a9a719293 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e4bbaf0bf13c33be275e8a17997597dfd0ed03a
+refs/heads/master: 3ea1ae989a9ddcfe15b80dc8cea5c4d38a13b9ab
diff --git a/trunk/arch/powerpc/platforms/pseries/eeh_dev.c b/trunk/arch/powerpc/platforms/pseries/eeh_dev.c
index 8e3443b260e4..a0cee3a29c97 100644
--- a/trunk/arch/powerpc/platforms/pseries/eeh_dev.c
+++ b/trunk/arch/powerpc/platforms/pseries/eeh_dev.c
@@ -100,6 +100,8 @@ static int __init eeh_dev_phb_init(void)
 	list_for_each_entry_safe(phb, tmp, &hose_list, list_node)
 		eeh_dev_phb_init_dynamic(phb);
 
+	pr_info("EEH: devices created\n");
+
 	return 0;
 }
 
diff --git a/trunk/arch/powerpc/platforms/pseries/eeh_pseries.c b/trunk/arch/powerpc/platforms/pseries/eeh_pseries.c
index 5e2805a019c3..cf6d6cc0be80 100644
--- a/trunk/arch/powerpc/platforms/pseries/eeh_pseries.c
+++ b/trunk/arch/powerpc/platforms/pseries/eeh_pseries.c
@@ -561,7 +561,19 @@ static struct eeh_ops pseries_eeh_ops = {
  */
 static int __init eeh_pseries_init(void)
 {
-	return eeh_ops_register(&pseries_eeh_ops);
+	int ret = -EINVAL;
+
+	if (!machine_is(pseries))
+		return ret;
+
+	ret = eeh_ops_register(&pseries_eeh_ops);
+	if (!ret)
+		pr_info("EEH: pSeries platform initialized\n");
+	else
+		pr_info("EEH: pSeries platform initialization failure (%d)\n",
+			ret);
+
+	return ret;
 }
 
 early_initcall(eeh_pseries_init);