Merged patch fixing MIPS build.

diff --git a/ChangeLog b/ChangeLog
index 5e8ade9de30ca63b8e8e55210e1ad5261bff96f8..09a12c928c8268bb94d1a4cf829de5de2f11201b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-06  Michal Ludvig  <mludvig@suse.cz>
+
+       Merged patch from Steven J. Hill <sjhill@realitydiluted.com>
+       to allow the compilation of a native MIPS strace.
+
 2002-11-06  Michal Ludvig  <mludvig@suse.cz>
 
        From Marty Leisner <leisner@rochester.rr.com>, 

diff --git a/bjm.c b/bjm.c
index b9ebd5abbaf8adebc773ab670fe8875a0e09fae2..586da53410a613c5ab8ce99f70abab4634b301ef 100644 (file)
--- a/bjm.c
+++ b/bjm.c
@@ -42,6 +42,7 @@
 #include <sys/user.h>
 #include <sys/syscall.h>
 #include <signal.h>
+#include <linux/linkage.h>
 
 /* Bits of module.flags.  */
 

diff --git a/system.c b/system.c
index f56f4235bdd652805b4980c56a05f1868bce6c0e..4c1aa59486fb363309f4d304f33841a49d66817d 100644 (file)
--- a/system.c
+++ b/system.c
@@ -72,7 +72,7 @@ struct pt_regs;
 #include <linux/utsname.h>
 #endif
 
-#ifdef HAVE_ASM_SYSMIPS_H
+#ifdef MIPS
 #include <asm/sysmips.h>
 #endif