diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-20 12:00:30 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-20 12:00:30 +0300 |
| commit | 35eaa42c4a1017c08d0572008db375becb621744 (patch) | |
| tree | 8185b6d18acfc63285e3132c9039c7d6c9a90527 /mm/Kconfig | |
| parent | 4b95391c8ef0f270ed58234597aef58976abe01c (diff) | |
| parent | a7904a538933c525096ca2ccde1e60d0ee62c08e (diff) | |
| download | linux-35eaa42c4a1017c08d0572008db375becb621744.tar.xz | |
Merge 5.16-rc6 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/Kconfig')
| -rw-r--r-- | mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 28edafc820ad..356f4f2c779e 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -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 |