From b407dd46b6b1b99161fdeac1bb810ba1fe44177e Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 4 Dec 2012 12:52:28 -0700
Subject: [PATCH] --- yaml --- r: 336237 b: refs/heads/master c:
 527897ccd968c86ad3265d62962c8beccdb94e47 h: refs/heads/master i:   336235:
 fc829c6577d88e2ac2d4b17687f52dc2cd08f306 v: v3

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

diff --git a/[refs] b/[refs]
index 924332674566..1def2c2452cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54d1ae492f724f103a07f69c8e429a35d43b5c52
+refs/heads/master: 527897ccd968c86ad3265d62962c8beccdb94e47
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index ec0aca8ba6bf..c4e11390a44c 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 & RW_MASK) == READ) {
+	if (rw & 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 c8c21be11ab4..dd4b80a9f1a9 100644
--- a/trunk/kernel/watchdog.c
+++ b/trunk/kernel/watchdog.c
@@ -368,9 +368,6 @@ 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 */
diff --git a/trunk/lib/Makefile b/trunk/lib/Makefile
index 821a16229111..a08b791200f3 100644
--- a/trunk/lib/Makefile
+++ b/trunk/lib/Makefile
@@ -163,7 +163,7 @@ $(obj)/crc32table.h: $(obj)/gen_crc32table
 #
 obj-$(CONFIG_OID_REGISTRY) += oid_registry.o
 
-$(obj)/oid_registry.c: $(obj)/oid_registry_data.c
+$(obj)/oid_registry.o: $(obj)/oid_registry_data.c
 
 $(obj)/oid_registry_data.c: $(srctree)/include/linux/oid_registry.h \
 			    $(src)/build_OID_registry