Skip to content

Commit

Permalink
[PATCH] uml: fix compilation problems
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Mar 29, 2007
1 parent af84eab commit 622e696
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions arch/um/include/mconsole.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion arch/um/sys-i386/ldt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion fs/hostfs/hostfs_kern.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 622e696

Please sign in to comment.