s390: remove "64" suffix from mem64.S and swsusp_asm64.S

Rename two more files which I forgot. Also remove the "asm" from the
swsusp_asm64.S file, since the ".S" suffix already makes it obvious
that this file contains assembler code.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index a6d0b9d..ffb8761 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -40,7 +40,7 @@ extra-y                               += head.o head64.o vmlinux.lds
 obj-$(CONFIG_MODULES)          += s390_ksyms.o module.o
 obj-$(CONFIG_SMP)              += smp.o
 obj-$(CONFIG_SCHED_BOOK)       += topology.o
-obj-$(CONFIG_HIBERNATION)      += suspend.o swsusp_asm64.o
+obj-$(CONFIG_HIBERNATION)      += suspend.o swsusp.o
 obj-$(CONFIG_AUDIT)            += audit.o
 compat-obj-$(CONFIG_AUDIT)     += compat_audit.o
 obj-$(CONFIG_COMPAT)           += compat_linux.o compat_signal.o

diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp.S
similarity index 100%
rename from arch/s390/kernel/swsusp_asm64.S
rename to arch/s390/kernel/swsusp.S

diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
index 15536da..0e8fefe 100644 (file)
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
@@ -3,7 +3,7 @@
 #
 
 lib-y += delay.o string.o uaccess.o find.o
-obj-y += mem64.o
+obj-y += mem.o
 lib-$(CONFIG_SMP) += spinlock.o
 lib-$(CONFIG_KPROBES) += probes.o
 lib-$(CONFIG_UPROBES) += probes.o

diff --git a/arch/s390/lib/mem64.S b/arch/s390/lib/mem.S
similarity index 100%
rename from arch/s390/lib/mem64.S
rename to arch/s390/lib/mem.S