Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dd61dfa authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86: rename do_not_nx to disable_nx in mm/init_64.c 



As a preparational step for unifying noexec handling on 32-bit and 64-bit,
rename the do_not_nx variable to disable_nx on 64-bit.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <1236265497.31324.11.camel@penberg-laptop>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c77a3b59

arch/x86/mm/init_64.c

+4 −4
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ early_param("gbpages", parse_direct_gbpages_on); 
pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;

EXPORT_SYMBOL_GPL(__supported_pte_mask);



static int do_not_nx __cpuinitdata;

static int disable_nx __cpuinitdata;



/*

 * noexec=on|off
@@ -100,9 +100,9 @@ static int __init nonx_setup(char *str) 
		return -EINVAL;

	if (!strncmp(str, "on", 2)) {

		__supported_pte_mask |= _PAGE_NX;

		do_not_nx = 0;

		disable_nx = 0;

	} else if (!strncmp(str, "off", 3)) {

		do_not_nx = 1;

		disable_nx = 1;

		__supported_pte_mask &= ~_PAGE_NX;

	}

	return 0;
@@ -114,7 +114,7 @@ void __cpuinit check_efer(void) 
	unsigned long efer;



	rdmsrl(MSR_EFER, efer);

	if (!(efer & EFER_NX) || do_not_nx)

	if (!(efer & EFER_NX) || disable_nx)

		__supported_pte_mask &= ~_PAGE_NX;

}