[zaptel-commits] tzafrir: branch 1.4 r2259 - in /branches/1.4: ./ xpp/xbus-core.c

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Thu Mar  1 13:50:34 2007
New Revision: 2259

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2259
Log:
r2257 | tzafrir | 2007-03-01 21:29:12 +0200 (Thu, 01 Mar 2007) | 2 lines

SLAB_KERNEL is an obsolete alias of GFP_KERNEL. Fix build on Vanilla 2.6.20 .

Modified:
    branches/1.4/   (props changed)
    branches/1.4/xpp/xbus-core.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/xpp/xbus-core.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/xbus-core.c?view=diff&rev=2259&r1=2258&r2=2259
==============================================================================
--- branches/1.4/xpp/xbus-core.c (original)
+++ branches/1.4/xpp/xbus-core.c Thu Mar  1 13:50:34 2007
@@ -630,7 +630,7 @@
 	BUG_ON(xbus->busname[0] == '\0');	/* No name? */
 	BUG_ON(xbus->poller);			/* Hmmm... overrun pollers? */
 	DBG("%s\n", xbus->busname);
-	poller = kmalloc(sizeof(*poller), SLAB_KERNEL);
+	poller = kmalloc(sizeof(*poller), GFP_KERNEL);
 	if(!poller)
 		goto err;
 	memset(poller, 0, sizeof(*poller));