]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
mm/memory_hotplug: use pgprot_val to get value of pgprot
authorliusongtang <liusongtang@huawei.com>
Tue, 10 May 2022 01:20:52 +0000 (18:20 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 13 May 2022 14:20:07 +0000 (07:20 -0700)
pgprot.pgprot is non-portable code.  It should be replaced by portable
macro pgprot_val.

Link: https://lkml.kernel.org/r/20220426071302.220646-1-liusongtang@huawei.com
Signed-off-by: liusongtang <liusongtang@huawei.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Xiaoming Ni <nixiaoming@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/memory_hotplug.c

index 19a6beb9d4b62e3f3b701fd2315acf4fae461bf9..e99fd60548f5fc3d78770356ab771aa73f2cb462 100644 (file)
@@ -303,7 +303,7 @@ int __ref __add_pages(int nid, unsigned long pfn, unsigned long nr_pages,
        int err;
        struct vmem_altmap *altmap = params->altmap;
 
-       if (WARN_ON_ONCE(!params->pgprot.pgprot))
+       if (WARN_ON_ONCE(!pgprot_val(params->pgprot)))
                return -EINVAL;
 
        VM_BUG_ON(!mhp_range_allowed(PFN_PHYS(pfn), nr_pages * PAGE_SIZE, false));