[ bp: Adjust to x86/entry changes. ]
We need to "unadjust" it for the stable branches, and I dare not do it myself :)
Would picking up the original version from the mailing list work here as a backport?
I posted versions to stable@vger.kernel.org based on the original earlier today. 5.6 & 5.7 applied cleanly. 5.4 and 4.19 needed another small tweak.
-Tony