Merge branch 'x86-pti-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse source

Pull x86 pti fixes from Ingo Molnar:
 "An APM fix, and a BTS hardware-tracing fix related to PTI changes"

* 'x86-pti-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apm: Don't access __preempt_count with zeroed fs
  x86/events/intel/ds: Fix bts_interrupt_threshold alignment

...

This commit is contained in:

Linus Torvalds 2018-07-21 17:23:58 -07:00

parent 48b1db7c7a 6f6060a5c9

commit 43227e098c

3 changed files with 10 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

arch/x86/events/intel/ds.c

View file

6

arch/x86/include/asm/apm.h

View file

5

arch/x86/kernel/apm_32.c

View file