Commit 908d6d81 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] sparse: amd64 - more trivial annotations

parent 7c3f26b7
This diff is collapsed.
...@@ -28,7 +28,7 @@ static int get_free_idx(void) ...@@ -28,7 +28,7 @@ static int get_free_idx(void)
* Set a given TLS descriptor: * Set a given TLS descriptor:
* When you want addresses > 32bit use arch_prctl() * When you want addresses > 32bit use arch_prctl()
*/ */
int do_set_thread_area(struct thread_struct *t, struct user_desc *u_info) int do_set_thread_area(struct thread_struct *t, struct user_desc __user *u_info)
{ {
struct user_desc info; struct user_desc info;
struct n_desc_struct *desc; struct n_desc_struct *desc;
...@@ -75,7 +75,7 @@ int do_set_thread_area(struct thread_struct *t, struct user_desc *u_info) ...@@ -75,7 +75,7 @@ int do_set_thread_area(struct thread_struct *t, struct user_desc *u_info)
return 0; return 0;
} }
asmlinkage long sys32_set_thread_area(struct user_desc *u_info) asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info)
{ {
return do_set_thread_area(&current->thread, u_info); return do_set_thread_area(&current->thread, u_info);
} }
...@@ -102,7 +102,7 @@ asmlinkage long sys32_set_thread_area(struct user_desc *u_info) ...@@ -102,7 +102,7 @@ asmlinkage long sys32_set_thread_area(struct user_desc *u_info)
#define GET_USEABLE(desc) (((desc)->b >> 20) & 1) #define GET_USEABLE(desc) (((desc)->b >> 20) & 1)
#define GET_LONGMODE(desc) (((desc)->b >> 21) & 1) #define GET_LONGMODE(desc) (((desc)->b >> 21) & 1)
int do_get_thread_area(struct thread_struct *t, struct user_desc *u_info) int do_get_thread_area(struct thread_struct *t, struct user_desc __user *u_info)
{ {
struct user_desc info; struct user_desc info;
struct n_desc_struct *desc; struct n_desc_struct *desc;
...@@ -132,7 +132,7 @@ int do_get_thread_area(struct thread_struct *t, struct user_desc *u_info) ...@@ -132,7 +132,7 @@ int do_get_thread_area(struct thread_struct *t, struct user_desc *u_info)
return 0; return 0;
} }
asmlinkage long sys32_get_thread_area(struct user_desc *u_info) asmlinkage long sys32_get_thread_area(struct user_desc __user *u_info)
{ {
return do_get_thread_area(&current->thread, u_info); return do_get_thread_area(&current->thread, u_info);
} }
...@@ -141,10 +141,11 @@ asmlinkage long sys32_get_thread_area(struct user_desc *u_info) ...@@ -141,10 +141,11 @@ asmlinkage long sys32_get_thread_area(struct user_desc *u_info)
int ia32_child_tls(struct task_struct *p, struct pt_regs *childregs) int ia32_child_tls(struct task_struct *p, struct pt_regs *childregs)
{ {
struct n_desc_struct *desc; struct n_desc_struct *desc;
struct user_desc info, *cp; struct user_desc info;
struct user_desc __user *cp;
int idx; int idx;
cp = (void *)childregs->rsi; cp = (void __user *)childregs->rsi;
if (copy_from_user(&info, cp, sizeof(info))) if (copy_from_user(&info, cp, sizeof(info)))
return -EFAULT; return -EFAULT;
if (LDT_empty(&info)) if (LDT_empty(&info))
......
...@@ -139,9 +139,9 @@ extern unsigned long csum_partial_copy_generic(const char *src, const char *dst, ...@@ -139,9 +139,9 @@ extern unsigned long csum_partial_copy_generic(const char *src, const char *dst,
int *src_err_ptr, int *dst_err_ptr); int *src_err_ptr, int *dst_err_ptr);
extern unsigned int csum_partial_copy_from_user(const char *src, char *dst, extern unsigned int csum_partial_copy_from_user(const char __user *src, char *dst,
int len, unsigned int isum, int *errp); int len, unsigned int isum, int *errp);
extern unsigned int csum_partial_copy_to_user(const char *src, char *dst, extern unsigned int csum_partial_copy_to_user(const char *src, char __user *dst,
int len, unsigned int isum, int *errp); int len, unsigned int isum, int *errp);
extern unsigned int csum_partial_copy_nocheck(const char *src, char *dst, int len, extern unsigned int csum_partial_copy_nocheck(const char *src, char *dst, int len,
unsigned int sum); unsigned int sum);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment