diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-04 11:15:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-04 11:15:26 +0100 |
| commit | 1b4c36f9b11e4a68f6174d1b6542b50cd29cddd2 (patch) | |
| tree | 735b11a744d0acd18a1d7b7a4a5fa63fc6d23b92 /arch/x86/kernel/cpu/cyrix.c | |
| parent | d0ba9bcf001c7907e4755b0e498f5ff9d1a228ef (diff) | |
| parent | f6bdaab79ee4228a143ee1b4cb80416d6ffc0c63 (diff) | |
Merge branch 'x86/urgent' into x86/cpu, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/cyrix.c')
| -rw-r--r-- | arch/x86/kernel/cpu/cyrix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c index 9651275aecd1..dfec2c61e354 100644 --- a/arch/x86/kernel/cpu/cyrix.c +++ b/arch/x86/kernel/cpu/cyrix.c @@ -153,8 +153,8 @@ static void geode_configure(void) u8 ccr3; local_irq_save(flags); - /* Suspend on halt power saving and enable #SUSP pin */ - setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88); + /* Suspend on halt power saving */ + setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x08); ccr3 = getCx86(CX86_CCR3); setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ |