Marcelo, please apply: this patch squashes some incorrect format
designator warnings in init/do_mounts.c. These seem to have been
fixed already in 2.5.
diff -urN /home/dgibson/kernel/linuxppc_2_4_devel/init/do_mounts.c linux-bartholomew/init/do_mounts.c
--- /home/dgibson/kernel/linuxppc_2_4_devel/init/do_mounts.c 2002-12-04 10:44:51.000000000 +1100
+++ linux-bartholomew/init/do_mounts.c 2003-01-15 17:42:29.000000000 +1100
@@ -593,7 +593,7 @@
rd_blocks >>= 1;
if (nblocks > rd_blocks) {
- printk("RAMDISK: image too big! (%d/%d blocks)\n",
+ printk("RAMDISK: image too big! (%d/%lu blocks)\n",
nblocks, rd_blocks);
goto done;
}
@@ -620,11 +620,11 @@
goto done;
}
- printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%d disk%s] into ram disk... ",
+ printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%ld disk%s] into ram disk... ",
nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : "");
for (i=0; i < nblocks; i++) {
if (i && (i % devblocks == 0)) {
- printk("done disk #%d.\n", i/devblocks);
+ printk("done disk #%ld.\n", i/devblocks);
rotate = 0;
if (close(in_fd)) {
printk("Error closing the disk.\n");
@@ -636,7 +636,7 @@
printk("Error opening disk.\n");
goto noclose_input;
}
- printk("Loading disk #%d... ", i/devblocks+1);
+ printk("Loading disk #%ld... ", i/devblocks+1);
}
read(in_fd, buf, BLOCK_SIZE);
write(out_fd, buf, BLOCK_SIZE);
--
David Gibson | For every complex problem there is a
[email protected] | solution which is simple, neat and
| wrong.
http://www.ozlabs.org/people/dgibson