diff options
| author | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2010-10-06 15:55:59 +0000 |
|---|---|---|
| committer | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2010-10-06 15:55:59 +0000 |
| commit | a69c2def56fbfa9212f804b265ec2650b6e97c23 (patch) | |
| tree | c4b78852d2ea46825de914d34e981db8e78f8121 /include | |
| parent | 60457093d30b23ac2531682205ab0bd9a5aae2ed (diff) | |
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 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'include')
| -rw-r--r-- | include/vki/vki-amd64-linux.h | 6 | ||||
| -rw-r--r-- | include/vki/vki-arm-linux.h | 9 | ||||
| -rw-r--r-- | include/vki/vki-ppc32-linux.h | 6 | ||||
| -rw-r--r-- | include/vki/vki-ppc64-linux.h | 6 | ||||
| -rw-r--r-- | 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 57f2e871..de3fd41e 100644 --- a/include/vki/vki-amd64-linux.h +++ b/include/vki/vki-amd64-linux.h @@ -63,6 +63,12 @@ typedef unsigned int vki_u32; #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 508be437..678e268e 100644 --- a/include/vki/vki-arm-linux.h +++ b/include/vki/vki-arm-linux.h @@ -64,6 +64,12 @@ typedef unsigned int vki_u32; #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 858f9417..6b443860 100644 --- a/include/vki/vki-ppc32-linux.h +++ b/include/vki/vki-ppc32-linux.h @@ -69,6 +69,12 @@ extern unsigned long VKI_PAGE_SIZE; #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 4d786bb2..5af8470f 100644 --- a/include/vki/vki-ppc64-linux.h +++ b/include/vki/vki-ppc64-linux.h @@ -70,6 +70,12 @@ extern unsigned long VKI_PAGE_SIZE; #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 0d505294..8f8aec8f 100644 --- a/include/vki/vki-x86-linux.h +++ b/include/vki/vki-x86-linux.h @@ -64,6 +64,12 @@ typedef unsigned int vki_u32; #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 //---------------------------------------------------------------------- |