diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2016-07-11 19:04:13 +0300 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2016-07-11 19:04:13 +0300 |
commit | 7d9a7086319daf826ebf06c1abe31728823e1240 (patch) | |
tree | a9aa4c5469a9779ecb0618e7c5fc2f1ed749696a /arch/arm64/kernel/Makefile | |
parent | 16c11325cc44f0614a45e584d439e195059c3f5a (diff) | |
download | linux-7d9a7086319daf826ebf06c1abe31728823e1240.tar.xz |
Revert "arm64: Fix vdso-offsets.h dependency"
This reverts commit 90f777beb788d08300f4a1482cb4fd37a401b472.
While this commit was aimed at fixing the dependencies, with a large
make -j the vdso-offsets.h file is not generated, leading to build
failures.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/Makefile')
-rw-r--r-- | arch/arm64/kernel/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index efffc231a244..7700c0c23962 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -54,7 +54,6 @@ obj-m += $(arm64-obj-m) head-y := head.o extra-y += $(head-y) vmlinux.lds -# Check that the vDSO symbol offsets header file is up to date and re-generate -# it if necessary. -$(objtree)/include/generated/vdso-offsets.h: FORCE - $(Q)$(MAKE) $(build)=$(obj)/vdso $@ +# vDSO - this must be built first to generate the symbol offsets +$(call objectify,$(arm64-obj-y)): $(obj)/vdso/vdso-offsets.h +$(obj)/vdso/vdso-offsets.h: $(obj)/vdso |