Commit 8f97a35a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-5.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu 

Pull percpu fixes from Dennis Zhou:
 "This contains a fix for SMP && !MMU archs for percpu which has been
  tested by arm and sh. It seems in the past they have gotten away with
  it due to mapping of vm functions to km functions, but this fell apart
  a few releases ago and was just reported recently.

  The other is just a minor dependency clean up.

  I think queued up right now by Andrew is a fix in percpu that papers
  of what seems to be a bug in hotplug for a special situation with
  memoryless nodes. Michal Hocko is digging into it further"

* 'for-5.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
  percpu_ref: Replace kernel.h with the necessary inclusions
  percpu: km: ensure it is used with NOMMU (either UP or SMP)
parents bbdff6d5 a4f1192c

include/linux/percpu-refcount.h

+1 −1
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ 
#define _LINUX_PERCPU_REFCOUNT_H



#include <linux/atomic.h>

#include <linux/kernel.h>

#include <linux/percpu.h>

#include <linux/rcupdate.h>

#include <linux/types.h>

#include <linux/gfp.h>



struct percpu_ref;

mm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ config THP_SWAP 
# UP and nommu archs use km based percpu allocator

#

config NEED_PER_CPU_KM

	depends on !SMP

	depends on !SMP || !MMU

	bool

	default y