diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-30 14:16:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-30 14:16:30 -0700 |
| commit | 883c9ab9eb595f8542d01e55d29a346c8d96862e (patch) | |
| tree | a2538b1989629dfc9d00289db3f4e32e4cfdd83b /arch/parisc/Kconfig | |
| parent | 08af78d7a52b2b34f7e865102cfc49bfc9c8bcc9 (diff) | |
| parent | 24b6c22504a27210a8377e54d24d425ae414f2c1 (diff) | |
| download | linux-stable-883c9ab9eb595f8542d01e55d29a346c8d96862e.tar.gz linux-stable-883c9ab9eb595f8542d01e55d29a346c8d96862e.tar.bz2 linux-stable-883c9ab9eb595f8542d01e55d29a346c8d96862e.zip | |
Merge branch 'parisc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes and cleanups from Helge Deller:
"Nothing exiting in this patchset, just
- small cleanups of header files
- default to 4 CPUs when building a SMP kernel
- mark 16kB and 64kB page sizes broken
- addition of the new io_pgetevents syscall"
* 'parisc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Build kernel without -ffunction-sections
parisc: Reduce debug output in unwind code
parisc: Wire up io_pgetevents syscall
parisc: Default to 4 SMP CPUs
parisc: Convert printk(KERN_LEVEL) to pr_lvl()
parisc: Mark 16kB and 64kB page sizes BROKEN
parisc: Drop struct sigaction from not exported header file
Diffstat (limited to 'arch/parisc/Kconfig')
| -rw-r--r-- | arch/parisc/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index c480770fabcd..17526bebcbd2 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -244,11 +244,11 @@ config PARISC_PAGE_SIZE_4KB config PARISC_PAGE_SIZE_16KB bool "16KB" - depends on PA8X00 + depends on PA8X00 && BROKEN config PARISC_PAGE_SIZE_64KB bool "64KB" - depends on PA8X00 + depends on PA8X00 && BROKEN endchoice @@ -347,7 +347,7 @@ config NR_CPUS int "Maximum number of CPUs (2-32)" range 2 32 depends on SMP - default "32" + default "4" endmenu |