From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Cong Wang <amwang@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Seth Jennings <sjenning@linux.vnet.ibm.com>,
Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the kmap_atomic tree with the staging.current tree
Date: Thu, 9 Feb 2012 14:48:07 +1100 [thread overview]
Message-ID: <20120209144807.78f2807f594959f3836cf2eb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
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@canb.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;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-02-09 3:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 3:48 Stephen Rothwell [this message]
2012-02-09 8:39 ` linux-next: manual merge of the kmap_atomic tree with the staging.current tree Cong Wang
2012-02-09 8:45 ` Andrew Morton
2012-02-09 9:26 ` Cong Wang
-- strict thread matches above, loose matches on Subject: below --
2012-01-31 3:27 Stephen Rothwell
2012-01-31 3:39 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120209144807.78f2807f594959f3836cf2eb@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=amwang@redhat.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sjenning@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).