Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  kfifo: fix inaccurate comment
  tools/thermal: tmon: fix for segfault
  net: Spelling s/stucture/structure/
  edd: don't spam log if no EDD information is present
  Documentation: Fix early-microcode.txt references after file rename
  tracing: Block comments should align the * on each line
  treewide: Fix typos in printk
  GenWQE: Fix a typo in two comments
  treewide: Align function definition open/close braces

2 files changed, 7 insertions, 6 deletions

diff --git a/tools/thermal/tmon/sysfs.c b/tools/thermal/tmon/sysfs.c
index 1c12536f2081..18f523557983 100644
--- a/tools/thermal/tmon/sysfs.c
+++ b/tools/thermal/tmon/sysfs.c
@@ -486,6 +486,7 @@ int zone_instance_to_index(int zone_inst)
 int update_thermal_data()
 {
         int i;
+        int next_thermal_record = cur_thermal_record + 1;
         char tz_name[256];
         static unsigned long samples;
 
@@ -495,9 +496,9 @@ int update_thermal_data()
         }
 
         /* circular buffer for keeping historic data */
-        if (cur_thermal_record >= NR_THERMAL_RECORDS)
-                cur_thermal_record = 0;
-        gettimeofday(&trec[cur_thermal_record].tv, NULL);
+        if (next_thermal_record >= NR_THERMAL_RECORDS)
+                next_thermal_record = 0;
+        gettimeofday(&trec[next_thermal_record].tv, NULL);
         if (tmon_log) {
                 fprintf(tmon_log, "%lu ", ++samples);
                 fprintf(tmon_log, "%3.1f ", p_param.t_target);
@@ -507,11 +508,12 @@ int update_thermal_data()
                 snprintf(tz_name, 256, "%s/%s%d", THERMAL_SYSFS, TZONE,
                         ptdata.tzi[i].instance);
                 sysfs_get_ulong(tz_name, "temp",
-                                &trec[cur_thermal_record].temp[i]);
+                                &trec[next_thermal_record].temp[i]);
                 if (tmon_log)
                         fprintf(tmon_log, "%lu ",
-                                trec[cur_thermal_record].temp[i]/1000);
+                                trec[next_thermal_record].temp[i] / 1000);
         }
+        cur_thermal_record = next_thermal_record;
         for (i = 0; i < ptdata.nr_cooling_dev; i++) {
                 char cdev_name[256];
                 unsigned long val;
diff --git a/tools/thermal/tmon/tmon.c b/tools/thermal/tmon/tmon.c
index 9aa19652e8e8..b43138f8b862 100644
--- a/tools/thermal/tmon/tmon.c
+++ b/tools/thermal/tmon/tmon.c
@@ -336,7 +336,6 @@ int main(int argc, char **argv)
                         show_data_w();
                         show_cooling_device();
                 }
-                cur_thermal_record++;
                 time_elapsed += ticktime;
                 controller_handler(trec[0].temp[target_tz_index] / 1000,
                                 &yk);