Merge tag 'block-5.10-2020-12-12' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / xen / unpopulated-alloc.c

diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-alloc.c
index 8c512ea..7762c1b 100644 (file)
--- a/drivers/xen/unpopulated-alloc.c
+++ b/drivers/xen/unpopulated-alloc.c
@@ -12,7 +12,7 @@
 #include <xen/xen.h>
 
 static DEFINE_MUTEX(list_lock);
-static LIST_HEAD(page_list);
+static struct page *page_list;
 static unsigned int list_count;
 
 static int fill_list(unsigned int nr_pages)
@@ -84,7 +84,8 @@ static int fill_list(unsigned int nr_pages)
                struct page *pg = virt_to_page(vaddr + PAGE_SIZE * i);
 
                BUG_ON(!virt_addr_valid(vaddr + PAGE_SIZE * i));
-               list_add(&pg->lru, &page_list);
+               pg->zone_device_data = page_list;
+               page_list = pg;
                list_count++;
        }
 
@@ -118,12 +119,10 @@ int xen_alloc_unpopulated_pages(unsigned int nr_pages, struct page **pages)
        }
 
        for (i = 0; i < nr_pages; i++) {
-               struct page *pg = list_first_entry_or_null(&page_list,
-                                                          struct page,
-                                                          lru);
+               struct page *pg = page_list;
 
                BUG_ON(!pg);
-               list_del(&pg->lru);
+               page_list = pg->zone_device_data;
                list_count--;
                pages[i] = pg;
 
@@ -134,7 +133,8 @@ int xen_alloc_unpopulated_pages(unsigned int nr_pages, struct page **pages)
                                unsigned int j;
 
                                for (j = 0; j <= i; j++) {
-                                       list_add(&pages[j]->lru, &page_list);
+                                       pages[j]->zone_device_data = page_list;
+                                       page_list = pages[j];
                                        list_count++;
                                }
                                goto out;
@@ -160,7 +160,8 @@ void xen_free_unpopulated_pages(unsigned int nr_pages, struct page **pages)
 
        mutex_lock(&list_lock);
        for (i = 0; i < nr_pages; i++) {
-               list_add(&pages[i]->lru, &page_list);
+               pages[i]->zone_device_data = page_list;
+               page_list = pages[i];
                list_count++;
        }
        mutex_unlock(&list_lock);
@@ -189,7 +190,8 @@ static int __init init(void)
                        struct page *pg =
                                pfn_to_page(xen_extra_mem[i].start_pfn + j);
 
-                       list_add(&pg->lru, &page_list);
+                       pg->zone_device_data = page_list;
+                       page_list = pg;
                        list_count++;
                }
        }