Linux/linux 43227e0 — arch/x86/events/intel ds.c, arch/x86/include/asm apm.h
Merge branch 'x86-pti-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 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
| Delta | File | |
|---|---|---|
| +5 | -3 | arch/x86/events/intel/ds.c |
| +0 | -6 | arch/x86/include/asm/apm.h |
| +5 | -0 | arch/x86/kernel/apm_32.c |
| +10 | -9 | 3 files |
