update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / include / vki / vki-x86-linux.h

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/vki/vki-x86-linux.h b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/vki/vki-x86-linux.h
index e45a0ed639aa9fddc67408409fdb3e09dd0d4608..8f8aec8f373294038e2eb3eb7b5064800d342d15 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/vki/vki-x86-linux.h
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/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
 //----------------------------------------------------------------------
@@ -479,13 +485,6 @@ struct vki_termios {
         ((nr)   << _VKI_IOC_NRSHIFT) | \
         ((size) << _VKI_IOC_SIZESHIFT))
 
-/* provoke compile error for invalid uses of size argument */
-#define _VKI_IOC_TYPECHECK(t) \
-       ((sizeof(t) == sizeof(t[1]) && \
-         sizeof(t) < (1 << _VKI_IOC_SIZEBITS)) \
-        ? sizeof(t) \
-        : /*cause gcc to complain about division by zero*/(1/0) )
-
 /* used to create numbers */
 #define _VKI_IO(type,nr)       _VKI_IOC(_VKI_IOC_NONE,(type),(nr),0)
 #define _VKI_IOR(type,nr,size) _VKI_IOC(_VKI_IOC_READ,(type),(nr),(_VKI_IOC_TYPECHECK(size)))