diff options
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/sys-x86_64/syscall_table.c | 5 | ||||
-rw-r--r-- | arch/um/sys-x86_64/syscalls.c | 14 |
2 files changed, 0 insertions, 19 deletions
diff --git a/arch/um/sys-x86_64/syscall_table.c b/arch/um/sys-x86_64/syscall_table.c index dd21d69715e6..47d469e7e7ce 100644 --- a/arch/um/sys-x86_64/syscall_table.c +++ b/arch/um/sys-x86_64/syscall_table.c | |||
@@ -26,11 +26,6 @@ | |||
26 | 26 | ||
27 | /* On UML we call it this way ("old" means it's not mmap2) */ | 27 | /* On UML we call it this way ("old" means it's not mmap2) */ |
28 | #define sys_mmap old_mmap | 28 | #define sys_mmap old_mmap |
29 | /* | ||
30 | * On x86-64 sys_uname is actually sys_newuname plus a compatibility trick. | ||
31 | * See arch/x86_64/kernel/sys_x86_64.c | ||
32 | */ | ||
33 | #define sys_uname sys_uname64 | ||
34 | 29 | ||
35 | #define stub_clone sys_clone | 30 | #define stub_clone sys_clone |
36 | #define stub_fork sys_fork | 31 | #define stub_fork sys_fork |
diff --git a/arch/um/sys-x86_64/syscalls.c b/arch/um/sys-x86_64/syscalls.c index f1199fd34d38..f3d82bb6e15a 100644 --- a/arch/um/sys-x86_64/syscalls.c +++ b/arch/um/sys-x86_64/syscalls.c | |||
@@ -12,20 +12,6 @@ | |||
12 | #include "asm/uaccess.h" | 12 | #include "asm/uaccess.h" |
13 | #include "os.h" | 13 | #include "os.h" |
14 | 14 | ||
15 | asmlinkage long sys_uname64(struct new_utsname __user * name) | ||
16 | { | ||
17 | int err; | ||
18 | |||
19 | down_read(&uts_sem); | ||
20 | err = copy_to_user(name, utsname(), sizeof (*name)); | ||
21 | up_read(&uts_sem); | ||
22 | |||
23 | if (personality(current->personality) == PER_LINUX32) | ||
24 | err |= copy_to_user(&name->machine, "i686", 5); | ||
25 | |||
26 | return err ? -EFAULT : 0; | ||
27 | } | ||
28 | |||
29 | long arch_prctl(struct task_struct *task, int code, unsigned long __user *addr) | 15 | long arch_prctl(struct task_struct *task, int code, unsigned long __user *addr) |
30 | { | 16 | { |
31 | unsigned long *ptr = addr, tmp; | 17 | unsigned long *ptr = addr, tmp; |