summaryrefslogtreecommitdiffstats
path: root/kbuild-AFTER_LINK.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-26 09:33:38 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-26 09:33:38 -0400
commit35eff41288ccf2a1ddd555db0b0e51906af970a0 (patch)
tree761d7f671ba27b4a314aa72a864f9a3a56dc7d5b /kbuild-AFTER_LINK.patch
parent21694f1b769f352163ed762b519cc7155dd1c97d (diff)
downloadkernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.gz
kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.xz
kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.zip
Linux v4.1-5596-gaefbef10e3ae
Diffstat (limited to 'kbuild-AFTER_LINK.patch')
-rw-r--r--kbuild-AFTER_LINK.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/kbuild-AFTER_LINK.patch b/kbuild-AFTER_LINK.patch
index 582616bc6..490622a52 100644
--- a/kbuild-AFTER_LINK.patch
+++ b/kbuild-AFTER_LINK.patch
@@ -15,15 +15,15 @@ Signed-off-by: Roland McGrath <roland@redhat.com>
arch/powerpc/kernel/vdso64/Makefile | 3 ++-
arch/s390/kernel/vdso32/Makefile | 3 ++-
arch/s390/kernel/vdso64/Makefile | 3 ++-
- arch/x86/vdso/Makefile | 5 +++--
+ arch/x86/entry/vdso/Makefile | 5 +++--
scripts/link-vmlinux.sh | 4 ++++
7 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
-index ff3bddea482d..d8a439dd6351 100644
+index f6fe17d88da5..eb6ddbf37f30 100644
--- a/arch/arm64/kernel/vdso/Makefile
+++ b/arch/arm64/kernel/vdso/Makefile
-@@ -48,7 +48,8 @@ $(obj-vdso): %.o: %.S FORCE
+@@ -52,7 +52,8 @@ $(obj-vdso): %.o: %.S FORCE
# Actual build commands
quiet_cmd_vdsold = VDSOL $@
@@ -89,10 +89,10 @@ index 2a8ddfd12a5b..452ca53561fe 100644
quiet_cmd_vdso64as = VDSO64A $@
cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
-diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
+diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index e97032069f88..9ea82f444dea 100644
---- a/arch/x86/vdso/Makefile
-+++ b/arch/x86/vdso/Makefile
+--- a/arch/x86/entry/vdso/Makefile
++++ b/arch/x86/entry/vdso/Makefile
@@ -172,8 +172,9 @@ $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \
quiet_cmd_vdso = VDSO $@
cmd_vdso = $(CC) -nostdlib -o $@ \