summaryrefslogtreecommitdiffstats
path: root/arch/um/sys-i386/ldt.c
diff options
context:
space:
mode:
authorJeff Dike2007-03-29 10:20:32 +0200
committerLinus Torvalds2007-03-29 17:22:25 +0200
commit622e696938c6a9c5357d2ec4a07ed2f27d56925a (patch)
tree6ec16e38f83381d44ce4ec9391228a65e88ea7eb /arch/um/sys-i386/ldt.c
parent[PATCH] uml: fix LVM crash (diff)
downloadkernel-qcow2-linux-622e696938c6a9c5357d2ec4a07ed2f27d56925a.tar.gz
kernel-qcow2-linux-622e696938c6a9c5357d2ec4a07ed2f27d56925a.tar.xz
kernel-qcow2-linux-622e696938c6a9c5357d2ec4a07ed2f27d56925a.zip
[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>
Diffstat (limited to 'arch/um/sys-i386/ldt.c')
-rw-r--r--arch/um/sys-i386/ldt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index 4a8b4202ef9e..a939a7ef0227 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);