New syscalls for strace

Michael Holzheu holzheu at de.ibm.com
Fri Jun 23 08:15:11 UTC 2006


Hi all,

Since in linux 2.6.17 we have more than 300 system calls, we have to expand
our system call list in strace. Currently there is a limitation to 300.
This patch adds 50 more system calls to the list which makes in total
350.

In addition to that I added the new system calls for s390 and s390x.

Please consider integrating the patch!

Thanks

Michael

---

diff -Naur strace-4.5.14/linux/arm/syscallent.h strace-4.5.14-linux-2.6.17/linux/arm/syscallent.h
--- strace-4.5.14/linux/arm/syscallent.h	2006-01-12 23:34:50.000000000 +0100
+++ strace-4.5.14-linux-2.6.17/linux/arm/syscallent.h	2006-06-22 14:25:44.000000000 +0200
@@ -346,54 +346,104 @@
 	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
 	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
 	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
+	{ 5,	0,	printargs,		"SYS_300"	}, /* 300 */
+	{ 5,	0,	printargs,		"SYS_301"	}, /* 301 */
+	{ 5,	0,	printargs,		"SYS_302"	}, /* 302 */
+	{ 5,	0,	printargs,		"SYS_303"	}, /* 303 */
+	{ 5,	0,	printargs,		"SYS_304"	}, /* 304 */
+	{ 5,	0,	printargs,		"SYS_305"	}, /* 305 */
+	{ 5,	0,	printargs,		"SYS_306"	}, /* 306 */
+	{ 5,	0,	printargs,		"SYS_307"	}, /* 307 */
+	{ 5,	0,	printargs,		"SYS_308"	}, /* 308 */
+	{ 5,	0,	printargs,		"SYS_309"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
 
-#if SYS_socket_subcall != 300 && !defined X86_64 /* pers1 broken on x86-64 */
+#if SYS_socket_subcall != 350 && !defined X86_64 /* pers1 broken on x86-64 */
  #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
+	{ 8,	0,	printargs,		"socket_subcall"},
+	{ 3,	TN,	sys_socket,		"socket"	},
+	{ 3,	TN,	sys_bind,		"bind"		},
+	{ 3,	TN,	sys_connect,		"connect"	},
+	{ 2,	TN,	sys_listen,		"listen"	},
+	{ 3,	TN,	sys_accept,		"accept"	},
+	{ 3,	TN,	sys_getsockname,	"getsockname"	},
+	{ 3,	TN,	sys_getpeername,	"getpeername"	},
+	{ 4,	TN,	sys_socketpair,		"socketpair"	},
+	{ 4,	TN,	sys_send,		"send"		},
+	{ 4,	TN,	sys_recv,		"recv"		},
+	{ 6,	TN,	sys_sendto,		"sendto"	},
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	},
+	{ 2,	TN,	sys_shutdown,		"shutdown"	},
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	},
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	},
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	},
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	},
 
-#if SYS_ipc_subcall != 318 && !defined X86_64 /* pers1 broken on x86-64 */
+#if SYS_ipc_subcall != 368 && !defined X86_64 /* pers1 broken on x86-64 */
  #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_semop,		"semop"		},
+	{ 4,	TI,	sys_semget,		"semget"	},
+	{ 4,	TI,	sys_semctl,		"semctl"	},
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	},
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	},
+	{ 4,	TI,	sys_msgget,		"msgget"	},
+	{ 4,	TI,	sys_msgctl,		"msgctl"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_shmat,		"shmat"		},
+	{ 4,	TI,	sys_shmdt,		"shmdt"		},
+	{ 4,	TI,	sys_shmget,		"shmget"	},
+	{ 4,	TI,	sys_shmctl,		"shmctl"	},
diff -Naur strace-4.5.14/linux/m68k/syscallent.h strace-4.5.14-linux-2.6.17/linux/m68k/syscallent.h
--- strace-4.5.14/linux/m68k/syscallent.h	2006-01-12 23:34:50.000000000 +0100
+++ strace-4.5.14-linux-2.6.17/linux/m68k/syscallent.h	2006-06-22 14:26:37.000000000 +0200
@@ -329,54 +329,104 @@
 	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
 	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
 	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
+	{ 5,	0,	printargs,		"SYS_300"	}, /* 300 */
+	{ 5,	0,	printargs,		"SYS_301"	}, /* 301 */
+	{ 5,	0,	printargs,		"SYS_302"	}, /* 302 */
+	{ 5,	0,	printargs,		"SYS_303"	}, /* 303 */
+	{ 5,	0,	printargs,		"SYS_304"	}, /* 304 */
+	{ 5,	0,	printargs,		"SYS_305"	}, /* 305 */
+	{ 5,	0,	printargs,		"SYS_306"	}, /* 306 */
+	{ 5,	0,	printargs,		"SYS_307"	}, /* 307 */
+	{ 5,	0,	printargs,		"SYS_308"	}, /* 308 */
+	{ 5,	0,	printargs,		"SYS_309"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
 
-#if SYS_socket_subcall != 300
+#if SYS_socket_subcall != 350
  #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
+	{ 8,	0,	printargs,		"socket_subcall"},
+	{ 3,	TN,	sys_socket,		"socket"	},
+	{ 3,	TN,	sys_bind,		"bind"		},
+	{ 3,	TN,	sys_connect,		"connect"	},
+	{ 2,	TN,	sys_listen,		"listen"	},
+	{ 3,	TN,	sys_accept,		"accept"	},
+	{ 3,	TN,	sys_getsockname,	"getsockname"	},
+	{ 3,	TN,	sys_getpeername,	"getpeername"	},
+	{ 4,	TN,	sys_socketpair,		"socketpair"	},
+	{ 4,	TN,	sys_send,		"send", SYS_sub_send },
+	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv },
+	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto },
+	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom },
+	{ 2,	TN,	sys_shutdown,		"shutdown"	},
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	},
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	},
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	},
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	},
 
-#if SYS_ipc_subcall != 318
+#if SYS_ipc_subcall != 368
  #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_semop,		"semop"		},
+	{ 4,	TI,	sys_semget,		"semget"	},
+	{ 4,	TI,	sys_semctl,		"semctl"	},
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	},
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	},
+	{ 4,	TI,	sys_msgget,		"msgget"	},
+	{ 4,	TI,	sys_msgctl,		"msgctl"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_shmat,		"shmat"		},
+	{ 4,	TI,	sys_shmdt,		"shmdt"		},
+	{ 4,	TI,	sys_shmget,		"shmget"	},
+	{ 4,	TI,	sys_shmctl,		"shmctl"	},
diff -Naur strace-4.5.14/linux/s390/ipc.calls strace-4.5.14-linux-2.6.17/linux/s390/ipc.calls
--- strace-4.5.14/linux/s390/ipc.calls	1970-01-01 01:00:00.000000000 +0100
+++ strace-4.5.14-linux-2.6.17/linux/s390/ipc.calls	2006-06-22 13:40:57.000000000 +0200
@@ -0,0 +1,25 @@
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 418 */
+	{ 4,	TI,	sys_semop,		"semop"	}, /* 419 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 420 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 421 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 422 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 423 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 429 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 430 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 431 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 432 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 433 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
+	{ 4,	TI,	sys_shmat,		"shmat"	}, /* 439 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"	}, /* 440 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 441 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 442 */
diff -Naur strace-4.5.14/linux/s390/sock.calls strace-4.5.14-linux-2.6.17/linux/s390/sock.calls
--- strace-4.5.14/linux/s390/sock.calls	1970-01-01 01:00:00.000000000 +0100
+++ strace-4.5.14-linux-2.6.17/linux/s390/sock.calls	2006-06-22 13:40:30.000000000 +0200
@@ -0,0 +1,18 @@
+	{ 8,	0,	printargs,		"socket_subcall"},	/* 300 100 
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
+	{ 3,	TN,	sys_bind,		"bind"	}, /* 402 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 404 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 405 */
+	{ 3,	TN,	sys_getsockname,		"getsockname"	}, /* 406 */
+	{ 3,	TN,	sys_getpeername,		"getpeername"	}, /* 407 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
+	{ 4,	TN,	sys_send,		"send"	}, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv"	}, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 412 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
diff -Naur strace-4.5.14/linux/s390/syscallent.h strace-4.5.14-linux-2.6.17/linux/s390/syscallent.h
--- strace-4.5.14/linux/s390/syscallent.h	2005-12-02 05:18:16.000000000 +0100
+++ strace-4.5.14-linux-2.6.17/linux/s390/syscallent.h	2006-06-22 14:20:57.000000000 +0200
@@ -317,66 +317,116 @@
 	{ 2,	0,	printargs,		"inotify_rm_watch" }, /* 286 */
 
 	{ 5,	0,	printargs,		"SYS_287"	}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"	}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"	}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"	}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"	}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"	}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"	}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"	}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"	}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"	}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
+	{ 4,	TD|TF,	printargs,		"openat"	}, /* 288 */
+	{ 3,	TD|TF,	printargs,		"mkdirat"	}, /* 289 */
+	{ 4,	TD|TF,	printargs,		"mknodat"	}, /* 290 */
+	{ 5,	TD|TF,	printargs,		"fchownat"	}, /* 291 */
+	{ 3,	TD|TF,	printargs,		"futimesat"	}, /* 292 */
+	{ 4,	TD|TF,	printargs,		"fstatat64"	}, /* 293 */
+	{ 3,	TD|TF,	printargs,		"unlinkat"	}, /* 294 */
+	{ 4,	TD|TF,	printargs,		"renameat"	}, /* 295 */
+	{ 5,	TD|TF,	printargs,		"linkat"	}, /* 296 */
+	{ 3,	TD|TF,	printargs,		"symlinkat"	}, /* 297 */
+	{ 4,	TD|TF,	printargs,		"readlinkat"	}, /* 298 */
+	{ 3,	TD|TF,	printargs,		"fchmodat"	}, /* 299 */
+	{ 3,	TD|TF,	printargs,		"faccessat"	}, /* 300 */
+	{ 6,	TD,	printargs,		"pselect6"	}, /* 301 */
+	{ 5,	TD,	printargs,		"ppoll"		}, /* 302 */
+	{ 1,	TP,	printargs,		"unshare"	}, /* 303 */
+	{ 2,	0,	printargs,		"set_robust_list"},/* 304 */
+	{ 3,	0,	printargs,		"get_robust_list"},/* 305 */
+	{ 6,	TD,	printargs,		"splice"	}, /* 306 */
+	{ 4,	TD,	printargs,		"sync_file_range"},/* 307 */
+	{ 4,	TD,	printargs,		"tee"		}, /* 308 */
+	{ 4,	TD,	printargs,		"vmsplice"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
 
-#if SYS_socket_subcall != 300
+#if SYS_socket_subcall != 350
  #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
+	{ 8,	0,	printargs,		"socket_subcall"}, 
+	{ 3,	TN,	sys_socket,		"socket"	},
+	{ 3,	TN,	sys_bind,		"bind"		},
+	{ 3,	TN,	sys_connect,		"connect"	},
+	{ 2,	TN,	sys_listen,		"listen"	},
+	{ 3,	TN,	sys_accept,		"accept"	},
+	{ 3,	TN,	sys_getsockname,	"getsockname"	},
+	{ 3,	TN,	sys_getpeername,	"getpeername"	},
+	{ 4,	TN,	sys_socketpair,		"socketpair"	},
+	{ 4,	TN,	sys_send,		"send"		},
+	{ 4,	TN,	sys_recv,		"recv"		},
+	{ 6,	TN,	sys_sendto,		"sendto"	},
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	},
+	{ 2,	TN,	sys_shutdown,		"shutdown"	},
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	},
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	},
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	},
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	},
 
-#if SYS_ipc_subcall != 318
+#if SYS_ipc_subcall != 368
  #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_semop,		"semop"		},
+	{ 4,	TI,	sys_semget,		"semget"	},
+	{ 4,	TI,	sys_semctl,		"semctl"	},
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	},
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	},
+	{ 4,	TI,	sys_msgget,		"msgget"	},
+	{ 4,	TI,	sys_msgctl,		"msgctl"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_shmat,		"shmat"		},
+	{ 4,	TI,	sys_shmdt,		"shmdt"		},
+	{ 4,	TI,	sys_shmget,		"shmget"	},
+	{ 4,	TI,	sys_shmctl,		"shmctl"	},
diff -Naur strace-4.5.14/linux/s390x/syscallent.h strace-4.5.14-linux-2.6.17/linux/s390x/syscallent.h
--- strace-4.5.14/linux/s390x/syscallent.h	2005-12-02 05:18:16.000000000 +0100
+++ strace-4.5.14-linux-2.6.17/linux/s390x/syscallent.h	2006-06-22 14:24:29.000000000 +0200
@@ -316,66 +316,115 @@
 	{ 2,	0,	printargs,		"inotify_rm_watch" }, /* 286 */
 
 	{ 5,	0,	printargs,		"SYS_287"	}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"	}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"	}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"	}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"	}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"	}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"	}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"	}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"	}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"	}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
-
-#if SYS_socket_subcall != 300
+	{ 4,	TD|TF,	printargs,		"openat"	}, /* 288 */
+	{ 3,	TD|TF,	printargs,		"mkdirat"	}, /* 289 */
+	{ 4,	TD|TF,	printargs,		"mknodat"	}, /* 290 */
+	{ 5,	TD|TF,	printargs,		"fchownat"	}, /* 291 */
+	{ 3,	TD|TF,	printargs,		"futimesat"	}, /* 292 */
+	{ 4,	TD|TF,	printargs,		"fstatat64"	}, /* 293 */
+	{ 3,	TD|TF,	printargs,		"unlinkat"	}, /* 294 */
+	{ 4,	TD|TF,	printargs,		"renameat"	}, /* 295 */
+	{ 5,	TD|TF,	printargs,		"linkat"	}, /* 296 */
+	{ 3,	TD|TF,	printargs,		"symlinkat"	}, /* 297 */
+	{ 4,	TD|TF,	printargs,		"readlinkat"	}, /* 298 */
+	{ 3,	TD|TF,	printargs,		"fchmodat"	}, /* 299 */
+	{ 3,	TD|TF,	printargs,		"faccessat"	}, /* 300 */
+	{ 6,	TD,	printargs,		"pselect6"	}, /* 301 */
+	{ 5,	TD,	printargs,		"ppoll"		}, /* 302 */
+	{ 1,	TP,	printargs,		"unshare"	}, /* 303 */
+	{ 2,	0,	printargs,		"set_robust_list"},/* 304 */
+	{ 3,	0,	printargs,		"get_robust_list"},/* 305 */
+	{ 6,	TD,	printargs,		"splice"	}, /* 306 */
+	{ 4,	TD,	printargs,		"sync_file_range"},/* 307 */
+	{ 4,	TD,	printargs,		"tee"		}, /* 308 */
+	{ 4,	TD,	printargs,		"vmsplice"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
+#if SYS_socket_subcall != 350
  #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send"		}, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv"		}, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
+	{ 8,	0,	printargs,		"socket_subcall"},
+	{ 3,	TN,	sys_socket,		"socket"	},
+	{ 3,	TN,	sys_bind,		"bind"		},
+	{ 3,	TN,	sys_connect,		"connect"	},
+	{ 2,	TN,	sys_listen,		"listen"	},
+	{ 3,	TN,	sys_accept,		"accept"	},
+	{ 3,	TN,	sys_getsockname,	"getsockname"	},
+	{ 3,	TN,	sys_getpeername,	"getpeername"	},
+	{ 4,	TN,	sys_socketpair,		"socketpair"	},
+	{ 4,	TN,	sys_send,		"send"		},
+	{ 4,	TN,	sys_recv,		"recv"		},
+	{ 6,	TN,	sys_sendto,		"sendto"	},
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	},
+	{ 2,	TN,	sys_shutdown,		"shutdown"	},
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	},
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	},
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	},
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	},
 
-#if SYS_ipc_subcall != 318
+#if SYS_ipc_subcall != 368
  #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_semop,		"semop"		},
+	{ 4,	TI,	sys_semget,		"semget"	},
+	{ 4,	TI,	sys_semctl,		"semctl"	},
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	},
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	},
+	{ 4,	TI,	sys_msgget,		"msgget"	},
+	{ 4,	TI,	sys_msgctl,		"msgctl"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_shmat,		"shmat"		},
+	{ 4,	TI,	sys_shmdt,		"shmdt"		},
+	{ 4,	TI,	sys_shmget,		"shmget"	},
+	{ 4,	TI,	sys_shmctl,		"shmctl"	},
diff -Naur strace-4.5.14/linux/syscall.h strace-4.5.14-linux-2.6.17/linux/syscall.h
--- strace-4.5.14/linux/syscall.h	2006-01-12 23:34:50.000000000 +0100
+++ strace-4.5.14-linux-2.6.17/linux/syscall.h	2006-06-22 13:55:00.000000000 +0200
@@ -183,7 +183,7 @@
 #  undef SYS_sendmsg
 #  undef SYS_recvmsg
 # endif /* IA64 */
-#  define SYS_socket_subcall	300
+#  define SYS_socket_subcall	350
 #define SYS_sub_socket		(SYS_socket_subcall + 1)
 #define SYS_sub_bind		(SYS_socket_subcall + 2)
 #define SYS_sub_connect		(SYS_socket_subcall + 3)
diff -Naur strace-4.5.14/linux/syscallent.h strace-4.5.14-linux-2.6.17/linux/syscallent.h
--- strace-4.5.14/linux/syscallent.h	2006-01-12 23:34:50.000000000 +0100
+++ strace-4.5.14-linux-2.6.17/linux/syscallent.h	2006-06-22 14:27:36.000000000 +0200
@@ -330,54 +330,104 @@
 	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
 	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
 	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
+	{ 5,	0,	printargs,		"SYS_300"	}, /* 300 */
+	{ 5,	0,	printargs,		"SYS_301"	}, /* 301 */
+	{ 5,	0,	printargs,		"SYS_302"	}, /* 302 */
+	{ 5,	0,	printargs,		"SYS_303"	}, /* 303 */
+	{ 5,	0,	printargs,		"SYS_304"	}, /* 304 */
+	{ 5,	0,	printargs,		"SYS_305"	}, /* 305 */
+	{ 5,	0,	printargs,		"SYS_306"	}, /* 306 */
+	{ 5,	0,	printargs,		"SYS_307"	}, /* 307 */
+	{ 5,	0,	printargs,		"SYS_308"	}, /* 308 */
+	{ 5,	0,	printargs,		"SYS_309"	}, /* 309 */
+	{ 5,	0,	printargs,		"SYS_310"	}, /* 310 */
+	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
+	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
+	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
+	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
+	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
+	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
+	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
+	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
+	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
+	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
+	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
+	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
+	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
+	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
+	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
+	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
+	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
+	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
+	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
+	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
+	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
+	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
+	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
+	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
+	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
+	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
+	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
+	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
+	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
+	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
+	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
+	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
+	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
+	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
+	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
+	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
+	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
 
-#if SYS_socket_subcall != 300
+#if SYS_socket_subcall != 350
  #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 300 */
-	{ 3,	TN,	sys_socket,		"socket"	}, /* 301 */
-	{ 3,	TN,	sys_bind,		"bind"		}, /* 302 */
-	{ 3,	TN,	sys_connect,		"connect"	}, /* 303 */
-	{ 2,	TN,	sys_listen,		"listen"	}, /* 304 */
-	{ 3,	TN,	sys_accept,		"accept"	}, /* 305 */
-	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 306 */
-	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 307 */
-	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 308 */
-	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 309 */
-	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 310 */
-	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 311 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 312 */
-	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 313 */
-	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 314 */
-	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 315 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 316 */
-	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 317 */
+	{ 8,	0,	printargs,		"socket_subcall"},
+	{ 3,	TN,	sys_socket,		"socket"	},
+	{ 3,	TN,	sys_bind,		"bind"		},
+	{ 3,	TN,	sys_connect,		"connect"	},
+	{ 2,	TN,	sys_listen,		"listen"	},
+	{ 3,	TN,	sys_accept,		"accept"	},
+	{ 3,	TN,	sys_getsockname,	"getsockname"	},
+	{ 3,	TN,	sys_getpeername,	"getpeername"	},
+	{ 4,	TN,	sys_socketpair,		"socketpair"	},
+	{ 4,	TN,	sys_send,		"send", SYS_sub_send },
+	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv },
+	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto },
+	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom },
+	{ 2,	TN,	sys_shutdown,		"shutdown"	},
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	},
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	},
+	{ 5,	TN,	sys_sendmsg,		"sendmsg"	},
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	},
 
-#if SYS_ipc_subcall != 318
+#if SYS_ipc_subcall != 368
  #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 318 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 319 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 320 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 321 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 322 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 323 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 324 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 325 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 326 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 327 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 328 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 329 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 330 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 331 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 332 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 333 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 334 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 335 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 336 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 337 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 338 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 339 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 342 */
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_semop,		"semop"		},
+	{ 4,	TI,	sys_semget,		"semget"	},
+	{ 4,	TI,	sys_semctl,		"semctl"	},
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	},
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	},
+	{ 4,	TI,	sys_msgget,		"msgget"	},
+	{ 4,	TI,	sys_msgctl,		"msgctl"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	0,	printargs,		"ipc_subcall"	},
+	{ 4,	TI,	sys_shmat,		"shmat"		},
+	{ 4,	TI,	sys_shmdt,		"shmdt"		},
+	{ 4,	TI,	sys_shmget,		"shmget"	},
+	{ 4,	TI,	sys_shmctl,		"shmctl"	},




More information about the Strace-devel mailing list