[PATCH 11/13] Integrate the ridr code

[Nadia.Derbey@bull.net]

[-- Attachment #1: ridr_integrate.patch --]
[-- Type: text/plain, Size: 1573 bytes --]

[PATCH 11/13]

>From now on the ridr code can be compiled and used (the initialization routine
is called during kernel init).

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>

---
 init/main.c  |    2 ++
 lib/Makefile |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6.25-rc8-mm1/lib/Makefile
===================================================================
--- linux-2.6.25-rc8-mm1.orig/lib/Makefile	2008-04-11 17:14:08.000000000 +0200
+++ linux-2.6.25-rc8-mm1/lib/Makefile	2008-04-11 18:10:26.000000000 +0200
@@ -6,7 +6,7 @@ lib-y := ctype.o string.o vsprintf.o cmd
 	 rbtree.o radix-tree.o dump_stack.o \
 	 idr.o int_sqrt.o extable.o prio_tree.o \
 	 sha1.o irq_regs.o reciprocal_div.o argv_split.o \
-	 proportions.o prio_heap.o ratelimit.o
+	 proportions.o prio_heap.o ratelimit.o ridr.o
 
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
Index: linux-2.6.25-rc8-mm1/init/main.c
===================================================================
--- linux-2.6.25-rc8-mm1.orig/init/main.c	2008-04-11 17:14:32.000000000 +0200
+++ linux-2.6.25-rc8-mm1/init/main.c	2008-04-11 18:11:01.000000000 +0200
@@ -60,6 +60,7 @@
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/idr.h>
+#include <linux/ridr.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -636,6 +637,7 @@ asmlinkage void __init start_kernel(void
 	security_init();
 	vfs_caches_init(num_physpages);
 	radix_tree_init();
+	ridr_init_cache();
 	signals_init();
 	/* rootfs populating might need page-writeback */
 	page_writeback_init();

--