[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 68360] Valgrind does not compile against 2.6.0-testX kernels
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-11-19 22:07:47
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
     
http://bugs.kde.org/show_bug.cgi?id=68360     




------- Additional Comments From mueller@kde.org  2003-11-19 23:07 -------
Subject: valgrind

CVS commit by mueller: 

this should fix compilation on weird kernel 2.6.x installations.
CCMAIL: 68360@bugs.kde.org


  M +4 -4      coregrind/vg_syscalls.c   1.59
  M +0 -1      coregrind/vg_unsafe.h   1.22
  M +13 -0     include/vg_kerneliface.h   1.8


--- valgrind/coregrind/vg_syscalls.c  #1.58:1.59
@@ -2488,5 +2488,5 @@ PRE(ioctl)
 #       endif
 
-   case IIOCGETCPS:
+   case VKI_IIOCGETCPS:
       /* In early 2.4 kernels, ISDN_MAX_CHANNELS was only defined
        * when KERNEL was. I never saw a larger value than 64 though */
@@ -2498,5 +2498,5 @@ PRE(ioctl)
                      * 2 * sizeof(unsigned long) );
       break;
-   case IIOCNETGPN:
+   case VKI_IIOCNETGPN:
       SYSCALL_TRACK( pre_mem_read, tid, "ioctl(IIOCNETGPN)",
                      (UInt)&((isdn_net_ioctl_phone *)arg3)->name,
@@ -2887,5 +2887,5 @@ POST(ioctl)
 #       endif
 
-   case IIOCGETCPS:
+   case VKI_IIOCGETCPS:
       /* In early 2.4 kernels, ISDN_MAX_CHANNELS was only defined
        * when KERNEL was. I never saw a larger value than 64 though */
@@ -2897,5 +2897,5 @@ POST(ioctl)
                    * 2 * sizeof(unsigned long) );
       break;
-   case IIOCNETGPN:
+   case VKI_IIOCNETGPN:
       if (res == 0)
          VG_TRACK( post_mem_write, arg3, sizeof(isdn_net_ioctl_phone) );

--- valgrind/coregrind/vg_unsafe.h  #1.21:1.22
@@ -58,5 +58,4 @@
 #include <linux/sem.h>    /* for struct sembuf */
 
-#include <linux/isdn.h>   /* for ISDN ioctls */
 #include <scsi/sg.h>      /* for the SG_* ioctls */
 #include <sched.h>        /* for struct sched_param */

--- valgrind/include/vg_kerneliface.h  #1.7:1.8
@@ -372,4 +372,17 @@ struct vki_ucontext {
 #define VKI_ERESTARTSYS     512     /* Restart the syscall */
 
+/* Copied from linux/isdn.h */
+
+#define VKI_IIOCGETCPS  _IO( 'I',21 )
+#define VKI_IIOCNETGPN  _IO( 'I',34 )
+
+#define ISDN_MSNLEN          32
+
+typedef struct {
+    char name[ 10 ];
+    char phone[ ISDN_MSNLEN ];
+    int  outgoing;
+} isdn_net_ioctl_phone;
+
 
 /* Gawd ... hack ... */
[prev in list] [next in list] [prev in thread] [next in thread]