diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
| commit | 76467874b83835129dc454e3a7a8e5d1186101b0 (patch) | |
| tree | 162129f0c36c35be4aa323cf00626db0e804c3fc /arch/um/kernel/syscall_kern.c | |
| parent | 8628de0583504138551a05ad44ca388467f0f552 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/um/kernel/syscall_kern.c')
| -rw-r--r-- | arch/um/kernel/syscall_kern.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/syscall_kern.c b/arch/um/kernel/syscall_kern.c index 8e1a3501ff46..37d3978337d8 100644 --- a/arch/um/kernel/syscall_kern.c +++ b/arch/um/kernel/syscall_kern.c | |||
| @@ -104,7 +104,7 @@ long sys_pipe(unsigned long __user * fildes) | |||
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | 106 | ||
| 107 | long sys_uname(struct old_utsname * name) | 107 | long sys_uname(struct old_utsname __user * name) |
| 108 | { | 108 | { |
| 109 | long err; | 109 | long err; |
| 110 | if (!name) | 110 | if (!name) |
| @@ -115,7 +115,7 @@ long sys_uname(struct old_utsname * name) | |||
| 115 | return err?-EFAULT:0; | 115 | return err?-EFAULT:0; |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | long sys_olduname(struct oldold_utsname * name) | 118 | long sys_olduname(struct oldold_utsname __user * name) |
| 119 | { | 119 | { |
| 120 | long error; | 120 | long error; |
| 121 | 121 | ||