Re: [PATCH] 2.3.51 Compile warnings on sparc

From: Sean Hunter (sean@uncarved.co.uk)
Date: Tue Mar 14 2000 - 03:06:59 EST


Sean P. Mc Braindamage here forgot to include the patch. Here it is.

Sorry

Sean

On Tue, Mar 14, 2000 at 07:38:58AM +0000, Sean Hunter wrote:
> The following patch fixes some compile warnings I had when compiling
> 2.3.51 on sparc. This is a great kernel BTW, thanks everyone for the
> hard work.
>
> Sean

diff -ur linux/drivers/video/fbmem.c linux.patched/drivers/video/fbmem.c
--- linux/drivers/video/fbmem.c Wed Mar 8 22:00:08 2000
+++ linux.patched/drivers/video/fbmem.c Mon Mar 13 22:26:27 2000
@@ -418,10 +418,13 @@
         int fbidx = GET_FB_IDX(file->f_dentry->d_inode->i_rdev);
         struct fb_info *info = registered_fb[fbidx];
         struct fb_ops *fb = info->fbops;
+ unsigned long off;
+#if !defined(__sparc__) || defined(__sparc_v9__)
         struct fb_fix_screeninfo fix;
         struct fb_var_screeninfo var;
- unsigned long start, off;
+ unsigned long start;
         u32 len;
+#endif
 
         if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
                 return -EINVAL;
diff -ur linux/fs/nfs/read.c linux.patched/fs/nfs/read.c
--- linux/fs/nfs/read.c Sat Nov 27 23:51:32 1999
+++ linux.patched/fs/nfs/read.c Mon Mar 13 22:12:11 2000
@@ -234,7 +234,7 @@
 
         lock_kernel();
         dprintk("NFS: nfs_readpage (%p %ld@%lu)\n",
- page, PAGE_SIZE, page->index);
+ page, (long)PAGE_SIZE, page->index);
         get_page(page);
 
         /*
diff -ur linux/mm/filemap.c linux.patched/mm/filemap.c
--- linux/mm/filemap.c Fri Mar 10 18:48:53 2000
+++ linux.patched/mm/filemap.c Mon Mar 13 22:13:46 2000
@@ -1963,7 +1963,7 @@
         } while(page_hash_table == NULL && --order > 0);
 
         printk("Page-cache hash table entries: %d (order: %ld, %ld bytes)\n",
- (1 << page_hash_bits), order, (PAGE_SIZE << order));
+ (1 << page_hash_bits), order, (long)(PAGE_SIZE << order));
         if (!page_hash_table)
                 panic("Failed to allocate page hash table\n");
         memset((void *)page_hash_table, 0, PAGE_HASH_SIZE * sizeof(struct page *));
diff -ur linux/mm/page_alloc.c linux.patched/mm/page_alloc.c
--- linux/mm/page_alloc.c Mon Mar 6 22:30:56 2000
+++ linux.patched/mm/page_alloc.c Mon Mar 13 22:16:20 2000
@@ -401,7 +401,7 @@
                                 }
                                 total += nr * (1 << order);
                                 printk("%lu*%lukB ", nr,
- (PAGE_SIZE>>10) << order);
+ (unsigned long)(PAGE_SIZE>>10) << order);
                         }
                         spin_unlock_irqrestore(&zone->lock, flags);
                 }

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed Mar 15 2000 - 21:00:27 EST