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

4570cd6a · Linus Torvalds · fa2a455b · 666acb94 · 4570cd6a · 4570cd6a
Commit 4570cd6a authored Nov 29, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

arch/powerpc/kernel/ppc_ksyms.c arch/powerpc/kernel/ppc_ksyms.c +2 -4

arch/ppc/kernel/ppc_ksyms.c arch/ppc/kernel/ppc_ksyms.c +1 -1

No files found.
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -163,15 +163,13 @@ EXPORT_SYMBOL(giveup_altivec);
 EXPORT_SYMBOL(giveup_spe);
 #endif /* CONFIG_SPE */
-#ifdef CONFIG_PPC64
+#ifndef CONFIG_PPC64
-EXPORT_SYMBOL(__flush_icache_range);
-#else
 EXPORT_SYMBOL(flush_instruction_cache);
-EXPORT_SYMBOL(flush_icache_range);
 EXPORT_SYMBOL(flush_tlb_kernel_range);
 EXPORT_SYMBOL(flush_tlb_page);
 EXPORT_SYMBOL(_tlbie);
 #endif
+EXPORT_SYMBOL(__flush_icache_range);
 EXPORT_SYMBOL(flush_dcache_range);
 #ifdef CONFIG_SMP

--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -184,7 +184,7 @@ EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(flush_instruction_cache);
 EXPORT_SYMBOL(giveup_fpu);
-EXPORT_SYMBOL(flush_icache_range);
+EXPORT_SYMBOL(__flush_icache_range);
 EXPORT_SYMBOL(flush_dcache_range);
 EXPORT_SYMBOL(flush_icache_user_range);
 EXPORT_SYMBOL(flush_dcache_page);