linux-next: manual merge of the kmap_atomic tree with thestaging.current tree

[Stephen Rothwell]

Hi Cong,

Today's linux-next merge of the kmap_atomic tree got a conflict in
drivers/staging/zcache/zcache-main.c between commit 2a4830110b90
("staging: zcache: fix serialization bug in zv stats") from the
staging.current tree and commit a3a2486aeadb ("zcache: remove the second
argument of k [un]map_atomic()") from the kmap_atomic tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/zcache/zcache-main.c
index 875acd8,57550ae..0000000
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@@ -674,9 -675,9 +674,9 @@@ static struct zv_hdr *zv_create(struct 
  			&page, &offset, ZCACHE_GFP_MASK);
  	if (unlikely(ret))
  		goto out;
 -	zv_curr_dist_counts[chunks]++;
 -	zv_cumul_dist_counts[chunks]++;
 +	atomic_inc(&zv_curr_dist_counts[chunks]);
 +	atomic_inc(&zv_cumul_dist_counts[chunks]);
- 	zv = kmap_atomic(page, KM_USER0) + offset;
+ 	zv = kmap_atomic(page) + offset;
  	zv->index = index;
  	zv->oid = *oid;
  	zv->pool_id = pool_id;

Attachment: pgp00000.pgp
Description: PGP signature