diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-17 09:18:44 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-17 09:18:44 -0400 |
| commit | 9a8428e0a76710bd8d78da42597f25b22101eeca (patch) | |
| tree | a08c19c181ccb883a9d5792d475f72264351f247 | |
| parent | be0af1dc5293092d001cae7dae3a437c5249320e (diff) | |
| download | kernel-9a8428e0a76710bd8d78da42597f25b22101eeca.tar.gz kernel-9a8428e0a76710bd8d78da42597f25b22101eeca.tar.xz kernel-9a8428e0a76710bd8d78da42597f25b22101eeca.zip | |
Clean up removed config options
The DEBUG_RODATA and STATIC_CPU_HAS options were removed by
the upstream maintainers. Drop them.
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | Makefile.release | 1 | ||||
| -rw-r--r-- | config-debug | 2 | ||||
| -rw-r--r-- | config-nodebug | 2 | ||||
| -rw-r--r-- | config-x86-generic | 1 |
5 files changed, 0 insertions, 7 deletions
@@ -91,7 +91,6 @@ debug: @perl -pi -e 's/# CONFIG_WQ_WATCHDOG is not set/CONFIG_WQ_WATCHDOG=y/' config-nodebug @perl -pi -e 's/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/' config-nodebug @perl -pi -e 's/# CONFIG_DEBUG_KMEMLEAK is not set/CONFIG_DEBUG_KMEMLEAK=y/' config-nodebug - @perl -pi -e 's/# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set/CONFIG_X86_DEBUG_STATIC_CPU_HAS=y/' config-nodebug @# just in case we're going from extremedebug -> debug @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug diff --git a/Makefile.release b/Makefile.release index 6fa0645b8..f1d31bb0c 100644 --- a/Makefile.release +++ b/Makefile.release @@ -74,7 +74,6 @@ config-release: @perl -pi -e 's/CONFIG_XFS_WARN=y/# CONFIG_XFS_WARN is not set/' config-nodebug @perl -pi -e 's/CONFIG_EDAC_DEBUG=y/# CONFIG_EDAC_DEBUG is not set/' config-nodebug @perl -pi -e 's/CONFIG_RTLWIFI_DEBUG=y/# CONFIG_RTLWIFI_DEBUG is not set/' config-nodebug - @perl -pi -e 's/CONFIG_X86_DEBUG_STATIC_CPU_HAS=y/# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set/' config-nodebug @# Undo anything that make extremedebug might have set @perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug diff --git a/config-debug b/config-debug index fc6505b48..b6313babc 100644 --- a/config-debug +++ b/config-debug @@ -126,5 +126,3 @@ CONFIG_MAC80211_MESSAGE_TRACING=y CONFIG_EDAC_DEBUG=y CONFIG_SPI_DEBUG=y - -CONFIG_X86_DEBUG_STATIC_CPU_HAS=y diff --git a/config-nodebug b/config-nodebug index 3a2eee381..997ee3d0a 100644 --- a/config-nodebug +++ b/config-nodebug @@ -126,5 +126,3 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y # CONFIG_EDAC_DEBUG is not set # CONFIG_SPI_DEBUG is not set - -CONFIG_X86_DEBUG_STATIC_CPU_HAS=y diff --git a/config-x86-generic b/config-x86-generic index 6bd4bca3f..e67be0b9c 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -71,7 +71,6 @@ CONFIG_X86_MPPARSE=y CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set -CONFIG_DEBUG_RODATA=y CONFIG_DEBUG_WX=y CONFIG_DEBUG_STACKOVERFLOW=y |