From 878207ebb96236e6524377bbec85a9426c8adda3 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Wed, 6 Oct 2010 15:55:59 +0000 Subject: [PATCH] Define VKI_SHMLBA for all supported Linux targets, thereby unbreaking the breakage created by r11399. Part of #222545. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11400 --- include/vki/vki-amd64-linux.h | 6 ++++++ include/vki/vki-arm-linux.h | 9 ++++++--- include/vki/vki-ppc32-linux.h | 6 ++++++ include/vki/vki-ppc64-linux.h | 6 ++++++ include/vki/vki-x86-linux.h | 6 ++++++ 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/include/vki/vki-amd64-linux.h b/include/vki/vki-amd64-linux.h index 57f2e871e8..de3fd41ee1 100644 --- a/include/vki/vki-amd64-linux.h +++ b/include/vki/vki-amd64-linux.h @@ -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 //---------------------------------------------------------------------- diff --git a/include/vki/vki-arm-linux.h b/include/vki/vki-arm-linux.h index 508be43791..678e268eca 100644 --- a/include/vki/vki-arm-linux.h +++ b/include/vki/vki-arm-linux.h @@ -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 //---------------------------------------------------------------------- diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h index 858f9417a1..6b44386073 100644 --- a/include/vki/vki-ppc32-linux.h +++ b/include/vki/vki-ppc32-linux.h @@ -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 //---------------------------------------------------------------------- diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h index 4d786bb242..5af8470f4f 100644 --- a/include/vki/vki-ppc64-linux.h +++ b/include/vki/vki-ppc64-linux.h @@ -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 //---------------------------------------------------------------------- diff --git a/include/vki/vki-x86-linux.h b/include/vki/vki-x86-linux.h index 0d50529467..8f8aec8f37 100644 --- a/include/vki/vki-x86-linux.h +++ b/include/vki/vki-x86-linux.h @@ -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 //---------------------------------------------------------------------- -- 2.47.2