linux-next: build failure after merge of the tty tree

linux-next: build failure after merge of the tty tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

Hi Greg,

After merging the tty tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "isdn_tty_revision" [drivers/isdn/i4l/isdn.ko] undefined!

Presumably caused by commit 1ca6711ec001 ("ISDN: i4l, remove cvs crap").
That variable is still referenced in drivers/isdn/i4l/isdn_common.c.  Grep
is your friend.

I have used the tty tree from next-20120405 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 1/1] ISDN: remove uses of isdn_tty_revision

[Jiri Slaby]

Commit "ISDN: i4l, remove cvs crap" removed definition of
isdn_tty_revision, but there is still a user. So this causes linking
errors. This was hidden from my radar because the variable was not
declared in any header. Instead isdn_common.c declares it locally.

So remove this variable also from isdn_common.c, because there is
really no way to find out the version. Git commit or tag is...

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Karsten Keil <isdn@linux-pingi.de>
---
 drivers/isdn/i4l/isdn_common.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 2ffa0b73..8c610fa 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -46,7 +46,6 @@ static DEFINE_MUTEX(isdn_mutex);
 static char *isdn_revision = "$Revision: 1.1.2.3 $";
 
 extern char *isdn_net_revision;
-extern char *isdn_tty_revision;
 #ifdef CONFIG_ISDN_PPP
 extern char *isdn_ppp_revision;
 #else
@@ -2351,8 +2350,6 @@ static int __init isdn_init(void)
 
 	strcpy(tmprev, isdn_revision);
 	printk(KERN_NOTICE "ISDN subsystem Rev: %s/", isdn_getrev(tmprev));
-	strcpy(tmprev, isdn_tty_revision);
-	printk("%s/", isdn_getrev(tmprev));
 	strcpy(tmprev, isdn_net_revision);
 	printk("%s/", isdn_getrev(tmprev));
 	strcpy(tmprev, isdn_ppp_revision);
-- 
1.7.9.2

Re: [PATCH 1/1] ISDN: remove uses of isdn_tty_revision

[Jiri Slaby]

On 04/10/2012 10:35 AM, Jiri Slaby wrote:
> Commit "ISDN: i4l, remove cvs crap" removed definition of
> isdn_tty_revision, but there is still a user. So this causes linking
> errors. This was hidden from my radar because the variable was not
> declared in any header. Instead isdn_common.c declares it locally.
> 
> So remove this variable also from isdn_common.c, because there is
> really no way to find out the version. Git commit or tag is...
> 
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: Karsten Keil <isdn@linux-pingi.de>

Oh, and

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks!

> ---
>  drivers/isdn/i4l/isdn_common.c |    3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
> index 2ffa0b73..8c610fa 100644
> --- a/drivers/isdn/i4l/isdn_common.c
> +++ b/drivers/isdn/i4l/isdn_common.c
> @@ -46,7 +46,6 @@ static DEFINE_MUTEX(isdn_mutex);
>  static char *isdn_revision = "$Revision: 1.1.2.3 $";
>  
>  extern char *isdn_net_revision;
> -extern char *isdn_tty_revision;
>  #ifdef CONFIG_ISDN_PPP
>  extern char *isdn_ppp_revision;
>  #else
> @@ -2351,8 +2350,6 @@ static int __init isdn_init(void)
>  
>  	strcpy(tmprev, isdn_revision);
>  	printk(KERN_NOTICE "ISDN subsystem Rev: %s/", isdn_getrev(tmprev));
> -	strcpy(tmprev, isdn_tty_revision);
> -	printk("%s/", isdn_getrev(tmprev));
>  	strcpy(tmprev, isdn_net_revision);
>  	printk("%s/", isdn_getrev(tmprev));
>  	strcpy(tmprev, isdn_ppp_revision);
> 



-- 
js
suse labs