Commit b71f1bf5 authored by Al Viro's avatar Al Viro
Browse files

cris: rename __copy_user_zeroing to __copy_user_in 



... now that it doesn't zero anymore

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent de09be34

arch/cris/arch-v10/lib/usercopy.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -188,11 +188,10 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, unsigned long pn) 
}

}

EXPORT_SYMBOL(__copy_user);

EXPORT_SYMBOL(__copy_user);





/* Copy from user to kernel, zeroing the bytes that were inaccessible in

/* Copy from user to kernel.  The return-value is the number of bytes that were

   userland.  The return-value is the number of bytes that were

   inaccessible.  */

   inaccessible.  */





unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc,

unsigned long __copy_user_in(void *pdst, const void __user *psrc,

				  unsigned long pn)

				  unsigned long pn)

{

{

  /* We want the parameters put in special registers.

  /* We want the parameters put in special registers.
@@ -357,7 +356,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, 
exception:

exception:

  return retn + n;

  return retn + n;

}

}

EXPORT_SYMBOL(__copy_user_zeroing);

EXPORT_SYMBOL(__copy_user_in);





/* Zero userspace.  */

/* Zero userspace.  */

unsigned long __do_clear_user(void __user *pto, unsigned long pn)

unsigned long __do_clear_user(void __user *pto, unsigned long pn)

arch/cris/arch-v32/lib/usercopy.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -156,10 +156,9 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, unsigned long pn) 
}

}

EXPORT_SYMBOL(__copy_user);

EXPORT_SYMBOL(__copy_user);





/* Copy from user to kernel, zeroing the bytes that were inaccessible in

/* Copy from user to kernel.  The return-value is the number of bytes that were

   userland.  The return-value is the number of bytes that were

   inaccessible.  */

   inaccessible.  */

unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc,

unsigned long __copy_user_in(void *pdst, const void __user *psrc,

				  unsigned long pn)

				  unsigned long pn)

{

{

  /* We want the parameters put in special registers.

  /* We want the parameters put in special registers.
@@ -309,7 +308,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, 
exception:

exception:

  return retn + n;

  return retn + n;

}

}

EXPORT_SYMBOL(__copy_user_zeroing);

EXPORT_SYMBOL(__copy_user_in);





/* Zero userspace.  */

/* Zero userspace.  */

unsigned long __do_clear_user(void __user *pto, unsigned long pn)

unsigned long __do_clear_user(void __user *pto, unsigned long pn)

arch/cris/include/asm/uaccess.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -169,7 +169,7 @@ extern long __get_user_bad(void); 
   live in lib/usercopy.c  */

   live in lib/usercopy.c  */





extern unsigned long __copy_user(void __user *to, const void *from, unsigned long n);

extern unsigned long __copy_user(void __user *to, const void *from, unsigned long n);

extern unsigned long __copy_user_zeroing(void *to, const void __user *from, unsigned long n);

extern unsigned long __copy_user_in(void *to, const void __user *from, unsigned long n);

extern unsigned long __do_clear_user(void __user *to, unsigned long n);

extern unsigned long __do_clear_user(void __user *to, unsigned long n);





static inline long

static inline long
@@ -236,7 +236,7 @@ __constant_copy_from_user(void *to, const void __user *from, unsigned long n) 
	else if (n == 24)

	else if (n == 24)

		__asm_copy_from_user_24(to, from, ret);

		__asm_copy_from_user_24(to, from, ret);

	else

	else

		ret = __copy_user_zeroing(to, from, n);

		ret = __copy_user_in(to, from, n);





	return ret;

	return ret;

}

}
@@ -343,7 +343,7 @@ static inline size_t copy_from_user(void *to, const void __user *from, size_t n) 
		if (__builtin_constant_p(n))

		if (__builtin_constant_p(n))

			res = __constant_copy_from_user(to, from, n);

			res = __constant_copy_from_user(to, from, n);

		else

		else

			res = __copy_user_zeroing(to, from, n);

			res = __copy_user_in(to, from, n);

	}

	}

	if (unlikely(res))

	if (unlikely(res))

		memset(to + n - res , 0, res);

		memset(to + n - res , 0, res);
@@ -368,7 +368,7 @@ static inline unsigned long 
__generic_copy_from_user_nocheck(void *to, const void __user *from,

__generic_copy_from_user_nocheck(void *to, const void __user *from,

				 unsigned long n)

				 unsigned long n)

{

{

	return __copy_user_zeroing(to, from, n);

	return __copy_user_in(to, from, n);

}

}





static inline unsigned long

static inline unsigned long