summaryrefslogtreecommitdiffstats
path: root/patches/boot_time_opt_guest/0153-x86-Return-memory-from-guest-to-host-kernel.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/boot_time_opt_guest/0153-x86-Return-memory-from-guest-to-host-kernel.patch')
-rw-r--r--patches/boot_time_opt_guest/0153-x86-Return-memory-from-guest-to-host-kernel.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/boot_time_opt_guest/0153-x86-Return-memory-from-guest-to-host-kernel.patch b/patches/boot_time_opt_guest/0153-x86-Return-memory-from-guest-to-host-kernel.patch
index cdb876a..e0364ef 100644
--- a/patches/boot_time_opt_guest/0153-x86-Return-memory-from-guest-to-host-kernel.patch
+++ b/patches/boot_time_opt_guest/0153-x86-Return-memory-from-guest-to-host-kernel.patch
@@ -1,4 +1,4 @@
1From 855ef164854307839c08c60688eaeac14f9a649e Mon Sep 17 00:00:00 2001 1From 986184ccf3e478cf9eeffc635e444ea025eb4052 Mon Sep 17 00:00:00 2001
2From: Sebastien Boeuf <sebastien.boeuf@intel.com> 2From: Sebastien Boeuf <sebastien.boeuf@intel.com>
3Date: Mon, 23 Jan 2017 15:26:13 -0800 3Date: Mon, 23 Jan 2017 15:26:13 -0800
4Subject: [PATCH 153/154] x86: Return memory from guest to host kernel 4Subject: [PATCH 153/154] x86: Return memory from guest to host kernel
@@ -86,10 +86,10 @@ index bc62e7cbf1b1..4a2f6d1adbd2 100644
86 #ifdef CONFIG_PARAVIRT_SPINLOCKS 86 #ifdef CONFIG_PARAVIRT_SPINLOCKS
87 void __init kvm_spinlock_init(void); 87 void __init kvm_spinlock_init(void);
88diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c 88diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
89index edbbfc854e39..14167b3f6514 100644 89index 43e10d6fdbed..8479d3fb6206 100644
90--- a/arch/x86/kernel/kvm.c 90--- a/arch/x86/kernel/kvm.c
91+++ b/arch/x86/kernel/kvm.c 91+++ b/arch/x86/kernel/kvm.c
92@@ -552,6 +552,16 @@ static __init int activate_jump_labels(void) 92@@ -549,6 +549,16 @@ static __init int activate_jump_labels(void)
93 } 93 }
94 arch_initcall(activate_jump_labels); 94 arch_initcall(activate_jump_labels);
95 95
@@ -131,18 +131,18 @@ index 4efc3f56e6df..26eb3a05a8a3 100644
131+ 131+
132 #endif /* _LINUX_MM_ARCH_HOOKS_H */ 132 #endif /* _LINUX_MM_ARCH_HOOKS_H */
133diff --git a/mm/page_alloc.c b/mm/page_alloc.c 133diff --git a/mm/page_alloc.c b/mm/page_alloc.c
134index 1460e6ad5e14..5f6e6371bc6f 100644 134index 2302f250d6b1..65e9121583e1 100644
135--- a/mm/page_alloc.c 135--- a/mm/page_alloc.c
136+++ b/mm/page_alloc.c 136+++ b/mm/page_alloc.c
137@@ -64,6 +64,7 @@ 137@@ -65,6 +65,7 @@
138 #include <linux/page_owner.h> 138 #include <linux/page_owner.h>
139 #include <linux/kthread.h> 139 #include <linux/kthread.h>
140 #include <linux/memcontrol.h> 140 #include <linux/memcontrol.h>
141+#include <linux/mm-arch-hooks.h> 141+#include <linux/mm-arch-hooks.h>
142 #include <linux/ftrace.h>
142 143
143 #include <asm/sections.h> 144 #include <asm/sections.h>
144 #include <asm/tlbflush.h> 145@@ -869,6 +870,7 @@ static inline void __free_one_page(struct page *page,
145@@ -855,6 +856,7 @@ static inline void __free_one_page(struct page *page,
146 } 146 }
147 147
148 done_merging: 148 done_merging:
@@ -151,5 +151,5 @@ index 1460e6ad5e14..5f6e6371bc6f 100644
151 151
152 /* 152 /*
153-- 153--
1542.12.1 1542.13.2
155 155