Skip to content

Commit

Permalink
Fix /proc/spl/kstat/simd on x86
Browse files Browse the repository at this point in the history
Evidently while reworking it on aarch64, I broke it on x86 and
didn't notice.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes openzfs#16556
  • Loading branch information
rincebrain authored and tonyhutter committed Nov 5, 2024
1 parent 9616275 commit 948704c
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion module/zcommon/simd_stat.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ kstat_t *simd_stat_kstat;
#endif /* _KERNEL */

#ifdef _KERNEL
/* Sometimes, we don't define these at all. */
#ifndef HAVE_KERNEL_FPU
#define HAVE_KERNEL_FPU (0)
#endif
#ifndef HAVE_UNDERSCORE_KERNEL_FPU
#define HAVE_UNDERSCORE_KERNEL_FPU (0)
#endif

#define SIMD_STAT_PRINT(s, feat, val) \
kmem_scnprintf(s + off, MAX(4095-off, 0), "%-16s\t%1d\n", feat, (val))

Expand All @@ -48,7 +56,7 @@ simd_stat_kstat_data(char *buf, size_t size, void *data)
if (off == 0) {
off += SIMD_STAT_PRINT(simd_stat_kstat_payload,
"kfpu_allowed", kfpu_allowed());
#ifdef __x86__
#if defined(__x86_64__) || defined(__i386__)
off += SIMD_STAT_PRINT(simd_stat_kstat_payload,
"kfpu", HAVE_KERNEL_FPU);
off += SIMD_STAT_PRINT(simd_stat_kstat_payload,
Expand Down

0 comments on commit 948704c

Please sign in to comment.