Refs #85 #104. Use patch instead of git to apply this segfaults.patch.

This commit is contained in:
Xianyi Zhang 2012-05-08 23:50:46 +08:00
parent e7846547be
commit dee74174ff
2 changed files with 6 additions and 21 deletions

View File

@ -95,7 +95,7 @@
A This may be related to a bug in the Linux kernel 2.6.32. Try applying A This may be related to a bug in the Linux kernel 2.6.32. Try applying
the patch segaults.patch using the patch segaults.patch using
git am segfaults.patch patch < segfaults.patch
and see if the crashes persist. Note that this patch will lead to many and see if the crashes persist. Note that this patch will lead to many
compiler warnings. compiler warnings.

View File

@ -1,27 +1,12 @@
From ac40907baa90a0acc78139762ffa3c6f09274236 Mon Sep 17 00:00:00 2001 diff -ruN common_linux.h.orig common_linux.h
From: =?UTF-8?q?Alexander=20Ebersp=C3=A4cher?= <alex.eberspaecher@gmail.com> --- common_linux.h.orig 2012-04-23 11:27:55.000000000 +0800
Date: Wed, 2 May 2012 11:22:52 +0200 +++ common_linux.h 2012-05-08 23:43:00.000000000 +0800
Subject: [PATCH] Fix segfaults with kernel 2.6.32. This comes at the price of many compiler warnings. @@ -77,7 +77,7 @@
---
common_linux.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common_linux.h b/common_linux.h
index b0381d9..40a94cb 100644
--- a/common_linux.h
+++ b/common_linux.h
@@ -76,9 +76,8 @@ static inline int my_mbind(void *addr, unsigned long len, int mode,
#endif
#else #else
//Fixed randomly SEGFAULT when nodemask==NULL with above Linux 2.6.34 //Fixed randomly SEGFAULT when nodemask==NULL with above Linux 2.6.34
-// unsigned long null_nodemask=0; // unsigned long null_nodemask=0;
- return syscall(SYS_mbind, addr, len, mode, nodemask, maxnode, flags); - return syscall(SYS_mbind, addr, len, mode, nodemask, maxnode, flags);
+ unsigned long null_nodemask=0;
+ return 0; + return 0;
#endif #endif
} }
--
1.7.1