diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2016-07-11 18:04:13 +0200 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2016-07-11 18:04:13 +0200 |
| commit | 7d9a7086319daf826ebf06c1abe31728823e1240 (patch) | |
| tree | a9aa4c5469a9779ecb0618e7c5fc2f1ed749696a /arch/arm64/kernel/vdso | |
| parent | arm64: mm: change IOMMU notifier action to attach DMA ops (diff) | |
| download | linux-7d9a7086319daf826ebf06c1abe31728823e1240.tar.xz linux-7d9a7086319daf826ebf06c1abe31728823e1240.zip | |
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/vdso')
| -rw-r--r-- | arch/arm64/kernel/vdso/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index 285433720202..b467fd0a384b 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -23,7 +23,7 @@ GCOV_PROFILE := n ccflags-y += -Wl,-shared obj-y += vdso.o -extra-y += vdso.lds +extra-y += vdso.lds vdso-offsets.h CPPFLAGS_vdso.lds += -P -C -U$(ARCH) # Force dependency (incbin is bad) @@ -42,10 +42,11 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE gen-vdsosym := $(srctree)/$(src)/gen_vdso_offsets.sh quiet_cmd_vdsosym = VDSOSYM $@ define cmd_vdsosym - $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ + $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ && \ + cp $@ include/generated/ endef -$(objtree)/include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE +$(obj)/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE $(call if_changed,vdsosym) # Assembly rules for the .S files |