summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorLouis Burda <quent.burda@gmail.com>2022-12-11 02:50:50 +0100
committerLouis Burda <quent.burda@gmail.com>2022-12-11 02:50:50 +0100
commitbe291b876f75894ecb80308be35d2983f069038f (patch)
tree612cd595ea258b358e5917a692179f9a833cfda4 /arch/x86/kernel
parent6a825bc86322af6c7bac4304dec5722e18539aa2 (diff)
downloadcachepc-linux-be291b876f75894ecb80308be35d2983f069038f.tar.gz
cachepc-linux-be291b876f75894ecb80308be35d2983f069038f.zip
Revert unnecessary diffs and small tdp_mmu fix
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/sev.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c
index 5c2d9b07c6aa..f603a724b08e 100644
--- a/arch/x86/kernel/sev.c
+++ b/arch/x86/kernel/sev.c
@@ -1034,8 +1034,6 @@ static int wakeup_cpu_via_vmgexit(int apic_id, unsigned long start_ip)
if (!vmsa)
return -ENOMEM;
- CPC_WARN("New VMSA allocated!\n");
-
/* CR4 should maintain the MCE value */
cr4 = native_read_cr4() & X86_CR4_MCE;
@@ -2591,11 +2589,11 @@ static int rmpupdate(u64 pfn, struct rmpupdate *val)
* direct map.
*/
if (val->assigned) {
- // if (invalid_direct_map(pfn, npages)) {
- // pr_err("Failed to unmap pfn 0x%llx pages %d from direct_map\n",
- // pfn, npages);
- // return -EFAULT;
- // }
+ if (invalid_direct_map(pfn, npages)) {
+ pr_err("Failed to unmap pfn 0x%llx pages %d from direct_map\n",
+ pfn, npages);
+ return -EFAULT;
+ }
}
retry: