diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
| commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
| tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /arch/um/include/um_uaccess.h | |
| parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/um/include/um_uaccess.h')
| -rw-r--r-- | arch/um/include/um_uaccess.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/include/um_uaccess.h b/arch/um/include/um_uaccess.h index 2b6fc8e0f071..45c04999d670 100644 --- a/arch/um/include/um_uaccess.h +++ b/arch/um/include/um_uaccess.h | |||
| @@ -34,7 +34,6 @@ extern int copy_to_user(void __user *to, const void *from, int n); | |||
| 34 | 34 | ||
| 35 | extern int __do_copy_to_user(void *to, const void *from, int n, | 35 | extern int __do_copy_to_user(void *to, const void *from, int n, |
| 36 | void **fault_addr, jmp_buf **fault_catcher); | 36 | void **fault_addr, jmp_buf **fault_catcher); |
| 37 | extern void __do_copy(void *to, const void *from, int n); | ||
| 38 | 37 | ||
| 39 | /* | 38 | /* |
| 40 | * strncpy_from_user: - Copy a NUL terminated string from userspace. | 39 | * strncpy_from_user: - Copy a NUL terminated string from userspace. |