From 8036c9131038b6ac2323482294ff01acaeee6bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 8 Mar 2021 01:03:52 +0100
Subject: [PATCH] Adjust page-zeroing options

In 5.11 the mechanism (and the options) for zeroing unused pages have
changed. Now it is no longer tied to a debugging mechanism, but is one
of available security features.
---
 config-qubes | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config-qubes b/config-qubes
index 284c1649..0d3aa1db 100644
--- a/config-qubes
+++ b/config-qubes
@@ -50,9 +50,8 @@ CONFIG_INTEL_IOMMU_DEFAULT_ON=y
 
 # CONFIG_PROC_KCORE is not set
 
-CONFIG_PAGE_POISONING=y
-# CONFIG_PAGE_POISONING_NO_SANITY is not set
-CONFIG_PAGE_POISONING_ZERO=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_INIT_ON_FREE_DEFAULT_ON=y
 
 CONFIG_PANIC_ON_OOPS=y
 CONFIG_PANIC_ON_OOPS_VALUE=1