UBUNTU: [Debian] make rebuild use skippable error codes when skipping.

[mirror_ubuntu-bionic-kernel.git] / mm / page_owner.c

diff --git a/mm/page_owner.c b/mm/page_owner.c
index 4f44b95b9d1e53cb7a8b294f339afea90b885e93..662cb621df1e46442dfadb73f679f9d5031f729b 100644 (file)
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -20,9 +20,9 @@
 #define PAGE_OWNER_STACK_DEPTH (16)
 
 struct page_owner {
-       unsigned int order;
+       unsigned short order;
+       short last_migrate_reason;
        gfp_t gfp_mask;
-       int last_migrate_reason;
        depot_stack_handle_t handle;
 };
 
@@ -123,13 +123,13 @@ void __reset_page_owner(struct page *page, unsigned int order)
 static inline bool check_recursive_alloc(struct stack_trace *trace,
                                        unsigned long ip)
 {
-       int i, count;
+       int i;
 
        if (!trace->nr_entries)
                return false;
 
-       for (i = 0, count = 0; i < trace->nr_entries; i++) {
-               if (trace->entries[i] == ip && ++count == 2)
+       for (i = 0; i < trace->nr_entries; i++) {
+               if (trace->entries[i] == ip)
                        return true;
        }
 
@@ -616,7 +616,6 @@ static void init_early_allocated_pages(void)
 {
        pg_data_t *pgdat;
 
-       drain_all_pages(NULL);
        for_each_online_pgdat(pgdat)
                init_zones_in_node(pgdat);
 }