summarylogtreecommitdiffstats
path: root/vmmon-12.5.8-4.13.12.patch
diff options
context:
space:
mode:
authorBen White2017-11-26 10:22:54 +0100
committerBen White2017-11-26 10:22:54 +0100
commitfa7bc6621a55852893097df4d1e877469d80add0 (patch)
treed0a452a9d80bfcdcf4af712c15846ebcd98ee838 /vmmon-12.5.8-4.13.12.patch
parent889dc3e310659f3f6fddc49cb8cca39945390968 (diff)
downloadaur-fa7bc6621a55852893097df4d1e877469d80add0.tar.gz
Working on a clean install of 12.5.8
Diffstat (limited to 'vmmon-12.5.8-4.13.12.patch')
-rw-r--r--vmmon-12.5.8-4.13.12.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/vmmon-12.5.8-4.13.12.patch b/vmmon-12.5.8-4.13.12.patch
new file mode 100644
index 00000000000..756fa66fa3c
--- /dev/null
+++ b/vmmon-12.5.8-4.13.12.patch
@@ -0,0 +1,62 @@
+diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+--- vmmon-only/linux/hostif.c
++++ vmmon-only/linux/hostif.c
+@@ -99,6 +99,37 @@
+ #include "vmmonInt.h"
+ #include "versioned_atomic.h"
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
++#define global_zone_page_state global_page_state
++#endif
++
++static unsigned long get_nr_slab_unreclaimable(void)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0)
++ return global_node_page_state(NR_SLAB_UNRECLAIMABLE);
++#else
++ return global_page_state(NR_SLAB_UNRECLAIMABLE);
++#endif
++}
++
++static unsigned long get_nr_unevictable(void)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ return global_node_page_state(NR_UNEVICTABLE);
++#else
++ return global_page_state(NR_UNEVICTABLE);
++#endif
++}
++
++static unsigned long get_nr_anon_mapped(void)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++ return global_node_page_state(NR_ANON_MAPPED);
++#else
++ return global_page_state(NR_ANON_PAGES);
++#endif
++}
++
+ /*
+ * Determine if we can use high resolution timers.
+ */
+@@ -1594,16 +1625,11 @@ HostIF_EstimateLockedPageLimit(const VMDriver* vm, // IN
+ unsigned int reservedPages = MEMDEFAULTS_MIN_HOST_PAGES;
+ unsigned int hugePages = (vm == NULL) ? 0 :
+ BYTES_2_PAGES(vm->memInfo.hugePageBytes);
+- unsigned int lockedPages = global_page_state(NR_PAGETABLE) +
+- global_page_state(NR_SLAB_UNRECLAIMABLE) +
+- global_page_state(NR_UNEVICTABLE) +
++ unsigned int lockedPages = global_zone_page_state(NR_PAGETABLE) +
++ get_nr_slab_unreclaimable() +
++ get_nr_unevictable() +
+ hugePages + reservedPages;
+- unsigned int anonPages =
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+- global_page_state(NR_ANON_MAPPED);
+-#else
+- global_page_state(NR_ANON_PAGES);
+-#endif
++ unsigned int anonPages = get_nr_anon_mapped();
+ unsigned int swapPages = BYTES_2_PAGES(linuxState.swapSize);
+
+ if (anonPages > swapPages) {