[arch-commits] Commit in linux/trunk (0001-quirk-asm_volatile_goto.patch PKGBUILD)

[Thomas Bächler]

    Date: Saturday, February 22, 2014 @ 23:54:25
  Author: thomas
Revision: 206252

Prepare 3.13.5 update

Modified:
  linux/trunk/PKGBUILD
Deleted:
  linux/trunk/0001-quirk-asm_volatile_goto.patch

------------------------------------+
 0001-quirk-asm_volatile_goto.patch |   51 -----------------------------------
 PKGBUILD                           |    9 +-----
 2 files changed, 2 insertions(+), 58 deletions(-)

Deleted: 0001-quirk-asm_volatile_goto.patch
===================================================================
--- 0001-quirk-asm_volatile_goto.patch	2014-02-22 20:39:39 UTC (rev 206251)
+++ 0001-quirk-asm_volatile_goto.patch	2014-02-22 22:54:25 UTC (rev 206252)
@@ -1,51 +0,0 @@
-From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001
-From: Steven Noonan <steven at uplinklabs.net>
-Date: Thu, 13 Feb 2014 07:01:07 +0000
-Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional
-
-I started noticing problems with KVM guest destruction on Linux
-3.12+, where guest memory wasn't being cleaned up. I bisected it
-down to the commit introducing the new 'asm goto'-based atomics,
-and found this quirk was later applied to those.
-
-Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the
-known 'asm goto' bug) I am still getting some kind of
-miscompilation. If I enable the asm_volatile_goto quirk for my
-compiler, KVM guests are destroyed correctly and the memory is
-cleaned up.
-
-So make the quirk unconditional for now, until bug is found
-and fixed.
-
-Suggested-by: Linus Torvalds <torvalds at linux-foundation.org>
-Signed-off-by: Steven Noonan <steven at uplinklabs.net>
-Cc: Peter Zijlstra <peterz at infradead.org>
-Cc: Steven Rostedt <rostedt at goodmis.org>
-Cc: Jakub Jelinek <jakub at redhat.com>
-Cc: Richard Henderson <rth at twiddle.net>
-Cc: Andrew Morton <akpm at linux-foundation.org>
-Cc: Oleg Nesterov <oleg at redhat.com>
-Cc: <stable at vger.kernel.org>
-Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net
-Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
-Signed-off-by: Ingo Molnar <mingo at kernel.org>
----
-diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
-index ded4299..2507fd2 100644
---- a/include/linux/compiler-gcc4.h
-+++ b/include/linux/compiler-gcc4.h
-@@ -75,11 +75,7 @@
-  *
-  * (asm goto is automatically volatile - the naming reflects this.)
-  */
--#if GCC_VERSION <= 40801
--# define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
--#else
--# define asm_volatile_goto(x...)	do { asm goto(x); } while (0)
--#endif
-+#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
- 
- #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
- #if GCC_VERSION >= 40400
---
-cgit v0.9.2

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-22 20:39:39 UTC (rev 206251)
+++ PKGBUILD	2014-02-22 22:54:25 UTC (rev 206252)
@@ -5,7 +5,7 @@
 pkgbase=linux               # Build stock -ARCH kernel
 #pkgbase=linux-custom       # Build kernel with a different name
 _srcname=linux-3.13
-pkgver=3.13.4
+pkgver=3.13.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -28,11 +28,10 @@
         '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch'
         '0001-SUNRPC-Ensure-that-gss_auth-isn-t-freed-before-its-u.patch'
         '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch'
-        '0001-quirk-asm_volatile_goto.patch'
         'i8042-fix-aliases.patch'
         )
 md5sums=('0ecbaf65c00374eb4a826c2f9f37606f'
-         '77ca721ea0e8373f58f596fe0d9b1b47'
+         '114c391a592131f1c12544e063173a45'
          'ba4468d313adfaf22368add7f58204aa'
          '035bb27dac306f5c028d96cad14bb249'
          'eb14dcfd80c00852ef81ded6e826826a'
@@ -46,7 +45,6 @@
          'a724515b350b29c53f20e631c6cf9a14'
          '1ae4ec847f41fa1b6d488f956e94c893'
          'e6fa278c092ad83780e2dd0568e24ca6'
-         '6baa312bc166681f48e972824f3f6649'
          '93dbf73af819b77f03453a9c6de2bb47')
 
 _kernelname=${pkgbase#linux}
@@ -93,9 +91,6 @@
 
   # Fix i8042 aliases
   patch -p1 -i "${srcdir}/i8042-fix-aliases.patch"
-  # Fix compile issues
-  # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859
-  patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch"
 
   if [ "${CARCH}" = "x86_64" ]; then
     cat "${srcdir}/config.x86_64" > ./.config