Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 920573bd authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras
Browse files

[PATCH] powerpc: remove duplicate EXPORT_SYMBOLS 



remove warnings when building a 64bit kernel.
smp_call_function triggers also with 32bit kernel.

WARNING: vmlinux: duplicate symbol 'smp_call_function' previous definition was in vmlinux
arch/powerpc/kernel/ppc_ksyms.c:164:EXPORT_SYMBOL(smp_call_function);
arch/powerpc/kernel/smp.c:300:EXPORT_SYMBOL(smp_call_function);

WARNING: vmlinux: duplicate symbol 'ioremap' previous definition was in vmlinux
arch/powerpc/kernel/ppc_ksyms.c:113:EXPORT_SYMBOL(ioremap);
arch/powerpc/mm/pgtable_64.c:321:EXPORT_SYMBOL(ioremap);

WARNING: vmlinux: duplicate symbol '__ioremap' previous definition was in vmlinux
arch/powerpc/kernel/ppc_ksyms.c:117:EXPORT_SYMBOL(__ioremap);
arch/powerpc/mm/pgtable_64.c:322:EXPORT_SYMBOL(__ioremap);

WARNING: vmlinux: duplicate symbol 'iounmap' previous definition was in vmlinux
arch/powerpc/kernel/ppc_ksyms.c:118:EXPORT_SYMBOL(iounmap);
arch/powerpc/mm/pgtable_64.c:323:EXPORT_SYMBOL(iounmap);

Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0e8ed479

arch/powerpc/kernel/ppc_ksyms.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -110,15 +110,6 @@ EXPORT_SYMBOL(_insw_ns); 
EXPORT_SYMBOL(_outsw_ns);

EXPORT_SYMBOL(_outsw_ns);

EXPORT_SYMBOL(_insl_ns);

EXPORT_SYMBOL(_insl_ns);

EXPORT_SYMBOL(_outsl_ns);

EXPORT_SYMBOL(_outsl_ns);

EXPORT_SYMBOL(ioremap);

#ifdef CONFIG_44x

EXPORT_SYMBOL(ioremap64);

#endif

EXPORT_SYMBOL(__ioremap);

EXPORT_SYMBOL(iounmap);

#ifdef CONFIG_PPC32

EXPORT_SYMBOL(ioremap_bot);	/* aka VMALLOC_END */

#endif





#if defined(CONFIG_PPC32) && (defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE))

#if defined(CONFIG_PPC32) && (defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE))

EXPORT_SYMBOL(ppc_ide_md);

EXPORT_SYMBOL(ppc_ide_md);
@@ -161,7 +152,6 @@ EXPORT_SYMBOL(__flush_icache_range); 
EXPORT_SYMBOL(flush_dcache_range);

EXPORT_SYMBOL(flush_dcache_range);





#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

EXPORT_SYMBOL(smp_call_function);

#ifdef CONFIG_PPC32

#ifdef CONFIG_PPC32

EXPORT_SYMBOL(smp_hw_index);

EXPORT_SYMBOL(smp_hw_index);

#endif

#endif

arch/powerpc/mm/pgtable_32.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ 




unsigned long ioremap_base;

unsigned long ioremap_base;

unsigned long ioremap_bot;

unsigned long ioremap_bot;

EXPORT_SYMBOL(ioremap_bot);	/* aka VMALLOC_END */

int io_bat_index;

int io_bat_index;





#if defined(CONFIG_6xx) || defined(CONFIG_POWER3)

#if defined(CONFIG_6xx) || defined(CONFIG_POWER3)
@@ -153,6 +154,7 @@ ioremap64(unsigned long long addr, unsigned long size) 
{

{

	return __ioremap(addr, size, _PAGE_NO_CACHE);

	return __ioremap(addr, size, _PAGE_NO_CACHE);

}

}

EXPORT_SYMBOL(ioremap64);





void __iomem *

void __iomem *

ioremap(phys_addr_t addr, unsigned long size)

ioremap(phys_addr_t addr, unsigned long size)
@@ -162,6 +164,7 @@ ioremap(phys_addr_t addr, unsigned long size) 
	return ioremap64(addr64, size);

	return ioremap64(addr64, size);

}

}

#endif /* CONFIG_PHYS_64BIT */

#endif /* CONFIG_PHYS_64BIT */

EXPORT_SYMBOL(ioremap);





void __iomem *

void __iomem *

__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)

__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
@@ -247,6 +250,7 @@ __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) 
out:

out:

	return (void __iomem *) (v + ((unsigned long)addr & ~PAGE_MASK));

	return (void __iomem *) (v + ((unsigned long)addr & ~PAGE_MASK));

}

}

EXPORT_SYMBOL(__ioremap);





void iounmap(volatile void __iomem *addr)

void iounmap(volatile void __iomem *addr)

{

{
@@ -259,6 +263,7 @@ void iounmap(volatile void __iomem *addr) 
	if (addr > high_memory && (unsigned long) addr < ioremap_bot)

	if (addr > high_memory && (unsigned long) addr < ioremap_bot)

		vunmap((void *) (PAGE_MASK & (unsigned long)addr));

		vunmap((void *) (PAGE_MASK & (unsigned long)addr));

}

}

EXPORT_SYMBOL(iounmap);





void __iomem *ioport_map(unsigned long port, unsigned int len)

void __iomem *ioport_map(unsigned long port, unsigned int len)

{

{