summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2002-10-10 04:02:49 +0000
committerrwatson <rwatson@FreeBSD.org>2002-10-10 04:02:49 +0000
commit970f7235dadefcd6486a52d4c410b97b8f04173d (patch)
tree2da9fa00b9ca8ba261843810d3185ba1a329d910 /sys/kern
parent62fbfa7b701436251d4d12fdffdd5ad235500363 (diff)
downloadFreeBSD-src-970f7235dadefcd6486a52d4c410b97b8f04173d.zip
FreeBSD-src-970f7235dadefcd6486a52d4c410b97b8f04173d.tar.gz
Fix what looks like a merge-o from a conflict in the last commit to
syscalls.master.
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/syscalls.master13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 0b2da4c..b0de50b 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -30,11 +30,10 @@
; NOSTD implemented but as a lkm that can be statically
; compiled in sysent entry will be filled with lkmsys
; so the SYSCALL_MODULE macro works
-
-+; Please copy any additions and changes to the following compatability tables:
-+; sys/ia64/ia32/syscalls.master (take a best guess)
-+; [other 64 bit platforms with an alternate 32 bit syscall table go here too]
-
+;
+; Please copy any additions and changes to the following compatability tables:
+; sys/ia64/ia32/syscalls.master (take a best guess)
+; [other 64 bit platforms with an alternate 32 bit syscall table go here too]
; #ifdef's, etc. may be included, and are copied to the output files.
#include <sys/param.h>
@@ -599,7 +598,3 @@
void *data, size_t nbytes); }
414 STD BSD { int extattr_delete_link(const char *path, \
int attrnamespace, const char *attrname); }
-
-; Please copy any additions and changes to the following compatability tables:
-; sys/ia64/ia32/syscalls.master (take a best guess)
-; [other 64 bit platforms with an alternate 32 bit syscall table go here too]
OpenPOWER on IntegriCloud