diff for duplicates of <20110104194054.GA635@ericsson.com> diff --git a/a/1.txt b/N1/1.txt index b935c7c..2619cbf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -114,7 +114,7 @@ Or define the struct first and then all the forward declarations. > + struct coretemp_data *data = dev_get_drvdata(dev); > + > + update_alarm(data); -> + if (attr->index = SHOW_CRIT_ALARM) +> + if (attr->index == SHOW_CRIT_ALARM) > + /* read the Out-of-spec log, never clear */ > + return sprintf(buf, "%d\n", data->crit_alarm); > + @@ -132,11 +132,11 @@ readability. > - int err; > + int err = -EINVAL; > -> - if (attr->index = SHOW_TEMP) +> - if (attr->index == SHOW_TEMP) > + switch (attr->index) { > + case SHOW_TEMP: > err = data->valid ? sprintf(buf, "%d\n", data->temp) : -EAGAIN; -> - else if (attr->index = SHOW_TJMAX) +> - else if (attr->index == SHOW_TJMAX) > + break; > + case SHOW_TJMAX: > err = sprintf(buf, "%d\n", data->tjmax); @@ -309,7 +309,7 @@ drivers/hwmon/coretemp.c:396: error: implicit declaration of function ‘apic_wr > + > + rdmsr_on_cpu(data->id, MSR_IA32_THERM_INTERRUPT, &eax, &edx); > + -> + if (thres = CORE_TMIN) { +> + if (thres == CORE_TMIN) { > + eax = (eax & ~THERM_MASK_THRESHOLD0) | > + (diff << THERM_SHIFT_THRESHOLD0); > + data->tmin = temp; @@ -419,9 +419,3 @@ with coretemp support, or is some detection needed ? > lm-sensors mailing list > lm-sensors@lm-sensors.org > http://lists.lm-sensors.org/mailman/listinfo/lm-sensors - - -_______________________________________________ -lm-sensors mailing list -lm-sensors@lm-sensors.org -http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N1/content_digest index 1754174..17da961 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0D6D887BA8C9DFF48B5233887EF04654105C11DB93B@bgsmsx502.gar.corp.intel.com\0" "From\0Guenter Roeck <guenter.roeck@ericsson.com>\0" - "Subject\0Re: [lm-sensors]\0" - "Date\0Tue, 04 Jan 2011 19:40:54 +0000\0" + "Subject\0Re: Patch[2/2]:hwmon:Adding_Threshold_Support_to_Coretemp.c\0" + "Date\0Tue, 4 Jan 2011 11:40:54 -0800\0" "To\0R" " Durgadoss <durgadoss.r@intel.com>\0" "Cc\0x86@kernel.org <x86@kernel.org>" @@ -126,7 +126,7 @@ "> +\tstruct coretemp_data *data = dev_get_drvdata(dev);\n" "> +\n" "> +\tupdate_alarm(data);\n" - "> +\tif (attr->index = SHOW_CRIT_ALARM)\n" + "> +\tif (attr->index == SHOW_CRIT_ALARM)\n" "> +\t\t/* read the Out-of-spec log, never clear */\n" "> +\t\treturn sprintf(buf, \"%d\\n\", data->crit_alarm);\n" "> +\n" @@ -144,11 +144,11 @@ "> -\tint err;\n" "> +\tint err = -EINVAL;\n" "> \n" - "> -\tif (attr->index = SHOW_TEMP)\n" + "> -\tif (attr->index == SHOW_TEMP)\n" "> +\tswitch (attr->index) {\n" "> +\tcase SHOW_TEMP:\n" "> \t\terr = data->valid ? sprintf(buf, \"%d\\n\", data->temp) : -EAGAIN;\n" - "> -\telse if (attr->index = SHOW_TJMAX)\n" + "> -\telse if (attr->index == SHOW_TJMAX)\n" "> +\t\tbreak;\n" "> +\tcase SHOW_TJMAX:\n" "> \t\terr = sprintf(buf, \"%d\\n\", data->tjmax);\n" @@ -321,7 +321,7 @@ "> +\n" "> +\trdmsr_on_cpu(data->id, MSR_IA32_THERM_INTERRUPT, &eax, &edx);\n" "> +\n" - "> +\tif (thres = CORE_TMIN) {\n" + "> +\tif (thres == CORE_TMIN) {\n" "> +\t\teax = (eax & ~THERM_MASK_THRESHOLD0) |\n" "> +\t\t\t\t\t(diff << THERM_SHIFT_THRESHOLD0);\n" "> +\t\tdata->tmin = temp;\n" @@ -430,12 +430,6 @@ "> _______________________________________________\n" "> lm-sensors mailing list\n" "> lm-sensors@lm-sensors.org\n" - "> http://lists.lm-sensors.org/mailman/listinfo/lm-sensors\n" - "\n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + > http://lists.lm-sensors.org/mailman/listinfo/lm-sensors -8599d59b32efef8b97e61eadd454945c9c61ccd87531defb3cb25f5b1e77f770 +d192f7e136332c6bc88b3281972be201b97a7f4f8e544ef7c06beaeeba3bae07
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.