From 4a280fe5e75dce56464d8bed0a61f26328a73789 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Mon, 15 Mar 2004 15:27:05 -0800
Subject: [PATCH] [PATCH] Move iSeries specific EXPORT_SYMBOLs out of
ppc_ksyms.c
From: Stephen Rothwell <sfr@canb.auug.org.au>
After this the only iSeries specific EXPORT_SYMBOLS in ppc_ksyms.c are
the assembler ones ...
---
arch/ppc64/kernel/HvLpConfig.c | 5 ++---
arch/ppc64/kernel/iSeries_VpdInfo.c | 2 ++
arch/ppc64/kernel/iSeries_pci.c | 10 ++++++++++
arch/ppc64/kernel/iSeries_pci_reset.c | 2 ++
arch/ppc64/kernel/iSeries_proc.c | 2 ++
arch/ppc64/kernel/mf.c | 3 +++
arch/ppc64/kernel/ppc_ksyms.c | 25 +------------------------
7 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/arch/ppc64/kernel/HvLpConfig.c b/arch/ppc64/kernel/HvLpConfig.c
index 2f1b141d2f6c..cb1d6473203c 100644
--- a/arch/ppc64/kernel/HvLpConfig.c
+++ b/arch/ppc64/kernel/HvLpConfig.c
@@ -17,12 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _HVLPCONFIG_H
+#include <linux/module.h>
#include <asm/iSeries/HvLpConfig.h>
-#endif
HvLpIndex HvLpConfig_getLpIndex_outline(void)
{
return HvLpConfig_getLpIndex();
}
-
+EXPORT_SYMBOL(HvLpConfig_getLpIndex_outline);
diff --git a/arch/ppc64/kernel/iSeries_VpdInfo.c b/arch/ppc64/kernel/iSeries_VpdInfo.c
index 016462aaf61c..0138f8a257e6 100644
--- a/arch/ppc64/kernel/iSeries_VpdInfo.c
+++ b/arch/ppc64/kernel/iSeries_VpdInfo.c
@@ -27,6 +27,7 @@
/************************************************************************/
#include <linux/config.h>
#include <linux/init.h>
+#include <linux/module.h>
#include <linux/pci.h>
#include <asm/types.h>
#include <asm/resource.h>
@@ -105,6 +106,7 @@ LocationData* iSeries_GetLocationData(struct pci_dev *PciDev)
strcpy(&LocationPtr->CardLocation[0], &DevNode->CardLocation[0]);
return LocationPtr;
}
+EXPORT_SYMBOL(iSeries_GetLocationData);
/*
* Formats the device information.
diff --git a/arch/ppc64/kernel/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c
index b52c8d4ab96e..4c220e3fd3ba 100644
--- a/arch/ppc64/kernel/iSeries_pci.c
+++ b/arch/ppc64/kernel/iSeries_pci.c
@@ -26,6 +26,7 @@
#include <linux/list.h>
#include <linux/string.h>
#include <linux/init.h>
+#include <linux/module.h>
#include <linux/ide.h>
#include <linux/pci.h>
@@ -472,6 +473,7 @@ void *iSeries_memset_io(void *dest, char c, size_t Count)
}
return dest;
}
+EXPORT_SYMBOL(iSeries_memset_io);
void *iSeries_memcpy_toio(void *dest, void *source, size_t count)
{
@@ -485,6 +487,7 @@ void *iSeries_memcpy_toio(void *dest, void *source, size_t count)
}
return dest;
}
+EXPORT_SYMBOL(iSeries_memcpy_toio);
void *iSeries_memcpy_fromio(void *dest, void *source, size_t count)
{
@@ -498,6 +501,7 @@ void *iSeries_memcpy_fromio(void *dest, void *source, size_t count)
}
return dest;
}
+EXPORT_SYMBOL(iSeries_memcpy_fromio);
/*
* Look down the chain to find the matching Device Device
@@ -708,6 +712,7 @@ u8 iSeries_Read_Byte(void *IoAddress)
return (u8)ret.value;
}
+EXPORT_SYMBOL(iSeries_Read_Byte);
u16 iSeries_Read_Word(void *IoAddress)
{
@@ -737,6 +742,7 @@ u16 iSeries_Read_Word(void *IoAddress)
return swab16((u16)ret.value);
}
+EXPORT_SYMBOL(iSeries_Read_Word);
u32 iSeries_Read_Long(void *IoAddress)
{
@@ -766,6 +772,7 @@ u32 iSeries_Read_Long(void *IoAddress)
return swab32((u32)ret.value);
}
+EXPORT_SYMBOL(iSeries_Read_Long);
/*
* Write MM I/O Instructions for the iSeries
@@ -799,6 +806,7 @@ void iSeries_Write_Byte(u8 data, void *IoAddress)
rc = HvCall4(HvCallPciBarStore8, dsa, BarOffset, data, 0);
} while (CheckReturnCode("WWB", DevNode, rc) != 0);
}
+EXPORT_SYMBOL(iSeries_Write_Byte);
void iSeries_Write_Word(u16 data, void *IoAddress)
{
@@ -825,6 +833,7 @@ void iSeries_Write_Word(u16 data, void *IoAddress)
rc = HvCall4(HvCallPciBarStore16, dsa, BarOffset, swab16(data), 0);
} while (CheckReturnCode("WWW", DevNode, rc) != 0);
}
+EXPORT_SYMBOL(iSeries_Write_Word);
void iSeries_Write_Long(u32 data, void *IoAddress)
{
@@ -851,6 +860,7 @@ void iSeries_Write_Long(u32 data, void *IoAddress)
rc = HvCall4(HvCallPciBarStore32, dsa, BarOffset, swab32(data), 0);
} while (CheckReturnCode("WWL", DevNode, rc) != 0);
}
+EXPORT_SYMBOL(iSeries_Write_Long);
void pcibios_name_device(struct pci_dev *dev)
{
diff --git a/arch/ppc64/kernel/iSeries_pci_reset.c b/arch/ppc64/kernel/iSeries_pci_reset.c
index 31405862a207..e1e48c35ea96 100644
--- a/arch/ppc64/kernel/iSeries_pci_reset.c
+++ b/arch/ppc64/kernel/iSeries_pci_reset.c
@@ -29,6 +29,7 @@
/************************************************************************/
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/module.h>
#include <linux/pci.h>
#include <linux/irq.h>
@@ -100,3 +101,4 @@ int iSeries_Device_ToggleReset(struct pci_dev *PciDev, int AssertTime,
}
return DeviceNode->ReturnCode;
}
+EXPORT_SYMBOL(iSeries_Device_ToggleReset);
diff --git a/arch/ppc64/kernel/iSeries_proc.c b/arch/ppc64/kernel/iSeries_proc.c
index 47be7adc74f3..3d9fabc4db4e 100644
--- a/arch/ppc64/kernel/iSeries_proc.c
+++ b/arch/ppc64/kernel/iSeries_proc.c
@@ -19,6 +19,7 @@
#include <linux/proc_fs.h>
#include <linux/spinlock.h>
#include <linux/init.h>
+#include <linux/module.h>
#include <asm/iSeries/iSeries_proc.h>
static struct proc_dir_entry *iSeries_proc_root;
@@ -129,3 +130,4 @@ void iSeries_proc_callback(iSeriesProcFunction initFunction)
}
spin_unlock_irqrestore(&iSeries_proc_lock, flags);
}
+EXPORT_SYMBOL(iSeries_proc_callback);
diff --git a/arch/ppc64/kernel/mf.c b/arch/ppc64/kernel/mf.c
index ca5063f9392f..3b4c5561f46f 100644
--- a/arch/ppc64/kernel/mf.c
+++ b/arch/ppc64/kernel/mf.c
@@ -30,6 +30,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/mm.h>
+#include <linux/module.h>
#include <asm/iSeries/HvLpConfig.h>
#include <linux/slab.h>
#include <linux/delay.h>
@@ -560,6 +561,7 @@ void mf_allocateLpEvents(HvLpIndex targetLp, HvLpEvent_Type type,
if ((rc != 0) && (hdlr != NULL))
(*hdlr)(userToken, rc);
}
+EXPORT_SYMBOL(mf_allocateLpEvents);
/*
* Global kernel interface to unseed and deallocate events already in
@@ -590,6 +592,7 @@ void mf_deallocateLpEvents(HvLpIndex targetLp, HvLpEvent_Type type,
if ((rc != 0) && (hdlr != NULL))
(*hdlr)(userToken, rc);
}
+EXPORT_SYMBOL(mf_deallocateLpEvents);
/*
* Global kernel interface to tell the VSP object in the primary
diff --git a/arch/ppc64/kernel/ppc_ksyms.c b/arch/ppc64/kernel/ppc_ksyms.c
index 060d2e147602..c43a75d46546 100644
--- a/arch/ppc64/kernel/ppc_ksyms.c
+++ b/arch/ppc64/kernel/ppc_ksyms.c
@@ -42,11 +42,7 @@
#include <asm/cacheflush.h>
#include <asm/proc_fs.h>
#ifdef CONFIG_PPC_ISERIES
-#include <asm/iSeries/iSeries_pci.h>
-#include <asm/iSeries/iSeries_proc.h>
-#include <asm/iSeries/mf.h>
-#include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/HvLpConfig.h>
+#include <asm/iSeries/HvCallSc.h>
#endif
extern int do_signal(sigset_t *, struct pt_regs *);
@@ -98,7 +94,6 @@ EXPORT_SYMBOL(msChunks);
EXPORT_SYMBOL(reloc_offset);
#ifdef CONFIG_PPC_ISERIES
-EXPORT_SYMBOL(iSeries_proc_callback);
EXPORT_SYMBOL(HvCall0);
EXPORT_SYMBOL(HvCall1);
EXPORT_SYMBOL(HvCall2);
@@ -107,11 +102,6 @@ EXPORT_SYMBOL(HvCall4);
EXPORT_SYMBOL(HvCall5);
EXPORT_SYMBOL(HvCall6);
EXPORT_SYMBOL(HvCall7);
-EXPORT_SYMBOL(HvLpEvent_unregisterHandler);
-EXPORT_SYMBOL(HvLpEvent_registerHandler);
-EXPORT_SYMBOL(mf_allocateLpEvents);
-EXPORT_SYMBOL(mf_deallocateLpEvents);
-EXPORT_SYMBOL(HvLpConfig_getLpIndex_outline);
#endif
EXPORT_SYMBOL(_insb);
@@ -135,19 +125,6 @@ EXPORT_SYMBOL(pci_map_single);
EXPORT_SYMBOL(pci_unmap_single);
EXPORT_SYMBOL(pci_map_sg);
EXPORT_SYMBOL(pci_unmap_sg);
-#ifdef CONFIG_PPC_ISERIES
-EXPORT_SYMBOL(iSeries_GetLocationData);
-EXPORT_SYMBOL(iSeries_Device_ToggleReset);
-EXPORT_SYMBOL(iSeries_memset_io);
-EXPORT_SYMBOL(iSeries_memcpy_toio);
-EXPORT_SYMBOL(iSeries_memcpy_fromio);
-EXPORT_SYMBOL(iSeries_Read_Byte);
-EXPORT_SYMBOL(iSeries_Read_Word);
-EXPORT_SYMBOL(iSeries_Read_Long);
-EXPORT_SYMBOL(iSeries_Write_Byte);
-EXPORT_SYMBOL(iSeries_Write_Word);
-EXPORT_SYMBOL(iSeries_Write_Long);
-#endif /* CONFIG_PPC_ISERIES */
#endif /* CONFIG_PCI */
EXPORT_SYMBOL(start_thread);
--
2.30.9