Commit a4a264f1 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

ppc64: use usercopy_64.c from powerpc/lib 



since it is identical to usercopy.c from ppc64/lib.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent a2b0ca84

arch/powerpc/lib/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ 


ifeq ($(CONFIG_PPC_MERGE),y)

obj-y			:= string.o

obj-$(CONFIG_PPC64)	+= usercopy_64.o mem_64.o

obj-$(CONFIG_PPC64)	+= mem_64.o

endif



obj-y			+= strcase.o

obj-$(CONFIG_PPC32)	+= div64.o copy_32.o checksum_32.o

obj-$(CONFIG_PPC64)	+= checksum_64.o copypage_64.o copyuser_64.o \

			   memcpy_64.o

			   memcpy_64.o usercopy_64.o

obj-$(CONFIG_PPC_ISERIES) += e2a.o

ifeq ($(CONFIG_PPC64),y)

obj-$(CONFIG_SMP)	+= locks.o

arch/ppc64/lib/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,4 +3,3 @@ 
#



lib-y := string.o
 
lib-y += usercopy.o

arch/ppc64/lib/usercopy.c

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * Functions which are too large to be inlined.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */

#include <linux/module.h>

#include <asm/uaccess.h>



unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)

{

	if (likely(access_ok(VERIFY_READ, from, n)))

		n = __copy_from_user(to, from, n);

	else

		memset(to, 0, n);

	return n;

}



unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)

{

	if (likely(access_ok(VERIFY_WRITE, to, n)))

		n = __copy_to_user(to, from, n);

	return n;

}



unsigned long copy_in_user(void __user *to, const void __user *from,

			   unsigned long n)

{

	might_sleep();

	if (likely(access_ok(VERIFY_READ, from, n) &&

	    access_ok(VERIFY_WRITE, to, n)))

		n =__copy_tofrom_user(to, from, n);

	return n;

}



EXPORT_SYMBOL(copy_from_user);

EXPORT_SYMBOL(copy_to_user);

EXPORT_SYMBOL(copy_in_user);