diff options
author | Prakash Surya <[email protected]> | 2012-08-23 17:45:31 -0700 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2012-08-24 13:19:06 -0700 |
commit | 15a9e03368d8f186751a432740a5a281f45d712d (patch) | |
tree | 94ad8ef71428ac66e58f816cb993deb5ed8c1aec /include | |
parent | 52cd92022eaf8f105510df708d234012cbe5078d (diff) |
Wrap smp_processor_id in kpreempt_[dis|en]able
After surveying the code, the few places where smp_processor_id is used
were deemed to be safe to use with a preempt enabled kernel. As such, no
core logic had to be changed. These smp_processor_id call sites are simply
are wrapped in kpreempt_disable and kpreempt_enabled to prevent the
Linux kernel from emitting scary warnings.
Signed-off-by: Prakash Surya <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Issue #83
Diffstat (limited to 'include')
-rw-r--r-- | include/sys/zfs_context.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h index 7bcdc9e98..6201214ec 100644 --- a/include/sys/zfs_context.h +++ b/include/sys/zfs_context.h @@ -61,6 +61,7 @@ #include <sys/fm/fs/zfs.h> #include <sys/sunddi.h> #include <sys/ctype.h> +#include <sys/disp.h> #include <linux/dcache_compat.h> #else /* _KERNEL */ @@ -228,6 +229,9 @@ extern kthread_t *zk_thread_create(caddr_t stk, size_t stksize, proc_t *pp, int state, pri_t pri); extern void zk_thread_join(kt_did_t tid); +#define kpreempt_disable() ((void)0) +#define kpreempt_enable() ((void)0) + #define PS_NONE -1 #define issig(why) (FALSE) |