]> git.baikalelectronics.ru Git - kernel.git/commit
x86/entry: Move PUSH_AND_CLEAR_REGS() back into error_entry
authorPeter Zijlstra <peterz@infradead.org>
Wed, 6 Jul 2022 13:33:30 +0000 (15:33 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Jul 2022 10:54:10 +0000 (12:54 +0200)
commit2372e512c2cc8b4c7de361e141b900bc404ab53e
treebbdf7756366ee770faf668f8d7ab9748be586da8
parent0bca8c60b21f6eeabb4d6043bc2aae6179fd5189
x86/entry: Move PUSH_AND_CLEAR_REGS() back into error_entry

commit 0071ec4ce58fd6153fce3a0a66c2f35f22b262ac upstream.

Commit

  0696ce348f2a ("x86/entry: Move PUSH_AND_CLEAR_REGS out of error_entry()")

moved PUSH_AND_CLEAR_REGS out of error_entry, into its own function, in
part to avoid calling error_entry() for XenPV.

However, commit

  e4d3322e1123 ("x86/entry: Avoid very early RET")

had to change that because the 'ret' was too early and moved it into
idtentry, bloating the text size, since idtentry is expanded for every
exception vector.

However, with the advent of xen_error_entry() in commit

  971fc43c7fed8 ("x86/xen: Add UNTRAIN_RET")

it became possible to remove PUSH_AND_CLEAR_REGS from idtentry, back
into *error_entry().

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
[cascardo: error_entry still does cld]
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/entry/entry_64.S