diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-06-26 12:24:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-06-26 12:24:42 +0200 |
| commit | 2c92d787cc9fad57d05c96bd117782183768258a (patch) | |
| tree | 51c0c567b8be2fd56073a8ce31f8ebd123a7d562 /include/linux/psp-sev.h | |
| parent | 145a773aef83181d47ebab21bb33c89233aadb1e (diff) | |
| parent | 8be3a53e18e0e1a98f288f6c7f5e9da3adbe9c49 (diff) | |
Merge branch 'linus' into x86/entry, to resolve conflictsx86_entry_for_5.8
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/psp-sev.h')
| -rw-r--r-- | include/linux/psp-sev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h index 7fbc8679145c..49d155cd2dfe 100644 --- a/include/linux/psp-sev.h +++ b/include/linux/psp-sev.h @@ -597,7 +597,7 @@ int sev_guest_df_flush(int *error); */ int sev_guest_decommission(struct sev_data_decommission *data, int *error); -void *psp_copy_user_blob(u64 __user uaddr, u32 len); +void *psp_copy_user_blob(u64 uaddr, u32 len); #else /* !CONFIG_CRYPTO_DEV_SP_PSP */ |