Remove inclusion of <linux/module.h> and <asm/atomic.h> since that

seems to lead to a portability swamp.  As a result, remove autoconf
check for <asm/atomic.h>.  Replace all this junk with
VKI_SIZEOF_STRUCT_MODULE (== 96) since that's all I ever wanted to
know in the first place.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@413

diff --git a/configure.in b/configure.in
index 4d8b9ec510d847d7914398eeb0e5fa86b7720d16..091b4cebd7be86ed94cbe3161300abede1fcce3f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -262,7 +262,7 @@ AC_SUBST(PREFERRED_STACK_BOUNDARY)
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h malloc.h stdlib.h string.h sys/socket.h sys/statfs.h sys/time.h termios.h unistd.h utime.h asm/atomic.h])
+AC_CHECK_HEADERS([fcntl.h malloc.h stdlib.h string.h sys/socket.h sys/statfs.h sys/time.h termios.h unistd.h utime.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_UID_T

diff --git a/coregrind/vg_kerneliface.h b/coregrind/vg_kerneliface.h
index 8eb7046306750d92e428cd01ab54b07747f8ca41..ef6cd6677d24465f99136d304adfbbbd5ed8c2fd 100644 (file)
--- a/coregrind/vg_kerneliface.h
+++ b/coregrind/vg_kerneliface.h
@@ -326,6 +326,24 @@ struct vki_stat {
 #define VKI_AT_PHDR   3     /* program headers for program */
 
 
+/* Including <linux/module.h> leads to loads of hassle because then we
+   need <asm/atomic.h> sometimes (RedHat 7.3) and that is a
+   kernel-only header which deliberately #errors on gcc-3.1.  Mucho
+   hassle considering that we only want to know sizeof(struct module).
+   Hence ...
+ 
+   #include <stdio.h>
+   #include <asm/atomic.h>
+   #include <linux/module.h>
+
+   int main ( void )
+   {
+      printf ("sizeof(struct module) = %d\n", sizeof(struct module) );
+      return 0;
+    }
+*/
+
+#define VKI_SIZEOF_STRUCT_MODULE 96
 
 #endif /* ndef __VG_KERNELIFACE_H */
 

diff --git a/coregrind/vg_unsafe.h b/coregrind/vg_unsafe.h
index cd9f3cd740b82c98697b02bd133b2eb5660a31bf..0f726468d0ca172d2a59fd6594389506a4ba7af6 100644 (file)
--- a/coregrind/vg_unsafe.h
+++ b/coregrind/vg_unsafe.h
@@ -50,10 +50,6 @@
 #include <linux/sem.h>    /* for struct sembuf */
 
 #include <linux/isdn.h>   /* for ISDN ioctls */
-#ifdef HAVE_ASM_ATOMIC_H
-#include <asm/atomic.h>   /* necessary for module.h */
-#endif
-#include <linux/module.h> /* for struct module */
 #include <scsi/sg.h>      /* for the SG_* ioctls */
 #include <sched.h>        /* for struct sched_param */
 #include <linux/sysctl.h> /* for struct __sysctl_args */

diff --git a/vg_kerneliface.h b/vg_kerneliface.h
index 8eb7046306750d92e428cd01ab54b07747f8ca41..ef6cd6677d24465f99136d304adfbbbd5ed8c2fd 100644 (file)
--- a/vg_kerneliface.h
+++ b/vg_kerneliface.h
@@ -326,6 +326,24 @@ struct vki_stat {
 #define VKI_AT_PHDR   3     /* program headers for program */
 
 
+/* Including <linux/module.h> leads to loads of hassle because then we
+   need <asm/atomic.h> sometimes (RedHat 7.3) and that is a
+   kernel-only header which deliberately #errors on gcc-3.1.  Mucho
+   hassle considering that we only want to know sizeof(struct module).
+   Hence ...
+ 
+   #include <stdio.h>
+   #include <asm/atomic.h>
+   #include <linux/module.h>
+
+   int main ( void )
+   {
+      printf ("sizeof(struct module) = %d\n", sizeof(struct module) );
+      return 0;
+    }
+*/
+
+#define VKI_SIZEOF_STRUCT_MODULE 96
 
 #endif /* ndef __VG_KERNELIFACE_H */
 

diff --git a/vg_syscall_mem.c b/vg_syscall_mem.c
index 5fc3cc7ddac3edac7fd9fd2b2764d2d9ff88ced0..e228f8ad7a560e7196548b3035ca3e4d46683210 100644 (file)
--- a/vg_syscall_mem.c
+++ b/vg_syscall_mem.c
@@ -871,7 +871,7 @@ void VG_(perform_assumed_nonblocking_syscall) ( ThreadId tid )
             VG_(printf)("init_module ( %p, %p )\n", arg1, arg2 );
          must_be_readable_asciiz( tst, "init_module(name)", arg1 );
          must_be_readable( tst, "init_module(image)", arg2, 
-                           sizeof(struct module) );
+                           VKI_SIZEOF_STRUCT_MODULE );
          KERNEL_DO_SYSCALL(tid,res);
          break;
 

diff --git a/vg_unsafe.h b/vg_unsafe.h
index cd9f3cd740b82c98697b02bd133b2eb5660a31bf..0f726468d0ca172d2a59fd6594389506a4ba7af6 100644 (file)
--- a/vg_unsafe.h
+++ b/vg_unsafe.h
@@ -50,10 +50,6 @@
 #include <linux/sem.h>    /* for struct sembuf */
 
 #include <linux/isdn.h>   /* for ISDN ioctls */
-#ifdef HAVE_ASM_ATOMIC_H
-#include <asm/atomic.h>   /* necessary for module.h */
-#endif
-#include <linux/module.h> /* for struct module */
 #include <scsi/sg.h>      /* for the SG_* ioctls */
 #include <sched.h>        /* for struct sched_param */
 #include <linux/sysctl.h> /* for struct __sysctl_args */