git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wrap smp_processor_id in kpreempt_[dis|en]able
[zfs.git]
/
module
/
zfs
/
fm.c
diff --git
a/module/zfs/fm.c
b/module/zfs/fm.c
index
e4ecfea
..
a41d353
100644
(file)
--- a/
module/zfs/fm.c
+++ b/
module/zfs/fm.c
@@
-1413,7
+1413,13
@@
fm_ena_generate_cpu(uint64_t timestamp, processorid_t cpuid, uchar_t format)
uint64_t
fm_ena_generate(uint64_t timestamp, uchar_t format)
{
uint64_t
fm_ena_generate(uint64_t timestamp, uchar_t format)
{
- return (fm_ena_generate_cpu(timestamp, getcpuid(), format));
+ uint64_t ena;
+
+ kpreempt_disable();
+ ena = fm_ena_generate_cpu(timestamp, getcpuid(), format);
+ kpreempt_enable();
+
+ return (ena);
}
uint64_t
}
uint64_t