[PATCH] powerpc: Some ppc compile fixes...

This gets most of the Fedora rawhide RPM building again, as long as I
disable CHRP.

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 17c1b6aa44bc12cfd37978e9b97330ca7331c394..935d965715154ea784aaf66e2a78afe8d596403c 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -412,7 +412,7 @@ config PPC_MPC106
 
 config GENERIC_TBSYNC
        bool
-       default y if CONFIG_PPC32 && CONFIG_SMP
+       default y if PPC32 && SMP
        default n
 
 source "drivers/cpufreq/Kconfig"

diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index b2758148a0de54461b04d735e8fb347ec1884b55..16d9a904f3cbc35b24a6341a1928663829d163ed 100644 (file)
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -244,7 +244,6 @@ EXPORT_SYMBOL(set_context);
 extern long mol_trampoline;
 EXPORT_SYMBOL(mol_trampoline); /* For MOL */
 EXPORT_SYMBOL(flush_hash_pages); /* For MOL */
-EXPORT_SYMBOL_GPL(__handle_mm_fault); /* For MOL */
 #ifdef CONFIG_SMP
 extern int mmu_hash_lock;
 EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 86fb1e0286d38b704cd8f8ebf327c4aeb3673e11..c85b87cb59d11763100d0f74630a2f30b7bc6dc3 100644 (file)
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -439,7 +439,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
        hwif->speedproc = &via_set_drive;
 
 
-#if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
        if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) {
                hwif->irq = hwif->channel ? 15 : 14;
        }