[gnumach] 01/01: fix race conditions, notably in disk writes

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository gnumach.

commit eff7ef8df22748da36d425ad48a829306cad8243
Author: Samuel Thibault <address@hidden>
Date:   Thu May 29 13:28:00 2014 +0200

    fix race conditions, notably in disk writes
---
 debian/changelog                   |  7 +++++++
 debian/patches/git-xen_races.patch | 21 +++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 581b0d4..ed2fce6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnumach (2:1.4-11) UNRELEASED; urgency=medium
+
+  * patches/git-xen_races.patch: New patch to fix race conditions, notably in
+    disk writes.
+
+ -- Samuel Thibault <address@hidden>  Thu, 29 May 2014 13:27:29 +0200
+
 gnumach (2:1.4-10) unstable; urgency=medium
 
   * patches/git-notify_translatable{,2}.patch: New patch to make notify
diff --git a/debian/patches/git-xen_races.patch 
b/debian/patches/git-xen_races.patch
new file mode 100644
index 0000000..187b4dd
--- /dev/null
+++ b/debian/patches/git-xen_races.patch
@@ -0,0 +1,21 @@
+commit dc1631b7dc508cb67fa6983007ddba3a2314d6bf
+Author: Samuel Thibault <address@hidden>
+Date:   Tue May 27 20:28:56 2014 +0200
+
+    Add missing memory clobber
+    
+    * i386/i386/xen.h (mb, rmb, wmb): Add memory clobber.
+
+diff --git a/i386/i386/xen.h b/i386/i386/xen.h
+index 5bdaf0b..638d671 100644
+--- a/i386/i386/xen.h
++++ b/i386/i386/xen.h
+@@ -33,7 +33,7 @@
+ 
+ /* TODO: this should be moved in appropriate non-Xen place.  */
+ #define barrier() __asm__ __volatile__ ("": : :"memory")
+-#define mb() __asm__ __volatile__("lock; addl $0,0(%esp)")
++#define mb() __asm__ __volatile__("lock; addl $0,0(%%esp)":::"memory")
+ #define rmb() mb()
+ #define wmb() mb()
+ MACH_INLINE unsigned long xchgl(volatile unsigned long *ptr, unsigned long x)
diff --git a/debian/patches/series b/debian/patches/series
index 33f607a..d59ca6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ git-device_translatable.patch
 git-device_translatable2.patch
 git-mach_debug.patch
 git-mach_debug2.patch
+git-xen_races.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/gnumach.git