Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / s390 / kernel / Makefile

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 9269b5788facaf1ce05d7d5dcdc52b55b83d62c9..a81881c9b29760dee818bcff9f3baf348af1b0b7 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -4,9 +4,9 @@
 
 EXTRA_AFLAGS   := -traditional
 
-obj-y  :=  bitmap.o traps.o time.o process.o \
+obj-y  :=  bitmap.o traps.o time.o process.o reset.o \
             setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
-            semaphore.o s390_ext.o debug.o profile.o irq.o reipl_diag.o
+           semaphore.o s390_ext.o debug.o profile.o irq.o ipl.o
 
 obj-y  += $(if $(CONFIG_64BIT),entry64.o,entry.o)
 obj-y  += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
@@ -16,11 +16,15 @@ extra-y                             += head.o init_task.o vmlinux.lds
 obj-$(CONFIG_MODULES)          += s390_ksyms.o module.o
 obj-$(CONFIG_SMP)              += smp.o
 
+obj-$(CONFIG_AUDIT)            += audit.o
+compat-obj-$(CONFIG_AUDIT)     += compat_audit.o
 obj-$(CONFIG_COMPAT)           += compat_linux.o compat_signal.o \
-                                       compat_wrapper.o compat_exec_domain.o
-obj-$(CONFIG_BINFMT_ELF32)     += binfmt_elf32.o
+                                       compat_wrapper.o compat_exec_domain.o \
+                                       binfmt_elf32.o $(compat-obj-y)
 
 obj-$(CONFIG_VIRT_TIMER)       += vtime.o
+obj-$(CONFIG_STACKTRACE)       += stacktrace.o
+obj-$(CONFIG_KPROBES)          += kprobes.o
 
 # Kexec part
 S390_KEXEC_OBJS := machine_kexec.o crash.o