diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-28 18:29:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-28 18:29:25 -0800 |
| commit | fad7bdc9b054a3dc2f5e77a8061c07aead6f5a5e (patch) | |
| tree | 5005f612c8bb682fa621d6d3f8b75897e71590af /arch/um/Kconfig | |
| parent | Merge tag 'trace-v5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| parent | um: Fix time-travel=inf-cpu with xor/raid6 (diff) | |
| download | linux-fad7bdc9b054a3dc2f5e77a8061c07aead6f5a5e.tar.xz linux-fad7bdc9b054a3dc2f5e77a8061c07aead6f5a5e.zip | |
Merge tag 'for-linus-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Anton Ivanov:
"I am sending this on behalf of Richard who is traveling.
This contains the following changes for UML:
- Fix for time travel mode
- Disable CONFIG_CONSTRUCTORS again
- A new command line option to have an non-raw serial line
- Preparations to remove obsolete UML network drivers"
* tag 'for-linus-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Fix time-travel=inf-cpu with xor/raid6
Revert "um: Enable CONFIG_CONSTRUCTORS"
um: Mark non-vector net transports as obsolete
um: Add an option to make serial driver non-raw
Diffstat (limited to 'arch/um/Kconfig')
| -rw-r--r-- | arch/um/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 6f0edd0c0220..0917f8443c28 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -189,6 +189,8 @@ config SECCOMP config UML_TIME_TRAVEL_SUPPORT bool prompt "Support time-travel mode (e.g. for test execution)" + # inf-cpu mode is incompatible with the benchmarking + depends on !RAID6_PQ_BENCHMARK help Enable this option to support time travel inside the UML instance. |