From: Roland McGrath <roland@redhat.com>
Date: Sun, 22 Dec 2002 03:34:39 +0000 (+0000)
Subject: 2002-12-21  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~929
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09f0d1d4c48e19b84573f66e8c8edab79150a550;p=strace

2002-12-21  Roland McGrath  <roland@redhat.com>

	* linux/syscall.h [I386 || IA64] (SYS_socket_subcall): Bump to 300 for
	safety, since up to 260 are already used in 2.5 kernels.
	* linux/syscallent.h: Update the table.
	* linux/ia64/syscallent.h: Likewise.
---

diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h
index 1690d6f6..7491b0c8 100644
--- a/linux/ia64/syscallent.h
+++ b/linux/ia64/syscallent.h
@@ -246,50 +246,6 @@
    starts where that one leaves off.
 */
 
-	{ 8,	0,	printargs,		"SYS_299"	}, /* 299 */
-	{ 8,	0,	printargs,		"SYS_300"	}, /* 300 */
-	{ 8,	0,	printargs,		"SYS_301"	}, /* 301 */
-	{ 8,	0,	printargs,		"SYS_302"	}, /* 302 */
-	{ 8,	0,	printargs,		"SYS_303"	}, /* 303 */
-	{ 8,	0,	printargs,		"SYS_304"	}, /* 304 */
-	{ 8,	0,	printargs,		"SYS_305"	}, /* 305 */
-	{ 8,	0,	printargs,		"SYS_306"	}, /* 306 */
-	{ 8,	0,	printargs,		"SYS_307"	}, /* 307 */
-	{ 8,	0,	printargs,		"SYS_308"	}, /* 308 */
-	{ 8,	0,	printargs,		"SYS_309"	}, /* 309 */
-	{ 8,	0,	printargs,		"SYS_310"	}, /* 310 */
-	{ 8,	0,	printargs,		"SYS_311"	}, /* 311 */
-	{ 8,	0,	printargs,		"SYS_312"	}, /* 312 */
-	{ 8,	0,	printargs,		"SYS_313"	}, /* 313 */
-	{ 8,	0,	printargs,		"SYS_314"	}, /* 314 */
-	{ 8,	0,	printargs,		"SYS_315"	}, /* 315 */
-	{ 8,	0,	printargs,		"SYS_316"	}, /* 316 */
-	{ 8,	0,	printargs,		"SYS_317"	}, /* 317 */
-	{ 8,	0,	printargs,		"SYS_318"	}, /* 318 */
-	{ 8,	0,	printargs,		"SYS_319"	}, /* 319 */
-	{ 8,	0,	printargs,		"SYS_320"	}, /* 320 */
-	{ 8,	0,	printargs,		"SYS_321"	}, /* 321 */
-	{ 8,	0,	printargs,		"SYS_322"	}, /* 322 */
-	{ 8,	0,	printargs,		"SYS_323"	}, /* 323 */
-	{ 8,	0,	printargs,		"SYS_324"	}, /* 324 */
-	{ 8,	0,	printargs,		"SYS_325"	}, /* 325 */
-	{ 8,	0,	printargs,		"SYS_326"	}, /* 326 */
-	{ 8,	0,	printargs,		"SYS_327"	}, /* 327 */
-	{ 8,	0,	printargs,		"SYS_328"	}, /* 328 */
-	{ 8,	0,	printargs,		"SYS_329"	}, /* 329 */
-	{ 8,	0,	printargs,		"SYS_330"	}, /* 330 */
-	{ 8,	0,	printargs,		"SYS_331"	}, /* 331 */
-	{ 8,	0,	printargs,		"SYS_332"	}, /* 332 */
-	{ 8,	0,	printargs,		"SYS_333"	}, /* 333 */
-	{ 8,	0,	printargs,		"SYS_334"	}, /* 334 */
-	{ 8,	0,	printargs,		"SYS_335"	}, /* 335 */
-	{ 8,	0,	printargs,		"SYS_336"	}, /* 336 */
-	{ 8,	0,	printargs,		"SYS_337"	}, /* 337 */
-	{ 8,	0,	printargs,		"SYS_338"	}, /* 338 */
-	{ 8,	0,	printargs,		"SYS_339"	}, /* 339 */
-	{ 8,	0,	printargs,		"SYS_340"	}, /* 340 */
-	{ 8,	0,	printargs,		"SYS_341"	}, /* 341 */
-	{ 8,	0,	printargs,		"SYS_342"	}, /* 342 */
 	{ 8,	0,	printargs,		"SYS_343"	}, /* 343 */
 	{ 8,	0,	printargs,		"SYS_344"	}, /* 344 */
 	{ 8,	0,	printargs,		"SYS_345"	}, /* 345 */
diff --git a/linux/syscall.h b/linux/syscall.h
index b5e05047..10f85203 100644
--- a/linux/syscall.h
+++ b/linux/syscall.h
@@ -142,8 +142,12 @@ int sys_osf_utimes();
 #  undef SYS_getsockopt
 #  undef SYS_sendmsg
 #  undef SYS_recvmsg
-#endif /* IA64 */
-#define SYS_socket_subcall	256
+# endif /* IA64 */
+# if defined I386 || defined IA64
+#  define SYS_socket_subcall	300
+# else
+#  define SYS_socket_subcall	256
+# endif
 #define SYS_socket		(SYS_socket_subcall + 1)
 #define SYS_bind		(SYS_socket_subcall + 2)
 #define SYS_connect		(SYS_socket_subcall + 3)