strace/strace-4.5.15.diff

--- mem.c
+++ mem.c
@@ -555,7 +555,7 @@
 #if defined(LINUX) && defined(__i386__)
 void
 print_ldt_entry (ldt_entry)
-struct modify_ldt_ldt_s *ldt_entry;
+struct user_desc *ldt_entry;
 {
 	tprintf("base_addr:%#08lx, "
 		"limit:%d, "
@@ -580,10 +580,10 @@
 struct tcb *tcp;
 {
 	if (entering(tcp)) {
-		struct modify_ldt_ldt_s copy;
+		struct user_desc copy;
 		tprintf("%ld", tcp->u_arg[0]);
 		if (tcp->u_arg[1] == 0
-				|| tcp->u_arg[2] != sizeof (struct modify_ldt_ldt_s)
+				|| tcp->u_arg[2] != sizeof (struct user_desc)
 				|| umove(tcp, tcp->u_arg[1], &copy) == -1)
 			tprintf(", %lx", tcp->u_arg[1]);
 		else {
@@ -603,7 +603,7 @@
 sys_set_thread_area(tcp)
 struct tcb *tcp;
 {
-	struct modify_ldt_ldt_s copy;
+	struct user_desc copy;
 	if (entering(tcp)) {
 		if (umove(tcp, tcp->u_arg[0], &copy) != -1) {
 			if (copy.entry_number == -1)
@@ -632,7 +632,7 @@
 sys_get_thread_area(tcp)
 struct tcb *tcp;
 {
-	struct modify_ldt_ldt_s copy;
+	struct user_desc copy;
 	if (exiting(tcp)) {
 		if (umove(tcp, tcp->u_arg[0], &copy) != -1) {
 			tprintf("{entry_number:%d, ", copy.entry_number);
--- process.c
+++ process.c
@@ -591,7 +591,7 @@
 			tprintf(", parent_tidptr=%#lx", tcp->u_arg[ARG_PTID]);
 		if (flags & CLONE_SETTLS) {
 # ifdef I386
-			struct modify_ldt_ldt_s copy;
+			struct user_desc copy;
 			if (umove(tcp, tcp->u_arg[ARG_TLS], &copy) != -1) {
 				tprintf(", {entry_number:%d, ",
 					copy.entry_number);
--- signal.c
+++ signal.c
@@ -1697,7 +1697,7 @@
 struct tcb *tcp;
 {
 	if (entering(tcp)) {
-		tprintf("%ld, %s", tcp->u_arg[0], signame(tcp->u_arg[1]));
+		tprintf("%d, %s", (pid_t)tcp->u_arg[0], signame(tcp->u_arg[1]));
 	}
 	return 0;
 }
--- strace.c
+++ strace.c
@@ -1461,7 +1461,7 @@
 
 #ifdef LINUX
 	if (zombie != NULL)
-		error = detach(zombie) || error;
+		error = detach(zombie, 0) || error;
 #endif
 
 	return error;
@@ -2035,7 +2035,7 @@
 			fprintf(stderr,
 				"PANIC: handle_group_exit: %d leader %d\n",
 				tcp->pid, leader ? leader->pid : -1);
-		detach(tcp);	/* Already died.  */
+		detach(tcp, 0);	/* Already died.  */
 	}
 	else {
 		/* Mark that we are taking the process down.  */
--- system.c
+++ system.c
@@ -1612,7 +1612,6 @@
 	{ CTL_KERN, "CTL_KERN" },
 	{ CTL_VM, "CTL_VM" },
 	{ CTL_NET, "CTL_NET" },
-	{ CTL_PROC, "CTL_PROC" },
 	{ CTL_FS, "CTL_FS" },
 	{ CTL_DEBUG, "CTL_DEBUG" },
 	{ CTL_DEV, "CTL_DEV" },