diff -NurpP --minimal linux-2.4.25-rc2-vs1.26/arch/sparc/kernel/entry.S linux-2.4.25-rc2-vs1.26-sparc-fix1/arch/sparc/kernel/entry.S
--- linux-2.4.25-rc2-vs1.26/arch/sparc/kernel/entry.S	2003-06-13 16:51:32.000000000 +0200
+++ linux-2.4.25-rc2-vs1.26-sparc-fix1/arch/sparc/kernel/entry.S	2004-02-13 10:08:04.000000000 +0100
@@ -36,7 +36,7 @@
 
 #define curptr      g6
 
-#define NR_SYSCALLS 256      /* Each OS is different... */
+#define NR_SYSCALLS 267      /* Each OS is different... */
 
 /* These are just handy. */
 #define _SV	save	%sp, -STACKFRAME_SZ, %sp
diff -NurpP --minimal linux-2.4.25-rc2-vs1.26/arch/sparc/kernel/ptrace.c linux-2.4.25-rc2-vs1.26-sparc-fix1/arch/sparc/kernel/ptrace.c
--- linux-2.4.25-rc2-vs1.26/arch/sparc/kernel/ptrace.c	2002-08-03 02:39:43.000000000 +0200
+++ linux-2.4.25-rc2-vs1.26-sparc-fix1/arch/sparc/kernel/ptrace.c	2004-02-13 10:13:41.000000000 +0100
@@ -305,7 +305,7 @@ asmlinkage void do_ptrace(struct pt_regs
 		get_task_struct(child);
 	read_unlock(&tasklist_lock);
 
-	if (!child) {
+	if (!child || !vx_check(child->vx_id, VX_WATCH|VX_IDENT)) {
 		pt_error_return(regs, ESRCH);
 		goto out;
 	}
diff -NurpP --minimal linux-2.4.25-rc2-vs1.26/arch/sparc/kernel/systbls.S linux-2.4.25-rc2-vs1.26-sparc-fix1/arch/sparc/kernel/systbls.S
--- linux-2.4.25-rc2-vs1.26/arch/sparc/kernel/systbls.S	2004-02-12 23:21:42.000000000 +0100
+++ linux-2.4.25-rc2-vs1.26-sparc-fix1/arch/sparc/kernel/systbls.S	2004-02-13 10:08:30.000000000 +0100
@@ -72,8 +72,7 @@ sys_call_table:
 /*250*/	.long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
 /*255*/	.long sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
 /*260*/	.long sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
-/*265*/	.long sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
-/*270*/	.long sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_vserver, sys_nis_syscall
+/*265*/	.long sys_nis_syscall, sys_nis_syscall, sys_vserver
 
 #ifdef CONFIG_SUNOS_EMUL
 	/* Now the SunOS syscall table. */
diff -NurpP --minimal linux-2.4.25-rc2-vs1.26/arch/sparc64/kernel/entry.S linux-2.4.25-rc2-vs1.26-sparc-fix1/arch/sparc64/kernel/entry.S
--- linux-2.4.25-rc2-vs1.26/arch/sparc64/kernel/entry.S	2004-02-12 23:21:42.000000000 +0100
+++ linux-2.4.25-rc2-vs1.26-sparc-fix1/arch/sparc64/kernel/entry.S	2004-02-13 10:09:55.000000000 +0100
@@ -26,7 +26,7 @@
 
 #define curptr      g6
 
-#define NR_SYSCALLS 274      /* Each OS is different... */
+#define NR_SYSCALLS 267      /* Each OS is different... */
 
 	.text
 	.align		32
diff -NurpP --minimal linux-2.4.25-rc2-vs1.26/arch/sparc64/kernel/systbls.S linux-2.4.25-rc2-vs1.26-sparc-fix1/arch/sparc64/kernel/systbls.S
--- linux-2.4.25-rc2-vs1.26/arch/sparc64/kernel/systbls.S	2004-02-12 23:21:42.000000000 +0100
+++ linux-2.4.25-rc2-vs1.26-sparc-fix1/arch/sparc64/kernel/systbls.S	2004-02-13 10:09:27.000000000 +0100
@@ -72,8 +72,7 @@ sys_call_table32:
 /*250*/	.word sys32_mremap, sys32_sysctl, sys_getsid, sys_fdatasync, sys32_nfsservctl
 	.word sys_aplib, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
 /*260*/	.word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
-	.word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
-/*270*/	.word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_vserver, sys_nis_syscall
+	.word sys_nis_syscall, sys_nis_syscall, sys_vserver
 
 	/* Now the 64-bit native Linux syscall table. */
 
@@ -134,8 +133,7 @@ sys_call_table:
 /*250*/	.word sys64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
 	.word sys_aplib, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
 /*260*/	.word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
-	.word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall
-/*270*/	.word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_vserver, sys_nis_syscall
+	.word sys_nis_syscall, sys_nis_syscall, sys_vserver
 
 #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \
     defined(CONFIG_SOLARIS_EMUL_MODULE)
diff -NurpP --minimal linux-2.4.25-rc2-vs1.26/include/asm-sparc/unistd.h linux-2.4.25-rc2-vs1.26-sparc-fix1/include/asm-sparc/unistd.h
--- linux-2.4.25-rc2-vs1.26/include/asm-sparc/unistd.h	2004-02-12 23:21:42.000000000 +0100
+++ linux-2.4.25-rc2-vs1.26-sparc-fix1/include/asm-sparc/unistd.h	2004-02-13 10:11:29.000000000 +0100
@@ -272,7 +272,7 @@
 #define __NR_nfsservctl         254
 #define __NR_aplib              255
 
-#define __NR_vserver	273
+#define __NR_vserver		267
 
 #define _syscall0(type,name) \
 type name(void) \
diff -NurpP --minimal linux-2.4.25-rc2-vs1.26/include/asm-sparc64/unistd.h linux-2.4.25-rc2-vs1.26-sparc-fix1/include/asm-sparc64/unistd.h
--- linux-2.4.25-rc2-vs1.26/include/asm-sparc64/unistd.h	2004-02-12 23:21:42.000000000 +0100
+++ linux-2.4.25-rc2-vs1.26-sparc-fix1/include/asm-sparc64/unistd.h	2004-02-13 10:11:53.000000000 +0100
@@ -274,7 +274,7 @@
 #define __NR_nfsservctl         254
 #define __NR_aplib              255
 
-#define __NR_vserver	273
+#define __NR_vserver		267
 
 #define _syscall0(type,name) \
 type name(void) \