diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 08:05:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 08:05:54 -0800 |
| commit | 4570cd6a65f0559b0e11a6f953f5204fea5c719d (patch) | |
| tree | b09ce26ab076decded3d7a6d6b1693ac3bdb103f | |
| parent | fa2a455b028f3b6ca4dae129c6337d7edf21f12c (diff) | |
| parent | 666acb94d155106e494c6dfdd8b2fae44e0fad61 (diff) | |
| download | linux-4570cd6a65f0559b0e11a6f953f5204fea5c719d.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
| -rw-r--r-- | arch/powerpc/kernel/ppc_ksyms.c | 6 | ||||
| -rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index af4d1bc9a2eb..94db25708456 100644 --- 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 -EXPORT_SYMBOL(__flush_icache_range); -#else +#ifndef CONFIG_PPC64 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 diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index 66073f775193..bb6a5c6a64be 100644 --- 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); |