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

Commit 4570cd6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

parents fa2a455b 666acb94

arch/powerpc/kernel/ppc_ksyms.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -163,15 +163,13 @@ EXPORT_SYMBOL(giveup_altivec); 
EXPORT_SYMBOL(giveup_spe);

EXPORT_SYMBOL(giveup_spe);

#endif /* CONFIG_SPE */

#endif /* CONFIG_SPE */





#ifdef CONFIG_PPC64

#ifndef CONFIG_PPC64

EXPORT_SYMBOL(__flush_icache_range);

#else

EXPORT_SYMBOL(flush_instruction_cache);

EXPORT_SYMBOL(flush_instruction_cache);

EXPORT_SYMBOL(flush_icache_range);

EXPORT_SYMBOL(flush_tlb_kernel_range);

EXPORT_SYMBOL(flush_tlb_kernel_range);

EXPORT_SYMBOL(flush_tlb_page);

EXPORT_SYMBOL(flush_tlb_page);

EXPORT_SYMBOL(_tlbie);

EXPORT_SYMBOL(_tlbie);

#endif

#endif

EXPORT_SYMBOL(__flush_icache_range);

EXPORT_SYMBOL(flush_dcache_range);

EXPORT_SYMBOL(flush_dcache_range);





#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

arch/ppc/kernel/ppc_ksyms.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,7 @@ EXPORT_SYMBOL(kernel_thread); 




EXPORT_SYMBOL(flush_instruction_cache);

EXPORT_SYMBOL(flush_instruction_cache);

EXPORT_SYMBOL(giveup_fpu);

EXPORT_SYMBOL(giveup_fpu);

EXPORT_SYMBOL(flush_icache_range);

EXPORT_SYMBOL(__flush_icache_range);

EXPORT_SYMBOL(flush_dcache_range);

EXPORT_SYMBOL(flush_dcache_range);

EXPORT_SYMBOL(flush_icache_user_range);

EXPORT_SYMBOL(flush_icache_user_range);

EXPORT_SYMBOL(flush_dcache_page);

EXPORT_SYMBOL(flush_dcache_page);