| commit | 92d4c21e51fc12736c39c2a161a42f20e2be8a00 | [log] [tgz] |
|---|---|---|
| author | Olivier Deprez <olivier.deprez@arm.com> | Tue Dec 06 15:05:30 2022 +0100 |
| committer | Olivier Deprez <olivier.deprez@arm.com> | Tue Dec 06 15:05:30 2022 +0100 |
| tree | 0ea63b023a85dff7aeb0895b46d3b22a65669ae1 | |
| parent | 157378f43faad830e4aa3815bde5fa9f9a9f5be6 [diff] [blame] |
Update Linux to v5.10.157 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.157.tar.xz Signed-off-by: Olivier Deprez <olivier.deprez@arm.com> Change-Id: I7b30d9e98d8c465d6b44de8e7433b4a40b3289ba
diff --git a/arch/x86/lib/error-inject.c b/arch/x86/lib/error-inject.c index be5b5fb..5208970 100644 --- a/arch/x86/lib/error-inject.c +++ b/arch/x86/lib/error-inject.c
@@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#include <linux/linkage.h> #include <linux/error-injection.h> #include <linux/kprobes.h> @@ -10,7 +11,7 @@ ".type just_return_func, @function\n" ".globl just_return_func\n" "just_return_func:\n" - " ret\n" + ASM_RET ".size just_return_func, .-just_return_func\n" );