CVS commit: [netbsd-10] src/sys/kern

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Wed Nov 29 12:25:17 UTC 2023

Modified Files:
        src/sys/kern [netbsd-10]: exec_subr.c

Log Message:
Additionally pull up the following for ticket #477:

        sys/kern/exec_subr.c            1.87

Fix build for kernels w/o PAX_MPROTECT.


To generate a diff of this commit:
cvs rdiff -u -r1.84.20.1 -r1.84.20.2 src/sys/kern/exec_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.84.20.1 src/sys/kern/exec_subr.c:1.84.20.2
--- src/sys/kern/exec_subr.c:1.84.20.1	Tue Nov 28 12:56:28 2023
+++ src/sys/kern/exec_subr.c	Wed Nov 29 12:25:17 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_subr.c,v 1.84.20.1 2023/11/28 12:56:28 martin Exp $	*/
+/*	$NetBSD: exec_subr.c,v 1.84.20.2 2023/11/29 12:25:17 martin Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.84.20.1 2023/11/28 12:56:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.84.20.2 2023/11/29 12:25:17 martin Exp $");
 
 #include "opt_pax.h"
 
@@ -162,7 +162,7 @@ static int
 vmcmd_get_prot(struct lwp *l, const struct exec_vmcmd *cmd, vm_prot_t *prot,
     vm_prot_t *maxprot)
 {
-	vm_prot_t extraprot = PROT_MPROTECT_EXTRACT(cmd->ev_prot);
+	vm_prot_t extraprot __unused = PROT_MPROTECT_EXTRACT(cmd->ev_prot);
 
 	*prot = cmd->ev_prot & UVM_PROT_ALL;
 	*maxprot = PAX_MPROTECT_MAXPROTECT(l, *prot, extraprot, UVM_PROT_ALL);