diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 03:13:38 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 03:13:38 +0300 |
| commit | cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed (patch) | |
| tree | a56d5024a453bb323039f7c481ac17738269e24f /arch/x86/um | |
| parent | 047e6646579c2853afba0111f573796daf4fd485 (diff) | |
| parent | 32b88194f71d6ae7768a29f87fbba454728273ee (diff) | |
| download | linux-cf516d08eceb4c442f0f2f1a73ebf994b1dbf0ed.tar.xz | |
Merge 4.3-rc7 into staging-next
We want the other staging patches in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/um')
| -rw-r--r-- | arch/x86/um/ldt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/um/ldt.c b/arch/x86/um/ldt.c index 9701a4fd7bf2..836a1eb5df43 100644 --- a/arch/x86/um/ldt.c +++ b/arch/x86/um/ldt.c @@ -12,7 +12,10 @@ #include <skas.h> #include <sysdep/tls.h> -extern int modify_ldt(int func, void *ptr, unsigned long bytecount); +static inline int modify_ldt (int func, void *ptr, unsigned long bytecount) +{ + return syscall(__NR_modify_ldt, func, ptr, bytecount); +} static long write_ldt_entry(struct mm_id *mm_idp, int func, struct user_desc *desc, void **addr, int done) |