diff options
| author | Linus Torvalds | 2008-02-19 17:04:23 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2008-02-19 17:04:23 +0100 |
| commit | aa3f98037ce3bcf850bb41f7530754d27481a792 (patch) | |
| tree | aa539f1e52ea35f7c9f7a3e6e2171d72863e51d4 /arch/s390/Kconfig | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | [S390] qdio: FCP/SCSI write I/O stagnates on LPAR (diff) | |
| download | kernel-qcow2-linux-aa3f98037ce3bcf850bb41f7530754d27481a792.tar.gz kernel-qcow2-linux-aa3f98037ce3bcf850bb41f7530754d27481a792.tar.xz kernel-qcow2-linux-aa3f98037ce3bcf850bb41f7530754d27481a792.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] qdio: FCP/SCSI write I/O stagnates on LPAR
[S390] Fix futex_atomic_cmpxchg_std inline assembly.
[S390] dcss: Fix Unlikely(x) != y
[S390] sclp: clean up send/receive naming scheme
[S390] etr: fix compile error on !SMP
[S390] qdio: fix qdio_activate timeout handling.
[S390] Initialize per cpu lowcores on cpu hotplug.
[S390] find bit corner case.
[S390] dasd: fix locking in __dasd_device_process_final_queue
[S390] Make sure enabled wait psw is loaded in default_idle.
[S390] Let NR_CPUS default to 32/64 on s390/s390x.
[S390] cio: Do timed recovery on workqueue.
[S390] cio: Remember to initialize recovery_lock.
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 92a4f7b4323a..b21444b681b6 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -100,7 +100,8 @@ config NR_CPUS int "Maximum number of CPUs (2-64)" range 2 64 depends on SMP - default "32" + default "32" if !64BIT + default "64" if 64BIT help This allows you to specify the maximum number of CPUs which this kernel will support. The maximum supported value is 64 and the |