[S390] move sysinfo.c from drivers/s390 to arch/s390/kernel

[firefly-linux-kernel-4.4.55.git] / arch / s390 / kernel / Makefile

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 50f657e773449e29d1fa2d64ad5c8e87047f9bd2..33e7aee705133e9275d595f6cf97c7bb8db29a37 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -2,6 +2,11 @@
 # Makefile for the linux kernel.
 #
 
+ifdef CONFIG_FUNCTION_TRACER
+# Do not trace early boot code
+CFLAGS_REMOVE_early.o = -pg
+endif
+
 #
 # Passing null pointers is ok for smp code, since we access the lowcore here.
 #
@@ -12,9 +17,12 @@ CFLAGS_smp.o := -Wno-nonnull
 #
 CFLAGS_ptrace.o                += -DUTS_MACHINE='"$(UTS_MACHINE)"'
 
-obj-y  :=  bitmap.o traps.o time.o process.o base.o early.o \
-            setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
-           s390_ext.o debug.o irq.o ipl.o dis.o diag.o mem_detect.o
+CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w
+
+obj-y  :=  bitmap.o traps.o time.o process.o base.o early.o setup.o \
+           processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
+           s390_ext.o debug.o irq.o ipl.o dis.o diag.o mem_detect.o \
+           vdso.o vtime.o sysinfo.o
 
 obj-y  += $(if $(CONFIG_64BIT),entry64.o,entry.o)
 obj-y  += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
@@ -30,12 +38,16 @@ obj-$(CONFIG_COMPAT)                += compat_linux.o compat_signal.o \
                                        compat_wrapper.o compat_exec_domain.o \
                                        $(compat-obj-y)
 
-obj-$(CONFIG_VIRT_TIMER)       += vtime.o
 obj-$(CONFIG_STACKTRACE)       += stacktrace.o
 obj-$(CONFIG_KPROBES)          += kprobes.o
+obj-$(CONFIG_FUNCTION_TRACER)  += mcount.o
 
 # Kexec part
 S390_KEXEC_OBJS := machine_kexec.o crash.o
 S390_KEXEC_OBJS += $(if $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o)
 obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)
 
+# vdso
+obj-$(CONFIG_64BIT)            += vdso64/
+obj-$(CONFIG_32BIT)            += vdso32/
+obj-$(CONFIG_COMPAT)           += vdso32/