Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / src / patches / linux-2.6.32.8-xen-patch-fixes.patch

diff -Naur linux-2.6.32.8.org/init/main.c linux-2.6.32.8/init/main.c
--- linux-2.6.32.8.org/init/main.c	2010-02-17 20:30:17.000000000 +0100
+++ linux-2.6.32.8/init/main.c	2010-02-17 22:00:48.000000000 +0100
@@ -90,9 +90,6 @@
 extern void prio_tree_init(void);
 extern void radix_tree_init(void);
 extern void free_initmem(void);
-#ifndef CONFIG_DEBUG_RODATA
-static inline void mark_rodata_ro(void) { }
-#endif
 
 #ifdef CONFIG_TC
 extern void tc_init(void);