From 5cd5317f97f55f48496d9d5c637df5b0ebb0056b Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Dec 2012 08:39:57 -0800
Subject: [PATCH] --- yaml --- r: 336238 b: refs/heads/master c:
 d91fa971285a3ac33b4e8af6cea7c455543e2599 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/buffer.c       | 2 +-
 trunk/kernel/watchdog.c | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1def2c2452cc..93d2990edf1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 527897ccd968c86ad3265d62962c8beccdb94e47
+refs/heads/master: d91fa971285a3ac33b4e8af6cea7c455543e2599
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index c4e11390a44c..ec0aca8ba6bf 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -2935,7 +2935,7 @@ static void guard_bh_eod(int rw, struct bio *bio, struct buffer_head *bh)
 	bio->bi_io_vec[0].bv_len = bytes;
 
 	/* ..and clear the end of the buffer for reads */
-	if (rw & READ) {
+	if ((rw & RW_MASK) == READ) {
 		void *kaddr = kmap_atomic(bh->b_page);
 		memset(kaddr + bh_offset(bh) + bytes, 0, bh->b_size - bytes);
 		kunmap_atomic(kaddr);
diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c
index dd4b80a9f1a9..c8c21be11ab4 100644
--- a/trunk/kernel/watchdog.c
+++ b/trunk/kernel/watchdog.c
@@ -368,6 +368,9 @@ static void watchdog_disable(unsigned int cpu)
 {
 	struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
 
+	if (!watchdog_enabled)
+		return;
+
 	watchdog_set_prio(SCHED_NORMAL, 0);
 	hrtimer_cancel(hrtimer);
 	/* disable the perf event */