Linux v3.15-7378-g14208b0ec569

1 files changed, 55 insertions, 53 deletions

diff --git a/x86-vdso-Fix-vdso_install.patch b/x86-vdso-Fix-vdso_install.patch
index 07ea014d6..27ea765da 100644
--- a/x86-vdso-Fix-vdso_install.patch
+++ b/x86-vdso-Fix-vdso_install.patch
@@ -1,74 +1,72 @@
                                                                                                                                                                                                                                                                
 Delivered-To: jwboyer@gmail.com
-Received: by 10.76.6.212 with SMTP id d20csp275722oaa;
-        Wed, 11 Jun 2014 09:20:25 -0700 (PDT)
-X-Received: by 10.69.19.225 with SMTP id gx1mr6471089pbd.34.1402503625308;
-        Wed, 11 Jun 2014 09:20:25 -0700 (PDT)
+Received: by 10.76.6.212 with SMTP id d20csp286438oaa;
+        Wed, 11 Jun 2014 12:25:34 -0700 (PDT)
+X-Received: by 10.66.66.135 with SMTP id f7mr16103670pat.22.1402514734508;
+        Wed, 11 Jun 2014 12:25:34 -0700 (PDT)
 Return-Path: <luto@amacapital.net>
 Received: from bastion.fedoraproject.org (bastion02.fedoraproject.org. [209.132.181.3])
-        by mx.google.com with ESMTP id ql2si38457915pbb.240.2014.06.11.09.20.24
+        by mx.google.com with ESMTP id px17si7599032pab.171.2014.06.11.12.25.34
         for <jwboyer@gmail.com>;
-        Wed, 11 Jun 2014 09:20:25 -0700 (PDT)
+        Wed, 11 Jun 2014 12:25:34 -0700 (PDT)
 Received-SPF: softfail (google.com: domain of transitioning luto@amacapital.net does not designate 209.132.181.3 as permitted sender) client-ip=209.132.181.3;
 Authentication-Results: mx.google.com;
        spf=softfail (google.com: domain of transitioning luto@amacapital.net does not designate 209.132.181.3 as permitted sender) smtp.mail=luto@amacapital.net
 Received: by bastion02.phx2.fedoraproject.org (Postfix)
-	id ABE9740A20; Wed, 11 Jun 2014 16:20:24 +0000 (UTC)
+	id E8FA440A1B; Wed, 11 Jun 2014 19:25:33 +0000 (UTC)
 Delivered-To: jwboyer@fedoraproject.org
-Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.19])
-	by bastion02.phx2.fedoraproject.org (Postfix) with ESMTP id 9199C40A1F
-	for <jwboyer@fedoraproject.org>; Wed, 11 Jun 2014 16:20:24 +0000 (UTC)
-Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182])
-	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5BGKMOu006187
-	for <jwboyer@fedoraproject.org>; Wed, 11 Jun 2014 12:20:22 -0400
-Received: by mail-pd0-f182.google.com with SMTP id y13so1508044pdi.41
-        for <jwboyer@fedoraproject.org>; Wed, 11 Jun 2014 09:20:22 -0700 (PDT)
+Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.16])
+	by bastion02.phx2.fedoraproject.org (Postfix) with ESMTP id C7A2B409CE
+	for <jwboyer@fedoraproject.org>; Wed, 11 Jun 2014 19:25:33 +0000 (UTC)
+Received: from mail-pb0-f41.google.com (mail-pb0-f41.google.com [209.85.160.41])
+	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5BJPWY6031412
+	for <jwboyer@fedoraproject.org>; Wed, 11 Jun 2014 15:25:32 -0400
+Received: by mail-pb0-f41.google.com with SMTP id ma3so134149pbc.14
+        for <jwboyer@fedoraproject.org>; Wed, 11 Jun 2014 12:25:32 -0700 (PDT)
 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
         d=1e100.net; s=20130820;
         h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
-         :references:in-reply-to:references;
-        bh=fvSn8VazUxkz9ExMYKy6+VgDXUnYm2e2axImee41iYo=;
-        b=doKgULGvb83kqKC2GoYr96Mlccfs3qcAuUmxMaHHgsoaLVoIpjQHWAR5Ljlf1urgNH
-         5dpvJa3vFGXcfv0Vqz/23JTrdN80HDpaTWO/nqYRXsgAL8pv/eeqQSbcDCEmN7u+cxjE
-         oQN4uemKozS3d+oz85NkvcKfaNo9TClMYfVfUfmyTw/ozP5mwB3r7W1ETQtzX9JVvlTy
-         SMn54//MfdI8OLFUHIDCkm/wRcZWVTByQGV0KWNw0e6M4e5b9K1QdMrc6JRggwjb83Ac
-         Jcmkw8T0QAUEMcPJb9RG4FlSWnpWNibDkLv5JQQXBjkkJWr15hyDSAfSsA+oZZRtTIpA
-         nBeg==
-X-Gm-Message-State: ALoCoQkMXf8ZMZ5uLDoOV8k+pACZwfbQeckbP3vuvgRzInhcXkweeCIrAi3AC/TDzSbLfaNVjprH
-X-Received: by 10.69.31.97 with SMTP id kl1mr6531199pbd.162.1402503622428;
-        Wed, 11 Jun 2014 09:20:22 -0700 (PDT)
+         :references;
+        bh=3SQxyOCkOEd7ZqBxGm7GVdRdWte9s/+lnDgnWxAd/KE=;
+        b=aDS8HAiLCK/Rp4I/5iUikYimi8LKsU7iI7K+lCuBGaFVgUY6pa4zykb8A2q/aJWuZY
+         UDJbBhP0gnZ+xlKkVrRVa9iCwYAJHHf/Ipdidjs0lwFVTlSZuyxXR61vFdRhgN2HFtl9
+         AHx95u6UKn2KLoVxtRU6ZiYMMpVacmmQlHh6iZcMsVq2C52qTBchO6r0rGMmeP0f69QZ
+         h86teTPCUlRQXQCUH9pvTEtmamygxGmf9VBYom8qD3KYuAlQkOGRTo7fwiRjgTHCXk92
+         veKA7umfd4rqs9iIIi2qnh4NTonxfWG7lfJVW+j2Ep+gHfCm1hyuM5CVS8fybRvf2gv0
+         gKNA==
+X-Gm-Message-State: ALoCoQnKVS9+ljO89CTRxFu6zQ1VI6ucPd7i9b7bFnfJZAyZDVXkacL2IJbXQ11P4CBXW2DOSlaH
+X-Received: by 10.68.201.10 with SMTP id jw10mr7480616pbc.25.1402514732325;
+        Wed, 11 Jun 2014 12:25:32 -0700 (PDT)
 Received: from localhost (50-76-60-73-ip-static.hfc.comcastbusiness.net. [50.76.60.73])
-        by mx.google.com with ESMTPSA id ga1sm75742069pbb.82.2014.06.11.09.20.21
+        by mx.google.com with ESMTPSA id id10sm76404116pbc.35.2014.06.11.12.25.30
         for <multiple recipients>
         (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
-        Wed, 11 Jun 2014 09:20:21 -0700 (PDT)
+        Wed, 11 Jun 2014 12:25:31 -0700 (PDT)
 From: Andy Lutomirski <luto@amacapital.net>
 To: "H. Peter Anvin" <hpa@zytor.com>, Josh Boyer <jwboyer@fedoraproject.org>
 Cc: Michal Marek <mmarek@suse.cz>, linux-kbuild@vger.kernel.org,
         "Linux-Kernel@Vger. Kernel. Org" <linux-kernel@vger.kernel.org>,
         Andy Lutomirski <luto@amacapital.net>
-Subject: [PATCH 2/2] x86,vdso: Fix vdso_install
-Date: Wed, 11 Jun 2014 09:20:07 -0700
-Message-Id: <fe51e9f5c338d33b1a8b20813441538df5e17add.1402503408.git.luto@amacapital.net>
+Subject: [PATCH v2] x86,vdso: Fix vdso_install
+Date: Wed, 11 Jun 2014 12:25:29 -0700
+Message-Id: <5d5e221e59be20a3a7ceb99452e74e233383e7b4.1402514715.git.luto@amacapital.net>
 X-Mailer: git-send-email 1.9.3
-In-Reply-To: <cover.1402503408.git.luto@amacapital.net>
-References: <5398749B.4090209@zytor.com>
- <cover.1402503408.git.luto@amacapital.net>
-In-Reply-To: <cover.1402503408.git.luto@amacapital.net>
-References: <cover.1402503408.git.luto@amacapital.net>
-X-RedHat-Spam-Score: -2.01  (BAYES_00,DCC_REPUT_13_19,RCVD_IN_DNSWL_NONE,SPF_PASS,URIBL_BLOCKED)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.110.19
+In-Reply-To: <sam@ravnborg.org>
+References: <sam@ravnborg.org>
+X-RedHat-Spam-Score: -2.7  (BAYES_00,DCC_REPUT_13_19,RCVD_IN_DNSWL_LOW,SPF_PASS,URIBL_BLOCKED)
+X-Scanned-By: MIMEDefang 2.68 on 10.5.110.16
 
-Rather than monkeying with barely-comprehensible static pattern
-rules, just use an explicit loop.
+The filenames are different now.  Inspired by a patch from
+Sam Ravnborg.
 
+Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
 Signed-off-by: Andy Lutomirski <luto@amacapital.net>
 ---
- arch/x86/vdso/Makefile | 20 +++++++-------------
- 1 file changed, 7 insertions(+), 13 deletions(-)
+ arch/x86/vdso/Makefile | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
-index 9769df0..b1c70cc 100644
+index 9769df0..e3683d6 100644
 --- a/arch/x86/vdso/Makefile
 +++ b/arch/x86/vdso/Makefile
 @@ -9,11 +9,6 @@ VDSOX32-$(CONFIG_X86_X32_ABI)	:= y
@@ -83,27 +81,31 @@ index 9769df0..b1c70cc 100644
  # files to link into the vdso
  vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o
  
-@@ -176,15 +171,14 @@ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
+@@ -176,15 +171,20 @@ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
  GCOV_PROFILE := n
  
  #
 -# Install the unstripped copy of vdso*.so listed in $(vdso-install-y).
-+# Install the unstripped copies of vdso*.so listed in $(vdso-install-y).
++# Install the unstripped copies of vdso*.so.
  #
 -quiet_cmd_vdso_install = INSTALL $@
 -      cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@
 -$(vdso-install-y): %.so: $(obj)/%.so.dbg FORCE
--	@mkdir -p $(MODLIB)/vdso
--	$(call cmd,vdso_install)
-+quiet_cmd_vdso_install = INSTALL $(sofile)
-+      cmd_vdso_install = cp $(obj)/$(sofile).dbg $(MODLIB)/vdso/$(sofile)
++quiet_cmd_vdso_install = INSTALL $(@:install_%=%)
++      cmd_vdso_install = cp $< $(MODLIB)/vdso/$(@:install_%=%)
++
++vdso_img_insttargets := $(vdso_img_sodbg:%=install_%)
++
++$(MODLIB)/vdso: FORCE
+ 	@mkdir -p $(MODLIB)/vdso
++
++$(vdso_img_insttargets): install_%: $(obj)/% $(MODLIB)/vdso FORCE
+ 	$(call cmd,vdso_install)
  
 -PHONY += vdso_install $(vdso-install-y)
 -vdso_install: $(vdso-install-y)
-+PHONY += vdso_install
-+vdso_install: $(vdso_img_sodbg:%=$(obj)/%) FORCE
-+	@mkdir -p $(MODLIB)/vdso
-+	@$(foreach sofile,$(vdso_img_sodbg:%.dbg=%),$(call recipe-cmd,vdso_install);)
++PHONY += vdso_install $(vdso_img_insttargets)
++vdso_install: $(vdso_img_insttargets) FORCE
  
  clean-files := vdso32-syscall* vdso32-sysenter* vdso32-int80*
 --