Commit 4a280fe5 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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 ...
parent 41052e9a
...@@ -17,12 +17,11 @@ ...@@ -17,12 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _HVLPCONFIG_H #include <linux/module.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iSeries/HvLpConfig.h>
#endif
HvLpIndex HvLpConfig_getLpIndex_outline(void) HvLpIndex HvLpConfig_getLpIndex_outline(void)
{ {
return HvLpConfig_getLpIndex(); return HvLpConfig_getLpIndex();
} }
EXPORT_SYMBOL(HvLpConfig_getLpIndex_outline);
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
/************************************************************************/ /************************************************************************/
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/resource.h> #include <asm/resource.h>
...@@ -105,6 +106,7 @@ LocationData* iSeries_GetLocationData(struct pci_dev *PciDev) ...@@ -105,6 +106,7 @@ LocationData* iSeries_GetLocationData(struct pci_dev *PciDev)
strcpy(&LocationPtr->CardLocation[0], &DevNode->CardLocation[0]); strcpy(&LocationPtr->CardLocation[0], &DevNode->CardLocation[0]);
return LocationPtr; return LocationPtr;
} }
EXPORT_SYMBOL(iSeries_GetLocationData);
/* /*
* Formats the device information. * Formats the device information.
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h>
#include <linux/ide.h> #include <linux/ide.h>
#include <linux/pci.h> #include <linux/pci.h>
...@@ -472,6 +473,7 @@ void *iSeries_memset_io(void *dest, char c, size_t Count) ...@@ -472,6 +473,7 @@ void *iSeries_memset_io(void *dest, char c, size_t Count)
} }
return dest; return dest;
} }
EXPORT_SYMBOL(iSeries_memset_io);
void *iSeries_memcpy_toio(void *dest, void *source, size_t count) 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) ...@@ -485,6 +487,7 @@ void *iSeries_memcpy_toio(void *dest, void *source, size_t count)
} }
return dest; return dest;
} }
EXPORT_SYMBOL(iSeries_memcpy_toio);
void *iSeries_memcpy_fromio(void *dest, void *source, size_t count) 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) ...@@ -498,6 +501,7 @@ void *iSeries_memcpy_fromio(void *dest, void *source, size_t count)
} }
return dest; return dest;
} }
EXPORT_SYMBOL(iSeries_memcpy_fromio);
/* /*
* Look down the chain to find the matching Device Device * Look down the chain to find the matching Device Device
...@@ -708,6 +712,7 @@ u8 iSeries_Read_Byte(void *IoAddress) ...@@ -708,6 +712,7 @@ u8 iSeries_Read_Byte(void *IoAddress)
return (u8)ret.value; return (u8)ret.value;
} }
EXPORT_SYMBOL(iSeries_Read_Byte);
u16 iSeries_Read_Word(void *IoAddress) u16 iSeries_Read_Word(void *IoAddress)
{ {
...@@ -737,6 +742,7 @@ u16 iSeries_Read_Word(void *IoAddress) ...@@ -737,6 +742,7 @@ u16 iSeries_Read_Word(void *IoAddress)
return swab16((u16)ret.value); return swab16((u16)ret.value);
} }
EXPORT_SYMBOL(iSeries_Read_Word);
u32 iSeries_Read_Long(void *IoAddress) u32 iSeries_Read_Long(void *IoAddress)
{ {
...@@ -766,6 +772,7 @@ u32 iSeries_Read_Long(void *IoAddress) ...@@ -766,6 +772,7 @@ u32 iSeries_Read_Long(void *IoAddress)
return swab32((u32)ret.value); return swab32((u32)ret.value);
} }
EXPORT_SYMBOL(iSeries_Read_Long);
/* /*
* Write MM I/O Instructions for the iSeries * Write MM I/O Instructions for the iSeries
...@@ -799,6 +806,7 @@ void iSeries_Write_Byte(u8 data, void *IoAddress) ...@@ -799,6 +806,7 @@ void iSeries_Write_Byte(u8 data, void *IoAddress)
rc = HvCall4(HvCallPciBarStore8, dsa, BarOffset, data, 0); rc = HvCall4(HvCallPciBarStore8, dsa, BarOffset, data, 0);
} while (CheckReturnCode("WWB", DevNode, rc) != 0); } while (CheckReturnCode("WWB", DevNode, rc) != 0);
} }
EXPORT_SYMBOL(iSeries_Write_Byte);
void iSeries_Write_Word(u16 data, void *IoAddress) void iSeries_Write_Word(u16 data, void *IoAddress)
{ {
...@@ -825,6 +833,7 @@ 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); rc = HvCall4(HvCallPciBarStore16, dsa, BarOffset, swab16(data), 0);
} while (CheckReturnCode("WWW", DevNode, rc) != 0); } while (CheckReturnCode("WWW", DevNode, rc) != 0);
} }
EXPORT_SYMBOL(iSeries_Write_Word);
void iSeries_Write_Long(u32 data, void *IoAddress) void iSeries_Write_Long(u32 data, void *IoAddress)
{ {
...@@ -851,6 +860,7 @@ 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); rc = HvCall4(HvCallPciBarStore32, dsa, BarOffset, swab32(data), 0);
} while (CheckReturnCode("WWL", DevNode, rc) != 0); } while (CheckReturnCode("WWL", DevNode, rc) != 0);
} }
EXPORT_SYMBOL(iSeries_Write_Long);
void pcibios_name_device(struct pci_dev *dev) void pcibios_name_device(struct pci_dev *dev)
{ {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
/************************************************************************/ /************************************************************************/
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -100,3 +101,4 @@ int iSeries_Device_ToggleReset(struct pci_dev *PciDev, int AssertTime, ...@@ -100,3 +101,4 @@ int iSeries_Device_ToggleReset(struct pci_dev *PciDev, int AssertTime,
} }
return DeviceNode->ReturnCode; return DeviceNode->ReturnCode;
} }
EXPORT_SYMBOL(iSeries_Device_ToggleReset);
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h>
#include <asm/iSeries/iSeries_proc.h> #include <asm/iSeries/iSeries_proc.h>
static struct proc_dir_entry *iSeries_proc_root; static struct proc_dir_entry *iSeries_proc_root;
...@@ -129,3 +130,4 @@ void iSeries_proc_callback(iSeriesProcFunction initFunction) ...@@ -129,3 +130,4 @@ void iSeries_proc_callback(iSeriesProcFunction initFunction)
} }
spin_unlock_irqrestore(&iSeries_proc_lock, flags); spin_unlock_irqrestore(&iSeries_proc_lock, flags);
} }
EXPORT_SYMBOL(iSeries_proc_callback);
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/module.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iSeries/HvLpConfig.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -560,6 +561,7 @@ void mf_allocateLpEvents(HvLpIndex targetLp, HvLpEvent_Type type, ...@@ -560,6 +561,7 @@ void mf_allocateLpEvents(HvLpIndex targetLp, HvLpEvent_Type type,
if ((rc != 0) && (hdlr != NULL)) if ((rc != 0) && (hdlr != NULL))
(*hdlr)(userToken, rc); (*hdlr)(userToken, rc);
} }
EXPORT_SYMBOL(mf_allocateLpEvents);
/* /*
* Global kernel interface to unseed and deallocate events already in * Global kernel interface to unseed and deallocate events already in
...@@ -590,6 +592,7 @@ void mf_deallocateLpEvents(HvLpIndex targetLp, HvLpEvent_Type type, ...@@ -590,6 +592,7 @@ void mf_deallocateLpEvents(HvLpIndex targetLp, HvLpEvent_Type type,
if ((rc != 0) && (hdlr != NULL)) if ((rc != 0) && (hdlr != NULL))
(*hdlr)(userToken, rc); (*hdlr)(userToken, rc);
} }
EXPORT_SYMBOL(mf_deallocateLpEvents);
/* /*
* Global kernel interface to tell the VSP object in the primary * Global kernel interface to tell the VSP object in the primary
......
...@@ -42,11 +42,7 @@ ...@@ -42,11 +42,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/proc_fs.h> #include <asm/proc_fs.h>
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
#include <asm/iSeries/iSeries_pci.h> #include <asm/iSeries/HvCallSc.h>
#include <asm/iSeries/iSeries_proc.h>
#include <asm/iSeries/mf.h>
#include <asm/iSeries/HvLpEvent.h>
#include <asm/iSeries/HvLpConfig.h>
#endif #endif
extern int do_signal(sigset_t *, struct pt_regs *); extern int do_signal(sigset_t *, struct pt_regs *);
...@@ -98,7 +94,6 @@ EXPORT_SYMBOL(msChunks); ...@@ -98,7 +94,6 @@ EXPORT_SYMBOL(msChunks);
EXPORT_SYMBOL(reloc_offset); EXPORT_SYMBOL(reloc_offset);
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
EXPORT_SYMBOL(iSeries_proc_callback);
EXPORT_SYMBOL(HvCall0); EXPORT_SYMBOL(HvCall0);
EXPORT_SYMBOL(HvCall1); EXPORT_SYMBOL(HvCall1);
EXPORT_SYMBOL(HvCall2); EXPORT_SYMBOL(HvCall2);
...@@ -107,11 +102,6 @@ EXPORT_SYMBOL(HvCall4); ...@@ -107,11 +102,6 @@ EXPORT_SYMBOL(HvCall4);
EXPORT_SYMBOL(HvCall5); EXPORT_SYMBOL(HvCall5);
EXPORT_SYMBOL(HvCall6); EXPORT_SYMBOL(HvCall6);
EXPORT_SYMBOL(HvCall7); 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 #endif
EXPORT_SYMBOL(_insb); EXPORT_SYMBOL(_insb);
...@@ -135,19 +125,6 @@ EXPORT_SYMBOL(pci_map_single); ...@@ -135,19 +125,6 @@ EXPORT_SYMBOL(pci_map_single);
EXPORT_SYMBOL(pci_unmap_single); EXPORT_SYMBOL(pci_unmap_single);
EXPORT_SYMBOL(pci_map_sg); EXPORT_SYMBOL(pci_map_sg);
EXPORT_SYMBOL(pci_unmap_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 */ #endif /* CONFIG_PCI */
EXPORT_SYMBOL(start_thread); EXPORT_SYMBOL(start_thread);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment