git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
ldt.c
diff --git
a/arch/i386/kernel/ldt.c
b/arch/i386/kernel/ldt.c
index
fe1ffa5
..
b410e5f
100644
(file)
--- a/
arch/i386/kernel/ldt.c
+++ b/
arch/i386/kernel/ldt.c
@@
-1,5
+1,5
@@
/*
/*
- * linux/kernel/ldt.c
+ * linux/
arch/i386/
kernel/ldt.c
*
* Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
*
* Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
* Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
@@
-18,6
+18,7
@@
#include <asm/system.h>
#include <asm/ldt.h>
#include <asm/desc.h>
#include <asm/system.h>
#include <asm/ldt.h>
#include <asm/desc.h>
+#include <asm/mmu_context.h>
#ifdef CONFIG_SMP /* avoids "defined but not used" warnig */
static void flush_ldt(void *null)
#ifdef CONFIG_SMP /* avoids "defined but not used" warnig */
static void flush_ldt(void *null)
@@
-159,16
+160,14
@@
static int read_default_ldt(void __user * ptr, unsigned long bytecount)
{
int err;
unsigned long size;
{
int err;
unsigned long size;
- void *address;
err = 0;
err = 0;
- address = &default_ldt[0];
size = 5*sizeof(struct desc_struct);
if (size > bytecount)
size = bytecount;
err = size;
size = 5*sizeof(struct desc_struct);
if (size > bytecount)
size = bytecount;
err = size;
- if (c
opy_to_user(ptr, address
, size))
+ if (c
lear_user(ptr
, size))
err = -EFAULT;
return err;
err = -EFAULT;
return err;