ARC: mm: vmalloc sync from kernel to user table to update PMD ...

[linux-2.6-microblaze.git] / arch / s390 / Makefile

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 098abe3..1e31728 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -129,9 +129,6 @@ OBJCOPYFLAGS        := -O binary
 
 head-y         := arch/s390/kernel/head64.o
 
-# See arch/s390/Kbuild for content of core part of the kernel
-core-y         += arch/s390/
-
 libs-y         += arch/s390/lib/
 drivers-y      += drivers/s390/
 
@@ -166,6 +163,19 @@ archheaders:
 archprepare:
        $(Q)$(MAKE) $(build)=$(syscalls) kapi
        $(Q)$(MAKE) $(build)=$(tools) kapi
+ifeq ($(KBUILD_EXTMOD),)
+# We need to generate vdso-offsets.h before compiling certain files in kernel/.
+# In order to do that, we should use the archprepare target, but we can't since
+# asm-offsets.h is included in some files used to generate vdso-offsets.h, and
+# asm-offsets.h is built in prepare0, for which archprepare is a dependency.
+# Therefore we need to generate the header after prepare0 has been made, hence
+# this hack.
+prepare: vdso_prepare
+vdso_prepare: prepare0
+       $(Q)$(MAKE) $(build)=arch/s390/kernel/vdso64 include/generated/vdso64-offsets.h
+       $(if $(CONFIG_COMPAT),$(Q)$(MAKE) \
+               $(build)=arch/s390/kernel/vdso32 include/generated/vdso32-offsets.h)
+endif
 
 # Don't use tabs in echo arguments
 define archhelp