[uml-devel] [PATCH] uml compile fixes

[Alexander van Heukelum <heukelum@mailshack.com>]

Hi all,

I need the following two changes to get my favourite uml config
to compile (and run):

make ARCH=um SUBARCH=i386 KCONFIG_ALLCONFIG=mini.config allnoconfig

with mini.config:
CONFIG_BINFMT_ELF=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE="../initramfs"
CONFIG_EMBEDDED=y
CONFIG_KALLSYMS=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_SLOB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_XTERM_CHAN=y
CONFIG_PROC_FS=y
CONFIG_SYSFS=y

Please review/comment (or create a better patch for this yourself!).

(If you need one:) 
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>

diff --git a/arch/um/include/um_malloc.h b/arch/um/include/um_malloc.h
index 0ad17cb..e5b09fa 100644
--- a/arch/um/include/um_malloc.h
+++ b/arch/um/include/um_malloc.h
@@ -8,11 +8,19 @@
 
 #include "kern_constants.h"
 
+#ifdef UML_CONFIG_SLOB
+extern void *__kmalloc_node(int size, int flags, int node);
+static inline void *kmalloc(int size, int flags)
+{
+	return __kmalloc_node(size, flags, -1);
+}
+#else
 extern void *__kmalloc(int size, int flags);
 static inline void *kmalloc(int size, int flags)
 {
 	return __kmalloc(size, flags);
 }
+#endif
 
 extern void kfree(const void *ptr);
 
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
diff --git a/include/asm-um/tlb.h b/include/asm-um/tlb.h
index 39fc475..7febf85 100644
--- a/include/asm-um/tlb.h
+++ b/include/asm-um/tlb.h
@@ -2,6 +2,7 @@
 #define __UM_TLB_H
 
 #include <linux/swap.h>
+#include <linux/pagemap.h>
 #include <asm/percpu.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel