These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm64 / mm / pageattr.c

diff --git a/kernel/arch/arm64/mm/pageattr.c b/kernel/arch/arm64/mm/pageattr.c
index e47ed1c..cf62407 100644 (file)
--- a/kernel/arch/arm64/mm/pageattr.c
+++ b/kernel/arch/arm64/mm/pageattr.c
@@ -45,7 +45,7 @@ static int change_memory_common(unsigned long addr, int numpages,
        int ret;
        struct page_change_data data;
 
-       if (!IS_ALIGNED(addr, PAGE_SIZE)) {
+       if (!PAGE_ALIGNED(addr)) {
                start &= PAGE_MASK;
                end = start + size;
                WARN_ON_ONCE(1);
@@ -57,6 +57,9 @@ static int change_memory_common(unsigned long addr, int numpages,
        if (end < MODULES_VADDR || end >= MODULES_END)
                return -EINVAL;
 
+       if (!numpages)
+               return 0;
+
        data.set_mask = set_mask;
        data.clear_mask = clear_mask;