| Message ID | 20180925201814.3576.15105.stgit@localhost.localdomain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Address issues slowing persistent memory initialization | expand |
On Tue, Sep 25, 2018 at 01:19:15PM -0700, Alexander Duyck wrote: > The CONFIG_NO_BOOTMEM config option was recently removed by the patch "mm: > remove CONFIG_NO_BOOTMEM" (https://patchwork.kernel.org/patch/10600647/). > However it looks like it missed a few spots. The biggest one being the > dependency for deferred init. This patch goes through and removes the > remaining spots that appear to have been missed in the patch so that I am > able to build again with deferred memory initialization. Thanks for fixing it! > Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com> Acked-by: Mike Rapoport <rppt@linux.vnet.ibm.com> > --- > > v5: New patch, added to fix regression found in latest linux-next > > arch/csky/Kconfig | 1 - > mm/Kconfig | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig > index fe2c94b94fe3..fb2a0ae84dd5 100644 > --- a/arch/csky/Kconfig > +++ b/arch/csky/Kconfig > @@ -38,7 +38,6 @@ config CSKY > select HAVE_MEMBLOCK > select MAY_HAVE_SPARSE_IRQ > select MODULES_USE_ELF_RELA if MODULES > - select NO_BOOTMEM > select OF > select OF_EARLY_FLATTREE > select OF_RESERVED_MEM > diff --git a/mm/Kconfig b/mm/Kconfig > index c6a0d82af45f..b4421aa608c4 100644 > --- a/mm/Kconfig > +++ b/mm/Kconfig > @@ -631,7 +631,6 @@ config MAX_STACK_SIZE_MB > config DEFERRED_STRUCT_PAGE_INIT > bool "Defer initialisation of struct pages to kthreads" > default n > - depends on NO_BOOTMEM > depends on SPARSEMEM > depends on !NEED_PER_CPU_KM > depends on 64BIT >
diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig index fe2c94b94fe3..fb2a0ae84dd5 100644 --- a/arch/csky/Kconfig +++ b/arch/csky/Kconfig @@ -38,7 +38,6 @@ config CSKY select HAVE_MEMBLOCK select MAY_HAVE_SPARSE_IRQ select MODULES_USE_ELF_RELA if MODULES - select NO_BOOTMEM select OF select OF_EARLY_FLATTREE select OF_RESERVED_MEM diff --git a/mm/Kconfig b/mm/Kconfig index c6a0d82af45f..b4421aa608c4 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -631,7 +631,6 @@ config MAX_STACK_SIZE_MB config DEFERRED_STRUCT_PAGE_INIT bool "Defer initialisation of struct pages to kthreads" default n - depends on NO_BOOTMEM depends on SPARSEMEM depends on !NEED_PER_CPU_KM depends on 64BIT
The CONFIG_NO_BOOTMEM config option was recently removed by the patch "mm: remove CONFIG_NO_BOOTMEM" (https://patchwork.kernel.org/patch/10600647/). However it looks like it missed a few spots. The biggest one being the dependency for deferred init. This patch goes through and removes the remaining spots that appear to have been missed in the patch so that I am able to build again with deferred memory initialization. Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com> --- v5: New patch, added to fix regression found in latest linux-next arch/csky/Kconfig | 1 - mm/Kconfig | 1 - 2 files changed, 2 deletions(-)