|
From: <sv...@va...> - 2010-10-06 15:56:09
|
Author: sewardj Date: 2010-10-06 16:55:59 +0100 (Wed, 06 Oct 2010) New Revision: 11400 Log: Define VKI_SHMLBA for all supported Linux targets, thereby unbreaking the breakage created by r11399. Part of #222545. Modified: trunk/include/vki/vki-amd64-linux.h trunk/include/vki/vki-arm-linux.h trunk/include/vki/vki-ppc32-linux.h trunk/include/vki/vki-ppc64-linux.h trunk/include/vki/vki-x86-linux.h Modified: trunk/include/vki/vki-amd64-linux.h =================================================================== --- trunk/include/vki/vki-amd64-linux.h 2010-10-06 15:24:39 UTC (rev 11399) +++ trunk/include/vki/vki-amd64-linux.h 2010-10-06 15:55:59 UTC (rev 11400) @@ -63,6 +63,12 @@ #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 //---------------------------------------------------------------------- Modified: trunk/include/vki/vki-arm-linux.h =================================================================== --- trunk/include/vki/vki-arm-linux.h 2010-10-06 15:24:39 UTC (rev 11399) +++ trunk/include/vki/vki-arm-linux.h 2010-10-06 15:55:59 UTC (rev 11400) @@ -64,6 +64,12 @@ #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 @@ #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 //---------------------------------------------------------------------- Modified: trunk/include/vki/vki-ppc32-linux.h =================================================================== --- trunk/include/vki/vki-ppc32-linux.h 2010-10-06 15:24:39 UTC (rev 11399) +++ trunk/include/vki/vki-ppc32-linux.h 2010-10-06 15:55:59 UTC (rev 11400) @@ -69,6 +69,12 @@ #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 //---------------------------------------------------------------------- Modified: trunk/include/vki/vki-ppc64-linux.h =================================================================== --- trunk/include/vki/vki-ppc64-linux.h 2010-10-06 15:24:39 UTC (rev 11399) +++ trunk/include/vki/vki-ppc64-linux.h 2010-10-06 15:55:59 UTC (rev 11400) @@ -70,6 +70,12 @@ #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 //---------------------------------------------------------------------- Modified: trunk/include/vki/vki-x86-linux.h =================================================================== --- trunk/include/vki/vki-x86-linux.h 2010-10-06 15:24:39 UTC (rev 11399) +++ trunk/include/vki/vki-x86-linux.h 2010-10-06 15:55:59 UTC (rev 11400) @@ -64,6 +64,12 @@ #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 //---------------------------------------------------------------------- |