mm,hwpoison: try to narrow window race for free pages

[linux-2.6-microblaze.git] / kernel / resource.c

diff --git a/kernel/resource.c b/kernel/resource.c
index 841737b..f1175ce 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -382,10 +382,13 @@ static int find_next_iomem_res(resource_size_t start, resource_size_t end,
 
        if (p) {
                /* copy data */
-               res->start = max(start, p->start);
-               res->end = min(end, p->end);
-               res->flags = p->flags;
-               res->desc = p->desc;
+               *res = (struct resource) {
+                       .start = max(start, p->start),
+                       .end = min(end, p->end),
+                       .flags = p->flags,
+                       .desc = p->desc,
+                       .parent = p->parent,
+               };
        }
 
        read_unlock(&resource_lock);