소스 검색

make valgrind compile with newer kernel headers

Eric Andersen 20 년 전
부모
커밋
bca6ae25ab
1개의 변경된 파일19개의 추가작업 그리고 3개의 파일을 삭제
  1. 19 3
      package/valgrind/valgrind.patch

+ 19 - 3
package/valgrind/valgrind.patch

@@ -59,7 +59,7 @@ diff -urN y/valgrind-2.2.0/coregrind/vg_syscalls.c x/valgrind-2.2.0/coregrind/vg
  
  
  #ifdef HAVE_LINUX_FB_H
  #ifdef HAVE_LINUX_FB_H
     case FBIOGET_VSCREENINFO: /* 0x4600 */
     case FBIOGET_VSCREENINFO: /* 0x4600 */
-@@ -3483,6 +3496,88 @@
+@@ -3483,6 +3496,87 @@
                       sizeof(struct timeval) );
                       sizeof(struct timeval) );
        break;
        break;
  
  
@@ -68,11 +68,10 @@ diff -urN y/valgrind-2.2.0/coregrind/vg_syscalls.c x/valgrind-2.2.0/coregrind/vg
 +      SYSCALL_TRACK( pre_mem_write, tid, "ioctl(BLKSSZGET)", arg3,
 +      SYSCALL_TRACK( pre_mem_write, tid, "ioctl(BLKSSZGET)", arg3,
 +	      sizeof(int));
 +	      sizeof(int));
 +      break;
 +      break;
-+#ifndef BLKGETSIZE64
++#undef BLKGETSIZE64
 +#undef _IOR
 +#undef _IOR
 +#define _IOR(type,nr,size)      _IOC(_IOC_READ,(type),(nr),sizeof(size))
 +#define _IOR(type,nr,size)      _IOC(_IOC_READ,(type),(nr),sizeof(size))
 +#define BLKGETSIZE64 _IOR(0x12,114,size_t)
 +#define BLKGETSIZE64 _IOR(0x12,114,size_t)
-+#endif
 +   case BLKGETSIZE64:
 +   case BLKGETSIZE64:
 +      SYSCALL_TRACK( pre_mem_write, tid, "ioctl(BLKGETSIZE64)", arg3,
 +      SYSCALL_TRACK( pre_mem_write, tid, "ioctl(BLKGETSIZE64)", arg3,
 +	      sizeof(uint64_t));
 +	      sizeof(uint64_t));
@@ -238,3 +237,20 @@ diff -urN y/valgrind-2.2.0/coregrind/vg_syscalls.c x/valgrind-2.2.0/coregrind/vg
        /* We don't have any specific information on it, so
        /* We don't have any specific information on it, so
  	 try to do something reasonable based on direction and
  	 try to do something reasonable based on direction and
  	 size bits.  The encoding scheme is described in
  	 size bits.  The encoding scheme is described in
+--- valgrind-2.2.0.orig/coregrind/vg_unsafe.h	2005-02-18 18:49:47.000000000 -0700
++++ valgrind-2.2.0/coregrind/vg_unsafe.h	2005-02-18 19:40:39.000000000 -0700
+@@ -72,7 +72,13 @@
+ #ifndef HAVE_U16
+ typedef unsigned short u16;
+ #endif
+-#include <linux/mii.h>    /* for mii_* structs */
++/* Extracted from linux/mii.h for mii_* structs */
++struct mii_ioctl_data {
++	u16		phy_id;
++	u16		reg_num;
++	u16		val_in;
++	u16		val_out;
++};
+ #endif
+ #include <linux/ppdev.h>  /* for PP* ioctls */
+