mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/scsi/fcoe/fcoe.c
This commit is contained in:
commit
bb803cfbec
1787 changed files with 38426 additions and 34527 deletions
|
|
@ -638,7 +638,7 @@ struct rds_message *rds_send_get_message(struct rds_connection *,
|
|||
void rds_rdma_unuse(struct rds_sock *rs, u32 r_key, int force);
|
||||
|
||||
/* stats.c */
|
||||
DECLARE_PER_CPU(struct rds_statistics, rds_stats);
|
||||
DECLARE_PER_CPU_SHARED_ALIGNED(struct rds_statistics, rds_stats);
|
||||
#define rds_stats_inc_which(which, member) do { \
|
||||
per_cpu(which, get_cpu()).member++; \
|
||||
put_cpu(); \
|
||||
|
|
|
|||
Loading…
Reference in a new issue