Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux-pinebook-pro
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Admin message

Due to an influx of spam, we had to disable account registrations. If you don't have an account yet, please write an email to support@manjaro.org, with your desired username. Sorry for the inconvenience.

a964d23c

Commit a964d23c authored 5 years ago by Rafael J. Wysocki

Downloads
- Plain Diff

Merge branch 'pm-x86'

* pm-x86:
  x86/power: Fix 'nosmt' vs hibernation triple fault during resume
  x86: intel_epb: Do not build when CONFIG_PM is unset

parents a6137347 ec527c31

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/kernel/cpu/Makefile 4 additions, 1 deletion

arch/x86/kernel/cpu/Makefile
arch/x86/kernel/cpu/intel_epb.c 1 addition, 21 deletions

arch/x86/kernel/cpu/intel_epb.c
arch/x86/power/cpu.c 10 additions, 0 deletions

arch/x86/power/cpu.c
arch/x86/power/hibernate.c 33 additions, 0 deletions

arch/x86/power/hibernate.c
include/linux/cpu.h 4 additions, 0 deletions

include/linux/cpu.h
kernel/cpu.c 2 additions, 2 deletions

kernel/cpu.c
kernel/power/hibernate.c 9 additions, 0 deletions

kernel/power/hibernate.c

with 63 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment