From baab287a4dbe97206b9c5c29a10785b3327fed0c Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Mon, 23 May 2011 13:52:35 -0700 Subject: [PATCH] --- yaml --- r: 252130 b: refs/heads/master c: 6777b9e47e4daf7116ec12b69e9b5cc980809217 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/coretemp.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index aaffead1d006..c404e08bd02d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4258781ac720ff8f2fa6c34c1bd06a0cb8562188 +refs/heads/master: 6777b9e47e4daf7116ec12b69e9b5cc980809217 diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c index d9e70ac413a5..833d51ff43b3 100644 --- a/trunk/drivers/hwmon/coretemp.c +++ b/trunk/drivers/hwmon/coretemp.c @@ -511,8 +511,8 @@ static int create_core_data(struct platform_data *pdata, /* * Provide a single set of attributes for all HT siblings of a core * to avoid duplicate sensors (the processor ID and core ID of all - * HT siblings of a core is the same). - * Skip if a HT sibling of this core is already online. + * HT siblings of a core are the same). + * Skip if a HT sibling of this core is already registered. * This is not an error. */ if (pdata->core_data[attr_no] != NULL) @@ -772,10 +772,10 @@ static void __cpuinit put_core_offline(unsigned int cpu) coretemp_remove_core(pdata, &pdev->dev, indx); /* - * If a core is taken offline, but a HT sibling of the same core is - * still online, register the alternate sibling. This ensures that - * exactly one set of attributes is provided as long as at least one - * HT sibling of a core is online. + * If a HT sibling of a core is taken offline, but another HT sibling + * of the same core is still online, register the alternate sibling. + * This ensures that exactly one set of attributes is provided as long + * as at least one HT sibling of a core is online. */ for_each_sibling(i, cpu) { if (i != cpu) {