Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

42946160 · Linus Torvalds <[email protected]> · 2016-01-03 11:49:31 -08:00

Pull MIPS build fix from Ralf Baechle:
 "Fix a makefile issue resulting in build breakage with older binutils.

  This has sat in -next for a few days, testers and buildbot are happy
  with it, too though if you are going for another -rc that'd certainly
  help ironing out a few more issues"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: VDSO: Fix build error with binutils 2.24 and earlier

Commit: 429461608e77f1777ee5ecb044251ec64abc3edf
Parents: 4e5e384c · 398c7500

Merge commit. Changes below are compared with the first parent: 4e5e384c.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/mips/vdso/Makefile	modified	+1	−1	View file

arch/mips/vdso/Makefile

View file

diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
index 018f8c7..1456890 100644
--- a/arch/mips/vdso/Makefile
+++ b/arch/mips/vdso/Makefile
@@ -26,7 +26,7 @@ aflags-vdso := $(ccflags-vdso) \
 # the comments on that file.
 #
 ifndef CONFIG_CPU_MIPSR6
-  ifeq ($(call ld-ifversion, -lt, 22500000, y),)
+  ifeq ($(call ld-ifversion, -lt, 22500000, y),y)
     $(warning MIPS VDSO requires binutils >= 2.25)
     obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y))
     ccflags-vdso += -DDISABLE_MIPS_VDSO