]> git.ipfire.org Git - thirdparty/valgrind.git/commitdiff
Define VKI_SHMLBA for all supported Linux targets, thereby unbreaking
authorJulian Seward <jseward@acm.org>
Wed, 6 Oct 2010 15:55:59 +0000 (15:55 +0000)
committerJulian Seward <jseward@acm.org>
Wed, 6 Oct 2010 15:55:59 +0000 (15:55 +0000)
the breakage created by r11399.  Part of #222545.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11400

include/vki/vki-amd64-linux.h
include/vki/vki-arm-linux.h
include/vki/vki-ppc32-linux.h
include/vki/vki-ppc64-linux.h
include/vki/vki-x86-linux.h

index 57f2e871e8077f32b24055da128f01b815de4b09..de3fd41ee1ff6c364d5dc1377b34ce999043c7cc 100644 (file)
@@ -62,6 +62,12 @@ typedef unsigned int vki_u32;
 #define VKI_MAX_PAGE_SHIFT     VKI_PAGE_SHIFT
 #define VKI_MAX_PAGE_SIZE      VKI_PAGE_SIZE
 
+//----------------------------------------------------------------------
+// From linux-2.6.35.4/arch/x86/include/asm/shmparam.h
+//----------------------------------------------------------------------
+
+#define VKI_SHMLBA  VKI_PAGE_SIZE
+
 //----------------------------------------------------------------------
 // From linux-2.6.9/include/asm-x86_64/signal.h
 //----------------------------------------------------------------------
index 508be437910828ab385e7c2dc3a3ed938f65c98c..678e268eca2aa3b9b8c5434022ed73eb68d95d78 100644 (file)
@@ -63,6 +63,12 @@ typedef unsigned int vki_u32;
 #define VKI_MAX_PAGE_SHIFT     VKI_PAGE_SHIFT
 #define VKI_MAX_PAGE_SIZE      VKI_PAGE_SIZE
 
+//----------------------------------------------------------------------
+// From linux-2.6.35.4/arch/arm/include/asm/shmparam.h
+//----------------------------------------------------------------------
+
+#define VKI_SHMLBA  (4 * VKI_PAGE_SIZE)
+
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/asm-i386/signal.h
 //----------------------------------------------------------------------
@@ -731,9 +737,6 @@ struct vki_ipc_kludge {
 #define VKI_SHMGET             23
 #define VKI_SHMCTL             24
 
-#define VKI_SHMLBA  (4 * VKI_PAGE_SIZE)
-
-
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/asm-i386/shmbuf.h
 //----------------------------------------------------------------------
index 858f9417a188b9e948217a7ef1133aa52f0916ef..6b443860738dd8e33ead0b835f229d4115e0ea86 100644 (file)
@@ -68,6 +68,12 @@ extern unsigned long VKI_PAGE_SIZE;
 #define VKI_MAX_PAGE_SHIFT     16
 #define VKI_MAX_PAGE_SIZE      (1UL << VKI_MAX_PAGE_SHIFT)
 
+//----------------------------------------------------------------------
+// From linux-2.6.35.4/arch/powerpc/include/asm/shmparam.h
+//----------------------------------------------------------------------
+
+#define VKI_SHMLBA  VKI_PAGE_SIZE
+
 //----------------------------------------------------------------------
 // From linux-2.6.9/include/asm-ppc/signal.h
 //----------------------------------------------------------------------
index 4d786bb242680638edc439eaa6ea005da9bfd250..5af8470f4ff4d716f73c61bb4eceb35a218b1d90 100644 (file)
@@ -69,6 +69,12 @@ extern unsigned long VKI_PAGE_SIZE;
 #define VKI_MAX_PAGE_SHIFT     16
 #define VKI_MAX_PAGE_SIZE      (1UL << VKI_MAX_PAGE_SHIFT)
 
+//----------------------------------------------------------------------
+// From linux-2.6.35.4/arch/powerpc/include/asm/shmparam.h
+//----------------------------------------------------------------------
+
+#define VKI_SHMLBA  VKI_PAGE_SIZE
+
 //----------------------------------------------------------------------
 // From linux-2.6.13/include/asm-ppc64/signal.h
 //----------------------------------------------------------------------
index 0d50529467122202408fbe48dadd2cac48f37e0a..8f8aec8f373294038e2eb3eb7b5064800d342d15 100644 (file)
@@ -63,6 +63,12 @@ typedef unsigned int vki_u32;
 #define VKI_MAX_PAGE_SHIFT     VKI_PAGE_SHIFT
 #define VKI_MAX_PAGE_SIZE      VKI_PAGE_SIZE
 
+//----------------------------------------------------------------------
+// From linux-2.6.35.4/arch/x86/include/asm/shmparam.h
+//----------------------------------------------------------------------
+
+#define VKI_SHMLBA  VKI_PAGE_SIZE
+
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/asm-i386/signal.h
 //----------------------------------------------------------------------