Merge branch 'linus' into x86/entry, to resolve conflicts

[sfrench/cifs-2.6.git] / include / linux / psp-sev.h

diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h
index 7fbc8679145c24213f872d9ec292de8047008635..49d155cd2dfe9eaa98ccecdb99fce4ed48286c93 100644 (file)
--- 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 */