Commit 749c8496 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh64: Some symbol exports and build fixes. 



This fixes up misc build issues that were hit on the non-cayman
boards. Additionally, quite a few symbols needed to be exported
to fix the module build.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 6b3d7f02

arch/sh64/kernel/alphanum.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/sched.h>



void mach_alphanum(int pos, unsigned char val);

void mach_led(int pos, int val);



void print_seg(char *file, int line)

{

arch/sh64/kernel/pci-dma.c

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/mm.h>

#include <linux/string.h>

#include <linux/pci.h>

#include <linux/module.h>

#include <asm/io.h>



void *consistent_alloc(struct pci_dev *hwdev, size_t size,
@@ -36,6 +37,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size, 


	return vp;

}

EXPORT_SYMBOL(consistent_alloc);



void consistent_free(struct pci_dev *hwdev, size_t size,

			 void *vaddr, dma_addr_t dma_handle)
@@ -47,4 +49,4 @@ void consistent_free(struct pci_dev *hwdev, size_t size, 


	iounmap(vaddr);

}

EXPORT_SYMBOL(consistent_free);

arch/sh64/kernel/sh_ksyms.c

+8 −18
Original line number Diff line number Diff line
@@ -31,16 +31,11 @@ extern int dump_fpu(struct pt_regs *, elf_fpregset_t *); 


/* platform dependent support */

EXPORT_SYMBOL(dump_fpu);

EXPORT_SYMBOL(iounmap);

EXPORT_SYMBOL(enable_irq);

EXPORT_SYMBOL(disable_irq);

EXPORT_SYMBOL(kernel_thread);



/* Networking helper routines. */

EXPORT_SYMBOL(csum_partial_copy_nocheck);



EXPORT_SYMBOL(strstr);



#ifdef CONFIG_VT

EXPORT_SYMBOL(screen_info);

#endif
@@ -50,27 +45,22 @@ EXPORT_SYMBOL(__down_trylock); 
EXPORT_SYMBOL(__up);

EXPORT_SYMBOL(__put_user_asm_l);

EXPORT_SYMBOL(__get_user_asm_l);

EXPORT_SYMBOL(memcmp);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(memscan);

EXPORT_SYMBOL(strchr);

EXPORT_SYMBOL(strlen);



EXPORT_SYMBOL(udelay);

EXPORT_SYMBOL(__udelay);

EXPORT_SYMBOL(ndelay);

EXPORT_SYMBOL(__ndelay);

EXPORT_SYMBOL(flush_dcache_page);



/* For ext3 */

EXPORT_SYMBOL(sh64_page_clear);



/* Ugh.  These come in from libgcc.a at link time. */



extern void __sdivsi3(void);

extern void __muldi3(void);

extern void __udivsi3(void);

#define DECLARE_EXPORT(name) extern void name(void);EXPORT_SYMBOL(name)

extern char __div_table;

EXPORT_SYMBOL(__sdivsi3);

EXPORT_SYMBOL(__muldi3);

EXPORT_SYMBOL(__udivsi3);

EXPORT_SYMBOL(__div_table);



DECLARE_EXPORT(__sdivsi3);

DECLARE_EXPORT(__muldi3);

DECLARE_EXPORT(__udivsi3);

arch/sh64/lib/c-checksum.c

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/string.h>

#include <linux/errno.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <asm/byteorder.h>

#include <asm/uaccess.h>
@@ -110,7 +111,7 @@ static unsigned long do_csum(const unsigned char *buff, int len) 
	if (odd)

		result = ((result >> 8) & 0xff) | ((result & 0xff) << 8);



	pr_debug("\nCHECKSUM is 0x%x\n", result);

	pr_debug("\nCHECKSUM is 0x%lx\n", result);



      out:

	return result;

arch/sh64/lib/iomap.c

+5 −5
Original line number Diff line number Diff line
@@ -17,12 +17,15 @@ ioport_map(unsigned long port, unsigned int len) 
{

	return (void __iomem *)port;

}

EXPORT_SYMBOL(ioport_map);



void ioport_unmap(void __iomem *addr)

{

	/* Nothing .. */

}

EXPORT_SYMBOL(ioport_unmap);



#ifdef CONFIG_PCI

void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)

{

	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) 
	/* What? */

	return NULL;

}

EXPORT_SYMBOL(pci_iomap);



void pci_iounmap(struct pci_dev *dev, void __iomem *addr)

{

	/* Nothing .. */

}



EXPORT_SYMBOL(ioport_map);

EXPORT_SYMBOL(ioport_unmap);

EXPORT_SYMBOL(pci_iomap);

EXPORT_SYMBOL(pci_iounmap);

#endif