2007-07-05  Roland McGrath  <roland@redhat.com>

	* linux/syscallent.h: Fix sys_delete_module arg count.
	* linux/alpha/syscallent.h: Likewise.
	* linux/arm/syscallent.h: Likewise.
	* linux/hppa/syscallent.h: Likewise.
	* linux/ia64/syscallent.h: Likewise.
	* linux/m68k/syscallent.h: Likewise.
	* linux/mips/syscallent.h: Likewise.
	* linux/powerpc/syscallent.h: Likewise.
	* linux/s390/syscallent.h: Likewise.
	* linux/s390x/syscallent.h: Likewise.
	* linux/sh/syscallent.h: Likewise.
	* linux/sh64/syscallent.h: Likewise.
	* linux/sparc/syscallent.h: Likewise.
	* linux/sparc64/syscallent.h: Likewise.
	* linux/sparc64/syscallent2.h: Likewise.
	* linux/x86_64/syscallent.h: Likewise.
	* linux/dummy.h (sys_delete_module): Use sys_open.
	From Johannes Stezenbach <js@linuxtv.org>.
diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h
index 9278c37..29b12eb 100644
--- a/linux/alpha/syscallent.h
+++ b/linux/alpha/syscallent.h
@@ -336,7 +336,7 @@
 	{ 3,	TD,	sys_getdents,		"getdents"		}, /* 305 */
 	{ 2,	0,	sys_create_module,	"create_module"		}, /* 306 */
 	{ 4,	0,	sys_init_module,	"init_module"		}, /* 307 */
-	{ 1,	0,	sys_delete_module,	"delete_module"		}, /* 308 */
+	{ 2,	0,	sys_delete_module,	"delete_module"		}, /* 308 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"	}, /* 309 */
 	{ 3,	0,	sys_syslog,		"syslog"		}, /* 310 */
 	{ 3,	0,	sys_reboot,		"reboot"		}, /* 311 */
diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
index 2af1966..6ac442e 100644
--- a/linux/arm/syscallent.h
+++ b/linux/arm/syscallent.h
@@ -157,7 +157,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
 	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
 	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
diff --git a/linux/dummy.h b/linux/dummy.h
index 281e24d..5c6cfb6 100644
--- a/linux/dummy.h
+++ b/linux/dummy.h
@@ -54,7 +54,7 @@
 #define	sys_umount		sys_chdir
 #define	sys_swapon		sys_chdir
 #define	sys_swapoff		sys_chdir
-#define	sys_delete_module	sys_chdir
+#define	sys_delete_module	sys_open
 #define	sys_fchdir		sys_close
 #define	sys_setfsuid		sys_setuid
 #define	sys_setfsgid		sys_setgid
diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h
index 352f45e..dc4d051 100644
--- a/linux/hppa/syscallent.h
+++ b/linux/hppa/syscallent.h
@@ -134,7 +134,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"		}, /* 126 */
 	{ 2,	0,	sys_create_module,	"create_module"		}, /* 127 */
 	{ 4,	0,	sys_init_module,	"init_module"		}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"		}, /* 129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"		}, /* 129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"	}, /* 130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"		}, /* 131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"		}, /* 132 */
diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h
index e31d0d9..5f0d01d 100644
--- a/linux/ia64/syscallent.h
+++ b/linux/ia64/syscallent.h
@@ -940,7 +940,7 @@
 	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 1131 */
 	{ 2,	0,	sys_create_module,	"create_module"	}, /* 1132 */
 	{ 4,	0,	sys_init_module,	"init_module"	}, /* 1133 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 1134 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 1134 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 1135 */
 	{ 5,	0,	sys_query_module,	"query_module"	}, /* 1136 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 1137 */
diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h
index b07c3f3..7c084ec 100644
--- a/linux/m68k/syscallent.h
+++ b/linux/m68k/syscallent.h
@@ -157,7 +157,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
 	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
 	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
diff --git a/linux/mips/syscallent.h b/linux/mips/syscallent.h
index 5c3d255..a2d7da9 100644
--- a/linux/mips/syscallent.h
+++ b/linux/mips/syscallent.h
@@ -4127,7 +4127,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 4126 */
 	{ 2,	0,	sys_create_module,	"create_module"	}, /* 4127 */
 	{ 3,	0,	sys_init_module,	"init_module"	}, /* 4128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 4129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 4129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 4130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 4131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 4132 */
diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h
index a2de260..76a7c97 100644
--- a/linux/powerpc/syscallent.h
+++ b/linux/powerpc/syscallent.h
@@ -157,7 +157,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"		}, /* 126 */
 	{ 2,	0,	sys_create_module,	"create_module"		}, /* 127 */
 	{ 3,	0,	sys_init_module,	"init_module"		}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"		}, /* 129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"		}, /* 129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"	}, /* 130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"		}, /* 131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"		}, /* 132 */
diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h
index 8d3829e..887b1ef 100644
--- a/linux/s390/syscallent.h
+++ b/linux/s390/syscallent.h
@@ -157,7 +157,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
 	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
 	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h
index 9dd95cc..f963ba5 100644
--- a/linux/s390x/syscallent.h
+++ b/linux/s390x/syscallent.h
@@ -156,7 +156,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
 	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
 	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h
index a8df74b..a8a7aec 100644
--- a/linux/sh/syscallent.h
+++ b/linux/sh/syscallent.h
@@ -159,7 +159,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
 	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
 	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h
index 2b65b08..1d0f01b 100644
--- a/linux/sh64/syscallent.h
+++ b/linux/sh64/syscallent.h
@@ -157,7 +157,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
 	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
 	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h
index 005c82f..8998e5b 100644
--- a/linux/sparc/syscallent.h
+++ b/linux/sparc/syscallent.h
@@ -220,7 +220,7 @@
 	{ 1,	0,	sys_adjtimex,	"adjtimex" },		/* 219 */
 	{ 3,	TS,	sys_sigprocmask,"sigprocmask" },	/* 220 */
 	{ 2,	0,	sys_create_module,"create_module" },	/* 221 */
-	{ 1,	0,	sys_delete_module,"delete_module" },
+	{ 2,	0,	sys_delete_module,"delete_module" },
 	{ 1,	0,	sys_get_kernel_syms,"get_kernel_syms"},	/* 223 */
 	{ 1,	0,	sys_getpgid,	"getpgid" },		/* 224 */
 	{ 0,	0,	sys_bdflush,	"bdflush" },		/* 225 */
diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h
index 005c82f..8998e5b 100644
--- a/linux/sparc64/syscallent.h
+++ b/linux/sparc64/syscallent.h
@@ -220,7 +220,7 @@
 	{ 1,	0,	sys_adjtimex,	"adjtimex" },		/* 219 */
 	{ 3,	TS,	sys_sigprocmask,"sigprocmask" },	/* 220 */
 	{ 2,	0,	sys_create_module,"create_module" },	/* 221 */
-	{ 1,	0,	sys_delete_module,"delete_module" },
+	{ 2,	0,	sys_delete_module,"delete_module" },
 	{ 1,	0,	sys_get_kernel_syms,"get_kernel_syms"},	/* 223 */
 	{ 1,	0,	sys_getpgid,	"getpgid" },		/* 224 */
 	{ 0,	0,	sys_bdflush,	"bdflush" },		/* 225 */
diff --git a/linux/sparc64/syscallent2.h b/linux/sparc64/syscallent2.h
index 84b3d95..69d79d7 100644
--- a/linux/sparc64/syscallent2.h
+++ b/linux/sparc64/syscallent2.h
@@ -220,7 +220,7 @@
 	{ 1,	0,	sys_adjtimex,	"adjtimex" },		/* 219 */
 	{ 3,	TS,	sys_sigprocmask,"sigprocmask" },	/* 220 */
 	{ 2,	0,	sys_create_module,"create_module" },	/* 221 */
-	{ 1,	0,	sys_delete_module,"delete_module" },
+	{ 2,	0,	sys_delete_module,"delete_module" },
 	{ 1,	0,	sys_get_kernel_syms,"get_kernel_syms"},	/* 223 */
 	{ 1,	0,	sys_getpgid,	"getpgid" },		/* 224 */
 	{ 0,	0,	sys_bdflush,	"bdflush" },		/* 225 */
diff --git a/linux/syscallent.h b/linux/syscallent.h
index ff20d75..7704e65 100644
--- a/linux/syscallent.h
+++ b/linux/syscallent.h
@@ -157,7 +157,7 @@
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
 	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
 	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h
index 3f701b6..66c62b9 100644
--- a/linux/x86_64/syscallent.h
+++ b/linux/x86_64/syscallent.h
@@ -174,7 +174,7 @@
 	{ 3,	0,	sys_ioperm,		"ioperm"	},  /* 173 */
 	{ 2,	0,	sys_create_module,	"create_module"	},  /* 174 */
 	{ 3,	0,	sys_init_module,	"init_module"	},  /* 175 */
-	{ 1,	0,	sys_delete_module,	"delete_module"	},  /* 176 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	},  /* 176 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"},  /* 177 */
 	{ 5,	0,	sys_query_module,	"query_module"	},  /* 178 */
 	{ 4,	0,	sys_quotactl,		"quotactl"	},  /* 179 */