From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Sep 2020 19:15:21 +0000 (-0700)
Subject: Merge tag 'x86-urgent-2020-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: howlett/maple_spf/20210104~975
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f8818559ca6251adbcd9408dc1ebe3b832f3e1d7;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'x86-urgent-2020-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Thomas Gleixner:
 "Two fixes for the x86 interrupt code:

   - Unbreak the magic 'search the timer interrupt' logic in IO/APIC
     code which got wreckaged when the core interrupt code made the
     state tracking logic stricter.

     That caused the interrupt line to stay masked after switching from
     IO/APIC to PIC delivery mode, which obviously prevents interrupts
     from being delivered.

   - Make run_on_irqstack_code() typesafe. The function argument is a
     void pointer which is then cast to 'void (*fun)(void *).

     This breaks Control Flow Integrity checking in clang. Use proper
     helper functions for the three variants reuqired"

* tag 'x86-urgent-2020-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ioapic: Unbreak check_timer()
  x86/irq: Make run_on_irqstack_cond() typesafe
---

f8818559ca6251adbcd9408dc1ebe3b832f3e1d7