diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-29 15:48:34 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-29 15:48:34 -0500 |
| commit | be37bdbce7ceaacf4f20c6cc759efbe75ebd1196 (patch) | |
| tree | f1a42fb5a4a17eea41d47d2c002fa303009f5523 /arch/powerpc/kernel/ppc_ksyms.c | |
| parent | 019a61b99338d0ac05de25317b85da88e7ec4b35 (diff) | |
| parent | d70aa5e4b54aa7e704c886838715ac8a45d5750f (diff) | |
Merge ../linus
Diffstat (limited to 'arch/powerpc/kernel/ppc_ksyms.c')
| -rw-r--r-- | arch/powerpc/kernel/ppc_ksyms.c | 6 |
1 files changed, 2 insertions, 4 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); | |||
| 163 | EXPORT_SYMBOL(giveup_spe); | 163 | EXPORT_SYMBOL(giveup_spe); |
| 164 | #endif /* CONFIG_SPE */ | 164 | #endif /* CONFIG_SPE */ |
| 165 | 165 | ||
| 166 | #ifdef CONFIG_PPC64 | 166 | #ifndef CONFIG_PPC64 |
| 167 | EXPORT_SYMBOL(__flush_icache_range); | ||
| 168 | #else | ||
| 169 | EXPORT_SYMBOL(flush_instruction_cache); | 167 | EXPORT_SYMBOL(flush_instruction_cache); |
| 170 | EXPORT_SYMBOL(flush_icache_range); | ||
| 171 | EXPORT_SYMBOL(flush_tlb_kernel_range); | 168 | EXPORT_SYMBOL(flush_tlb_kernel_range); |
| 172 | EXPORT_SYMBOL(flush_tlb_page); | 169 | EXPORT_SYMBOL(flush_tlb_page); |
| 173 | EXPORT_SYMBOL(_tlbie); | 170 | EXPORT_SYMBOL(_tlbie); |
| 174 | #endif | 171 | #endif |
| 172 | EXPORT_SYMBOL(__flush_icache_range); | ||
| 175 | EXPORT_SYMBOL(flush_dcache_range); | 173 | EXPORT_SYMBOL(flush_dcache_range); |
| 176 | 174 | ||
| 177 | #ifdef CONFIG_SMP | 175 | #ifdef CONFIG_SMP |