[PATCH] adjust PPC sysctls

[Paul Mackerras]

This patch takes out the unused KERN_PPC_ZEROPAGED sysctl, and
restricts the KERN_PPC_POWERSAVE_NAP and KERN_PPC_L2CR sysctls to be
present only on those PPC processors where they are useful.  This
patch only affects PPC.

Linus, please apply this patch to your tree.

Paul.

diff -urN linux-2.5/kernel/sysctl.c linuxppc-2.5/kernel/sysctl.c
--- linux-2.5/kernel/sysctl.c	2002-09-20 22:31:26.000000000 +1000
+++ linuxppc-2.5/kernel/sysctl.c	2002-09-20 23:03:19.000000000 +1000
@@ -88,8 +88,8 @@
 extern int sysctl_userprocess_debug;
 #endif
 
-#ifdef CONFIG_PPC32
-extern unsigned long zero_paged_on, powersave_nap;
+#if defined(CONFIG_PPC32) && defined(CONFIG_6xx)
+extern unsigned long powersave_nap;
 int proc_dol2crvec(ctl_table *table, int write, struct file *filp,
 		  void *buffer, size_t *lenp);
 #endif
@@ -190,9 +190,7 @@
 	{KERN_SPARC_STOP_A, "stop-a", &stop_a_enabled, sizeof (int),
 	 0644, NULL, &proc_dointvec},
 #endif
-#ifdef CONFIG_PPC32
-	{KERN_PPC_ZEROPAGED, "zero-paged", &zero_paged_on, sizeof(int),
-	 0644, NULL, &proc_dointvec},
+#if defined(CONFIG_PPC32) && defined(CONFIG_6xx)
 	{KERN_PPC_POWERSAVE_NAP, "powersave-nap", &powersave_nap, sizeof(int),
 	 0644, NULL, &proc_dointvec},
 	{KERN_PPC_L2CR, "l2cr", NULL, 0,