projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-irqdomain-arm-for-linus' of git://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
net
/
rds
/
ib_rdma.c
diff --git
a/net/rds/ib_rdma.c
b/net/rds/ib_rdma.c
index e8fdb172adbb23940b8d2d698cd72fa216cd6ba1..273b8bff6ba448aa013932f5ac7c9f929f49aa70 100644
(file)
--- a/
net/rds/ib_rdma.c
+++ b/
net/rds/ib_rdma.c
@@
-267,7
+267,7
@@
static inline struct rds_ib_mr *rds_ib_reuse_fmr(struct rds_ib_mr_pool *pool)
unsigned long *flag;
preempt_disable();
unsigned long *flag;
preempt_disable();
- flag =
&__get_cpu_var(
clean_list_grace);
+ flag =
this_cpu_ptr(&
clean_list_grace);
set_bit(CLEAN_LIST_BUSY_BIT, flag);
ret = llist_del_first(&pool->clean_list);
if (ret)
set_bit(CLEAN_LIST_BUSY_BIT, flag);
ret = llist_del_first(&pool->clean_list);
if (ret)