From 11341ca68a0da81c4e9eee11ca5e9b4ab76f6a6f Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Sun, 2 Sep 2012 14:05:19 +0000 Subject: [PATCH] Merge from trunk, r12874 (Fix n-i-bz shmat of a segment > 4Gb does not work) git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_8_BRANCH@12931 --- coregrind/m_syswrap/syswrap-generic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c index 216c65e3b6..46d4531991 100644 --- a/coregrind/m_syswrap/syswrap-generic.c +++ b/coregrind/m_syswrap/syswrap-generic.c @@ -1700,7 +1700,7 @@ ML_(generic_POST_sys_semctl) ( ThreadId tid, /* ------ */ static -UInt get_shm_size ( Int shmid ) +SizeT get_shm_size ( Int shmid ) { #ifdef __NR_shmctl # ifdef VKI_IPC_64 @@ -1725,7 +1725,7 @@ UInt get_shm_size ( Int shmid ) if (sr_isError(__res)) return 0; - return buf.shm_segsz; + return (SizeT) buf.shm_segsz; } UWord @@ -1733,7 +1733,7 @@ ML_(generic_PRE_sys_shmat) ( ThreadId tid, UWord arg0, UWord arg1, UWord arg2 ) { /* void *shmat(int shmid, const void *shmaddr, int shmflg); */ - UInt segmentSize = get_shm_size ( arg0 ); + SizeT segmentSize = get_shm_size ( arg0 ); UWord tmp; Bool ok; if (arg1 == 0) { @@ -1768,7 +1768,7 @@ ML_(generic_POST_sys_shmat) ( ThreadId tid, UWord res, UWord arg0, UWord arg1, UWord arg2 ) { - UInt segmentSize = VG_PGROUNDUP(get_shm_size(arg0)); + SizeT segmentSize = VG_PGROUNDUP(get_shm_size(arg0)); if ( segmentSize > 0 ) { UInt prot = VKI_PROT_READ|VKI_PROT_WRITE; Bool d; -- 2.47.2