x86/srat: fix the end pfn check in valid_numa_range()

... and fix the coding style on fly.

valid_numa_range(..., epfn << PAGE_SHIFT, ...) and its only caller
memory_add(..., epfn, pxm) interpret epfn inconsistently. The former
interprets epfn as the last pfn, while the latter interprets it as the
last pfn plus one. Fix this inconsistency in valid_numa_range(), since
most of other places use the latter interpretation.

Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 528ec7181a0450c8f36cb5cc21f4dd68cedc9297..49d04b887bbea2cfb8f0e23fc329c19d6b3b697a 100644 (file)
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -110,8 +110,8 @@ int valid_numa_range(u64 start, u64 end, nodeid_t node)
        for (i = 0; i < num_node_memblks; i++) {
                struct node *nd = &node_memblk_range[i];
 
-               if (nd->start <= start && nd->end > end &&
-                       memblk_nodeid[i] == node )
+               if (nd->start <= start && nd->end >= end &&
+                       memblk_nodeid[i] == node)
                        return 1;
        }