commit 36a14638f7c06546717cc1316fcfee6da42b98cc
author Linus Torvalds <torvalds@linux-foundation.org> Sun Mar 28 12:19:16 2021 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Mar 28 12:19:16 2021 -0700
tree 21205e622f9d949e77197901abe23030ffa5d1ce
parent 47fbbc94dab61a1385f21a0a209c61b5d6b0a215
parent 9fcb51c14da2953de585c5c6e50697b8a6e91a7b

Merge tag 'x86-urgent-2021-03-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "Two fixes:

   - Fix build failure on Ubuntu with new GCC packages that turn
     on -fcf-protection

   - Fix SME memory encryption PTE encoding bug - AFAICT the code
     worked on 4K page sizes (level 1) but had the wrong shift at
     higher page level orders (level 2 and higher)"

* tag 'x86-urgent-2021-03-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Turn off -fcf-protection for realmode targets
  x86/mem_encrypt: Correct physical address calculation in __set_clr_pte_enc()