---

yaml --- r: 336236 b: refs/heads/master c: 54d1ae4 h: refs/heads/master v: v3
git-mirror · Dec 6, 2012 · 457b5cb · 457b5cb
1 parent fc829c6
commit 457b5cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3537f91f9be2ce5fcbaa1aa6d787ad0436daec6
+refs/heads/master: 54d1ae492f724f103a07f69c8e429a35d43b5c52
diff --git 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
@@ -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 */