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 /kernel | |
| 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-dev-fad7bdc9b054a3dc2f5e77a8061c07aead6f5a5e.tar.xz linux-dev-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 'kernel')
| -rw-r--r-- | kernel/gcov/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/gcov/Kconfig b/kernel/gcov/Kconfig index 060e8e726755..3941a9c48f83 100644 --- a/kernel/gcov/Kconfig +++ b/kernel/gcov/Kconfig @@ -4,7 +4,7 @@ menu "GCOV-based kernel profiling" config GCOV_KERNEL bool "Enable gcov-based kernel profiling" depends on DEBUG_FS - select CONSTRUCTORS + select CONSTRUCTORS if !UML default n ---help--- This option enables gcov-based code profiling (e.g. for code coverage |