Merge: x86/module: Fix the paravirt vs alternative order
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2055 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2170197 Conflicts: Minor context diffs in the first hunk due to the presence of later upstream commit ed53a0d9 ("x86/alternative: Use .ibt_endbr_seal to seal indirect calls") and commit 15e67227 ("x86: Undo return-thunk damage"). commit 5adf3494 Author: Peter Zijlstra <peterz@infradead.org> Date: Thu, 3 Mar 2022 12:23:23 +0100 x86/module: Fix the paravirt vs alternative order Ever since commit 4e629211 ("x86/paravirt: Add new features for paravirt patching") there is an ordering dependency between patching paravirt ops and patching alternatives, the module loader still violates this. Fixes: 4e629211 ("x86/paravirt: Add new features for paravirt patching") Signed-off-by:Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by:
Borislav Petkov <bp@suse.de> Reviewed-by:
Miroslav Benes <mbenes@suse.cz> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20220303112825.068773913@infradead.org Signed-off-by:
Waiman Long <longman@redhat.com> Approved-by:
Prarit Bhargava <prarit@redhat.com> Approved-by:
Dean Nelson <dnelson@redhat.com> Signed-off-by:
Herton R. Krzesinski <herton@redhat.com>
No related branches found
No related tags found
Loading
Please register or sign in to comment