Skip to content

Commit 8f97a35

Browse files
committed
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)
2 parents bbdff6d + a4f1192 commit 8f97a35

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/linux/percpu-refcount.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
#define _LINUX_PERCPU_REFCOUNT_H
5252

5353
#include <linux/atomic.h>
54-
#include <linux/kernel.h>
5554
#include <linux/percpu.h>
5655
#include <linux/rcupdate.h>
56+
#include <linux/types.h>
5757
#include <linux/gfp.h>
5858

5959
struct percpu_ref;

mm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ config THP_SWAP
428428
# UP and nommu archs use km based percpu allocator
429429
#
430430
config NEED_PER_CPU_KM
431-
depends on !SMP
431+
depends on !SMP || !MMU
432432
bool
433433
default y
434434

0 commit comments

Comments
 (0)