From: Stephen Rothwell After this the only iSeries specific EXPORT_SYMBOLS in ppc_ksyms.c are the assembler ones ... --- 25-akpm/arch/ppc64/kernel/HvLpConfig.c | 5 ++--- 25-akpm/arch/ppc64/kernel/iSeries_VpdInfo.c | 2 ++ 25-akpm/arch/ppc64/kernel/iSeries_pci.c | 10 ++++++++++ 25-akpm/arch/ppc64/kernel/iSeries_pci_reset.c | 2 ++ 25-akpm/arch/ppc64/kernel/iSeries_proc.c | 2 ++ 25-akpm/arch/ppc64/kernel/mf.c | 3 +++ 25-akpm/arch/ppc64/kernel/ppc_ksyms.c | 25 +------------------------ 7 files changed, 22 insertions(+), 27 deletions(-) diff -puN arch/ppc64/kernel/HvLpConfig.c~ppc64-iseries-exports arch/ppc64/kernel/HvLpConfig.c --- 25/arch/ppc64/kernel/HvLpConfig.c~ppc64-iseries-exports 2004-03-14 15:35:04.356276328 -0800 +++ 25-akpm/arch/ppc64/kernel/HvLpConfig.c 2004-03-14 15:35:04.366274808 -0800 @@ -17,12 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _HVLPCONFIG_H +#include #include -#endif HvLpIndex HvLpConfig_getLpIndex_outline(void) { return HvLpConfig_getLpIndex(); } - +EXPORT_SYMBOL(HvLpConfig_getLpIndex_outline); diff -puN arch/ppc64/kernel/iSeries_VpdInfo.c~ppc64-iseries-exports arch/ppc64/kernel/iSeries_VpdInfo.c --- 25/arch/ppc64/kernel/iSeries_VpdInfo.c~ppc64-iseries-exports 2004-03-14 15:35:04.357276176 -0800 +++ 25-akpm/arch/ppc64/kernel/iSeries_VpdInfo.c 2004-03-14 15:35:04.367274656 -0800 @@ -27,6 +27,7 @@ /************************************************************************/ #include #include +#include #include #include #include @@ -105,6 +106,7 @@ LocationData* iSeries_GetLocationData(st strcpy(&LocationPtr->CardLocation[0], &DevNode->CardLocation[0]); return LocationPtr; } +EXPORT_SYMBOL(iSeries_GetLocationData); /* * Formats the device information. diff -puN arch/ppc64/kernel/iSeries_pci.c~ppc64-iseries-exports arch/ppc64/kernel/iSeries_pci.c --- 25/arch/ppc64/kernel/iSeries_pci.c~ppc64-iseries-exports 2004-03-14 15:35:04.358276024 -0800 +++ 25-akpm/arch/ppc64/kernel/iSeries_pci.c 2004-03-14 15:35:04.368274504 -0800 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -472,6 +473,7 @@ void *iSeries_memset_io(void *dest, char } 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, vo } 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, } 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 *I 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 * 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 * 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 -puN arch/ppc64/kernel/iSeries_pci_reset.c~ppc64-iseries-exports arch/ppc64/kernel/iSeries_pci_reset.c --- 25/arch/ppc64/kernel/iSeries_pci_reset.c~ppc64-iseries-exports 2004-03-14 15:35:04.360275720 -0800 +++ 25-akpm/arch/ppc64/kernel/iSeries_pci_reset.c 2004-03-14 15:35:04.368274504 -0800 @@ -29,6 +29,7 @@ /************************************************************************/ #include #include +#include #include #include @@ -100,3 +101,4 @@ int iSeries_Device_ToggleReset(struct pc } return DeviceNode->ReturnCode; } +EXPORT_SYMBOL(iSeries_Device_ToggleReset); diff -puN arch/ppc64/kernel/iSeries_proc.c~ppc64-iseries-exports arch/ppc64/kernel/iSeries_proc.c --- 25/arch/ppc64/kernel/iSeries_proc.c~ppc64-iseries-exports 2004-03-14 15:35:04.361275568 -0800 +++ 25-akpm/arch/ppc64/kernel/iSeries_proc.c 2004-03-14 15:35:04.369274352 -0800 @@ -19,6 +19,7 @@ #include #include #include +#include #include static struct proc_dir_entry *iSeries_proc_root; @@ -129,3 +130,4 @@ void iSeries_proc_callback(iSeriesProcFu } spin_unlock_irqrestore(&iSeries_proc_lock, flags); } +EXPORT_SYMBOL(iSeries_proc_callback); diff -puN arch/ppc64/kernel/mf.c~ppc64-iseries-exports arch/ppc64/kernel/mf.c --- 25/arch/ppc64/kernel/mf.c~ppc64-iseries-exports 2004-03-14 15:35:04.363275264 -0800 +++ 25-akpm/arch/ppc64/kernel/mf.c 2004-03-14 15:35:04.369274352 -0800 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -560,6 +561,7 @@ void mf_allocateLpEvents(HvLpIndex targe 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 tar if ((rc != 0) && (hdlr != NULL)) (*hdlr)(userToken, rc); } +EXPORT_SYMBOL(mf_deallocateLpEvents); /* * Global kernel interface to tell the VSP object in the primary diff -puN arch/ppc64/kernel/ppc_ksyms.c~ppc64-iseries-exports arch/ppc64/kernel/ppc_ksyms.c --- 25/arch/ppc64/kernel/ppc_ksyms.c~ppc64-iseries-exports 2004-03-14 15:35:04.365274960 -0800 +++ 25-akpm/arch/ppc64/kernel/ppc_ksyms.c 2004-03-14 15:35:04.370274200 -0800 @@ -42,11 +42,7 @@ #include #include #ifdef CONFIG_PPC_ISERIES -#include -#include -#include -#include -#include +#include #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); _