svn commit: trunk/uClibc/libc/sysdeps/linux/mips: sys

[andersen at uclibc.org]

Author: andersen
Date: 2006-09-11 11:46:39 -0700 (Mon, 11 Sep 2006)
New Revision: 16105

Log:
Atsushi Nemoto writes:
The "make headers_install" in kernel 2.6.18 does not export
asm-mips/asm.h, asm-mips/regdef.h and asm-mips/sysmips.h.  Do not use
them.  We can use sys/asm.h and sys/regdef.h instead.  The sysmips.h
part of this patch is came from glibc 2.4 code.


Modified:
   trunk/uClibc/libc/sysdeps/linux/mips/clone.S
   trunk/uClibc/libc/sysdeps/linux/mips/pipe.S
   trunk/uClibc/libc/sysdeps/linux/mips/sys/sysmips.h
   trunk/uClibc/libc/sysdeps/linux/mips/syscall.S


Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/mips/clone.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/mips/clone.S	2006-09-11 18:40:10 UTC (rev 16104)
+++ trunk/uClibc/libc/sysdeps/linux/mips/clone.S	2006-09-11 18:46:39 UTC (rev 16105)
@@ -25,7 +25,7 @@
 #include <sys/regdef.h>
 #define _ERRNO_H	1
 #include <bits/errno.h>
-#include <asm/asm.h>
+#include <sys/asm.h>
 
 /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */
 

Modified: trunk/uClibc/libc/sysdeps/linux/mips/pipe.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/mips/pipe.S	2006-09-11 18:40:10 UTC (rev 16104)
+++ trunk/uClibc/libc/sysdeps/linux/mips/pipe.S	2006-09-11 18:46:39 UTC (rev 16105)
@@ -8,9 +8,9 @@
 /*see uClibc's sh/pipe.c and glibc-2.2.4's mips/pipe.S */
 
 #include <features.h>
-#include <asm/asm.h>
+#include <sys/asm.h>
 #include <asm/unistd.h>
-#include <asm/regdef.h>
+#include <sys/regdef.h>
 
 	.globl	pipe
 	.ent	pipe, 0

Modified: trunk/uClibc/libc/sysdeps/linux/mips/sys/sysmips.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/mips/sys/sysmips.h	2006-09-11 18:40:10 UTC (rev 16104)
+++ trunk/uClibc/libc/sysdeps/linux/mips/sys/sysmips.h	2006-09-11 18:46:39 UTC (rev 16105)
@@ -22,9 +22,17 @@
 #include <features.h>
 
 /*
- * Get the kernel definition for sysmips(2)
+ * Commands for the sysmips(2) call
+ *
+ * sysmips(2) is deprecated - though some existing software uses it.
+ * We only support the following commands.  Sysmips exists for compatibility
+ * purposes only so new software should avoid it.
  */
-#include <asm/sysmips.h>
+#define SETNAME                   1	/* set hostname                  */
+#define FLUSH_CACHE		   3	/* writeback and invalidate caches */
+#define MIPS_FIXADE               7	/* control address error fixing  */
+#define MIPS_RDNVRAM              10	/* read NVRAM			 */
+#define MIPS_ATOMIC_SET		2001	/* atomically set variable       */
 
 __BEGIN_DECLS
 

Modified: trunk/uClibc/libc/sysdeps/linux/mips/syscall.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/mips/syscall.S	2006-09-11 18:40:10 UTC (rev 16104)
+++ trunk/uClibc/libc/sysdeps/linux/mips/syscall.S	2006-09-11 18:46:39 UTC (rev 16105)
@@ -17,8 +17,8 @@
    02111-1307 USA.  */
 
 #include <features.h>
-#include <asm/asm.h>
-#include <asm/regdef.h>
+#include <sys/asm.h>
+#include <sys/regdef.h>
 
 #ifdef __PIC__
 	.option pic2