lkml.org 
[lkml]   [2003]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 2.6.0-test5: ISDN kcapi.c no longer compiles (fwd)
The trivial patch forwarded below by Karsten Keil is still needed in 
-test8.

Please apply
Adrian


----- Forwarded message from Karsten Keil <kkeil@suse.de> -----

Date: Mon, 15 Sep 2003 08:57:34 +0200
From: Karsten Keil <kkeil@suse.de>
To: Adrian Bunk <bunk@fs.tum.de>
Cc: isdn4linux@listserv.isdn4linux.de,
Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: 2.6.0-test5: ISDN kcapi.c no longer compiles

On Wed, Sep 10, 2003 at 06:57:42PM +0200, Adrian Bunk wrote:
> On Mon, Sep 08, 2003 at 01:32:05PM -0700, Linus Torvalds wrote:
> >...
> > Summary of changes from v2.6.0-test4 to v2.6.0-test5
> > ============================================
> >...
> > Karsten Keil:
> >...
> > o next fixes
> >...
>
> It seems this change broke the compilation of kcapi.c:
>

Ah, with your .config now it's clear what was broken: none MODULE compile

diff -ur -x '.built-in*' -x '.*cmd' linux-2.6.0-test5/drivers/isdn/capi/kcapi.c linux-2.6.0-test5-bk3/drivers/isdn/capi/kcapi.c
--- linux-2.6.0-test5/drivers/isdn/capi/kcapi.c 2003-09-14 17:43:45.000000000 +0200
+++ linux-2.6.0-test5-bk3/drivers/isdn/capi/kcapi.c 2003-09-14 22:39:28.000000000 +0200
@@ -77,17 +77,21 @@
static inline struct capi_ctr *
capi_ctr_get(struct capi_ctr *card)
{
+#ifdef MODULE
if (!try_module_get(card->owner))
return NULL;
DBG("Reserve module: %s", card->owner->name);
+#endif
return card;
}

static inline void
capi_ctr_put(struct capi_ctr *card)
{
+#ifdef MODULE
module_put(card->owner);
DBG("Release module: %s", card->owner->name);
+#endif
}

/* ------------------------------------------------------------- */

This should fix it.

--
Karsten Keil
SuSE Labs
ISDN development
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

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

\
 
 \ /
  Last update: 2005-03-22 13:58    [W:0.114 / U:0.640 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site