Added 'CONFIG_X86_MSR=y for 'powertop' to i586 and x86_64builds for fixing #11997

Message ID 20190210192122.22520-1-matthias.fischer@ipfire.org
State Accepted
Commit 256070e92fed192f80c0c4fcdbbf9102fdc8e6b4
Headers
Series Added 'CONFIG_X86_MSR=y for 'powertop' to i586 and x86_64builds for fixing #11997 |

Commit Message

Matthias Fischer Feb. 11, 2019, 6:21 a.m. UTC
  Triggered by:
https://forum.ipfire.org/viewtopic.php?f=69&t=22274

This - probably - fixes Bug #11997.

Needs testing on 64bit installations!

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/kernel/kernel.config.i586-ipfire     | 2 +-
 config/kernel/kernel.config.i586-ipfire-pae | 2 +-
 config/kernel/kernel.config.x86_64-ipfire   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
  

Comments

Michael Tremer Feb. 13, 2019, 10:30 p.m. UTC | #1
Hey,

I will leave this one for Arne to review and merge.

Best,
-Michael

> On 10 Feb 2019, at 19:21, Matthias Fischer <matthias.fischer@ipfire.org> wrote:
> 
> Triggered by:
> https://forum.ipfire.org/viewtopic.php?f=69&t=22274
> 
> This - probably - fixes Bug #11997.
> 
> Needs testing on 64bit installations!
> 
> Best,
> Matthias
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
> config/kernel/kernel.config.i586-ipfire     | 2 +-
> config/kernel/kernel.config.i586-ipfire-pae | 2 +-
> config/kernel/kernel.config.x86_64-ipfire   | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
> index aa7b0ed34..d54e8b8b6 100644
> --- a/config/kernel/kernel.config.i586-ipfire
> +++ b/config/kernel/kernel.config.i586-ipfire
> @@ -529,7 +529,7 @@ CONFIG_MICROCODE=y
> CONFIG_MICROCODE_INTEL=y
> CONFIG_MICROCODE_AMD=y
> CONFIG_MICROCODE_OLD_INTERFACE=y
> -# CONFIG_X86_MSR is not set
> +CONFIG_X86_MSR=y
> CONFIG_X86_CPUID=y
> # CONFIG_NOHIGHMEM is not set
> CONFIG_HIGHMEM4G=y
> diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
> index 781bb87e5..d86520155 100644
> --- a/config/kernel/kernel.config.i586-ipfire-pae
> +++ b/config/kernel/kernel.config.i586-ipfire-pae
> @@ -542,7 +542,7 @@ CONFIG_MICROCODE=y
> CONFIG_MICROCODE_INTEL=y
> CONFIG_MICROCODE_AMD=y
> CONFIG_MICROCODE_OLD_INTERFACE=y
> -# CONFIG_X86_MSR is not set
> +CONFIG_X86_MSR=y
> CONFIG_X86_CPUID=y
> # CONFIG_NOHIGHMEM is not set
> # CONFIG_HIGHMEM4G is not set
> diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
> index ed0f31c24..e6598c8d8 100644
> --- a/config/kernel/kernel.config.x86_64-ipfire
> +++ b/config/kernel/kernel.config.x86_64-ipfire
> @@ -532,7 +532,7 @@ CONFIG_MICROCODE=y
> CONFIG_MICROCODE_INTEL=y
> CONFIG_MICROCODE_AMD=y
> CONFIG_MICROCODE_OLD_INTERFACE=y
> -# CONFIG_X86_MSR is not set
> +CONFIG_X86_MSR=y
> CONFIG_X86_CPUID=y
> # CONFIG_X86_5LEVEL is not set
> CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
> -- 
> 2.18.0
>
  

Patch

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index aa7b0ed34..d54e8b8b6 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -529,7 +529,7 @@  CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
-# CONFIG_X86_MSR is not set
+CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 781bb87e5..d86520155 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -542,7 +542,7 @@  CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
-# CONFIG_X86_MSR is not set
+CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index ed0f31c24..e6598c8d8 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -532,7 +532,7 @@  CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
-# CONFIG_X86_MSR is not set
+CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 # CONFIG_X86_5LEVEL is not set
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y