Turns out the machine/asm.h isn't needed here, since SYS.h already

included it.

10 files changed, 1 insertions, 12 deletions

diff --git a/lib/libc/mips/mips/sys/Ovfork.S b/lib/libc/mips/mips/sys/Ovfork.S
index 9511964..d5e75f9 100644
--- a/lib/libc/mips/mips/sys/Ovfork.S
+++ b/lib/libc/mips/mips/sys/Ovfork.S
@@ -39,7 +39,6 @@
 	ASMSTR("from: @(#)Ovfork.s	8.1 (Berkeley) 6/4/93")
 	ASMSTR("$NetBSD: compat_Ovfork.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $")
 #endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
 WARN_REFERENCES(vfork, \
diff --git a/lib/libc/mips/mips/sys/brk.S b/lib/libc/mips/mips/sys/brk.S
index b649ffe..f3c7f82 100644
--- a/lib/libc/mips/mips/sys/brk.S
+++ b/lib/libc/mips/mips/sys/brk.S
@@ -38,7 +38,6 @@
 	ASMSTR("from: @(#)brk.s	8.1 (Berkeley) 6/4/93")
 	ASMSTR("$NetBSD: brk.S,v 1.16 2003/08/07 16:42:17 agc Exp $")
 #endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
 	.globl	_C_LABEL(minbrk)
diff --git a/lib/libc/mips/mips/sys/cerror.S b/lib/libc/mips/mips/sys/cerror.S
index 37d0f28..3419aac 100644
--- a/lib/libc/mips/mips/sys/cerror.S
+++ b/lib/libc/mips/mips/sys/cerror.S
@@ -38,7 +38,6 @@
 	ASMSTR("from: @(#)cerror.s	8.1 (Berkeley) 6/16/93")
 	ASMSTR("$NetBSD: cerror.S,v 1.13 2003/08/07 16:42:17 agc Exp $")
 #endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
 	/*
diff --git a/lib/libc/mips/mips/sys/exect.S b/lib/libc/mips/mips/sys/exect.S
index 36cbdf3..e32b2d8 100644
--- a/lib/libc/mips/mips/sys/exect.S
+++ b/lib/libc/mips/mips/sys/exect.S
@@ -37,7 +37,6 @@
 	ASMSTR("from: @(#)exect.s	8.1 (Berkeley) 6/4/93")
 	ASMSTR("$NetBSD: exect.S,v 1.9 2003/08/07 16:42:17 agc Exp $")
 #endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
 LEAF(exect)
diff --git a/lib/libc/mips/mips/sys/fork.S b/lib/libc/mips/mips/sys/fork.S
index 0f13c7f..1f665ea 100644
--- a/lib/libc/mips/mips/sys/fork.S
+++ b/lib/libc/mips/mips/sys/fork.S
@@ -38,7 +38,6 @@
 	ASMSTR("from: @(#)fork.s	8.1 (Berkeley) 6/4/93")
 	ASMSTR("$NetBSD: fork.S,v 1.11 2003/08/07 16:42:17 agc Exp $")
 #endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
 LEAF(__sys_fork)
diff --git a/lib/libc/mips/mips/sys/pipe.S b/lib/libc/mips/mips/sys/pipe.S
index 11abf65..4fc392c 100644
--- a/lib/libc/mips/mips/sys/pipe.S
+++ b/lib/libc/mips/mips/sys/pipe.S
@@ -38,7 +38,6 @@
 	ASMSTR("from: @(#)pipe.s	8.1 (Berkeley) 6/4/93")
 	ASMSTR("$NetBSD: pipe.S,v 1.11 2005/04/22 06:58:01 simonb Exp $")
 #endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
 LEAF(__sys_pipe)
diff --git a/lib/libc/mips/mips/sys/ptrace.S b/lib/libc/mips/mips/sys/ptrace.S
index 7027e7d..99ad816 100644
--- a/lib/libc/mips/mips/sys/ptrace.S
+++ b/lib/libc/mips/mips/sys/ptrace.S
@@ -38,7 +38,6 @@
 	ASMSTR("from: @(#)ptrace.s	8.1 (Berkeley) 6/4/93")
 	ASMSTR("$NetBSD: ptrace.S,v 1.9 2003/08/07 16:42:17 agc Exp $")
 #endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
 LEAF(ptrace)
diff --git a/lib/libc/mips/mips/sys/sbrk.S b/lib/libc/mips/mips/sys/sbrk.S
index 8146586..ae0807b 100644
--- a/lib/libc/mips/mips/sys/sbrk.S
+++ b/lib/libc/mips/mips/sys/sbrk.S
@@ -38,7 +38,6 @@
 	ASMSTR("from: @(#)sbrk.s	8.1 (Berkeley) 6/4/93")
 	ASMSTR("$NetBSD: sbrk.S,v 1.16 2005/04/22 06:58:01 simonb Exp $")
 #endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
 	.globl	_C_LABEL(__curbrk)
diff --git a/lib/libc/mips/mips/sys/shmat.S b/lib/libc/mips/mips/sys/shmat.S
index fe0ccc5..4189f40 100644
--- a/lib/libc/mips/mips/sys/shmat.S
+++ b/lib/libc/mips/mips/sys/shmat.S
@@ -1,8 +1,6 @@
 /*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:52 itohy Exp $	*/
 
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
 #include "SYS.h"
+__FBSDID("$FreeBSD$");
 
 RSYSCALL(shmat)
diff --git a/lib/libc/mips/mips/sys/syscall.S b/lib/libc/mips/mips/sys/syscall.S
index 16d75c0..98eaa11 100644
--- a/lib/libc/mips/mips/sys/syscall.S
+++ b/lib/libc/mips/mips/sys/syscall.S
@@ -38,7 +38,6 @@
 	ASMSTR("from: @(#)syscall.s	8.1 (Berkeley) 6/4/93")
 	ASMSTR("$NetBSD: syscall.S,v 1.5 2003/08/07 16:42:18 agc Exp $")
 #endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
 RSYSCALL(syscall)