package/valgrind/valgrind.patch

   1 diff -urN ../valgrind-2.4.0/coregrind/vg_syscalls.c valgrind-2.4.0/coregrind/vg_syscalls.c
   2 --- ../valgrind-2.4.0/coregrind/vg_syscalls.c   2005-03-23 03:22:03.000000000 -0700
   3 +++ valgrind-2.4.0/coregrind/vg_syscalls.c      2005-07-22 03:42:01.000000000 -0600
   4 @@ -3266,15 +3266,34 @@
   5        SYS_PRE_MEM_WRITE( "ioctl(RTC_IRQP_READ)", arg3, sizeof(unsigned long));
   6        break;
   7
   8 +   case VKI_BLKRRPART:
   9 +   case VKI_BLKFLSBUF:
  10 +      break;
  11     case VKI_BLKGETSIZE:
  12        SYS_PRE_MEM_WRITE( "ioctl(BLKGETSIZE)", arg3, sizeof(unsigned long));
  13        break;
  14 +   case VKI_BLKGETSIZE64:
  15 +      SYS_PRE_MEM_WRITE( "ioctl(BLKGETSIZE64)", arg3, sizeof(__vki_u64));
  16 +      break;
  17 +   case VKI_BLKSSZGET:
  18 +      SYS_PRE_MEM_WRITE( "ioctl(BLKSSZGET)", arg3, sizeof(unsigned long));
  19 +      break;
  20 +   case VKI_BLKBSZGET:
  21 +      SYS_PRE_MEM_WRITE( "ioctl(BLKBSZGET)", arg3, sizeof(unsigned long));
  22 +      break;
  23 +   case VKI_BLKBSZSET:
  24 +      SYS_PRE_MEM_READ( "ioctl(BLKBSZSET)", arg3, sizeof(unsigned long) );
  25 +      break;
  26
  27        /* Hard disks */
  28     case VKI_HDIO_GET_IDENTITY: /* 0x030d */
  29        SYS_PRE_MEM_WRITE( "ioctl(HDIO_GET_IDENTITY)", arg3,
  30                       VKI_SIZEOF_STRUCT_HD_DRIVEID );
  31        break;
  32 +   case VKI_HDIO_GETGEO: /* 0x0301 */
  33 +      SYS_PRE_MEM_WRITE( "ioctl(HDIO_GETGEO)", arg3,
  34 +                     sizeof(struct vki_hd_geometry) );
  35 +      break;
  36
  37        /* CD ROM stuff (??)  */
  38     case VKI_CDROM_GET_MCN:
  39 @@ -3332,6 +3351,7 @@
  40        break;
  41        /* The following two are probably bogus (should check args
  42          for readability).  JRS 20021117 */
  43 +   case VKI_CDROMEJECT:
  44     case VKI_CDROM_DRIVE_STATUS: /* 0x5326 */
  45     case VKI_CDROM_CLEAR_OPTIONS: /* 0x5321 */
  46        break;
  47 @@ -3931,14 +3951,31 @@
  48        VG_TRACK( post_mem_write,arg3, sizeof(unsigned long));
  49        break;
  50
  51 +   case VKI_BLKRRPART:
  52 +   case VKI_BLKFLSBUF:
  53 +      break;
  54     case VKI_BLKGETSIZE:
  55        VG_TRACK( post_mem_write,arg3, sizeof(unsigned long));
  56        break;
  57 +   case VKI_BLKGETSIZE64:
  58 +      VG_TRACK( post_mem_write,arg3, sizeof(__vki_u64));
  59 +      break;
  60 +   case VKI_BLKSSZGET:
  61 +      VG_TRACK( post_mem_write,arg3, sizeof(unsigned long));
  62 +      break;
  63 +   case VKI_BLKBSZGET:
  64 +      VG_TRACK( post_mem_write,arg3, sizeof(unsigned long));
  65 +      break;
  66 +   case VKI_BLKBSZSET:
  67 +      break;
  68
  69        /* Hard disks */
  70     case VKI_HDIO_GET_IDENTITY: /* 0x030d */
  71        VG_TRACK( post_mem_write,arg3, VKI_SIZEOF_STRUCT_HD_DRIVEID );
  72        break;
  73 +   case VKI_HDIO_GETGEO: /* 0x0301 */
  74 +      VG_TRACK( post_mem_write,arg3, sizeof(struct vki_hd_geometry) );
  75 +      break;
  76
  77        /* CD ROM stuff (??)  */
  78     case VKI_CDROMSUBCHNL:
  79 @@ -3967,6 +4004,7 @@
  80        break;
  81        /* The following two are probably bogus (should check args
  82          for readability).  JRS 20021117 */
  83 +   case VKI_CDROMEJECT:
  84     case VKI_CDROM_DRIVE_STATUS: /* 0x5326 */
  85     case VKI_CDROM_CLEAR_OPTIONS: /* 0x5321 */
  86        break;
  87 diff -urN ../valgrind-2.4.0/include/linux/vki.h valgrind-2.4.0/include/linux/vki.h
  88 --- ../valgrind-2.4.0/include/linux/vki.h       2005-03-10 23:28:14.000000000 -0700
  89 +++ valgrind-2.4.0/include/linux/vki.h  2005-07-22 03:42:01.000000000 -0600
  90 @@ -1389,7 +1389,14 @@
  91  // From linux-2.6.8.1/include/linux/fs.h
  92  //----------------------------------------------------------------------
  93
  94 -#define VKI_BLKGETSIZE _VKI_IO(0x12,96) /* return device size /512 (long *arg) */
  95 +#define VKI_BLKGETSIZE _VKI_IO(0x12,   96) /* return device size /512 (long *arg) */
  96 +#define VKI_BLKGETSIZE64 _VKI_IOR(0x12, 114, __vki_u64)        /* return device size in bytes (u64 *arg) */
  97 +#define VKI_BLKRRPART  _VKI_IO(0x12,   95)     /* re-read partition table */
  98 +#define VKI_BLKFLSBUF  _VKI_IO(0x12,   97)     /* flush buffer cache */
  99 +#define VKI_BLKSSZGET  _VKI_IO(0x12,   104)/* get block device sector size */
 100 +#define VKI_BLKBSZGET  _VKI_IOR(0x12,  112, unsigned long)
 101 +#define VKI_BLKBSZSET  _VKI_IOW(0x12,  113, unsigned long)
 102 +
 103
 104  #define VKI_FIBMAP     _VKI_IO(0x00,1) /* bmap access */
 105  #define VKI_FIGETBSZ    _VKI_IO(0x00,2)        /* get the block size used for bmap */
 106 @@ -1464,6 +1471,7 @@
 107                                             (struct cdrom_tochdr) */
 108  #define VKI_CDROMREADTOCENTRY  0x5306 /* Read TOC entry
 109                                             (struct cdrom_tocentry) */
 110 +#define VKI_CDROMEJECT         0x5309 /* Ejects the cdrom media */
 111  #define VKI_CDROMSUBCHNL       0x530b /* Read subchannel data
 112                                             (struct cdrom_subchnl) */
 113  #define VKI_CDROMREADMODE2     0x530c /* Read CDROM mode 2 data (2336 Bytes)
 114 @@ -1674,12 +1682,20 @@
 115  // From linux-2.6.8.1/include/linux/hdreg.h
 116  //----------------------------------------------------------------------
 117
 118 +#define VKI_HDIO_GETGEO                0x0301  /* get device geometry */
 119  #define VKI_HDIO_GET_IDENTITY  0x030d  /* get IDE identification info */
 120
 121  // [[Nb: done like this because the original type is a huge struct that will
 122  //   always be the same size.]]
 123  #define VKI_SIZEOF_STRUCT_HD_DRIVEID   512
 124
 125 +struct vki_hd_geometry {
 126 +      unsigned char heads;
 127 +      unsigned char sectors;
 128 +      unsigned short cylinders;
 129 +      unsigned long start;
 130 +};
 131 +
 132  //----------------------------------------------------------------------
 133  // From linux-2.6.8.1/include/linux/fb.h
 134  //----------------------------------------------------------------------