diff options
| author | James Morris <james.morris@microsoft.com> | 2019-01-10 11:41:59 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-10 11:41:59 -0800 |
| commit | 7ff17fe228094bad025c79c39e9e23af4364644c (patch) | |
| tree | 05dc0dd252df9b5e3ed8e4429dc5f31c070e0f23 /crypto/pcrypt.c | |
| parent | 7271e588c712517a184f75744b6e94d05c8251a4 (diff) | |
| parent | 9b882a6a998381cc1ea34edef55b8a6315114b7b (diff) | |
| download | linux-crypto-7ff17fe228094bad025c79c39e9e23af4364644c.tar.gz linux-crypto-7ff17fe228094bad025c79c39e9e23af4364644c.zip | |
Merge tag 'v5.0-rc1' into next-general
Linux 5.0-rc1
Sync to pick up LSM stacking work (which is based on -rc1).
Diffstat (limited to 'crypto/pcrypt.c')
| -rw-r--r-- | crypto/pcrypt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c index f8ec3d4b..d47cfc47 100644 --- a/crypto/pcrypt.c +++ b/crypto/pcrypt.c @@ -382,7 +382,7 @@ static int pcrypt_cpumask_change_notify(struct notifier_block *self, cpumask_copy(new_mask->mask, cpumask->cbcpu); rcu_assign_pointer(pcrypt->cb_cpumask, new_mask); - synchronize_rcu_bh(); + synchronize_rcu(); free_cpumask_var(old_mask->mask); kfree(old_mask); @@ -394,7 +394,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name) int ret; pinst->kobj.kset = pcrypt_kset; - ret = kobject_add(&pinst->kobj, NULL, name); + ret = kobject_add(&pinst->kobj, NULL, "%s", name); if (!ret) kobject_uevent(&pinst->kobj, KOBJ_ADD); |