]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] uml: fix compilation problems
authorJeff Dike <jdike@addtoit.com>
Thu, 29 Mar 2007 08:20:32 +0000 (01:20 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 29 Mar 2007 15:22:25 +0000 (08:22 -0700)
Fix a few miscellaneous compilation problems -
an assignment with mismatched types in ldt.c
a missing include in mconsole.h which needs a definition of uml_pt_regs
I missed removing an include of user_util.h in hostfs

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/um/include/mconsole.h
arch/um/sys-i386/ldt.c
fs/hostfs/hostfs_kern.c

index 2666815b6af57130cce633c759f0e8d86ebf9d12..b282839c16255b7db3e51851ce175d4b185047e9 100644 (file)
@@ -12,6 +12,8 @@
 #define u32 uint32_t
 #endif
 
+#include "sysdep/ptrace.h"
+
 #define MCONSOLE_MAGIC (0xcafebabe)
 #define MCONSOLE_MAX_DATA (512)
 #define MCONSOLE_VERSION 2
index 4a8b4202ef9e9f239102db00d00ba4a01391dd7b..a939a7ef02274eff96f5e3ca46d3e14772b80975 100644 (file)
@@ -394,7 +394,8 @@ static short * host_ldt_entries = NULL;
 static void ldt_get_host_info(void)
 {
        long ret;
-       struct ldt_entry * ldt, *tmp;
+       struct ldt_entry * ldt;
+       short *tmp;
        int i, size, k, order;
 
        spin_lock(&host_ldt_lock);
index 9baf69773ed119c2144bdb228ea592a715cec1f5..a2667db9f6b9fee0e93dbeec29305ff958d5111a 100644 (file)
@@ -20,7 +20,6 @@
 #include "hostfs.h"
 #include "kern_util.h"
 #include "kern.h"
-#include "user_util.h"
 #include "init.h"
 
 struct hostfs_inode_info {