From 0099fc98a58e16cc481730d1bd77d304a75900fb Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 22 Jan 2008 09:18:45 -0800
Subject: [PATCH] --- yaml --- r: 75632 b: refs/heads/master c:
 b2214fca2bf7db492cd508769da7ca703a7f1806 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/w1/slaves/w1_therm.c | 4 ++--
 trunk/kernel/rcupdate.c            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ae35734fba2c..0c089a56e55a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c61935fd0e7f087a643827b4bf5ef646963c10fa
+refs/heads/master: b2214fca2bf7db492cd508769da7ca703a7f1806
diff --git a/trunk/drivers/w1/slaves/w1_therm.c b/trunk/drivers/w1/slaves/w1_therm.c
index 4318935678c5..112f4ec59035 100644
--- a/trunk/drivers/w1/slaves/w1_therm.c
+++ b/trunk/drivers/w1/slaves/w1_therm.c
@@ -112,7 +112,7 @@ static struct w1_therm_family_converter w1_therm_families[] = {
 
 static inline int w1_DS18B20_convert_temp(u8 rom[9])
 {
-	int t = (rom[1] << 8) | rom[0];
+	s16 t = (rom[1] << 8) | rom[0];
 	t /= 16;
 	return t;
 }
@@ -204,7 +204,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj,
 
 				crc = w1_calc_crc8(rom, 8);
 
-				if (rom[8] == crc && rom[0])
+				if (rom[8] == crc)
 					verdict = 1;
 			}
 		}
diff --git a/trunk/kernel/rcupdate.c b/trunk/kernel/rcupdate.c
index a66d4d1615f7..f2c1a04e9b18 100644
--- a/trunk/kernel/rcupdate.c
+++ b/trunk/kernel/rcupdate.c
@@ -549,7 +549,7 @@ static void rcu_init_percpu_data(int cpu, struct rcu_ctrlblk *rcp,
 	rdp->blimit = blimit;
 }
 
-static void __devinit rcu_online_cpu(int cpu)
+static void __cpuinit rcu_online_cpu(int cpu)
 {
 	struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
 	struct rcu_data *bh_rdp = &per_cpu(rcu_bh_data, cpu);