patch-2.4.15 linux/arch/ppc/kernel/oak_setup.c

Next file: linux/arch/ppc/kernel/pci.c
Previous file: linux/arch/ppc/kernel/m8xx_setup.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.14/linux/arch/ppc/kernel/oak_setup.c linux/arch/ppc/kernel/oak_setup.c
@@ -1,5 +1,5 @@
 /*
- * BK Id: SCCS/s.oak_setup.c 1.10 10/18/01 11:16:28 trini
+ * BK Id: SCCS/s.oak_setup.c 1.12 11/13/01 21:26:07 paulus
  */
 /*
  *
@@ -23,6 +23,7 @@
 #include <linux/param.h>
 #include <linux/string.h>
 #include <linux/blk.h>
+#include <linux/seq_file.h>
 
 #include <asm/processor.h>
 #include <asm/board.h>
@@ -106,8 +107,7 @@
 	/* Initialize machine-dependency vectors */
 
 	ppc_md.setup_arch	 	= oak_setup_arch;
-	ppc_md.setup_residual	 	= oak_setup_residual;
-	ppc_md.get_cpuinfo	 	= NULL;
+	ppc_md.show_percpuinfo	 	= oak_show_percpuinfo;
 	ppc_md.irq_cannonicalize 	= NULL;
 	ppc_md.init_IRQ		 	= oak_init_IRQ;
 	ppc_md.get_irq		 	= oak_get_irq;
@@ -141,7 +141,7 @@
 }
 
 /*
- * int oak_setup_residual()
+ * int oak_show_percpuinfo()
  *
  * Description:
  *   This routine pretty-prints the platform's internal CPU and bus clock
@@ -159,18 +159,16 @@
  *   on error.
  */
 int
-oak_setup_residual(char *buffer)
+oak_show_percpuinfo(struct seq_file *m, int i)
 {
-	int len = 0;
 	bd_t *bp = (bd_t *)__res;
 
-	len += sprintf(len + buffer,
-		       "clock\t\t: %dMHz\n"
-		       "bus clock\t\t: %dMHz\n",
-		       bp->bi_intfreq / 1000000,
-		       bp->bi_busfreq / 1000000);
+	seq_printf(m, "clock\t\t: %dMHz\n"
+		   "bus clock\t\t: %dMHz\n",
+		   bp->bi_intfreq / 1000000,
+		   bp->bi_busfreq / 1000000);
 
-	return (len);
+	return 0;
 }
 
 /*

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)