From ac33c6041e399838679c4161a9f44381fa487778 Mon Sep 17 00:00:00 2001
From: Florian Krohm <florian@eich-krohm.de>
Date: Fri, 30 Sep 2011 01:27:26 +0000
Subject: [PATCH] Use <sys/mman.h> instead of <linux/mman.h> to fix a compile
 problem on SLES 10.  Patch by Rich Coe (rcoe@wi.rr.com). Fixes bugzilla
 #282238.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12072
---
 NEWS                              | 2 ++
 memcheck/tests/x86-linux/scalar.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index a13b290f6c..9579eead0f 100644
--- a/NEWS
+++ b/NEWS
@@ -279,6 +279,8 @@ fixed
 
 274378 - s390x: Various dispatcher tweaks
 
+282238 - SLES10: make check fails
+
 
 Release 3.6.1 (16 February 2011)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/memcheck/tests/x86-linux/scalar.h b/memcheck/tests/x86-linux/scalar.h
index 2d103703c7..ef28b03550 100644
--- a/memcheck/tests/x86-linux/scalar.h
+++ b/memcheck/tests/x86-linux/scalar.h
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <sys/ptrace.h>
 #include <sys/types.h>
-#include <linux/mman.h>
+#include <sys/mman.h>
 
 // Since we use vki_unistd.h, we can't include <unistd.h>.  So we have to
 // declare this ourselves.
-- 
2.47.2