Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/um/include/mconsole.h

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/um/sys-i386/ldt.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

fs/hostfs/hostfs_kern.c

+0 −1
Original line number Diff line number Diff line
@@ -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 {