Skip to contentSkip to conversation

2.6.0-test5: ISDN kcapi.c no longer compiles (fwd)

DISCUSSION Adrian Bunk 1 participant 1 message Oct 18, 2003

lore
Share & tools
lore
#0 lore raw

The trivial patch forwarded below by Karsten Keil is still needed in -test8.

Please apply
Adrian

----- Forwarded message from Karsten Keil <[email protected]> -----

Date: Mon, 15 Sep 2003 08:57:34 +0200
From: Karsten Keil <[email protected]>
To: Adrian Bunk <[email protected]>
Cc: [email protected],
Kernel Mailing List <[email protected]>
Subject: Re: 2.6.0-test5: ISDN kcapi.c no longer compiles

Quoted 10 lines · Adrian Bunk
Quoted 8 lines · Linus Torvalds

...
Summary of changes from v2.6.0-test4 to v2.6.0-test5
============================================
...
Karsten Keil:
...
o next fixes
...

Quoted 2 lines

It seems this change broke the compilation of kcapi.c:

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

drivers/isdn/capi/kcapi.c +4 -0
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
@@ -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.

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

----- End forwarded message -----