Skip to content
Snippets Groups Projects
Commit ad2d31cd authored by Herton R. Krzesinski's avatar Herton R. Krzesinski
Browse files

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: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20220303112825.068773913@infradead.org



Signed-off-by: default avatarWaiman Long <longman@redhat.com>

Approved-by: default avatarPrarit Bhargava <prarit@redhat.com>
Approved-by: default avatarDean Nelson <dnelson@redhat.com>

Signed-off-by: default avatarHerton R. Krzesinski <herton@redhat.com>
parents 8e6ac3f7 182546e5
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment