[parisc-linux-cvs] cleanups

[Helge Deller]

On Thursday 29 November 2001 21:54, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	deller	01/11/29 13:54:37
>
> Modified files:
> 	include/asm-parisc: cache.h
>
> Log message:
> add prototype for show_cache_info


Index: arch/parisc/kernel/cache.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/cache.c,v
retrieving revision 1.19
diff -u -p -r1.19 cache.c
--- arch/parisc/kernel/cache.c  2001/11/29 15:49:18     1.19
+++ arch/parisc/kernel/cache.c  2001/11/29 20:50:28
@@ -72,7 +72,7 @@ update_mmu_cache(struct vm_area_struct *
 }

 void
-show_cache_info(struct seq_file *m, void *v)
+show_cache_info(struct seq_file *m)
 {
        seq_printf(m, "I-cache\t\t: %ld KB\n",
                cache_info.ic_size/1024 );
Index: arch/parisc/kernel/processor.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/processor.c,v
retrieving revision 1.8
diff -u -p -r1.8 processor.c
--- arch/parisc/kernel/processor.c      2001/11/29 19:57:04     1.8
+++ arch/parisc/kernel/processor.c      2001/11/29 20:50:29
@@ -27,8 +27,9 @@
  *
  */
 #include <linux/config.h>
-#include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #define PCI_DEBUG
@@ -313,9 +314,10 @@ show_cpuinfo (struct seq_file *m, void *
                                "sversion\t: 0x%08x\n",
                                 boot_cpu_data.hversion,
                                 boot_cpu_data.sversion );
+
+               /* print cachesize info */
+               show_cache_info(m);

-               /* print cachesize info ? */
-               show_cache_info(m, v);
                seq_printf(m, "bogomips\t: %lu.%02lu\n",
                             loops_per_jiffy / (500000 / HZ),
                             (loops_per_jiffy / (5000 / HZ)) % 100);
Index: arch/parisc/kernel/sba_iommu.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/sba_iommu.c,v
retrieving revision 1.61
diff -u -p -r1.61 sba_iommu.c
--- arch/parisc/kernel/sba_iommu.c      2001/11/26 08:19:37     1.61
+++ arch/parisc/kernel/sba_iommu.c      2001/11/29 20:50:32
@@ -1130,7 +1130,7 @@ sba_coalesce_chunks( struct ioc *ioc,
        int n_mappings = 0;

        while (nents > 0) {
-               unsigned long vaddr = sg_virt_addr(startsg);
+               unsigned long vaddr = (unsigned long) sg_virt_addr(startsg);

                /*
                ** Prepare for first/next DMA stream
Index: include/asm-parisc/cache.h
===================================================================
RCS file: /var/cvs/linux/include/asm-parisc/cache.h,v
retrieving revision 1.14
diff -u -p -r1.14 cache.h
--- include/asm-parisc/cache.h  2001/09/06 09:44:12     1.14
+++ include/asm-parisc/cache.h  2001/11/29 20:50:41
@@ -50,6 +50,9 @@ extern void disable_sr_hashing_asm(int);
 extern void free_sid(unsigned long);
 unsigned long alloc_sid(void);

+struct seq_file;
+extern void show_cache_info(struct seq_file *m);
+
 extern int split_tlb;
 extern int dcache_stride;
 extern int icache_stride;