From e0ff8c8b4e6c0c53ffcbcd0e0eaec2a0929ce76a Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 22 Oct 2012 15:05:48 +0100
Subject: [PATCH] --- yaml --- r: 336234 b: refs/heads/master c:
 12e130b04580532aa099893158aa2776b321ae7f h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/fs/buffer.c             |  2 +-
 trunk/kernel/module_signing.c | 14 +++++++-------
 trunk/kernel/watchdog.c       |  3 ---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 4356bfd85aa3..d68a1bc144a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfd1f032f98e5ab3a04f23a0adbd53ff8744827d
+refs/heads/master: 12e130b04580532aa099893158aa2776b321ae7f
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/module_signing.c b/trunk/kernel/module_signing.c
index ea1b1df5dbb0..f2970bddc5ea 100644
--- a/trunk/kernel/module_signing.c
+++ b/trunk/kernel/module_signing.c
@@ -27,13 +27,13 @@
  *	- Information block
  */
 struct module_signature {
-	enum pkey_algo		algo : 8;	/* Public-key crypto algorithm */
-	enum pkey_hash_algo	hash : 8;	/* Digest algorithm */
-	enum pkey_id_type	id_type : 8;	/* Key identifier type */
-	u8			signer_len;	/* Length of signer's name */
-	u8			key_id_len;	/* Length of key identifier */
-	u8			__pad[3];
-	__be32			sig_len;	/* Length of signature data */
+	u8	algo;		/* Public-key crypto algorithm [enum pkey_algo] */
+	u8	hash;		/* Digest algorithm [enum pkey_hash_algo] */
+	u8	id_type;	/* Key identifier type [enum pkey_id_type] */
+	u8	signer_len;	/* Length of signer's name */
+	u8	key_id_len;	/* Length of key identifier */
+	u8	__pad[3];
+	__be32	sig_len;	/* Length of signature data */
 };
 
 /*
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 */