2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 4318935678c5..112f4ec59035 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/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/kernel/rcupdate.c b/kernel/rcupdate.c
index a66d4d1615f7..f2c1a04e9b18 100644
--- a/kernel/rcupdate.c
+++ b/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);