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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 9 Feb 2012 14:48:07 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Cong Wang <amwang@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Seth Jennings <sjenning@...ux.vnet.ibm.com>,
	Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the kmap_atomic tree with the
 staging.current tree

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@...b.auug.org.au

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;

Content of type "application/pgp-signature" skipped