diff options
| author | Laura Abbott <labbott@redhat.com> | 2018-02-28 09:34:54 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2018-02-28 09:34:54 -0800 |
| commit | 356f92a38197ec975404407382df72ed54258b26 (patch) | |
| tree | 4f33e54d8b6cd993d511d6b0b385e013529d90cc | |
| parent | 37ff69b901efe19de5cd01093f048dd966660ae3 (diff) | |
| download | kernel-356f92a38197ec975404407382df72ed54258b26.tar.gz kernel-356f92a38197ec975404407382df72ed54258b26.tar.xz kernel-356f92a38197ec975404407382df72ed54258b26.zip | |
Don't build in CONFIG_X86_PMEM_LEGACY (rhbz 1460398)
| -rw-r--r-- | configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY | 2 | ||||
| -rw-r--r-- | kernel-i686-PAE.config | 2 | ||||
| -rw-r--r-- | kernel-i686-PAEdebug.config | 2 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 2 | ||||
| -rw-r--r-- | kernel-i686.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64.config | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY b/configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY index 3ac539aca..b93c1350f 100644 --- a/configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY +++ b/configs/fedora/generic/x86/CONFIG_X86_PMEM_LEGACY @@ -1 +1 @@ -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 4e3b941a3..bf503e125 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -6226,7 +6226,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 8472d4886..5a2e8c691 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -6249,7 +6249,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 4d9582fb6..487f2b76c 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6249,7 +6249,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y diff --git a/kernel-i686.config b/kernel-i686.config index ef61f09ce..6ebbf4120 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6226,7 +6226,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index ec08afc9d..926a0f27f 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -6337,7 +6337,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y CONFIG_X86_POWERNOW_K8=m CONFIG_X86_PTDUMP=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 953d0d99f..eeaf80507 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -6314,7 +6314,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_PTDUMP is not set |