[Valgrind-developers] VALGRIND_2_0_REALLY: valgrind

[Dirk M. <mu...@kd...>]

CVS commit by mueller: 

backport compile fix. sorry for the breakage in the stable branch.


  M +2 -0      coregrind/vg_syscalls.c   1.40.2.9
  M +0 -3      coregrind/vg_unsafe.h   1.14.2.5
  M +34 -1     include/vg_kerneliface.h   1.1.2.1


--- valgrind/coregrind/vg_syscalls.c  #1.40.2.8:1.40.2.9
@@ -3262,4 +3262,6 @@ void VG_(perform_assumed_nonblocking_sys
          MAYBE_PRINTF("statfs64 ( %s, %p )\n", arg1,arg2);
          SYSCALL_TRACK( pre_mem_read_asciiz, tid, "statfs64(path)", arg1 );
+         SYSCALL_TRACK(  pre_mem_write, tid, "statfs64(buf)",
+                         arg2, sizeof(struct statfs64));
          KERNEL_DO_SYSCALL(tid,res);
          if (!VG_(is_kerror)(res) && res == 0)

--- valgrind/coregrind/vg_unsafe.h  #1.14.2.4:1.14.2.5
@@ -84,7 +84,4 @@
 #include <sys/types.h>
 
-#include <asm/statfs.h>
-#undef statfs
-
 #include <sys/sysinfo.h>
 

--- valgrind/include/vg_kerneliface.h  #1.1:1.1.2.1
@@ -412,6 +412,39 @@ typedef struct vki_modify_ldt_ldt_s {
 
 
+/* statfs structs */
+/*
+ * bits/statfs.h
+ */
 
-#endif /* ndef __VG_KERNELIFACE_H */
+struct statfs {
+        unsigned int f_type;
+        unsigned int f_bsize;
+        unsigned int f_blocks;
+        unsigned int f_bfree;
+        unsigned int f_bavail;
+        unsigned int f_files;
+        unsigned int f_ffree;
+        int f_fsid[ 2 ];
+        unsigned int f_namelen;
+        unsigned int f_frsize;
+        unsigned int f_spare[5];
+};
+
+struct statfs64 {
+        unsigned int f_type;
+        unsigned int f_bsize;
+        unsigned long long f_blocks;
+        unsigned long long f_bfree;
+        unsigned long long f_bavail;
+        unsigned long long f_files;
+        unsigned long long f_ffree;
+        int f_fsid[ 2 ];
+        unsigned int f_namelen;
+        unsigned int f_frsize;
+        unsigned int f_spare[5];
+};
+
+
+#endif /*  __VG_KERNELIFACE_H */
 
 /*--------------------------------------------------------------------*/