diff options
Diffstat (limited to 'module/icp')
| -rw-r--r-- | module/icp/algs/aes/aes_impl.c | 13 | ||||
| -rw-r--r-- | module/icp/algs/modes/gcm.c | 13 | ||||
| -rw-r--r-- | module/icp/core/kcf_prov_tabs.c | 5 | ||||
| -rw-r--r-- | module/icp/core/kcf_sched.c | 2 | ||||
| -rw-r--r-- | module/icp/os/modconf.c | 4 | ||||
| -rw-r--r-- | module/icp/spi/kcf_spi.c | 15 |
6 files changed, 24 insertions, 28 deletions
diff --git a/module/icp/algs/aes/aes_impl.c b/module/icp/algs/aes/aes_impl.c index 9c53964f0..a68a02cdf 100644 --- a/module/icp/algs/aes/aes_impl.c +++ b/module/icp/algs/aes/aes_impl.c @@ -1593,18 +1593,17 @@ intel_aes_instructions_present(void) : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) : "a"(func), "c"(subfunc)); - if (memcmp((char *) (&ebx), "Genu", 4) == 0 && - memcmp((char *) (&edx), "ineI", 4) == 0 && - memcmp((char *) (&ecx), "ntel", 4) == 0) { - + if (memcmp((char *)(&ebx), "Genu", 4) == 0 && + memcmp((char *)(&edx), "ineI", 4) == 0 && + memcmp((char *)(&ecx), "ntel", 4) == 0) { func = 1; subfunc = 0; /* check for aes-ni instruction set */ __asm__ __volatile__( - "cpuid" - : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) - : "a"(func), "c"(subfunc)); + "cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a"(func), "c"(subfunc)); cached_result = !!(ecx & INTEL_AESNI_FLAG); } else { diff --git a/module/icp/algs/modes/gcm.c b/module/icp/algs/modes/gcm.c index 9cd8ab1e9..80acb6636 100644 --- a/module/icp/algs/modes/gcm.c +++ b/module/icp/algs/modes/gcm.c @@ -723,18 +723,17 @@ intel_pclmulqdq_instruction_present(void) : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) : "a"(func), "c"(subfunc)); - if (memcmp((char *) (&ebx), "Genu", 4) == 0 && - memcmp((char *) (&edx), "ineI", 4) == 0 && - memcmp((char *) (&ecx), "ntel", 4) == 0) { - + if (memcmp((char *)(&ebx), "Genu", 4) == 0 && + memcmp((char *)(&edx), "ineI", 4) == 0 && + memcmp((char *)(&ecx), "ntel", 4) == 0) { func = 1; subfunc = 0; /* check for aes-ni instruction set */ __asm__ __volatile__( - "cpuid" - : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) - : "a"(func), "c"(subfunc)); + "cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a"(func), "c"(subfunc)); cached_result = !!(ecx & INTEL_PCLMULQDQ_FLAG); } else { diff --git a/module/icp/core/kcf_prov_tabs.c b/module/icp/core/kcf_prov_tabs.c index dca0fc103..c29832046 100644 --- a/module/icp/core/kcf_prov_tabs.c +++ b/module/icp/core/kcf_prov_tabs.c @@ -67,8 +67,9 @@ static uint_t prov_tab_max = KCF_MAX_PROVIDERS; void kcf_prov_tab_destroy(void) { - if (prov_tab) kmem_free(prov_tab, prov_tab_max * - sizeof (kcf_provider_desc_t *)); + if (prov_tab) + kmem_free(prov_tab, prov_tab_max * + sizeof (kcf_provider_desc_t *)); } /* diff --git a/module/icp/core/kcf_sched.c b/module/icp/core/kcf_sched.c index 4161bb7e3..90136c421 100644 --- a/module/icp/core/kcf_sched.c +++ b/module/icp/core/kcf_sched.c @@ -1062,7 +1062,7 @@ kcf_sched_destroy(void) for (i = 0; i < REQID_TABLES; i++) { if (kcf_reqid_table[i]) kmem_free(kcf_reqid_table[i], - sizeof (kcf_reqid_table_t)); + sizeof (kcf_reqid_table_t)); } if (gswq) diff --git a/module/icp/os/modconf.c b/module/icp/os/modconf.c index 32b46b5ff..eb50767b7 100644 --- a/module/icp/os/modconf.c +++ b/module/icp/os/modconf.c @@ -71,7 +71,7 @@ mod_install(struct modlinkage *modlp) if (modlp->ml_rev != MODREV_1) { cmn_err(CE_WARN, "mod_install: " - "modlinkage structure is not MODREV_1\n"); + "modlinkage structure is not MODREV_1\n"); return (EINVAL); } linkpp = (struct modlmisc **)&modlp->ml_linkage[0]; @@ -168,4 +168,4 @@ mod_info(struct modlinkage *modlp, struct modinfo *modinfop) if (retval == 0) return (1); return (0); -}
\ No newline at end of file +} diff --git a/module/icp/spi/kcf_spi.c b/module/icp/spi/kcf_spi.c index 8bd86b0a3..c2c2b54bc 100644 --- a/module/icp/spi/kcf_spi.c +++ b/module/icp/spi/kcf_spi.c @@ -701,16 +701,13 @@ kcf_prov_kstat_update(kstat_t *ksp, int rw) ks_data = ksp->ks_data; - ks_data->ps_ops_total.value.ui64 = - pd->pd_sched_info.ks_ndispatches; - ks_data->ps_ops_failed.value.ui64 = - pd->pd_sched_info.ks_nfails; - ks_data->ps_ops_busy_rval.value.ui64 = - pd->pd_sched_info.ks_nbusy_rval; + ks_data->ps_ops_total.value.ui64 = pd->pd_sched_info.ks_ndispatches; + ks_data->ps_ops_failed.value.ui64 = pd->pd_sched_info.ks_nfails; + ks_data->ps_ops_busy_rval.value.ui64 = pd->pd_sched_info.ks_nbusy_rval; ks_data->ps_ops_passed.value.ui64 = - pd->pd_sched_info.ks_ndispatches - - pd->pd_sched_info.ks_nfails - - pd->pd_sched_info.ks_nbusy_rval; + pd->pd_sched_info.ks_ndispatches - + pd->pd_sched_info.ks_nfails - + pd->pd_sched_info.ks_nbusy_rval; return (0); } |