diff --git a/[refs] b/[refs] index b01ca5131501..3f9eaa1a26c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9954d39e7d8b2f12517aa02d4d7b96eb4761a1d +refs/heads/master: 0068f260578fc54aa7d10bb3e4a25118287f00f7 diff --git a/trunk/arch/x86_64/lib/Makefile b/trunk/arch/x86_64/lib/Makefile index 4ecc6181db4d..4611996706a3 100644 --- a/trunk/arch/x86_64/lib/Makefile +++ b/trunk/arch/x86_64/lib/Makefile @@ -9,5 +9,5 @@ obj-$(CONFIG_SMP) += msr-on-cpu.o lib-y := csum-partial.o csum-copy_64.o csum-wrappers.o delay.o \ usercopy.o getuser.o putuser.o \ - thunk_64.o clear_page.o copy_page_64.o bitstr_64.o bitops.o + thunk_64.o clear_page_64.o copy_page_64.o bitstr_64.o bitops.o lib-y += memcpy.o memmove.o memset.o copy_user.o rwlock.o copy_user_nocache.o diff --git a/trunk/arch/x86_64/lib/clear_page.S b/trunk/arch/x86_64/lib/clear_page_64.S similarity index 100% rename from trunk/arch/x86_64/lib/clear_page.S rename to trunk/arch/x86_64/lib/clear_page_64.S