*_execsw static structures cannot be const due to the way they interact

    with EXEC_SET, DECLARE_MODULE, and module_register.  Specifically,
    module_register.  We may eventually be able to make these const, but
    not now.

4 files changed, 8 insertions, 8 deletions

diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 9fbd203..570c364 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_aout.c,v 1.43 1998/10/16 03:55:00 peter Exp $
+ *	$Id: imgact_aout.c,v 1.44 1999/01/01 14:41:51 bde Exp $
  */
 
 #include <sys/param.h>
@@ -300,5 +300,5 @@ out:
  * Since `const' objects end up in the text segment, TEXT_SET is the
  * correct directive to use.
  */
-static const struct execsw aout_execsw = { exec_aout_imgact, "a.out" };
+static struct execsw aout_execsw = { exec_aout_imgact, "a.out" };
 EXEC_SET(aout, aout_execsw);
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index a719abb..98613d8 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_elf.c,v 1.45 1999/01/26 02:38:10 julian Exp $
+ *	$Id: imgact_elf.c,v 1.46 1999/01/27 21:49:55 dillon Exp $
  */
 
 #include "opt_rlimit.h"
@@ -984,5 +984,5 @@ elf_putnote(void *dst, size_t *off, const char *name, int type,
  * Since `const' objects end up in the text segment, TEXT_SET is the
  * correct directive to use.
  */
-static const struct execsw elf_execsw = {exec_elf_imgact, "ELF"};
+static struct execsw elf_execsw = {exec_elf_imgact, "ELF"};
 EXEC_SET(elf, elf_execsw);
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index d666a87..35cfe43 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: imgact_gzip.c,v 1.34 1998/07/15 05:00:26 bde Exp $
+ * $Id: imgact_gzip.c,v 1.35 1998/10/16 03:55:00 peter Exp $
  *
  * This module handles execution of a.out files which have been run through
  * "gzip".  This saves diskspace, but wastes cpu-cycles and VM.
@@ -374,5 +374,5 @@ Flush(void *vp, u_char * ptr, u_long siz)
  * correct directive to use.
  */
 
-static const struct execsw gzip_execsw = {exec_gzip_imgact, "gzip"};
+static struct execsw gzip_execsw = {exec_gzip_imgact, "gzip"};
 EXEC_SET(execgzip, gzip_execsw);
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index e72b86d..361cf18 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_shell.c,v 1.16 1997/08/02 14:31:23 bde Exp $
+ *	$Id: imgact_shell.c,v 1.17 1998/10/16 03:55:00 peter Exp $
  */
 
 #include <sys/param.h>
@@ -134,5 +134,5 @@ exec_shell_imgact(imgp)
  * Since `const' objects end up in the text segment, TEXT_SET is the
  * correct directive to use.
  */
-static const struct execsw shell_execsw = { exec_shell_imgact, "#!" };
+static struct execsw shell_execsw = { exec_shell_imgact, "#!" };
 EXEC_SET(shell, shell_execsw);