diff --git a/[refs] b/[refs] index 6fa92f502b27..74729d2d3705 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7eb5e98f45e88762676744f1ab0f7f4c1354fb9 +refs/heads/master: a856413e26785ea5585c06b1aa773ed44bc116aa diff --git a/trunk/arch/x86_64/lib/Makefile b/trunk/arch/x86_64/lib/Makefile index 3e12aa58d453..430be2c1a59b 100644 --- a/trunk/arch/x86_64/lib/Makefile +++ b/trunk/arch/x86_64/lib/Makefile @@ -8,6 +8,6 @@ obj-y := io.o iomap_copy_64.o obj-$(CONFIG_SMP) += msr-on-cpu.o lib-y := csum-partial.o csum-copy_64.o csum-wrappers_64.o delay.o \ - usercopy_64.o getuser_64.o putuser.o \ + usercopy_64.o getuser_64.o putuser_64.o \ thunk_64.o clear_page_64.o copy_page_64.o bitstr_64.o bitops_64.o lib-y += memcpy_64.o memmove_64.o memset.o copy_user.o rwlock_64.o copy_user_nocache_64.o diff --git a/trunk/arch/x86_64/lib/putuser.S b/trunk/arch/x86_64/lib/putuser_64.S similarity index 100% rename from trunk/arch/x86_64/lib/putuser.S rename to trunk/arch/x86_64/lib/putuser_64.S