diff options
| author | Borislav Petkov <bp@suse.de> | 2021-03-18 18:43:11 +0300 | 
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-03-18 18:43:11 +0300 | 
| commit | afb4a37778491eae010a43edebea32ff2d45f01c (patch) | |
| tree | c40bcc6143e5542134477dd96a108d24b1f9074f /arch/x86/include/asm/proto.h | |
| parent | 229164175ff0c61ff581e6bf37fbfcb608b6e9bb (diff) | |
| parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
| download | linux-afb4a37778491eae010a43edebea32ff2d45f01c.tar.xz | |
Merge tag 'v5.12-rc3' into x86/seves
Pick up dependent SEV-ES urgent changes which went into -rc3 to base new
work ontop.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/include/asm/proto.h')
| -rw-r--r-- | arch/x86/include/asm/proto.h | 1 | 
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h index 2c35f1c01a2d..b6a9d51d1d79 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h @@ -25,6 +25,7 @@ void __end_SYSENTER_singlestep_region(void);  void entry_SYSENTER_compat(void);  void __end_entry_SYSENTER_compat(void);  void entry_SYSCALL_compat(void); +void entry_SYSCALL_compat_safe_stack(void);  void entry_INT80_compat(void);  #ifdef CONFIG_XEN_PV  void xen_entry_INT80_compat(void);  | 
