[PATCH] ppc64: reduce ifdef clutter in arch/ppc64/kernel/sysfs.c

[Anton Blanchard]

From: Christoph Hellwig <hch at lst.de>

Reduce ifdef clutter in arch/ppc64/kernel/sysfs.c

Signed-off-by: Anton Blanchard <anton at samba.org>

Index: linux-2.5/arch/ppc64/kernel/sysfs.c
===================================================================
--- linux-2.5.orig/arch/ppc64/kernel/sysfs.c	2004-11-14 15:14:37.794925342 +1100
+++ linux-2.5/arch/ppc64/kernel/sysfs.c	2004-11-14 15:20:24.829990790 +1100
@@ -17,8 +17,7 @@
 
 /* SMT stuff */
 
-#ifndef CONFIG_PPC_ISERIES
-
+#ifdef CONFIG_PPC_MULTIPLATFORM
 /* default to snooze disabled */
 DEFINE_PER_CPU(unsigned long, smt_snooze_delay);
 
@@ -94,19 +93,6 @@
 }
 __setup("smt-snooze-delay=", setup_smt_snooze_delay);
 
-#endif
-
-
-/* PMC stuff */
-
-#ifdef CONFIG_PPC_ISERIES
-void ppc64_enable_pmcs(void)
-{
-	/* XXX Implement for iseries */
-}
-#endif
-
-#ifdef CONFIG_PPC_MULTIPLATFORM
 /*
  * Enabling PMCs will slow partition context switch times so we only do
  * it the first time we write to the PMCs.
@@ -183,6 +169,14 @@
 	}
 #endif /* CONFIG_PPC_PSERIES */
 }
+
+#else
+
+/* PMC stuff */
+void ppc64_enable_pmcs(void)
+{
+	/* XXX Implement for iseries */
+}
 #endif /* CONFIG_PPC_MULTIPLATFORM */
 
 EXPORT_SYMBOL(ppc64_enable_pmcs);