diff for duplicates of <55DF23B4.40609@roeck-us.net> diff --git a/a/1.txt b/N1/1.txt index a1a0420..7e95603 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,8 +22,8 @@ Guenter > struct attribute **fam15h_power_attrs; > + struct cpuinfo_x86 *c = &boot_cpu_data; > -> - if (boot_cpu_data.x86 = 0x15 && boot_cpu_data.x86_model <= 0xf) -> + if (c->x86 = 0x15 && +> - if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf) +> + if (c->x86 == 0x15 && > + ((c->x86_model <= 0xf) || > + (c->x86_model >= 0x60 && c->x86_model <= 0x6f))) > n += 1; @@ -33,17 +33,11 @@ Guenter > > n = 0; > fam15h_power_attrs[n++] = &dev_attr_power1_crit.attr; -> - if (boot_cpu_data.x86 = 0x15 && boot_cpu_data.x86_model <= 0xf) -> + if (c->x86 = 0x15 && +> - if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf) +> + if (c->x86 == 0x15 && > + ((c->x86_model <= 0xf) || > + (c->x86_model >= 0x60 && c->x86_model <= 0x6f))) > fam15h_power_attrs[n++] = &dev_attr_power1_input.attr; > > fam15h_power_group.attrs = fam15h_power_attrs; > - - -_______________________________________________ -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 3d6faaf..a4ea1e2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01440662866-28716-1-git-send-email-ray.huang@amd.com\0" "ref\01440662866-28716-6-git-send-email-ray.huang@amd.com\0" "From\0Guenter Roeck <linux@roeck-us.net>\0" - "Subject\0Re: [lm-sensors] [PATCH 05/15] hwmon, fam15h_power: enable power1_input on AMD Carrizo\0" - "Date\0Thu, 27 Aug 2015 14:50:28 +0000\0" + "Subject\0Re: [PATCH 05/15] hwmon, fam15h_power: enable power1_input on AMD Carrizo\0" + "Date\0Thu, 27 Aug 2015 07:50:28 -0700\0" "To\0Huang Rui <ray.huang@amd.com>" Borislav Petkov <bp@suse.de> Jean Delvare <jdelvare@suse.de> @@ -50,8 +50,8 @@ "> \tstruct attribute **fam15h_power_attrs;\n" "> +\tstruct cpuinfo_x86 *c = &boot_cpu_data;\n" ">\n" - "> -\tif (boot_cpu_data.x86 = 0x15 && boot_cpu_data.x86_model <= 0xf)\n" - "> +\tif (c->x86 = 0x15 &&\n" + "> -\tif (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf)\n" + "> +\tif (c->x86 == 0x15 &&\n" "> +\t ((c->x86_model <= 0xf) ||\n" "> +\t (c->x86_model >= 0x60 && c->x86_model <= 0x6f)))\n" "> \t\tn += 1;\n" @@ -61,19 +61,13 @@ ">\n" "> \tn = 0;\n" "> \tfam15h_power_attrs[n++] = &dev_attr_power1_crit.attr;\n" - "> -\tif (boot_cpu_data.x86 = 0x15 && boot_cpu_data.x86_model <= 0xf)\n" - "> +\tif (c->x86 = 0x15 &&\n" + "> -\tif (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf)\n" + "> +\tif (c->x86 == 0x15 &&\n" "> +\t ((c->x86_model <= 0xf) ||\n" "> +\t (c->x86_model >= 0x60 && c->x86_model <= 0x6f)))\n" "> \t\tfam15h_power_attrs[n++] = &dev_attr_power1_input.attr;\n" ">\n" "> \tfam15h_power_group.attrs = fam15h_power_attrs;\n" - ">\n" - "\n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + > -ade320ac271959e5c3cabf7b59b5c12a53835132ea760e7a269fb4173c3f61b2 +1c9dd9be7033683bac1390ae290a1917878007798bf135e676e6dbadc429ff2c
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.