2.5.13: link failure

2.5.13: link failure

[Russell King]

2.5.13 with root nfs enabled doesn't link:

fs/fs.o: In function `root_nfs_getport':
fs/fs.o(.text.init+0x187c): undefined reference to `in_ntoa'

I haven't looked into this one yet.

2.5.13 with SCSI enabled:

drivers/scsi/scsidrv.o: In function `sd_init':
drivers/scsi/scsidrv.o(.text+0x128c8): undefined reference to `vmalloc'
drivers/scsi/scsidrv.o(.text+0x128fc): undefined reference to `vmalloc'
drivers/scsi/scsidrv.o(.text+0x12934): undefined reference to `vmalloc'
drivers/scsi/scsidrv.o(.text+0x12948): undefined reference to `vmalloc'
drivers/scsi/scsidrv.o(.text+0x1296c): undefined reference to `vmalloc'
drivers/scsi/scsidrv.o(.text+0x12980): more undefined references to `vmalloc' follow

The following patch fixes this, and also fixes the similar problem in
scsi_debug.c:

diff -u orig/drivers/scsi/scsi_debug.c linux/drivers/scsi/scsi_debug.c
--- orig/drivers/scsi/scsi_debug.c	Sun Apr 28 17:17:12 2002
+++ linux/drivers/scsi/scsi_debug.c	Fri May  3 11:08:53 2002
@@ -32,6 +32,7 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/smp_lock.h>
+#include <linux/vmalloc.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -40,7 +41,7 @@
 #include "scsi.h"
 #include "hosts.h"
 
-#include<linux/stat.h>
+#include <linux/stat.h>
 
 #ifndef LINUX_VERSION_CODE
 #include <linux/version.h>
diff -u orig/drivers/scsi/sd.c linux/drivers/scsi/sd.c
--- orig/drivers/scsi/sd.c	Fri May  3 11:13:39 2002
+++ linux/drivers/scsi/sd.c	Fri May  3 11:08:20 2002
@@ -41,7 +41,7 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
-
+#include <linux/vmalloc.h>
 #include <linux/smp.h>
 
 #include <asm/uaccess.h>


-- 
Russell King (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html

Re: 2.5.13: link failure

[Trond Myklebust]

>>>>> " " == Russell King <rmk@arm.linux.org.uk> writes:

     > 2.5.13 with root nfs enabled doesn't link:
     > fs/fs.o: In function `root_nfs_getport':
     > fs/fs.o(.text.init+0x187c): undefined reference to `in_ntoa'

     > I haven't looked into this one yet.

Nothing serious. Whoever it was that did that global replace missed a
spot is all...

Cheers,
  Trond

--- linux-2.5.13/fs/nfs/nfsroot.c.orig	Fri May  3 02:22:55 2002
+++ linux-2.5.13/fs/nfs/nfsroot.c	Fri May  3 12:39:18 2002
@@ -374,8 +374,8 @@
 {
 	struct sockaddr_in sin;
 
-	printk(KERN_NOTICE "Looking up port of RPC %d/%d on %s\n",
-		program, version, in_ntoa(servaddr));
+	printk(KERN_NOTICE "Looking up port of RPC %d/%d on %u.%u.%u.%u\n",
+		program, version, NIPQUAD(servaddr));
 	set_sockaddr(&sin, servaddr, 0);
 	return rpc_getport_external(&sin, program, version, proto);
 }