commit 6c2d458680d49d939ffd4b4cdc84d9e004d65910
author Glauber Costa <gcosta@redhat.com> Tue Jun 24 12:05:11 2008 -0300
committer Ingo Molnar <mingo@elte.hu> Wed Jul 09 09:14:05 2008 +0200
tree 074be66f819fdf326e8480139a01e489f5a41929
parent 87e2f1e7f6ab66306320403d4502d7938d3c703e

x86: merge getuser asm functions.

getuser_32.S and getuser_64.S are merged into getuser.S.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/lib/Makefile

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 86960a6..e929482 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -5,7 +5,7 @@
 obj-$(CONFIG_SMP) := msr-on-cpu.o
 
 lib-y := delay.o
-lib-y += usercopy_$(BITS).o getuser_$(BITS).o putuser_$(BITS).o
+lib-y += usercopy_$(BITS).o getuser.o putuser_$(BITS).o
 lib-y += memcpy_$(BITS).o
 
 ifeq ($(CONFIG_X86_32),y)