+ ix86-fix-vdso-build.patch added to -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: ix86: fix vDSO build
has been added to the -mm tree.  Its filename is
     ix86-fix-vdso-build.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/ix86-fix-vdso-build.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/ix86-fix-vdso-build.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: "Jan Beulich" <JBeulich@xxxxxxxx>
Subject: ix86: fix vDSO build

Relying on static functions used just once to get inlined (and
subsequently have dead code paths eliminated) is wrong: Compilers are free
to decide whether they do this, regardless of optimization level.  With
this not happening for vdso_addr() (observed with gcc 4.1.x), an
unresolved reference to align_vdso_addr() causes the build to fail.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Tested-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 arch/x86/vdso/vma.c |    4 ++++
 1 file changed, 4 insertions(+)

diff -puN arch/x86/vdso/vma.c~ix86-fix-vdso-build arch/x86/vdso/vma.c
--- a/arch/x86/vdso/vma.c~ix86-fix-vdso-build
+++ a/arch/x86/vdso/vma.c
@@ -62,6 +62,9 @@ struct linux_binprm;
    Only used for the 64-bit and x32 vdsos. */
 static unsigned long vdso_addr(unsigned long start, unsigned len)
 {
+#ifdef CONFIG_X86_32
+	return 0;
+#else
 	unsigned long addr, end;
 	unsigned offset;
 	end = (start + PMD_SIZE - 1) & PMD_MASK;
@@ -83,6 +86,7 @@ static unsigned long vdso_addr(unsigned
 	addr = align_vdso_addr(addr);
 
 	return addr;
+#endif
 }
 
 static int map_vdso(const struct vdso_image *image, bool calculate_addr)
_

Patches currently in -mm which might be from JBeulich@xxxxxxxx are

rtc-efi-check-for-invalid-data-coming-back-from-uefi.patch
initramfs-support-initramfs-that-is-bigger-than-2gib.patch
x86-64-fix-vdso-build.patch
ix86-fix-vdso-build.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux