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/ia64/include/asm/syscall.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/ia64/include/asm/syscall.h')
| -rw-r--r-- | arch/ia64/include/asm/syscall.h | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/syscall.h b/arch/ia64/include/asm/syscall.h index 6c6f16e409a8..0d23c0049301 100644 --- a/arch/ia64/include/asm/syscall.h +++ b/arch/ia64/include/asm/syscall.h @@ -32,7 +32,7 @@ static inline void syscall_rollback(struct task_struct *task,  static inline long syscall_get_error(struct task_struct *task,  				     struct pt_regs *regs)  { -	return regs->r10 == -1 ? regs->r8:0; +	return regs->r10 == -1 ? -regs->r8:0;  }  static inline long syscall_get_return_value(struct task_struct *task,  | 
