Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/ARM Fixes for v4.4-rc3.

Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.

3 files changed, 14 insertions, 11 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 842b0043ad94..8f59f057cdf4 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -324,6 +324,7 @@ config SENSORS_APPLESMC
 config SENSORS_ARM_SCPI
         tristate "ARM SCPI Sensors"
         depends on ARM_SCPI_PROTOCOL
+        depends on THERMAL || !THERMAL_OF
         help
           This driver provides support for temperature, voltage, current
           and power sensors available on ARM Ltd's SCP based platforms. The
@@ -1471,6 +1472,7 @@ config SENSORS_INA209
 config SENSORS_INA2XX
         tristate "Texas Instruments INA219 and compatibles"
         depends on I2C
+        select REGMAP_I2C
         help
           If you say yes here you get support for INA219, INA220, INA226,
           INA230, and INA231 power monitor chips.
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 1f5e956941b1..0af7fd311979 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -537,7 +537,7 @@ static int applesmc_init_index(struct applesmc_registers *s)
 static int applesmc_init_smcreg_try(void)
 {
         struct applesmc_registers *s = &smcreg;
-        bool left_light_sensor, right_light_sensor;
+        bool left_light_sensor = 0, right_light_sensor = 0;
         unsigned int count;
         u8 tmp[1];
         int ret;
diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c
index 2c1241bbf9af..7e20567bc369 100644
--- a/drivers/hwmon/scpi-hwmon.c
+++ b/drivers/hwmon/scpi-hwmon.c
@@ -117,7 +117,7 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
         struct scpi_ops *scpi_ops;
         struct device *hwdev, *dev = &pdev->dev;
         struct scpi_sensors *scpi_sensors;
-        int ret;
+        int ret, idx;
 
         scpi_ops = get_scpi_ops();
         if (!scpi_ops)
@@ -146,8 +146,8 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
 
         scpi_sensors->scpi_ops = scpi_ops;
 
-        for (i = 0; i < nr_sensors; i++) {
-                struct sensor_data *sensor = &scpi_sensors->data[i];
+        for (i = 0, idx = 0; i < nr_sensors; i++) {
+                struct sensor_data *sensor = &scpi_sensors->data[idx];
 
                 ret = scpi_ops->sensor_get_info(i, &sensor->info);
                 if (ret)
@@ -183,7 +183,7 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
                         num_power++;
                         break;
                 default:
-                        break;
+                        continue;
                 }
 
                 sensor->dev_attr_input.attr.mode = S_IRUGO;
@@ -194,11 +194,12 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
                 sensor->dev_attr_label.show = scpi_show_label;
                 sensor->dev_attr_label.attr.name = sensor->label;
 
-                scpi_sensors->attrs[i << 1] = &sensor->dev_attr_input.attr;
-                scpi_sensors->attrs[(i << 1) + 1] = &sensor->dev_attr_label.attr;
+                scpi_sensors->attrs[idx << 1] = &sensor->dev_attr_input.attr;
+                scpi_sensors->attrs[(idx << 1) + 1] = &sensor->dev_attr_label.attr;
 
-                sysfs_attr_init(scpi_sensors->attrs[i << 1]);
-                sysfs_attr_init(scpi_sensors->attrs[(i << 1) + 1]);
+                sysfs_attr_init(scpi_sensors->attrs[idx << 1]);
+                sysfs_attr_init(scpi_sensors->attrs[(idx << 1) + 1]);
+                idx++;
         }
 
         scpi_sensors->group.attrs = scpi_sensors->attrs;
@@ -236,8 +237,8 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
 
                 zone->sensor_id = i;
                 zone->scpi_sensors = scpi_sensors;
-                zone->tzd = thermal_zone_of_sensor_register(dev, i, zone,
-                                                            &scpi_sensor_ops);
+                zone->tzd = thermal_zone_of_sensor_register(dev,
+                                sensor->info.sensor_id, zone, &scpi_sensor_ops);
                 /*
                  * The call to thermal_zone_of_sensor_register returns
                  * an error for sensors that are not associated with