diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-11 16:18:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-11 16:18:58 -0700 |
| commit | 3864e8ccbba1dcdea87398ab80fdc8ae0fab7c45 (patch) | |
| tree | 7f9cce370f5e01b0c3a5e17a230e3e9207054e7c /arch/s390/Kconfig | |
| parent | 75ecb1a4d148b274aa9acd1d6ccaca0a4654784e (diff) | |
| parent | cbea66d9788a344e16e161f22a6e0c4deef2c0ed (diff) | |
| download | op-kernel-dev-3864e8ccbba1dcdea87398ab80fdc8ae0fab7c45.zip op-kernel-dev-3864e8ccbba1dcdea87398ab80fdc8ae0fab7c45.tar.gz | |
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] monwriter: Serialization bug for multithreaded applications.
[S390] vmur: diag14 only works with buffers below 2GB
[S390] vmur: add "top of queue" sanity check for reader open
[S390] vmur: reject open on z/VM reader files with status HOLD
[S390] vmur: use DECLARE_COMPLETION_ONSTACK to keep lockdep happy
[S390] vmur: allocate single record buffers instead of one big data buffer
[S390] remove DEFAULT_MIGRATION_COST
[S390] qdio: make sure data structures are correctly aligned.
[S390] hypfs: implement show_options
[S390] cio: avoid memory leak on error in css_alloc_subchannel().
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 098c62c..b711321 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -109,10 +109,6 @@ config HOTPLUG_CPU can be controlled through /sys/devices/system/cpu/cpu#. Say N if you want to disable CPU hotplug. -config DEFAULT_MIGRATION_COST - int - default "1000000" - config MATHEMU bool "IEEE FPU emulation" depends on MARCH_G5 |
