Re: 2.6.14-rc2-rt2

[Badari Pulavarty]

On Mon, 2005-09-26 at 09:02 +0200, Ingo Molnar wrote:
> i have released the 2.6.14-rc2-rt2 tree, which can be downloaded from 
> the usual place:
> 
>    http://redhat.com/~mingo/realtime-preempt/
> 

Hi Ingo,

I noticed that you moved to "-rt7" already.
 "-rt7" fails to compile with CONFIG_NUMA.

mm/slab.c:2404: error: conflicting types for `kmem_cache_alloc_node'
include/linux/slab.h:122: error: previous declaration of
`kmem_cache_alloc_node'

Here is the simple fix.

Thanks,
Badari


--- linux-2.6.14-rc2/mm/slab.c	2005-09-29 02:55:11.000000000 -0700
+++ linux-2.6.14-rc2-rt7/mm/slab.c	2005-09-29 02:48:05.000000000 -0700
@@ -2400,7 +2400,7 @@ out:
  * and can sleep. And it will allocate memory on the given node, which
  * can improve the performance for cpu bound structures.
  */
-void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int nodeid)
+void *kmem_cache_alloc_node(kmem_cache_t *cachep, unsigned int __nocast flags, int nodeid)
 {
 	int loop;
 	void *objp;