Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel-magellan/patches-4.17/0107-4.17.8-all-fixes.patch

    Annotation of /trunk/kernel-magellan/patches-4.17/0107-4.17.8-all-fixes.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3158 - (hide annotations) (download)
    Tue Jul 31 06:31:58 2018 UTC (5 years, 10 months ago) by niro
    File size: 1513 byte(s) 
    -linux-4.16.8
    1 niro 3158 diff --git a/Makefile b/Makefile
    2     index 5c9f331f29c0..7cc36fe18dbb 100644
    3     --- a/Makefile
    4     +++ b/Makefile
    5     @@ -1,7 +1,7 @@
    6     # SPDX-License-Identifier: GPL-2.0
    7     VERSION = 4
    8     PATCHLEVEL = 17
    9     -SUBLEVEL = 7
    10     +SUBLEVEL = 8
    11     EXTRAVERSION =
    12     NAME = Merciless Moray
    13    
    14     diff --git a/include/linux/mm.h b/include/linux/mm.h
    15     index 02a616e2f17d..d14261d6b213 100644
    16     --- a/include/linux/mm.h
    17     +++ b/include/linux/mm.h
    18     @@ -2081,7 +2081,7 @@ extern int __meminit __early_pfn_to_nid(unsigned long pfn,
    19     struct mminit_pfnnid_cache *state);
    20     #endif
    21    
    22     -#ifdef CONFIG_HAVE_MEMBLOCK
    23     +#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_FLAT_NODE_MEM_MAP)
    24     void zero_resv_unavail(void);
    25     #else
    26     static inline void zero_resv_unavail(void) {}
    27     diff --git a/mm/page_alloc.c b/mm/page_alloc.c
    28     index 322cb12a142f..7b841a764dd0 100644
    29     --- a/mm/page_alloc.c
    30     +++ b/mm/page_alloc.c
    31     @@ -6377,7 +6377,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,
    32     free_area_init_core(pgdat);
    33     }
    34    
    35     -#ifdef CONFIG_HAVE_MEMBLOCK
    36     +#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_FLAT_NODE_MEM_MAP)
    37     /*
    38     * Only struct pages that are backed by physical memory are zeroed and
    39     * initialized by going through __init_single_page(). But, there are some
    40     @@ -6415,7 +6415,7 @@ void __paginginit zero_resv_unavail(void)
    41     if (pgcnt)
    42     pr_info("Reserved but unavailable: %lld pages", pgcnt);
    43     }
    44     -#endif /* CONFIG_HAVE_MEMBLOCK */
    45     +#endif /* CONFIG_HAVE_MEMBLOCK && !CONFIG_FLAT_NODE_MEM_MAP */
    46    
    47     #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
    48