Merge import NS conversion from 'https://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc drivers/platform/x86/amd/hsmp/hsmp.c
index a8f3e751967857757b5cc464dfc9d1965de5c4cd,227b4ad4a51afbcd747d61192702b6e2a751206f..03164e30b3a502a0e2aa36d2ef93281e36c8d032
--- 1/drivers/platform/x86/amd/hsmp/hsmp.c
--- 2/drivers/platform/x86/amd/hsmp/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp/hsmp.c
@@@ -260,20 -237,8 +260,20 @@@ int hsmp_test(u16 sock_ind, u32 value
  
        return ret;
  }
- EXPORT_SYMBOL_NS_GPL(hsmp_test, AMD_HSMP);
+ EXPORT_SYMBOL_NS_GPL(hsmp_test, "AMD_HSMP");
  
 +static bool is_get_msg(struct hsmp_message *msg)
 +{
 +      if (hsmp_msg_desc_table[msg->msg_id].type == HSMP_GET)
 +              return true;
 +
 +      if (hsmp_msg_desc_table[msg->msg_id].type == HSMP_SET_GET &&
 +          (msg->args[0] & CHECK_GET_BIT))
 +              return true;
 +
 +      return false;
 +}
 +
  long hsmp_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
  {
        int __user *arguser = (int  __user *)arg;