diff options
| author | Steven Whitehouse <steve@men-an-tol.chygwyn.com> | 2006-02-23 04:49:43 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-23 04:49:43 -0500 |
| commit | d35462b4bb847b68321c55e95c926aa485aecce2 (patch) | |
| tree | b08e18bf6e672633402871ee763102fdb5e63229 /arch/um/sys-i386/ldt.c | |
| parent | 91ffd7db71e7451f89941a8f428b4daa2a7c1e38 (diff) | |
| parent | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/um/sys-i386/ldt.c')
| -rw-r--r-- | arch/um/sys-i386/ldt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c index 0cdfd4481d5e..1fa09a79a10b 100644 --- a/arch/um/sys-i386/ldt.c +++ b/arch/um/sys-i386/ldt.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include "choose-mode.h" | 16 | #include "choose-mode.h" |
| 17 | #include "kern.h" | 17 | #include "kern.h" |
| 18 | #include "mode_kern.h" | 18 | #include "mode_kern.h" |
| 19 | #include "proc_mm.h" | ||
| 20 | #include "os.h" | 19 | #include "os.h" |
| 21 | 20 | ||
| 22 | extern int modify_ldt(int func, void *ptr, unsigned long bytecount); | 21 | extern int modify_ldt(int func, void *ptr, unsigned long bytecount); |
| @@ -90,6 +89,7 @@ out: | |||
| 90 | #include "skas.h" | 89 | #include "skas.h" |
| 91 | #include "skas_ptrace.h" | 90 | #include "skas_ptrace.h" |
| 92 | #include "asm/mmu_context.h" | 91 | #include "asm/mmu_context.h" |
| 92 | #include "proc_mm.h" | ||
| 93 | 93 | ||
| 94 | long write_ldt_entry(struct mm_id * mm_idp, int func, struct user_desc * desc, | 94 | long write_ldt_entry(struct mm_id * mm_idp, int func, struct user_desc * desc, |
| 95 | void **addr, int done) | 95 | void **addr, int done) |