Commit 622e6969 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[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: default avatarJeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent af84eab2
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
#define u32 uint32_t #define u32 uint32_t
#endif #endif
#include "sysdep/ptrace.h"
#define MCONSOLE_MAGIC (0xcafebabe) #define MCONSOLE_MAGIC (0xcafebabe)
#define MCONSOLE_MAX_DATA (512) #define MCONSOLE_MAX_DATA (512)
#define MCONSOLE_VERSION 2 #define MCONSOLE_VERSION 2
......
...@@ -394,7 +394,8 @@ static short * host_ldt_entries = NULL; ...@@ -394,7 +394,8 @@ static short * host_ldt_entries = NULL;
static void ldt_get_host_info(void) static void ldt_get_host_info(void)
{ {
long ret; long ret;
struct ldt_entry * ldt, *tmp; struct ldt_entry * ldt;
short *tmp;
int i, size, k, order; int i, size, k, order;
spin_lock(&host_ldt_lock); spin_lock(&host_ldt_lock);
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "hostfs.h" #include "hostfs.h"
#include "kern_util.h" #include "kern_util.h"
#include "kern.h" #include "kern.h"
#include "user_util.h"
#include "init.h" #include "init.h"
struct hostfs_inode_info { struct hostfs_inode_info {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment