diff for duplicates of <20100722162217.GA22317@linux-os.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index 748a029..0448b11 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -166,21 +166,21 @@ index d307f9f..0c3d1e0 100644 - this_cpu = smp_processor_id(); now = get_jiffies_64(); -- if (level = CORE_LEVEL) +- if (level == CORE_LEVEL) - state = &per_cpu(thermal_state, this_cpu).core; - else - state = &per_cpu(thermal_state, this_cpu).package; -+ if (level = CORE_LEVEL) { -+ if (event = THERMAL_THROTTLING_EVENT) ++ if (level == CORE_LEVEL) { ++ if (event == THERMAL_THROTTLING_EVENT) + state = &pstate->core_throttle; -+ else if (event = POWER_LIMIT_EVENT) ++ else if (event == POWER_LIMIT_EVENT) + state = &pstate->core_power_limit; + else + return 0; -+ } else if (level = PACKAGE_LEVEL) { -+ if (event = THERMAL_THROTTLING_EVENT) ++ } else if (level == PACKAGE_LEVEL) { ++ if (event == THERMAL_THROTTLING_EVENT) + state = &pstate->package_throttle; -+ else if (event = POWER_LIMIT_EVENT) ++ else if (event == POWER_LIMIT_EVENT) + state = &pstate->package_power_limit; + else + return 0; @@ -210,18 +210,18 @@ index d307f9f..0c3d1e0 100644 - if (is_throttled) { - printk(KERN_CRIT "CPU%d: %s temperature above threshold, cpu clock throttled (total events = %lu)\n", - this_cpu, -- level = CORE_LEVEL ? "Core" : "Package", +- level == CORE_LEVEL ? "Core" : "Package", - state->throttle_count); + if (new_event) { -+ if (event = THERMAL_THROTTLING_EVENT) ++ if (event == THERMAL_THROTTLING_EVENT) + printk(KERN_CRIT "CPU%d: %s temperature above threshold, cpu clock throttled (total events = %lu)\n", + this_cpu, -+ level = CORE_LEVEL ? "Core" : "Package", ++ level == CORE_LEVEL ? "Core" : "Package", + state->count); + else + printk(KERN_CRIT "CPU%d: %s power limit notification (total events = %lu)\n", + this_cpu, -+ level = CORE_LEVEL ? "Core" : "Package", ++ level == CORE_LEVEL ? "Core" : "Package", + state->count); add_taint(TAINT_MACHINE_CHECK); @@ -230,16 +230,16 @@ index d307f9f..0c3d1e0 100644 - if (was_throttled) { - printk(KERN_INFO "CPU%d: %s temperature/speed normal\n", - this_cpu, -- level = CORE_LEVEL ? "Core" : "Package"); +- level == CORE_LEVEL ? "Core" : "Package"); + if (old_event) { -+ if (event = THERMAL_THROTTLING_EVENT) ++ if (event == THERMAL_THROTTLING_EVENT) + printk(KERN_INFO "CPU%d: %s temperature/speed normal\n", + this_cpu, -+ level = CORE_LEVEL ? "Core" : "Package"); ++ level == CORE_LEVEL ? "Core" : "Package"); + else + printk(KERN_INFO "CPU%d: %s power limit normal\n", + this_cpu, -+ level = CORE_LEVEL ? "Core" : "Package"); ++ level == CORE_LEVEL ? "Core" : "Package"); return 1; } @@ -365,8 +365,3 @@ index d307f9f..0c3d1e0 100644 } smp_thermal_vector = intel_thermal_interrupt; - -_______________________________________________ -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 db76e97..e2cde3b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\094E56C79ECC49A4B87113985F1FEBA8D03F8AE2A4B@bgsmsx502.gar.corp.intel.com\0" "ref\04C485DF1.5050407@linux.intel.com\0" "From\0Fenghua Yu <fenghua.yu@intel.com>\0" - "Subject\0[lm-sensors] [PATCH 4/5] Package Level Thermal Control and Power\0" - "Date\0Thu, 22 Jul 2010 16:22:17 +0000\0" + "Subject\0[PATCH 4/5] Package Level Thermal Control and Power Limit Notification: power limit notification\0" + "Date\0Thu, 22 Jul 2010 09:22:17 -0700\0" "To\0Ingo Molnar <mingo@redhat.com>" Thomas Gleixner <tglx@linutronix.de> H. Peter Anvin <hpa@linux.intel.com> @@ -184,21 +184,21 @@ " \n" "-\tthis_cpu = smp_processor_id();\n" " \tnow = get_jiffies_64();\n" - "-\tif (level = CORE_LEVEL)\n" + "-\tif (level == CORE_LEVEL)\n" "-\t\tstate = &per_cpu(thermal_state, this_cpu).core;\n" "-\telse\n" "-\t\tstate = &per_cpu(thermal_state, this_cpu).package;\n" - "+\tif (level = CORE_LEVEL) {\n" - "+\t\tif (event = THERMAL_THROTTLING_EVENT)\n" + "+\tif (level == CORE_LEVEL) {\n" + "+\t\tif (event == THERMAL_THROTTLING_EVENT)\n" "+\t\t\tstate = &pstate->core_throttle;\n" - "+\t\telse if (event = POWER_LIMIT_EVENT)\n" + "+\t\telse if (event == POWER_LIMIT_EVENT)\n" "+\t\t\tstate = &pstate->core_power_limit;\n" "+\t\telse\n" "+\t\t\t return 0;\n" - "+\t} else if (level = PACKAGE_LEVEL) {\n" - "+\t\tif (event = THERMAL_THROTTLING_EVENT)\n" + "+\t} else if (level == PACKAGE_LEVEL) {\n" + "+\t\tif (event == THERMAL_THROTTLING_EVENT)\n" "+\t\t\tstate = &pstate->package_throttle;\n" - "+\t\telse if (event = POWER_LIMIT_EVENT)\n" + "+\t\telse if (event == POWER_LIMIT_EVENT)\n" "+\t\t\tstate = &pstate->package_power_limit;\n" "+\t\telse\n" "+\t\t\treturn 0;\n" @@ -228,18 +228,18 @@ "-\tif (is_throttled) {\n" "-\t\tprintk(KERN_CRIT \"CPU%d: %s temperature above threshold, cpu clock throttled (total events = %lu)\\n\",\n" "-\t\t this_cpu,\n" - "-\t\t level = CORE_LEVEL ? \"Core\" : \"Package\",\n" + "-\t\t level == CORE_LEVEL ? \"Core\" : \"Package\",\n" "-\t\t state->throttle_count);\n" "+\tif (new_event) {\n" - "+\t\tif (event = THERMAL_THROTTLING_EVENT)\n" + "+\t\tif (event == THERMAL_THROTTLING_EVENT)\n" "+\t\t\tprintk(KERN_CRIT \"CPU%d: %s temperature above threshold, cpu clock throttled (total events = %lu)\\n\",\n" "+\t\t\t\tthis_cpu,\n" - "+\t\t\t\tlevel = CORE_LEVEL ? \"Core\" : \"Package\",\n" + "+\t\t\t\tlevel == CORE_LEVEL ? \"Core\" : \"Package\",\n" "+\t\t\t\tstate->count);\n" "+\t\telse\n" "+\t\t\tprintk(KERN_CRIT \"CPU%d: %s power limit notification (total events = %lu)\\n\",\n" "+\t\t\t\tthis_cpu,\n" - "+\t\t\t\tlevel = CORE_LEVEL ? \"Core\" : \"Package\",\n" + "+\t\t\t\tlevel == CORE_LEVEL ? \"Core\" : \"Package\",\n" "+\t\t\t\tstate->count);\n" " \n" " \t\tadd_taint(TAINT_MACHINE_CHECK);\n" @@ -248,16 +248,16 @@ "-\tif (was_throttled) {\n" "-\t\tprintk(KERN_INFO \"CPU%d: %s temperature/speed normal\\n\",\n" "-\t\t this_cpu,\n" - "-\t\t level = CORE_LEVEL ? \"Core\" : \"Package\");\n" + "-\t\t level == CORE_LEVEL ? \"Core\" : \"Package\");\n" "+\tif (old_event) {\n" - "+\t\tif (event = THERMAL_THROTTLING_EVENT)\n" + "+\t\tif (event == THERMAL_THROTTLING_EVENT)\n" "+\t\t\tprintk(KERN_INFO \"CPU%d: %s temperature/speed normal\\n\",\n" "+\t\t\t\tthis_cpu,\n" - "+\t\t\t\tlevel = CORE_LEVEL ? \"Core\" : \"Package\");\n" + "+\t\t\t\tlevel == CORE_LEVEL ? \"Core\" : \"Package\");\n" "+\t\telse\n" "+\t\t\tprintk(KERN_INFO \"CPU%d: %s power limit normal\\n\",\n" "+\t\t\t\tthis_cpu,\n" - "+\t\t\t\tlevel = CORE_LEVEL ? \"Core\" : \"Package\");\n" + "+\t\t\t\tlevel == CORE_LEVEL ? \"Core\" : \"Package\");\n" " \t\treturn 1;\n" " \t}\n" " \n" @@ -382,11 +382,6 @@ "+\t\t\t\t| PACKAGE_THERM_INT_HIGH_ENABLE), h);\n" " \t}\n" " \n" - " \tsmp_thermal_vector = intel_thermal_interrupt;\n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + " \tsmp_thermal_vector = intel_thermal_interrupt;" -1cfa79f099aba5135fdbddf7955b600edb485053223842596d37ca382092f31d +05fd4c2c0dff6478655debbe70765b73f01257f27daa0e18966d3f8c12d187a7
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.