diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index f2e98d350f1..afc2122234a 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -364,6 +364,3 @@ device xenpci # Xen HVM Hypervisor services driver # VMware support device vmx # VMware VMXNET3 Ethernet - -options PAX -options PAX_ASLR diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 27472f5ecda..1a4762d4c26 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -373,6 +373,3 @@ device xenpci # Xen HVM Hypervisor services driver # VMware support device vmx # VMware VMXNET3 Ethernet - -options PAX -options PAX_ASLR