aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sh64/kernel/alphanum.c1
-rw-r--r--arch/sh64/kernel/pci-dma.c4
-rw-r--r--arch/sh64/kernel/sh_ksyms.c26
-rw-r--r--arch/sh64/lib/c-checksum.c3
-rw-r--r--arch/sh64/lib/iomap.c10
-rw-r--r--arch/sh64/mm/ioremap.c7
6 files changed, 23 insertions, 28 deletions
diff --git a/arch/sh64/kernel/alphanum.c b/arch/sh64/kernel/alphanum.c
index 91707c1acd70..d1619d95fbaa 100644
--- a/arch/sh64/kernel/alphanum.c
+++ b/arch/sh64/kernel/alphanum.c
@@ -13,7 +13,6 @@
13#include <linux/sched.h> 13#include <linux/sched.h>
14 14
15void mach_alphanum(int pos, unsigned char val); 15void mach_alphanum(int pos, unsigned char val);
16void mach_led(int pos, int val);
17 16
18void print_seg(char *file, int line) 17void print_seg(char *file, int line)
19{ 18{
diff --git a/arch/sh64/kernel/pci-dma.c b/arch/sh64/kernel/pci-dma.c
index a9328f894755..8875a2a40da7 100644
--- a/arch/sh64/kernel/pci-dma.c
+++ b/arch/sh64/kernel/pci-dma.c
@@ -11,6 +11,7 @@
11#include <linux/mm.h> 11#include <linux/mm.h>
12#include <linux/string.h> 12#include <linux/string.h>
13#include <linux/pci.h> 13#include <linux/pci.h>
14#include <linux/module.h>
14#include <asm/io.h> 15#include <asm/io.h>
15 16
16void *consistent_alloc(struct pci_dev *hwdev, size_t size, 17void *consistent_alloc(struct pci_dev *hwdev, size_t size,
@@ -36,6 +37,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size,
36 37
37 return vp; 38 return vp;
38} 39}
40EXPORT_SYMBOL(consistent_alloc);
39 41
40void consistent_free(struct pci_dev *hwdev, size_t size, 42void consistent_free(struct pci_dev *hwdev, size_t size,
41 void *vaddr, dma_addr_t dma_handle) 43 void *vaddr, dma_addr_t dma_handle)
@@ -47,4 +49,4 @@ void consistent_free(struct pci_dev *hwdev, size_t size,
47 49
48 iounmap(vaddr); 50 iounmap(vaddr);
49} 51}
50 52EXPORT_SYMBOL(consistent_free);
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c
index 461ea3de316f..962c732961e4 100644
--- a/arch/sh64/kernel/sh_ksyms.c
+++ b/arch/sh64/kernel/sh_ksyms.c
@@ -31,16 +31,11 @@ extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
31 31
32/* platform dependent support */ 32/* platform dependent support */
33EXPORT_SYMBOL(dump_fpu); 33EXPORT_SYMBOL(dump_fpu);
34EXPORT_SYMBOL(iounmap);
35EXPORT_SYMBOL(enable_irq);
36EXPORT_SYMBOL(disable_irq);
37EXPORT_SYMBOL(kernel_thread); 34EXPORT_SYMBOL(kernel_thread);
38 35
39/* Networking helper routines. */ 36/* Networking helper routines. */
40EXPORT_SYMBOL(csum_partial_copy_nocheck); 37EXPORT_SYMBOL(csum_partial_copy_nocheck);
41 38
42EXPORT_SYMBOL(strstr);
43
44#ifdef CONFIG_VT 39#ifdef CONFIG_VT
45EXPORT_SYMBOL(screen_info); 40EXPORT_SYMBOL(screen_info);
46#endif 41#endif
@@ -50,27 +45,22 @@ EXPORT_SYMBOL(__down_trylock);
50EXPORT_SYMBOL(__up); 45EXPORT_SYMBOL(__up);
51EXPORT_SYMBOL(__put_user_asm_l); 46EXPORT_SYMBOL(__put_user_asm_l);
52EXPORT_SYMBOL(__get_user_asm_l); 47EXPORT_SYMBOL(__get_user_asm_l);
53EXPORT_SYMBOL(memcmp);
54EXPORT_SYMBOL(memcpy); 48EXPORT_SYMBOL(memcpy);
55EXPORT_SYMBOL(memset);
56EXPORT_SYMBOL(memscan);
57EXPORT_SYMBOL(strchr);
58EXPORT_SYMBOL(strlen);
59 49
50EXPORT_SYMBOL(udelay);
51EXPORT_SYMBOL(__udelay);
52EXPORT_SYMBOL(ndelay);
53EXPORT_SYMBOL(__ndelay);
60EXPORT_SYMBOL(flush_dcache_page); 54EXPORT_SYMBOL(flush_dcache_page);
61 55
62/* For ext3 */ 56/* For ext3 */
63EXPORT_SYMBOL(sh64_page_clear); 57EXPORT_SYMBOL(sh64_page_clear);
64 58
65/* Ugh. These come in from libgcc.a at link time. */ 59/* Ugh. These come in from libgcc.a at link time. */
66 60#define DECLARE_EXPORT(name) extern void name(void);EXPORT_SYMBOL(name)
67extern void __sdivsi3(void);
68extern void __muldi3(void);
69extern void __udivsi3(void);
70extern char __div_table; 61extern char __div_table;
71EXPORT_SYMBOL(__sdivsi3);
72EXPORT_SYMBOL(__muldi3);
73EXPORT_SYMBOL(__udivsi3);
74EXPORT_SYMBOL(__div_table); 62EXPORT_SYMBOL(__div_table);
75 63
76 64DECLARE_EXPORT(__sdivsi3);
65DECLARE_EXPORT(__muldi3);
66DECLARE_EXPORT(__udivsi3);
diff --git a/arch/sh64/lib/c-checksum.c b/arch/sh64/lib/c-checksum.c
index bd5501760240..053137abd8a0 100644
--- a/arch/sh64/lib/c-checksum.c
+++ b/arch/sh64/lib/c-checksum.c
@@ -10,6 +10,7 @@
10#include <linux/string.h> 10#include <linux/string.h>
11#include <linux/errno.h> 11#include <linux/errno.h>
12#include <linux/kernel.h> 12#include <linux/kernel.h>
13#include <linux/module.h>
13#include <asm/byteorder.h> 14#include <asm/byteorder.h>
14#include <asm/uaccess.h> 15#include <asm/uaccess.h>
15 16
@@ -110,7 +111,7 @@ static unsigned long do_csum(const unsigned char *buff, int len)
110 if (odd) 111 if (odd)
111 result = ((result >> 8) & 0xff) | ((result & 0xff) << 8); 112 result = ((result >> 8) & 0xff) | ((result & 0xff) << 8);
112 113
113 pr_debug("\nCHECKSUM is 0x%x\n", result); 114 pr_debug("\nCHECKSUM is 0x%lx\n", result);
114 115
115 out: 116 out:
116 return result; 117 return result;
diff --git a/arch/sh64/lib/iomap.c b/arch/sh64/lib/iomap.c
index 5cd3d5e9c762..253d1e351d49 100644
--- a/arch/sh64/lib/iomap.c
+++ b/arch/sh64/lib/iomap.c
@@ -17,12 +17,15 @@ ioport_map(unsigned long port, unsigned int len)
17{ 17{
18 return (void __iomem *)port; 18 return (void __iomem *)port;
19} 19}
20EXPORT_SYMBOL(ioport_map);
20 21
21void ioport_unmap(void __iomem *addr) 22void ioport_unmap(void __iomem *addr)
22{ 23{
23 /* Nothing .. */ 24 /* Nothing .. */
24} 25}
26EXPORT_SYMBOL(ioport_unmap);
25 27
28#ifdef CONFIG_PCI
26void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max) 29void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
27{ 30{
28 unsigned long start = pci_resource_start(dev, bar); 31 unsigned long start = pci_resource_start(dev, bar);
@@ -41,14 +44,11 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
41 /* What? */ 44 /* What? */
42 return NULL; 45 return NULL;
43} 46}
47EXPORT_SYMBOL(pci_iomap);
44 48
45void pci_iounmap(struct pci_dev *dev, void __iomem *addr) 49void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
46{ 50{
47 /* Nothing .. */ 51 /* Nothing .. */
48} 52}
49
50EXPORT_SYMBOL(ioport_map);
51EXPORT_SYMBOL(ioport_unmap);
52EXPORT_SYMBOL(pci_iomap);
53EXPORT_SYMBOL(pci_iounmap); 53EXPORT_SYMBOL(pci_iounmap);
54 54#endif
diff --git a/arch/sh64/mm/ioremap.c b/arch/sh64/mm/ioremap.c
index 990857756d44..535304e6601f 100644
--- a/arch/sh64/mm/ioremap.c
+++ b/arch/sh64/mm/ioremap.c
@@ -19,11 +19,12 @@
19#include <linux/sched.h> 19#include <linux/sched.h>
20#include <linux/string.h> 20#include <linux/string.h>
21#include <linux/io.h> 21#include <linux/io.h>
22#include <asm/pgalloc.h>
23#include <asm/tlbflush.h>
24#include <linux/ioport.h> 22#include <linux/ioport.h>
25#include <linux/bootmem.h> 23#include <linux/bootmem.h>
26#include <linux/proc_fs.h> 24#include <linux/proc_fs.h>
25#include <linux/module.h>
26#include <asm/pgalloc.h>
27#include <asm/tlbflush.h>
27 28
28static void shmedia_mapioaddr(unsigned long, unsigned long); 29static void shmedia_mapioaddr(unsigned long, unsigned long);
29static unsigned long shmedia_ioremap(struct resource *, u32, int); 30static unsigned long shmedia_ioremap(struct resource *, u32, int);
@@ -80,6 +81,7 @@ void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flag
80 } 81 }
81 return (void *) (offset + (char *)addr); 82 return (void *) (offset + (char *)addr);
82} 83}
84EXPORT_SYMBOL(__ioremap);
83 85
84void iounmap(void *addr) 86void iounmap(void *addr)
85{ 87{
@@ -94,6 +96,7 @@ void iounmap(void *addr)
94 96
95 kfree(area); 97 kfree(area);
96} 98}
99EXPORT_SYMBOL(iounmap);
97 100
98static struct resource shmedia_iomap = { 101static struct resource shmedia_iomap = {
99 .name = "shmedia_iomap", 102 .name = "shmedia_iomap",