diff -urN z/arch/i386/kernel/entry.S zz/arch/i386/kernel/entry.S
--- z/arch/i386/kernel/entry.S	Sat Jun 17 15:37:36 2000
+++ zz/arch/i386/kernel/entry.S	Sat Jun 17 15:42:17 2000
@@ -571,6 +571,7 @@
 	.long SYMBOL_NAME(sys_stat64)		/* 195 */
 	.long SYMBOL_NAME(sys_lstat64)
 	.long SYMBOL_NAME(sys_fstat64)
+#if 0
 	.rept 22
 		.long SYMBOL_NAME(sys_ni_syscall)
 	.endr
@@ -584,4 +585,14 @@
 	 */
 	.rept NR_syscalls-220
 		.long SYMBOL_NAME(sys_ni_syscall)
+#else
+	/*
+	 * NOTE!! This doesn't have to be exact - we just have
+	 * to make sure we have _enough_ of the "sys_ni_syscall"
+	 * entries. Don't panic if you notice that this hasn't
+	 * been shrunk every time we add a new system call.
+	 */
+	.rept NR_syscalls-197
+		.long SYMBOL_NAME(sys_ni_syscall)
+#endif
 	.endr
diff -urN z/arch/sparc/kernel/systbls.S zz/arch/sparc/kernel/systbls.S
--- z/arch/sparc/kernel/systbls.S	Sat Jun 17 15:37:36 2000
+++ zz/arch/sparc/kernel/systbls.S	Sat Jun 17 15:43:26 2000
@@ -46,7 +46,11 @@
 /*125*/	.long sys_nis_syscall, sys_setreuid, sys_setregid, sys_rename, sys_truncate
 /*130*/	.long sys_ftruncate, sys_flock, sys_lstat64, sys_nis_syscall, sys_nis_syscall
 /*135*/	.long sys_nis_syscall, sys_mkdir, sys_rmdir, sys_utimes, sys_stat64
+#if 0
 /*140*/	.long sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_fcntl64, sys_getrlimit
+#else
+/*140*/	.long sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_getrlimit
+#endif
 /*145*/	.long sys_setrlimit, sys_nis_syscall, sys_prctl, sys_pciconfig_read, sys_pciconfig_write
 /*150*/	.long sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_poll, sys_nis_syscall
 /*155*/	.long sys_nis_syscall, sys_nis_syscall, sys_statfs, sys_fstatfs, sys_oldumount
diff -urN z/arch/sparc64/kernel/sys_sparc32.c zz/arch/sparc64/kernel/sys_sparc32.c
--- z/arch/sparc64/kernel/sys_sparc32.c	Sat Jun 17 15:37:36 2000
+++ zz/arch/sparc64/kernel/sys_sparc32.c	Sat Jun 17 15:43:52 2000
@@ -638,6 +638,7 @@
 	}
 }
 
+#if 0
 asmlinkage long sys32_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg)
 {
 	switch (cmd) {
@@ -683,6 +684,7 @@
 		return sys_fcntl(fd, cmd, (unsigned long)arg);
 	}
 }
+#endif
 
 struct dqblk32 {
     __u32 dqb_bhardlimit;
diff -urN z/arch/sparc64/kernel/systbls.S zz/arch/sparc64/kernel/systbls.S
--- z/arch/sparc64/kernel/systbls.S	Sat Jun 17 15:37:36 2000
+++ zz/arch/sparc64/kernel/systbls.S	Sat Jun 17 15:46:25 2000
@@ -47,7 +47,11 @@
 	.word sys_nis_syscall, sys32_setreuid, sys32_setregid, sys_rename, sys_truncate
 /*130*/	.word sys_ftruncate, sys_flock, sys_lstat64, sys_nis_syscall, sys_nis_syscall
 	.word sys_nis_syscall, sys_mkdir, sys_rmdir, sys32_utimes, sys_stat64
+#if 0
 /*140*/	.word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys32_fcntl64, sys32_getrlimit
+#else
+/*140*/	.word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys32_getrlimit
+#endif
 	.word sys32_setrlimit, sys_nis_syscall, sys32_prctl, sys32_pciconfig_read, sys32_pciconfig_write
 /*150*/	.word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_poll, sys_nis_syscall
 	.word sys_nis_syscall, sys_nis_syscall, sys32_statfs, sys32_fstatfs, sys_oldumount
diff -urN z/fs/fcntl.c zz/fs/fcntl.c
--- z/fs/fcntl.c	Sat Jun 17 15:37:37 2000
+++ zz/fs/fcntl.c	Sat Jun 17 15:47:00 2000
@@ -234,6 +234,7 @@
 	return err;
 }
 
+#if 0
 #if BITS_PER_LONG == 32
 asmlinkage long sys_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg)
 {	
@@ -265,6 +266,7 @@
 	unlock_kernel();
 	return err;
 }
+#endif
 #endif
 
 static void send_sigio(struct fown_struct *fown, struct fasync_struct *fa)
diff -urN z/include/asm-i386/unistd.h zz/include/asm-i386/unistd.h
--- z/include/asm-i386/unistd.h	Sat Jun 17 15:37:38 2000
+++ zz/include/asm-i386/unistd.h	Sat Jun 17 15:47:12 2000
@@ -227,7 +227,9 @@
 #define __NR_madvise		219
 #define __NR_madvise1		219	/* delete when C lib stub is removed */
 #endif
+#if 0
 #define __NR_fcntl64		220
+#endif
 
 /* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
 
diff -urN z/include/asm-sparc/unistd.h zz/include/asm-sparc/unistd.h
--- z/include/asm-sparc/unistd.h	Sat Jun 17 15:37:38 2000
+++ zz/include/asm-sparc/unistd.h	Sat Jun 17 15:47:21 2000
@@ -158,7 +158,9 @@
 /* #define __NR_adjtime         140    SunOS Specific                              */
 #define __NR_getpeername        141 /* Common                                      */
 /* #define __NR_gethostid       142    SunOS Specific                              */
+#if 0
 #define __NR_fcntl64		143 /* Linux sparc32 Specific			   */
+#endif
 #define __NR_getrlimit          144 /* Common                                      */
 #define __NR_setrlimit          145 /* Common                                      */
 /* #define __NR_killpg          146    SunOS Specific                              */
diff -urN z/include/asm-sparc64/unistd.h zz/include/asm-sparc64/unistd.h
--- z/include/asm-sparc64/unistd.h	Sat Jun 17 15:37:38 2000
+++ zz/include/asm-sparc64/unistd.h	Sat Jun 17 15:47:33 2000
@@ -158,7 +158,9 @@
 /* #define __NR_adjtime         140    SunOS Specific                              */
 #define __NR_getpeername        141 /* Common                                      */
 /* #define __NR_gethostid       142    SunOS Specific                              */
+#if 0
 /* #define __NR_fcntl64		143    Linux sparc32 Specific			   */
+#endif
 #define __NR_getrlimit		144 /* Common                                      */
 #define __NR_setrlimit          145 /* Common                                      */
 /* #define __NR_killpg          146    SunOS Specific                              */