diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:04:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:04:46 +0100 |
| commit | 4d012040161cba054208555300d9fdf2b8925c34 (patch) | |
| tree | 326f597177a377bc17b98e5e77d242a0ba4b042c /arch/mips/Kconfig | |
| parent | c4bc515d73b5201d30f78b935accdd9e3988f05e (diff) | |
| parent | d58071a8a76d779eedab38033ae4c821c30295a5 (diff) | |
Merge 5.16-rc3 into usb-next
We need the USB driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index de60ad190057..0215dc1529e9 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -3097,7 +3097,7 @@ config STACKTRACE_SUPPORT config PGTABLE_LEVELS int default 4 if PAGE_SIZE_4KB && MIPS_VA_BITS_48 - default 3 if 64BIT && !PAGE_SIZE_64KB + default 3 if 64BIT && (!PAGE_SIZE_64KB || MIPS_VA_BITS_48) default 2 config MIPS_AUTO_PFN_OFFSET |