From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 12 Jun 2008 09:14:35 +0000 (+1000)
Subject: powerpc/pseries: Call pseries_kexec_setup only on pseries
X-Git-Tag: v2.6.27-rc1~1058^2~117
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cf2076012f3efbd945ceea67704fe515f8d6171f;p=linux-2.6-omap-h63xx.git

powerpc/pseries: Call pseries_kexec_setup only on pseries

The pseries_kexec_setup function overwrites some ppc_md
pointers, so make sure it only gets called when running on
the right architecture.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
index e9dd5fe081c..53cbd53d874 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -70,4 +70,4 @@ static int __init pseries_kexec_setup(void)
 
 	return 0;
 }
-__initcall(pseries_kexec_setup);
+machine_device_initcall(pseries, pseries_kexec_setup);