tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 4570cd6a fa2a455b

+3 -5
unified split
+2 -4
arch/powerpc/kernel/ppc_ksyms.c
··· 163 EXPORT_SYMBOL(giveup_spe); 164 #endif /* CONFIG_SPE */ 165 166 - #ifdef CONFIG_PPC64 167 - EXPORT_SYMBOL(__flush_icache_range); 168 - #else 169 EXPORT_SYMBOL(flush_instruction_cache); 170 - EXPORT_SYMBOL(flush_icache_range); 171 EXPORT_SYMBOL(flush_tlb_kernel_range); 172 EXPORT_SYMBOL(flush_tlb_page); 173 EXPORT_SYMBOL(_tlbie); 174 #endif 175 EXPORT_SYMBOL(flush_dcache_range); 176 177 #ifdef CONFIG_SMP
··· 163 EXPORT_SYMBOL(giveup_spe); 164 #endif /* CONFIG_SPE */ 165 166 + #ifndef CONFIG_PPC64 167 EXPORT_SYMBOL(flush_instruction_cache); 168 EXPORT_SYMBOL(flush_tlb_kernel_range); 169 EXPORT_SYMBOL(flush_tlb_page); 170 EXPORT_SYMBOL(_tlbie); 171 #endif 172 + EXPORT_SYMBOL(__flush_icache_range); 173 EXPORT_SYMBOL(flush_dcache_range); 174 175 #ifdef CONFIG_SMP
+1 -1
arch/ppc/kernel/ppc_ksyms.c
··· 184 185 EXPORT_SYMBOL(flush_instruction_cache); 186 EXPORT_SYMBOL(giveup_fpu); 187 - EXPORT_SYMBOL(flush_icache_range); 188 EXPORT_SYMBOL(flush_dcache_range); 189 EXPORT_SYMBOL(flush_icache_user_range); 190 EXPORT_SYMBOL(flush_dcache_page);
··· 184 185 EXPORT_SYMBOL(flush_instruction_cache); 186 EXPORT_SYMBOL(giveup_fpu); 187 + EXPORT_SYMBOL(__flush_icache_range); 188 EXPORT_SYMBOL(flush_dcache_range); 189 EXPORT_SYMBOL(flush_icache_user_range); 190 EXPORT_SYMBOL(flush_dcache_page);