At least one warning is left intact because it smells like a bug.
--- linux/fs/jffs/jffs_fm.c.orig Tue Jul 25 21:46:08 2000
+++ linux/fs/jffs/jffs_fm.c Tue Jul 25 22:42:21 2000
@@ -614,16 +614,17 @@
ssize = mtd->erasesize;
if (offset % ssize) {
- printk(KERN_WARNING "jffs_flash_erasable_size() given non-aligned offset %lx (erasesize %lx)\n", offset, ssize);
+ printk(KERN_WARNING "jffs_flash_erasable_size() given non-aligned offset %lx (erasesize %lx)\n", (u_long)offset, ssize);
/* The offset is not sector size aligned. */
return -1;
}
else if (offset > mtd->size) {
- printk(KERN_WARNING "jffs_flash_erasable_size given offset off the end of device (%lx > %lx)\n", offset, mtd->size);
+ printk(KERN_WARNING "jffs_flash_erasable_size given offset off the end of device (%lx > %lx)\n", (u_long)offset, mtd->size);
return -2;
}
else if (offset + size > mtd->size) {
- printk(KERN_WARNING "jffs_flash_erasable_size() given length which runs off the end of device (ofs %lx + len %lx = %lx, > %lx)\n", offset,size, offset+size, mtd->size);
+ printk(KERN_WARNING "jffs_flash_erasable_size() given length which runs off the end of device (ofs %lx + len %lx = %lx, > %lx)\n",
+ (u_long)offset,(u_long)size, (u_long)(offset+size), mtd->size);
return -3;
}
--- linux/drivers/mtd/cfi_cmdset_0002.c.orig Tue Jul 25 21:45:47 2000
+++ linux/drivers/mtd/cfi_cmdset_0002.c Tue Jul 25 22:15:44 2000
@@ -437,7 +437,7 @@
adr = instr->addr - (chipnum << cfi->chipshift) * (cfi->interleave);
len = instr->len;
-printk("erase : 0x%x 0x%x 0x%x\n", adr, len, chipnum, mtd->size);
+printk("erase : 0x%lx 0x%lx 0x%x 0x%lx\n", adr, len, chipnum, mtd->size);
while(len) {
//printk("erase : 0x%x 0x%x 0x%x 0x%x\n", chipnum, adr, len, cfi->chipshift);
--- linux/drivers/mtd/doc1000.c.orig Tue Jul 25 21:45:26 2000
+++ linux/drivers/mtd/doc1000.c Tue Jul 25 22:19:16 2000
@@ -294,7 +294,7 @@
static inline int byte_write (volatile u_char *addr, u_char byte)
{
- register u_char status;
+ register u_char status = 0;
register u_short i;
for (i = 0; i < max_tries; i++)
--- linux/drivers/mtd/docprobe.c.orig Tue Jul 25 21:45:47 2000
+++ linux/drivers/mtd/docprobe.c Tue Jul 25 22:27:05 2000
@@ -223,11 +223,11 @@
(*initroutine)(mtd);
#if defined(CONFIG_MODULES) && LINUX_VERSION_CODE >= 0x20400
if (initroutinedynamic)
- put_module_symbol(initroutine);
+ put_module_symbol((unsigned long)initroutine);
#endif
return;
}
- printk("Cannot find driver for DiskOnChip %s at 0x%X\n", name, physadr);
+ printk("Cannot find driver for DiskOnChip %s at 0x%lX\n", name, physadr);
}
iounmap((void *)docptr);
}
-- Frank- 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 : Tue Jul 25 2000 - 17:24:57 EDT