From f3194cfc7691a2366e2021f10e8076d161b033de Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 13 Jul 2006 17:52:12 +1000
Subject: [PATCH] --- yaml --- r: 34039 b: refs/heads/master c:
 a2ced11b6af59854cc2a2791dccd8b6c0da2f733 h: refs/heads/master i:   34037:
 0e03a9504c0817d50cb7555e64e077ad25fd109f   34035:
 434a8379466d963eb2fd0f9fc5e2514b94f419ea   34031:
 3eb1b929b7b67a1c4686929359d91dac5c458c40 v: v3

---
 [refs]                                            |  2 +-
 trunk/arch/powerpc/platforms/iseries/hvlpconfig.c | 13 +++++++++++++
 trunk/arch/powerpc/platforms/iseries/setup.c      |  1 +
 trunk/include/asm-powerpc/iseries/hv_lp_config.h  | 13 ++-----------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index f0cbe0872b4f..89c1ae64abcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c59acae85409fdf5d7574e90009c8410daf38938
+refs/heads/master: a2ced11b6af59854cc2a2791dccd8b6c0da2f733
diff --git a/trunk/arch/powerpc/platforms/iseries/hvlpconfig.c b/trunk/arch/powerpc/platforms/iseries/hvlpconfig.c
index 663a1affb4bb..cfcedaae6ea2 100644
--- a/trunk/arch/powerpc/platforms/iseries/hvlpconfig.c
+++ b/trunk/arch/powerpc/platforms/iseries/hvlpconfig.c
@@ -18,9 +18,22 @@
 
 #include <linux/module.h>
 #include <asm/iseries/hv_lp_config.h>
+#include <asm/iseries/it_lp_naca.h>
 
 HvLpIndex HvLpConfig_getLpIndex_outline(void)
 {
 	return HvLpConfig_getLpIndex();
 }
 EXPORT_SYMBOL(HvLpConfig_getLpIndex_outline);
+
+HvLpIndex HvLpConfig_getLpIndex(void)
+{
+	return itLpNaca.xLpIndex;
+}
+EXPORT_SYMBOL(HvLpConfig_getLpIndex);
+
+HvLpIndex HvLpConfig_getPrimaryLpIndex(void)
+{
+	return itLpNaca.xPrimaryLpIndex;
+}
+EXPORT_SYMBOL_GPL(HvLpConfig_getPrimaryLpIndex);
diff --git a/trunk/arch/powerpc/platforms/iseries/setup.c b/trunk/arch/powerpc/platforms/iseries/setup.c
index c9605d773a77..c34299b18d8b 100644
--- a/trunk/arch/powerpc/platforms/iseries/setup.c
+++ b/trunk/arch/powerpc/platforms/iseries/setup.c
@@ -48,6 +48,7 @@
 #include <asm/iseries/hv_call_event.h>
 #include <asm/iseries/hv_call_xm.h>
 #include <asm/iseries/it_lp_queue.h>
+#include <asm/iseries/it_lp_naca.h>
 #include <asm/iseries/mf.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/lpar_map.h>
diff --git a/trunk/include/asm-powerpc/iseries/hv_lp_config.h b/trunk/include/asm-powerpc/iseries/hv_lp_config.h
index df8b20739719..a006fd1e4a2c 100644
--- a/trunk/include/asm-powerpc/iseries/hv_lp_config.h
+++ b/trunk/include/asm-powerpc/iseries/hv_lp_config.h
@@ -25,7 +25,6 @@
 
 #include <asm/iseries/hv_call_sc.h>
 #include <asm/iseries/hv_types.h>
-#include <asm/iseries/it_lp_naca.h>
 
 enum {
 	HvCallCfg_Cur	= 0,
@@ -44,16 +43,8 @@ enum {
 #define HvCallCfgGetHostingLpIndex			HvCallCfg + 32
 
 extern HvLpIndex HvLpConfig_getLpIndex_outline(void);
-
-static inline HvLpIndex	HvLpConfig_getLpIndex(void)
-{
-	return itLpNaca.xLpIndex;
-}
-
-static inline HvLpIndex	HvLpConfig_getPrimaryLpIndex(void)
-{
-	return itLpNaca.xPrimaryLpIndex;
-}
+extern HvLpIndex HvLpConfig_getLpIndex(void);
+extern HvLpIndex HvLpConfig_getPrimaryLpIndex(void);
 
 static inline u64 HvLpConfig_getMsChunks(void)
 {