diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-03-29 01:20:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-29 08:22:25 -0700 |
| commit | 622e696938c6a9c5357d2ec4a07ed2f27d56925a (patch) | |
| tree | 6ec16e38f83381d44ce4ec9391228a65e88ea7eb | |
| parent | af84eab208916acad91f6342bbd57bc865caf150 (diff) | |
| download | op-kernel-dev-622e696938c6a9c5357d2ec4a07ed2f27d56925a.zip op-kernel-dev-622e696938c6a9c5357d2ec4a07ed2f27d56925a.tar.gz | |
[PATCH] uml: fix compilation problems
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>
| -rw-r--r-- | arch/um/include/mconsole.h | 2 | ||||
| -rw-r--r-- | arch/um/sys-i386/ldt.c | 3 | ||||
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/um/include/mconsole.h b/arch/um/include/mconsole.h index 2666815..b282839 100644 --- a/arch/um/include/mconsole.h +++ b/arch/um/include/mconsole.h @@ -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 diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c index 4a8b420..a939a7e 100644 --- a/arch/um/sys-i386/ldt.c +++ b/arch/um/sys-i386/ldt.c @@ -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); diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 9baf697..a2667db 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -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 { |
