lkml.org 
[lkml]   [2018]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: Linux 4.17.8
    diff --git a/Makefile b/Makefile
    index 5c9f331f29c0..7cc36fe18dbb 100644
    --- a/Makefile
    +++ b/Makefile
    @@ -1,7 +1,7 @@
    # SPDX-License-Identifier: GPL-2.0
    VERSION = 4
    PATCHLEVEL = 17
    -SUBLEVEL = 7
    +SUBLEVEL = 8
    EXTRAVERSION =
    NAME = Merciless Moray

    diff --git a/include/linux/mm.h b/include/linux/mm.h
    index 02a616e2f17d..d14261d6b213 100644
    --- a/include/linux/mm.h
    +++ b/include/linux/mm.h
    @@ -2081,7 +2081,7 @@ extern int __meminit __early_pfn_to_nid(unsigned long pfn,
    struct mminit_pfnnid_cache *state);
    #endif

    -#ifdef CONFIG_HAVE_MEMBLOCK
    +#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_FLAT_NODE_MEM_MAP)
    void zero_resv_unavail(void);
    #else
    static inline void zero_resv_unavail(void) {}
    diff --git a/mm/page_alloc.c b/mm/page_alloc.c
    index 322cb12a142f..7b841a764dd0 100644
    --- a/mm/page_alloc.c
    +++ b/mm/page_alloc.c
    @@ -6377,7 +6377,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,
    free_area_init_core(pgdat);
    }

    -#ifdef CONFIG_HAVE_MEMBLOCK
    +#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_FLAT_NODE_MEM_MAP)
    /*
    * Only struct pages that are backed by physical memory are zeroed and
    * initialized by going through __init_single_page(). But, there are some
    @@ -6415,7 +6415,7 @@ void __paginginit zero_resv_unavail(void)
    if (pgcnt)
    pr_info("Reserved but unavailable: %lld pages", pgcnt);
    }
    -#endif /* CONFIG_HAVE_MEMBLOCK */
    +#endif /* CONFIG_HAVE_MEMBLOCK && !CONFIG_FLAT_NODE_MEM_MAP */

    #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP

    \
     
     \ /
      Last update: 2018-07-18 08:31    [W:3.073 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site