diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2014-11-21 07:02:11 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2014-11-21 07:02:11 +0000 |
| commit | 060710d1906794b357981b00a80f00e9ef3fc64b (patch) | |
| tree | de15b9b46f6d69ca24bf52239e7faf082f66deb6 /sys | |
| parent | evbuffer_read will return 0 one an end of file condition. (diff) | |
| download | wireguard-openbsd-060710d1906794b357981b00a80f00e9ef3fc64b.tar.xz wireguard-openbsd-060710d1906794b357981b00a80f00e9ef3fc64b.zip | |
Since we enable NX in locore now, no need to do it again later in the
bootstrap sequence
ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/cpu.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c index 209fff74ea4..3083f696fbb 100644 --- a/sys/arch/amd64/amd64/cpu.c +++ b/sys/arch/amd64/amd64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.67 2014/11/16 12:30:56 deraadt Exp $ */ +/* $OpenBSD: cpu.c,v 1.68 2014/11/21 07:02:11 mlarkin Exp $ */ /* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */ /*- @@ -893,9 +893,6 @@ cpu_init_msrs(struct cpu_info *ci) wrmsr(MSR_FSBASE, 0); wrmsr(MSR_GSBASE, (u_int64_t)ci); wrmsr(MSR_KERNELGSBASE, 0); - - if (cpu_feature & CPUID_NXE) - wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_NXE); } void |