1 files changed, 12 insertions, 12 deletions

diff --git a/patches/boot_time_opt/0153-x86-Return-memory-from-guest-to-host-kernel.patch b/patches/boot_time_opt/0153-x86-Return-memory-from-guest-to-host-kernel.patch
index cdb876a..7e24355 100644
--- a/patches/boot_time_opt/0153-x86-Return-memory-from-guest-to-host-kernel.patch
+++ b/patches/boot_time_opt/0153-x86-Return-memory-from-guest-to-host-kernel.patch
@@ -1,4 +1,4 @@
-From 855ef164854307839c08c60688eaeac14f9a649e Mon Sep 17 00:00:00 2001
+From 9d487e5b95627e54c5ba256363ab6d1c5eaa592d Mon Sep 17 00:00:00 2001
 From: Sebastien Boeuf <sebastien.boeuf@intel.com>
 Date: Mon, 23 Jan 2017 15:26:13 -0800
 Subject: [PATCH 153/154] x86: Return memory from guest to host kernel
@@ -53,10 +53,10 @@ Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
  4 files changed, 42 insertions(+)
 
 diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h
-index bc62e7cbf1b1..4a2f6d1adbd2 100644
+index c373e44049b1..847f17ff111c 100644
 --- a/arch/x86/include/asm/kvm_para.h
 +++ b/arch/x86/include/asm/kvm_para.h
-@@ -92,6 +92,28 @@ void kvm_async_pf_task_wait(u32 token);
+@@ -93,6 +93,28 @@ void kvm_async_pf_task_wait(u32 token, int interrupt_kernel);
  void kvm_async_pf_task_wake(u32 token);
  u32 kvm_read_and_reset_pf_reason(void);
  extern void kvm_disable_steal_time(void);
@@ -86,10 +86,10 @@ index bc62e7cbf1b1..4a2f6d1adbd2 100644
  #ifdef CONFIG_PARAVIRT_SPINLOCKS
  void __init kvm_spinlock_init(void);
 diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
-index edbbfc854e39..14167b3f6514 100644
+index 8bb9594d0761..696319728469 100644
 --- a/arch/x86/kernel/kvm.c
 +++ b/arch/x86/kernel/kvm.c
-@@ -552,6 +552,16 @@ static __init int activate_jump_labels(void)
+@@ -563,6 +563,16 @@ static __init int activate_jump_labels(void)
  }
  arch_initcall(activate_jump_labels);
  
@@ -131,18 +131,18 @@ index 4efc3f56e6df..26eb3a05a8a3 100644
 +
  #endif /* _LINUX_MM_ARCH_HOOKS_H */
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 1460e6ad5e14..5f6e6371bc6f 100644
+index 77e4d3c5c57b..b14190aeedff 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -64,6 +64,7 @@
+@@ -65,6 +65,7 @@
  #include <linux/page_owner.h>
  #include <linux/kthread.h>
  #include <linux/memcontrol.h>
 +#include <linux/mm-arch-hooks.h>
- 
- #include <asm/sections.h>
- #include <asm/tlbflush.h>
-@@ -855,6 +856,7 @@ static inline void __free_one_page(struct page *page,
+ #include <linux/ftrace.h>
+ #include <linux/lockdep.h>
+ #include <linux/nmi.h>
+@@ -869,6 +870,7 @@ static inline void __free_one_page(struct page *page,
         }
  
  done_merging:
@@ -151,5 +151,5 @@ index 1460e6ad5e14..5f6e6371bc6f 100644
  
         /*
 -- 
-2.12.1
+2.15.0